Introduce Proxy Colonies

.circleci/config.yml

@@ -61,6 +61,10 @@ step_compile_mock_spy: &step_compile_mock_spy
         cd ./../.. && npx hardhat compile
         cp ./packages/wormhole-relayer/config.example.js ./packages/wormhole-relayer/config.js
         npx tsc
+step_generate_wormhole_types: &step_generate_wormhole_types
+    run:
+      name: "Generate wormhole API types for mock endpoint"
+      command: sudo apt install default-jre && cd ./helpers/wormholescanMock && pnpm i && npm run generate-types
 
 jobs:
   build-checks:
@@ -83,10 +87,10 @@ jobs:
       - run:
           name: "Checking contract storage layout hasn't had additions made"
           command: rm -rf .storage-layouts-normalized && npx hardhat storage-layout --update && npm run normalize:storageSlots && test -z "$(git status --porcelain)"
-      - <<: *step_compile_mock_spy
       - run:
           name: "Linting JavaScript"
           command: pnpm run eslint
+      - <<: *step_compile_mock_spy
       - run:
           name: "Linting Solidity"
           command: pnpm run solhint
@@ -310,32 +314,26 @@ jobs:
       - <<: *step_pull_solc_docker
       - <<: *step_setup_global_packages
       - run:
-          name: "Running chainid tests with coverage for mainnet"
-          command: CHAIN_ID=1 pnpm run test:contracts:chainid:coverage
-          environment:
-            NODE_OPTIONS: --max-old-space-size=6144
-      - run:
-          name: "Running chainid tests with coverage for goerli"
-          command: CHAIN_ID=5 pnpm run test:contracts:chainid:coverage
+          name: "Running chainid tests for Arbitrum One"
+          command: CHAIN_ID=42161 pnpm run test:contracts:chainid:coverage
           environment:
             NODE_OPTIONS: --max-old-space-size=6144
       - run:
-          name: "Running chainid tests with coverage for xDai"
+          name: "Running chainid tests for Xdai"
           command: CHAIN_ID=100 pnpm run test:contracts:chainid:coverage
           environment:
             NODE_OPTIONS: --max-old-space-size=6144
       - run:
-          name: "Running chainid tests with coverage for an unsupported network"
-          command: CHAIN_ID=777 pnpm run test:contracts:chainid:coverage
+          name: "Running chainid tests for Mainnet"
+          command: CHAIN_ID=1 pnpm run test:contracts:chainid:coverage
           environment:
             NODE_OPTIONS: --max-old-space-size=6144
       - persist_to_workspace:
           root: ./
           paths:
-            - coverage-chainid-1
-            - coverage-chainid-5
             - coverage-chainid-100
-            - coverage-chainid-777
+            - coverage-chainid-42161
+            - coverage-chainid-1
   coverage-test-bridging:
     <<: *job_common
     resource_class: large
@@ -348,6 +346,7 @@ jobs:
       - <<: *step_setup_global_packages
       - <<: *step_install_lsof
       - <<: *step_compile_mock_spy
+      - <<: *step_generate_wormhole_types
       - run:
           name: "Installing the safe-contracts dependencies"
           command: cd ./lib/safe-contracts && pnpm i --ignore-scripts

.eslintignore

@@ -7,3 +7,4 @@ keys/*
 lib/*
 packages/**/node_modules
 scripts/mockGuardianSpy.js
