Add wrapper functionality & bridge integration #281

loic1 · 2025-02-07T21:48:16Z

Changes:

Update FlowEVM TopShot contract code:
- Extend ERC721Wrapper OpenZeppelin library
- Remove ERC721URIStorage extension (per-token metadata storage isn't currently needed) and use baseTokenURI contract state variable instead to build metadata endpoint url from tokenURI with token ID
- Extend BridgePermissionsUpgradeable to prevent bridge onboarding before bridge upgrade
- Extend CrossVMBridgeFulfillmentUpgradeable to allow upgraded bridge to fulfill to EVM (i.e., mint or transfer)
Add Cadence bridging & wrapping txs

…ent-wrapper-functionality

loic1 · 2025-02-10T21:43:08Z

evm-bridging/src/BridgedTopShotMoments.sol

    struct RoyaltyInfo {
        address royaltyAddress;
        uint96 royaltyBps;
    }

+    /**
+     * @dev Initializes the contract.


Added contract init params: underlyingNftContractAddress, vmBridgeAddress, baseTokenURI_

loic1 · 2025-02-10T21:43:32Z

evm-bridging/src/BridgedTopShotMoments.sol

@@ -73,31 +117,33 @@ contract BridgedTopShotMoments is
        return _customSymbol;
    }

-    function safeMint(address to, uint256 tokenId, string memory uri) public onlyOwner {


Removed safeMint - minting will only be possible as part of:

Wrapper functionality

Bridge fulfillment (when contract is onboarded to upgraded bridge)

loic1 · 2025-02-10T21:43:58Z

evm-bridging/src/interfaces/IBridgePermissions.sol

+
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+
+interface IBridgePermissions is IERC165 {


From flow-evm-bridge repo

loic1 · 2025-02-10T21:44:27Z

evm-bridging/src/interfaces/ICrossVMBridgeFulfillment.sol

@@ -0,0 +1,6 @@
+pragma solidity 0.8.24;
+
+interface ICrossVMBridgeFulfillment {


Interface conformance expected to be needed to onboard a custom contract in upcoming upgraded bridge

loic1 · 2025-02-10T21:44:32Z

evm-bridging/src/lib/BridgePermissionsUpgradeable.sol

+ * Note: The Flow VM bridge checks for permissions at asset onboarding. If your asset has already
+ * been onboarded, setting `permissions` to `false` will not affect movement between VMs.
+ */
+abstract contract BridgePermissionsUpgradeable is Initializable, ERC165Upgradeable, IBridgePermissions {


From flow-evm-bridge repo

loic1 · 2025-02-10T21:44:55Z

evm-bridging/src/lib/CrossVMBridgeCallableUpgradeable.sol

+ * @dev A base contract intended for use in implementations on Flow, allowing a contract to define
+ *      access to the Cadence X EVM bridge on certain methods.
+ */
+abstract contract CrossVMBridgeCallableUpgradeable is ContextUpgradeable {


Adapted for upgradable contracts from flow-evm-repo draft PR - the functionality is what's currently expected to register a custom contract in upcoming upgraded bridge

loic1 · 2025-02-10T21:45:14Z

evm-bridging/src/lib/CrossVMBridgeFulfillmentUpgradeable.sol

+import {ERC165Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
+import {ICrossVMBridgeFulfillment} from "../interfaces/ICrossVMBridgeFulfillment.sol";
+
+abstract contract CrossVMBridgeFulfillmentUpgradeable is CrossVMBridgeCallableUpgradeable, ERC165Upgradeable, ERC721Upgradeable {


Adapted for upgradable contracts from flow-evm-repo draft PR - the functionality is what's currently expected to register a custom contract in upcoming upgraded bridge

loic1 · 2025-02-10T21:47:20Z

contracts/TopShot.cdc

        }
        return nil
    }

+    // resolveCrossVMPointerView resolves the CrossVMPointer view
+    // access(all) view fun resolveCrossVMPointerView(): MetadataViews.CrossVMPointer {


Commented out until this PR's changes are merged and pushed on-chain - this new metadata view should be returned both from contract and nft metadata views; this should provide the custom contract FlowEVM address

loic1 · 2025-02-10T21:49:04Z

evm-bridging/cadence/transactions/bridge_nfts_to_evm_and_wrap.cdc

+import "FlowEVMBridgeConfig"
+import "FlowEVMBridgeUtils"
+
+/// Bridges NFTs with provided IDs from Cadence to EVM and wraps them in a wrapper ERC721


All-in-one Cadence tx to bridge NFTs from Cadence to EVM and make EVM contract calls to approve wrapper erc721 contract as operator and wrap the bridged NFTs to wrapper erc721 NFTs

Adapted from flow-evm-bridge's batch_bridge_nft_to_evm.cdc

loic1 · 2025-02-10T21:49:48Z

evm-bridging/cadence/transactions/bridge_nfts_to_evm_and_wrap.cdc

+/// @param nftIDs: Array of IDs of the NFTs to wrap
+///
+transaction(
+    wrapperERC721Address: String,


This parameter should not be needed anymore once we can get the contract address from new metadata view on-chain

loic1 · 2025-02-19T00:05:32Z

Key Updates:

Added EVMPointer view support for newly deployed CrossVMMetadataViews (uncommented previously pushed changes)
- Uses placeholder for custom erc721 address until the actual testnet and mainnet contracts are deployed
- Added local test dependency handling
Updated txs to wrap/unwrap only when applicable and to transfer to optional provided evm address (with separate util methods)
Added tx fixes & improvements, withdrawTo/depositFor return checks, safeTransferFrom ownership checks - based on PR feedback + testing

contracts/TopShot.cdc

judezhu · 2025-02-20T01:44:16Z

evm-bridging/cadence/transactions/wrap_nfts.cdc

+    return decodedResult[0] as! EVM.EVMAddress
+}
+
+/// Calls a function on an EVM contract from provided coa


so we decided not to deploy an util contract for the mustCall function?

Yea it would be best achieved by holding the contract in a trusted neutral entity like the bridge account or a keyless account given the privileged access to COA, but it doesn't seem really worth it at this point as the wrapping/unwrapping logic is needed only temporarily until the bridge gains support for custom associations and unwrapping logic within its own context

judezhu

LGTM! left one question

loic1 added 10 commits February 7, 2025 11:47

add creator token functionality & interfaces

8116aae

implement wrapper

2bedd14

add bridge & wrap txs, baseTokenURI

6173a79

call hook from _update (oz v5 removed hooks), add IERC2981 conformance

bf68366

add comments

6169b18

add bridge permissions, fulfillment

8b98082

add bridge tests

916007f

Merge branch 'loic/add-creator-token-implementation' into loic/implem…

3b11214

…ent-wrapper-functionality

fix ci

dee93eb

rename param

f612e73

loic1 commented Feb 10, 2025

View reviewed changes

loic1 marked this pull request as ready for review February 10, 2025 21:52

loic1 requested a review from a team as a code owner February 10, 2025 21:52

loic1 changed the title ~~Implement wrapper functionality~~ Add wrapper functionality & bridge integration Feb 10, 2025

loic1 requested review from judezhu, Deewai and vdojnov February 10, 2025 22:07

loic1 added 4 commits February 10, 2025 19:59

update bridge extensions

a29f2ab

add tests, comments

a2d7e50

update readme

3a84536

add unwrap, transfer txs

2647f75

loic1 changed the base branch from loic/add-creator-token-implementation to evm-bridging February 17, 2025 22:47

loic1 added 6 commits February 17, 2025 15:10

Merge branch 'evm-bridging' into loic/implement-wrapper-functionality

b2ba91a

fix permissions updated event

9c6a36c

fix tx

8f626e1

add IERC4906

9a39230

fix isNFTWrapped, royalty tx

ec30197

return false if empty

03e4d86

loic1 requested review from zhangchiqing, judezhu, vdojnov and sisyphusSmiling February 19, 2025 00:05

loic1 added 3 commits February 18, 2025 18:06

fix type

56fab2c

fix tx param

986f4ed

fix tx

db51016

sisyphusSmiling approved these changes Feb 19, 2025

View reviewed changes

vdojnov reviewed Feb 19, 2025

View reviewed changes

contracts/TopShot.cdc Outdated Show resolved Hide resolved

loic1 added 2 commits February 19, 2025 14:54

parameterize address in metdata view

bea276f

fix tests

f6a88e6

loic1 requested a review from vdojnov February 19, 2025 22:06

loic1 added 3 commits February 19, 2025 17:55

fix json

83e8380

uint256 type

e2a0c9a

add log details

cf9b9b9

judezhu reviewed Feb 20, 2025

View reviewed changes

judezhu approved these changes Feb 20, 2025

View reviewed changes

loic1 added 3 commits February 19, 2025 20:32

increase gas limit

f0bbd4c

rename txs

c921ee3

add comments

0b18873

loic1 merged commit d6c8835 into evm-bridging Feb 20, 2025
1 check passed

loic1 mentioned this pull request Feb 20, 2025

Add EVM bridging project #286

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add wrapper functionality & bridge integration #281

Add wrapper functionality & bridge integration #281

loic1 commented Feb 7, 2025 •

edited

Loading

loic1 Feb 10, 2025

loic1 Feb 10, 2025

loic1 Feb 10, 2025

loic1 Feb 10, 2025

loic1 Feb 10, 2025

loic1 Feb 10, 2025

loic1 Feb 10, 2025

loic1 Feb 10, 2025

loic1 Feb 10, 2025 •

edited

Loading

loic1 Feb 10, 2025

loic1 commented Feb 19, 2025

judezhu Feb 20, 2025

loic1 Feb 20, 2025

judezhu left a comment


		import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";

		interface IBridgePermissions is IERC165 {

		@@ -0,0 +1,6 @@
		pragma solidity 0.8.24;

		interface ICrossVMBridgeFulfillment {

Add wrapper functionality & bridge integration #281

Add wrapper functionality & bridge integration #281

Conversation

loic1 commented Feb 7, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

loic1 Feb 10, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

loic1 commented Feb 19, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

judezhu left a comment

Choose a reason for hiding this comment

loic1 commented Feb 7, 2025 •

edited

Loading

loic1 Feb 10, 2025 •

edited

Loading