update factory deployment args json

onflow · May 4, 2024 · 51d4799 · 51d4799
1 parent 245f4b3
commit 51d4799
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
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
@@ -1265,7 +1265,7 @@ contract FlowEVMBridgeUtils {
                 "bridged": "EVMVMBridgedToken"
             }
         }
-        self.bridgeFactoryEVMAddress = EVMUtils.getEVMAddressFromHexString(address: bridgeFactoryAddressHex)
+        self.bridgeFactoryEVMAddress = EVMUtils.getEVMAddressFromHexString(address: bridgeFactoryAddressHex.toLower())
             ?? panic("Invalid EVM address hex")
     }
 }
diff --git a/cadence/transactions/evm/call.cdc b/cadence/transactions/evm/call.cdc
@@ -8,7 +8,7 @@ transaction(evmContractAddressHex: String, calldata: String, gasLimit: UInt64, v
     let coa: auth(EVM.Call) &EVM.CadenceOwnedAccount
 
     prepare(signer: auth(BorrowValue) &Account) {
-        let evmAddressBytes: [UInt8] = evmContractAddressHex.decodeHex()
+        let evmAddressBytes: [UInt8] = evmContractAddressHex.toLower().decodeHex()
         self.evmAddress = EVM.EVMAddress(
                 bytes: [
                     evmAddressBytes[0], evmAddressBytes[1], evmAddressBytes[2], evmAddressBytes[3], evmAddressBytes[4],

diff --git a/cadence/transactions/evm/deploy.cdc b/cadence/transactions/evm/deploy.cdc
@@ -2,7 +2,6 @@ import "FungibleToken"
 import "FlowToken"
 
 import "EVM"
-import "EVMUtils"
 
 /// Deploys a compiled solidity contract from bytecode to the EVM, with the signer's COA as the deployer
 ///

diff --git a/flow.json b/flow.json
@@ -39,13 +39,6 @@
 				"previewnet": "b6763b4399a888c8"
 			}
 		},
-		"EVMDeployer": {
-			"source": "./tests/contracts/EVMDeployer.cdc",
-			"aliases": {
-				"emulator": "f8d6e0586b0a20c7",
-				"testing": "0000000000000009"
-			}
-		},
 		"EVMUtils": {
 			"source": "./cadence/contracts/utils/EVMUtils.cdc",
 			"aliases": {