+helpers/wormholescanMock/dist/*

.eslintrc

@@ -43,6 +43,7 @@
       "error",
       "ignorePackages",
       {
+        "": "never",
         "js": "never",
         "jsx": "never",
         "ts": "never",

.gitignore

@@ -36,3 +36,4 @@ coverage-extensions/
 .pnpm-store
 .storage-layouts
 scripts/mockGuardianSpy.js
+helpers/wormholescanMock/src/encodeMockVAA.js

.soliumrc.json

@@ -12,6 +12,7 @@
     "error-reason": "error",
     "max-len": "error",
     "no-trailing-whitespace": "error",
-    "blank-lines": "error"
+    "blank-lines": "error",
+    "custom-errors": "off"
   }
 }

.storage-layouts-normalized/contracts/bridging/ProxyColony.sol:ProxyColony.json

@@ -0,0 +1,79 @@
+{
+  "storage": [
+    {
+      "contract": "contracts/bridging/ProxyColony.sol:ProxyColony",
+      "label": "authority",
+      "offset": 0,
+      "slot": "0",
+      "type": {
+        "encoding": "inplace",
+        "label": "contract DSAuthority",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColony.sol:ProxyColony",
+      "label": "owner",
+      "offset": 0,
+      "slot": "1",
+      "type": {
+        "encoding": "inplace",
+        "label": "address",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColony.sol:ProxyColony",
+      "label": "resolver",
+      "offset": 0,
+      "slot": "2",
+      "type": {
+        "encoding": "inplace",
+        "label": "address",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColony.sol:ProxyColony",
+      "label": "metatransactionNonces",
+      "offset": 0,
+      "slot": "3",
+      "type": {
+        "encoding": "mapping",
+        "key": {
+          "encoding": "inplace",
+          "label": "address",
+          "numberOfBytes": "20"
+        },
+        "label": "mapping(address => uint256)",
+        "numberOfBytes": "32",
+        "value": {
+          "encoding": "inplace",
+          "label": "uint256",
+          "numberOfBytes": "32"
+        }
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColony.sol:ProxyColony",
+      "label": "tokenBalances",
+      "offset": 0,
+      "slot": "4",
+      "type": {
+        "encoding": "mapping",
+        "key": {
+          "encoding": "inplace",
+          "label": "address",
+          "numberOfBytes": "20"
+        },
+        "label": "mapping(address => uint256)",
+        "numberOfBytes": "32",
+        "value": {
+          "encoding": "inplace",
+          "label": "uint256",
+          "numberOfBytes": "32"
+        }
+      }
+    }
+  ]
+}

.storage-layouts-normalized/contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork.json

@@ -0,0 +1,102 @@
+{
+  "storage": [
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "authority",
+      "offset": 0,
+      "slot": "0",
+      "type": {
+        "encoding": "inplace",
+        "label": "contract DSAuthority",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "owner",
+      "offset": 0,
+      "slot": "1",
+      "type": {
+        "encoding": "inplace",
+        "label": "address",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "resolver",
+      "offset": 0,
+      "slot": "2",
+      "type": {
+        "encoding": "inplace",
+        "label": "address",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "colonyBridgeAddress",
+      "offset": 0,
+      "slot": "3",
+      "type": {
+        "encoding": "inplace",
+        "label": "address",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "homeChainId",
+      "offset": 0,
+      "slot": "4",
+      "type": {
+        "encoding": "inplace",
+        "label": "uint256",
+        "numberOfBytes": "32"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "proxyColonyResolverAddress",
+      "offset": 0,
+      "slot": "5",
+      "type": {
+        "encoding": "inplace",
+        "label": "address",
+        "numberOfBytes": "20"
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "proxyColonies",
+      "offset": 0,
+      "slot": "6",
+      "type": {
+        "encoding": "mapping",
+        "key": {
+          "encoding": "inplace",
+          "label": "address",
+          "numberOfBytes": "20"
+        },
+        "label": "mapping(address => bool)",
+        "numberOfBytes": "32",
+        "value": {
+          "encoding": "inplace",
+          "label": "bool",
+          "numberOfBytes": "1"
+        }
+      }
+    },
+    {
+      "contract": "contracts/bridging/ProxyColonyNetwork.sol:ProxyColonyNetwork",
+      "label": "domainTokenReceiverResolver",
+      "offset": 0,
+      "slot": "7",
+      "type": {
+        "encoding": "inplace",
+        "label": "address",
+        "numberOfBytes": "20"
+      }
+    }
+  ]
+}