Merge pull request #124 from onflow/blocklist-followup

Remove EVMBlocklist initialization

cadence/contracts/bridge/FlowEVMBridgeConfig.cdc

@@ -229,18 +229,6 @@ contract FlowEVMBridgeConfig {
             ?? panic("Missing or mis-typed Blocklist in storage")
     }
 
-    /// Temporary method to initialize the EVMBlocklist resource as this resource was added after the contract was
-    /// deployed
-    ///
-    access(all)
-    fun initBlocklist() {
-        let path = /storage/evmBlocklist
-        if self.account.storage.type(at: path) != nil{
-            return
-        }
-        self.account.storage.save(<-create EVMBlocklist(), to: path)
-    }
-
     /*****************
         Constructs
      *****************/
@@ -278,28 +266,28 @@ contract FlowEVMBridgeConfig {
     access(all) resource EVMBlocklist {
         /// Mapping of serialized EVM addresses to their blocked status
         ///
-        access(all) let blockList: {String: Bool}
+        access(all) let blocklist: {String: Bool}
 
         init() {
-            self.blockList = {}
+            self.blocklist = {}
         }
 
         /// Returns whether the given EVM address is blocked from onboarding to the bridge
         ///
         access(all) view fun isBlocked(_ evmAddress: EVM.EVMAddress): Bool {
-            return self.blockList[evmAddress.toString()] ?? false
+            return self.blocklist[evmAddress.toString()] ?? false
         }
 
         /// Blocks the given EVM address from onboarding to the bridge
         ///
         access(Blocklist) fun block(_ evmAddress: EVM.EVMAddress) {
-            self.blockList[evmAddress.toString()] = true
+            self.blocklist[evmAddress.toString()] = true
         }
 
         /// Removes the given EVM address from the blocklist
         ///
         access(Blocklist) fun unblock(_ evmAddress: EVM.EVMAddress) {
-            self.blockList.remove(key: evmAddress.toString())
+            self.blocklist.remove(key: evmAddress.toString())
         }
     }
 
@@ -508,5 +496,8 @@ contract FlowEVMBridgeConfig {
         self.account.storage.save(<-create Admin(), to: self.adminStoragePath)
         let adminCap = self.account.capabilities.storage.issue<&Admin>(self.adminStoragePath)
         self.account.capabilities.publish(adminCap, at: self.adminPublicPath)
+
+        // Initialize the EVMBlocklist
+        self.account.storage.save(<-create EVMBlocklist(), to: /storage/evmBlocklist)
     }
 }

cadence/tests/flow_evm_bridge_tests.cdc

@@ -135,13 +135,6 @@ fun setup() {
         arguments: []
     )
     Test.expect(err, Test.beNil())
-    // Initialize EVMBlocklist resource in account storage
-    let initBlocklistResult = executeTransaction(
-        "../transactions/bridge/admin/blocklist/init_blocklist.cdc",
-        [],
-        bridgeAccount
-    )
-    Test.expect(initBlocklistResult, Test.beSucceeded())
 
     // Deploy registry
     let registryDeploymentResult = executeTransaction(

cadence/transactions/bridge/admin/blocklist/block_evm_address.cdc

@@ -12,7 +12,6 @@ transaction(evmContractHex: String) {
     let evmAddress: EVM.EVMAddress
 
     prepare(signer: auth(BorrowValue) &Account) {
-        FlowEVMBridgeConfig.initBlocklist()
         self.evmBlocklist = signer.storage.borrow<auth(FlowEVMBridgeConfig.Blocklist) &FlowEVMBridgeConfig.EVMBlocklist>(
                 from: /storage/evmBlocklist
             ) ?? panic("Could not borrow FlowEVMBridgeConfig Admin reference")

flow.json

@@ -255,7 +255,7 @@
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"mainnet": "f233dcee88fe0abe",
-				"testnet": "8c5303eaa26202d6"
+				"testnet": "9a0766d93b6608b7"
 			}
 		},
 		"EVM": {