Fix deployment of EVMBridgeRouter on service account

cadence/scripts/test/is_bridge_router_configured.cdc

@@ -0,0 +1,14 @@
+import "EVMBridgeRouter"
+
+access(all)
+fun main(): Bool {
+    let serviceAccount = getAuthAccount<auth(Storage) &Account>(0x0000000000000001)
+    let router = serviceAccount.storage.borrow<&EVMBridgeRouter.Router>(
+        from: /storage/evmBridgeRouter
+    ) ?? panic("Could not borrow Router")
+
+    assert(router.bridgeAddress == 0x0000000000000007)
+    assert(router.bridgeContractName == "FlowEVMBridge")
+
+    return true
+}

cadence/tests/flow_evm_bridge_tests.cdc

@@ -146,22 +146,12 @@ fun setup() {
     )
     Test.expect(err, Test.beNil())
 
-    // Deploy EVMBridgeRouter manually to service account for COA -> bridge integration
-    let deployResult = executeTransaction(
-        "../transactions/test/add_contract.cdc",
-        ["EVMBridgeRouter", getEVMBridgeRouterCode(), bridgeAccount.address, "FlowEVMBridge"],
-        serviceAccount
+    err = Test.deployContract(
+        name: "EVMBridgeRouter",
+        path: "../contracts/bridge/EVMBridgeRouter.cdc",
+        arguments: [bridgeAccount.address, "FlowEVMBridge"]
     )
-    Test.expect(updateResult, Test.beSucceeded())
-    // TODO: Remove once issue is address - added here for validation
-    Test.assertEqual(true, getAccount(serviceAccount.address).contracts.names.contains("EVMBridgeRouter"))
-    // This also fails with  I.Test.Test.Error(message: "could not find an account with address: 0000000000000001")
-    // err = Test.deployContract(
-    //     name: "EVMBridgeRouter",
-    //     path: "../contracts/bridge/EVMBridgeRouter.cdc",
-    //     arguments: []
-    // )
-    // Test.expect(err, Test.beNil())
+    Test.expect(err, Test.beNil())
 
     // Transfer ERC721 deployer some $FLOW
     let fundERC721AccountResult = executeTransaction(