Merge branch 'main' into add-gas-setting-txn

onflow · Jun 27, 2024 · d04268e · d04268e
2 parents 2d63284 + 1a7f269
commit d04268e
Show file tree

Hide file tree

Showing 14 changed files with 873 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,5 @@ coverage.lcov
 local.flow.json
 
 # Local
-.DS_Store
+.DS_Store
+.vscode/
diff --git a/cadence/tests/flow_evm_bridge_handler_tests.cdc b/cadence/tests/flow_evm_bridge_handler_tests.cdc
@@ -455,8 +455,11 @@ fun testBridgeHandledCadenceNativeTokenToEVMFails() {
     // Execute bridge to EVM - should fail since Handler is not enabled
     bridgeTokensToEVM(
         signer: alice,
-        contractAddr: exampleHandledTokenAccount.address,
-        contractName: "ExampleHandledToken",
+        vaultIdentifier: buildTypeIdentifier(
+            address: exampleHandledTokenAccount.address,
+            contractName: "ExampleHandledToken",
+            resourceName: "Vault"
+        ),
         amount: cadenceBalance,
         beFailed: true
     )
@@ -474,8 +477,11 @@ fun testBridgeHandledCadenceNativeTokenFromEVMFails() {
     // Execute bridge from EVM
     bridgeTokensFromEVM(
         signer: alice,
-        contractAddr: exampleHandledTokenAccount.address,
-        contractName: "ExampleHandledToken",
+        vaultIdentifier: buildTypeIdentifier(
+            address: exampleHandledTokenAccount.address,
+            contractName: "ExampleHandledToken",
+            resourceName: "Vault"
+        ),
         amount: evmBalance,
         beFailed: true
     )
@@ -518,8 +524,11 @@ fun testBridgeHandledCadenceNativeTokenToEVMFirstSucceeds() {
     // Execute bridge to EVM
     bridgeTokensToEVM(
         signer: alice,
-        contractAddr: exampleHandledTokenAccount.address,
-        contractName: "ExampleHandledToken",
+        vaultIdentifier: buildTypeIdentifier(
+            address: exampleHandledTokenAccount.address,
+            contractName: "ExampleHandledToken",
+            resourceName: "Vault"
+        ),
         amount: cadenceBalance,
         beFailed: false
     )
@@ -557,8 +566,11 @@ fun testBridgeHandledCadenceNativeTokenFromEVMSecondSucceeds() {
     let ufixEVMbalance = uint256ToUFix64(evmBalance, decimals: defaultDecimals)
     bridgeTokensFromEVM(
         signer: alice,
-        contractAddr: exampleHandledTokenAccount.address,
-        contractName: "ExampleHandledToken",
+        vaultIdentifier: buildTypeIdentifier(
+            address: exampleHandledTokenAccount.address,
+            contractName: "ExampleHandledToken",
+            resourceName: "Vault"
+        ),
         amount: evmBalance,
         beFailed: false
     )
@@ -617,8 +629,11 @@ fun testBridgeHandledCadenceNativeTokenFromEVMFirstSucceeds() {
     // Execute bridge from EVM
     bridgeTokensFromEVM(
         signer: alice,
-        contractAddr: exampleHandledTokenAccount.address,
-        contractName: "ExampleHandledToken",
+        vaultIdentifier: buildTypeIdentifier(
+            address: exampleHandledTokenAccount.address,
+            contractName: "ExampleHandledToken",
+            resourceName: "Vault"
+        ),
         amount: aliceEVMBalanceBefore,
         beFailed: false
     )
@@ -666,9 +681,11 @@ fun testBridgeHandledCadenceNativeTokenToEVMSecondSucceeds() {
     // Execute bridge to EVM
     bridgeTokensToEVM(
         signer: alice,
-        contractAddr: exampleHandledTokenAccount.address,
-        contractName: "ExampleHandledToken",
-        amount: aliceCadenceBalanceBefore,
+        vaultIdentifier: buildTypeIdentifier(
+            address: exampleHandledTokenAccount.address,
+            contractName: "ExampleHandledToken",
+            resourceName: "Vault"
+        ), amount: aliceCadenceBalanceBefore,
         beFailed: false
     )