Merge pull request #24 from onflow/merge-test-fix-base

Add NFT Bridging Cadence tests
onflow · Apr 3, 2024 · 5d36089 · 5d36089
2 parents 1ed2dab + 97cdfcd
commit 5d36089
Show file tree

Hide file tree

Showing 25 changed files with 1,160 additions and 138 deletions.
diff --git a/.github/workflows/cadence_test.yml b/.github/workflows/cadence_test.yml
@@ -11,25 +11,24 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20.x'
+          go-version: "1.20.x"
       - uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
       - name: Install Flow CLI
-        run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.15.0-cadence-v1.0.0-preview.12
+        run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/feature/stable-cadence/install.sh)"
       - name: Flow CLI Version
-        run: flow version
+        run: flow-c1 version
       - name: Update PATH
         run: echo "/root/.local/bin" >> $GITHUB_PATH
       - name: Run tests
         run: sh local/run_cadence_tests.sh
       - name: Normalize coverage report filepaths
-        run : sh ./local/normalize_coverage_report.sh
+        run: sh ./local/normalize_coverage_report.sh
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
diff --git a/cadence/args/bridged-nft-code-chunks-args.json b/cadence/args/bridged-nft-code-chunks-args.json
diff --git a/cadence/args/deploy-factory-args.json b/cadence/args/deploy-factory-args.json
diff --git a/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc b/cadence/contracts/bridge/FlowEVMBridgeUtils.cdc
@@ -690,7 +690,7 @@ contract FlowEVMBridgeUtils {
         )
     }
 
-    init(bridgeFactoryEVMAddress: String) {
+    init(bridgeFactoryBytecodeHex: String) {
         self.delimiter = "_"
         self.contractNamePrefixes = {
             Type<@{NonFungibleToken.NFT}>(): {
@@ -700,8 +700,11 @@ contract FlowEVMBridgeUtils {
                 "bridged": "EVMVMBridgedToken"
             }
         }
-        let bridgeFactoryEVMAddressBytes: [UInt8] = bridgeFactoryEVMAddress.decodeHex()
-        self.bridgeFactoryEVMAddress = self.getEVMAddressFromHexString(address: bridgeFactoryEVMAddress)
-            ?? panic("Invalid bridge factory EVM address")
+        // Deploy the FlowBridgeFactory.sol contract from provided bytecode and capture the deployed address
+        self.bridgeFactoryEVMAddress = self.borrowCOA().deploy(
+            code: bridgeFactoryBytecodeHex.decodeHex(),
+            gasLimit: 15000000,
+            value: EVM.Balance(attoflow: 0)
+        )
     }
 }
diff --git a/cadence/contracts/templates/emulator/EVMBridgedNFTTemplate.cdc b/cadence/contracts/templates/emulator/EVMBridgedNFTTemplate.cdc
@@ -32,8 +32,6 @@ access(all) contract {{CONTRACT_NAME}} : ICrossVM, IEVMBridgeNFTMinter, NonFungi
 
     /// Pointer to the Factory deployed Solidity contract address defining the bridged asset
     access(all) let evmNFTContractAddress: EVM.EVMAddress
-    /// Pointer to the Flow NFT contract address defining the bridged asset, this contract address in this case
-    access(all) let flowNFTContractAddress: Address
     /// Name of the NFT collection defined in the corresponding ERC721 contract
     access(all) let name: String
     /// Symbol of the NFT collection defined in the corresponding ERC721 contract
@@ -365,7 +363,6 @@ access(all) contract {{CONTRACT_NAME}} : ICrossVM, IEVMBridgeNFTMinter, NonFungi
 
     init(name: String, symbol: String, evmContractAddress: EVM.EVMAddress, contractURI: String?) {
         self.evmNFTContractAddress = evmContractAddress
-        self.flowNFTContractAddress = self.account.address
         self.name = name
         self.symbol = symbol
         self.contractURI = contractURI