feat: add Arbitrum GRT bridge (rebased, bridge only)

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Run tests
         run: yarn test:coverage
       - name: Upload coverage report
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.json

.github/workflows/e2e.yml

@@ -30,4 +30,10 @@ jobs:
       - name: Install packages
         run: yarn install --non-interactive --frozen-lockfile
       - name: Run e2e tests
-        run: ADDRESS_BOOK=addresses.json yarn test:e2e
+        run: |
+          git clone https://github.com/edgeandnode/nitro
+          pushd nitro
+          git submodule update --init --recursive
+          ./test-node.bash --init --no-blockscout --detach
+          popd
+          L1_NETWORK=localnitrol1 L2_NETWORK=localnitrol2 yarn test:e2e

.gitignore

@@ -20,5 +20,11 @@ bin/
 /reports
 coverage.json
 
+# Local test files
+addresses-local.json
+localNetwork.json
+arbitrum-addresses-local.json
 tx-*.log
+
+# Keys
 .keystore

.solcover.js

@@ -1,4 +1,4 @@
-const skipFiles = ['bancor', 'ens', 'erc1056']
+const skipFiles = ['bancor', 'ens', 'erc1056', 'arbitrum', 'tests/arbitrum']
 
 module.exports = {
   providerOptions: {

TESTING.md

@@ -33,37 +33,52 @@ There are several types of e2e tests which can be run separately:
   - Read and write interactions with the blockchain. _Requires an account with sufficient balance!_
   - Example: a test validating that a user can add signal to a subgraph.
 
-### Hardhat local node
+### Hardhat local node (L1)
 
-To run all e2e tests against a hardhat local node run:
+It can be useful to run E2E tests against a fresh protocol deployment on L1, this can be done with the following:
 
 ```bash
-yarn test:e2e
+L1_NETWORK=localhost yarn test:e2e
 ```
 
-The command will perform the following actions:
+The command will:
+- start a hardhat local node
+- deploy the L1 protocol
+- configure the new L1 deployment
+- Run all L1 e2e tests
 
-- Start a hardhat node (localhost)
-- Run `migrate:accounts` hardhat task to create keys for all protocol roles (deployer, governor, arbiter, etc). This currently doesn't support multisig accounts.
-- Run `migrate` hardhat task to deploy the protocol
-- Run `migrate:ownership` hardhat task to transfer ownership of governed contracts to the governor
-- Run `migrate:unpause` to unpause the protocol
-- Run `e2e` hardhat task to run all deployment tests (config and init)
-- Run `e2e:scenario` hardhat task to run a scenario
+### Arbitrum Nitro testnodes (L1/L2)
+
+If you want to test the protocol on an L1/L2 setup, you can run:
+
+```bash
+L1_NETWORK=localnitrol1 L2_NETWORK=localnitrol2 yarn test:e2e
+```
+
+In this case the command will:
+- deploy the L1 protocol
+- configure the new L1 deployment
+- deploy the L2 protocol
+- configure the new L2 deployment
+- configure the L1/L2 bridge
+- Run all L1 e2e tests
+- Run all L2 e2e tests
+
+Note that you'll need to setup the testnodes before running the tests. See [Quick Setup](https://github.com/edgeandnode/nitro#quick-setup) for details on how to do this.
 
 ### Other networks
 
 To run tests against a live testnet or even mainnet run:
 
 ```bash
 # All e2e tests
-npx hardhat e2e --network <network> --graph-config config/graph.<network>.yml
+ARBITRUM_ADDRESS_BOOK=<arbitrum-address-book> npx hardhat e2e --network <network> --l1-graph-config config/graph.<l1-network>.yml --l2-graph-config config/graph.<l2-network>.yml
 
 # Only deployment config tests
-npx hardhat e2e:config --network <network> --graph-config config/graph.<network>.yml
+ARBITRUM_ADDRESS_BOOK=<arbitrum-address-book> npx hardhat e2e:config --network <network> --l1-graph-config config/graph.<l1-network>.yml --l2-graph-config config/graph.<l2-network>.yml
 
 # Only deployment init tests
-npx hardhat e2e:init --network <network> --graph-config config/graph.<network>.yml
+ARBITRUM_ADDRESS_BOOK=<arbitrum-address-book> npx hardhat e2e:init --network <network> --l1-graph-config config/graph.<l1-network>.yml --l2-graph-config config/graph.<l2-network>.yml
 
 # Only a specific scenario
 npx hardhat e2e:scenario <scenario> --network <network> --graph-config config/graph.<network>.yml

addresses.json

@@ -496,6 +496,34 @@
     },
     "IEthereumDIDRegistry": {
       "address": "0xdCa7EF03e98e0DC2B855bE647C39ABe984fcF21B"
+    },
+    "BridgeEscrow": {
+      "address": "0x8e4145358af77516B886D865e2EcacC0Fd832B75",
+      "initArgs": ["0x48eD7AfbaB432d1Fc6Ea84EEC70E745d9DAcaF3B"],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x190ea3c8f731a77a8fd1cbce860f9561f233adeafe559b33201b7d21ccd298cf",
+      "proxy": true,
+      "implementation": {
+        "address": "0xDD569E05D54fBF5d02fE4a26aC03Ea00317A0A2e",
+        "creationCodeHash": "0x6a1fc897c0130a1c99221cde1938d247de13a0861111ac47ad81c691f323df1a",
+        "runtimeCodeHash": "0xc8e31a4ebea0c3e43ceece974071ba0b6db2bed6725190795e07a2d369d2a8ab",
+        "txHash": "0x369038dcc8d8e70d40782dd761a82cc453c7a4f1939284c724a5a72119e3e566"
+      }
+    },
+    "L1GraphTokenGateway": {
+      "address": "0xc82fF7b51c3e593D709BA3dE1b3a0d233D1DEca1",
+      "initArgs": ["0x48eD7AfbaB432d1Fc6Ea84EEC70E745d9DAcaF3B"],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x4a06731591df5c5f77c11bf8df7851234873eb6727fbbc93f5595a223f7cf3fc",
+      "proxy": true,
+      "implementation": {
+        "address": "0x06A7A68d0D0D496693508ad3f50A8EA962333B7D",
+        "creationCodeHash": "0x9dac8130793923c7f35f3943b755b7a88e2de9a25d0ae5c0b8cb020b6479151a",
+        "runtimeCodeHash": "0xcd798129b77d26c0b29369138d2d8dd413fcf6cb9b3838c5f95f50d9839a388a",
+        "txHash": "0xa4d75169094cd8601ec507234695d83042e888ec2ab49b0ce150d7aae908d895"
+      }
     }
   },
   "1337": {
@@ -692,5 +720,215 @@
       "runtimeCodeHash": "0x07012b5692ec6cbeb7a6986e061fc5026a2f76545b07bfd9182985de002fa281",
       "txHash": "0xe3d870434e38ee37142a86e0fc54063df59c02c3b70135f070c3a1025c5e8246"
     }
+  },
+  "421613": {
+    "GraphProxyAdmin": {
+      "address": "0x4037466bb242f51575d32E8B1be693b3E5Cd1386",
+      "creationCodeHash": "0x68b304ac6bce7380d5e0f6b14a122f628bffebcc75f8205cb60f0baf578b79c3",
+      "runtimeCodeHash": "0x8d9ba87a745cf82ab407ebabe6c1490197084d320efb6c246d94bcc80e804417",
+      "txHash": "0x9c4d5f8c0ab5a5bc36b0a063ab1ff04372ce7d917c0b200b94544b5da4f0230d"
+    },
+    "BancorFormula": {
+      "address": "0x71319060b9fdeD6174b6368bE04F9A1b7c9aCe48",
+      "creationCodeHash": "0x7ae36017eddb326ddd79c7363781366121361d42fdb201cf57c57424eede46f4",
+      "runtimeCodeHash": "0xed6701e196ad93718e28c2a2a44d110d9e9906085bcfe4faf4f6604b08f0116c",
+      "txHash": "0x7fe8cabb7a4fe56311591aa8d68d6c82cb0d5c232fc5aaf28bed4d1ece0e42e5"
+    },
+    "Controller": {
+      "address": "0x7f734E995010Aa8d28b912703093d532C37b6EAb",
+      "creationCodeHash": "0x798f913fbaa1b2547c917e3dc31679089ab27cba442c511c159803acdba28c15",
+      "runtimeCodeHash": "0x00ae0824f79c4e48d2d23a8d4e6d075f04f44f3ea30a4f4305c345bb98117c62",
+      "txHash": "0x6213da3e6367ef47cd6e1fe23e4d83296f16153a64236a5c91f865f2ec84c089"
+    },
+    "EpochManager": {
+      "address": "0x8ECedc7631f4616D7f4074f9fC9D0368674794BE",
+      "initArgs": ["0x7f734E995010Aa8d28b912703093d532C37b6EAb", "554"],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x62b0d6b8556be9443397ad1f6030fdc47b1a4a3ebcc63f34cdf4091420aec84b",
+      "proxy": true,
+      "implementation": {
+        "address": "0xAaB195Ed1B445A2A0E357494d9036bC746227AE2",
+        "creationCodeHash": "0x83bc0b08dbe1a9259666ec209f06223863f7bb9cfbf917a2d4b795c771a727fe",
+        "runtimeCodeHash": "0xed60261c6dc84ebc16830c36f3ee370a92802601d5a2fe1c3c19f5120dcbc2eb",
+        "txHash": "0xd4f8780490f63432580e3dd5b2b4d9b39e904e8b4ac5cfd23540658cbafe449d"
+      }
+    },
+    "L2GraphToken": {
+      "address": "0x18C924BD5E8b83b47EFaDD632b7178E2Fd36073D",
+      "initArgs": ["0xEfc519BEd6a43a14f1BBBbA9e796C4931f7A5540"],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x7ec14b524141af953959b537c1acbea9b49b12ee906563a6172123b09ab3d1f6",
+      "proxy": true,
+      "implementation": {
+        "address": "0x5dcAcF820D7b9F0640e8a23a5a857675A774C34a",
+        "creationCodeHash": "0x6c4146427aafa7375a569154be95c8c931bf83aab0315706dd78bdf79c889e4c",
+        "runtimeCodeHash": "0x004371d1d80011906953dcba17c648503fc94b94e1e0365c8d8c706ff91f93e9",
+        "txHash": "0xb748498a2ebc90e20dc8da981be832f4e00f08ea9ff289880738705e45d6aeca"
+      }
+    },
+    "GraphCurationToken": {
+      "address": "0x2B757ad83e4ed51ecaE8D4dC9AdE8E3Fa29F7BdC",
+      "creationCodeHash": "0x1ee42ee271cefe20c33c0de904501e618ac4b56debca67c634d0564cecea9ff2",
+      "runtimeCodeHash": "0x340e8f378c0117b300f3ec255bc5c3a273f9ab5bd2940fa8eb3b5065b21f86dc",
+      "txHash": "0x1aa753cd01fa4505c71f6866dae35faee723d181141ed91b6e5cf3082ee90f9b"
+    },
+    "ServiceRegistry": {
+      "address": "0x07ECDD4278D83Cd2425cA86256634f666b659e53",
+      "initArgs": ["0x7f734E995010Aa8d28b912703093d532C37b6EAb"],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x8a13420fdc91139297ab1497fbf5b443c156bbc7b9d2a1ac97fb9f23abde2723",
+      "proxy": true,
+      "implementation": {
+        "address": "0xd18D4B4e84eA4713E04060c93bD079A974BE6C4a",
+        "creationCodeHash": "0x50808e8cce93cf78a23c9e6dd7984356bd2bd93be30b358982909140dd61f6ff",
+        "runtimeCodeHash": "0xaef79c87f7e80107c0dc568cf1f8950459b5174ee3aa565ec487556a655e71db",
+        "txHash": "0x2d6043d89a5f5c4f3d0df0f50264ab7efebc898be0b5d358a00715ba9f657a89"
+      }
+    },
+    "Curation": {
+      "address": "0x7080AAcC4ADF4b1E72615D6eb24CDdE40a04f6Ca",
+      "initArgs": [
+        "0x7f734E995010Aa8d28b912703093d532C37b6EAb",
+        "0x71319060b9fdeD6174b6368bE04F9A1b7c9aCe48",
+        "0x2B757ad83e4ed51ecaE8D4dC9AdE8E3Fa29F7BdC",
+        "1000000",
+        "10000",
+        "1000000000000000000"
+      ],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x2e5744fa4eca56cf6902e27fcc0509487f39bdb0d29b9eb0181db986235289a0",
+      "proxy": true,
+      "implementation": {
+        "address": "0xDA6c9d39b49c3d41CaC2030c6B75b40Efea09817",
+        "creationCodeHash": "0xa5fa77df71a72c5aadba812345978c291c5fa1a3a23129b6eba3a38ac85d8b5d",
+        "runtimeCodeHash": "0x1d265e9f658778b48a0247cfef79bfc9304d1faa1f1e085f2fea85629f68e2d5",
+        "txHash": "0x815eda87a2599d6f2c7458c7b164e7307d05018f0dd72073a50971d424313377"
+      }
+    },
+    "SubgraphNFTDescriptor": {
+      "address": "0x30545f313bD2eb0F85E4f808Ae4D2C016efE78b2",
+      "creationCodeHash": "0xf16e8ff11d852eea165195ac9e0dfa00f98e48f6ce3c77c469c7df9bf195b651",
+      "runtimeCodeHash": "0x39583196f2bcb85789b6e64692d8c0aa56f001c46f0ca3d371abbba2c695860f",
+      "txHash": "0x060839a09e89cbd47adbb8c04cc76b21a00785600a4e8b44939dd928391777e1"
+    },
+    "SubgraphNFT": {
+      "address": "0x5571D8FE183AD1367dF21eE9968690f0Eabdc593",
+      "constructorArgs": ["0xEfc519BEd6a43a14f1BBBbA9e796C4931f7A5540"],
+      "creationCodeHash": "0xc1e58864302084de282dffe54c160e20dd96c6cfff45e00e6ebfc15e04136982",
+      "runtimeCodeHash": "0x7216e736a8a8754e88688fbf5c0c7e9caf35c55ecc3a0c5a597b951c56cf7458",
+      "txHash": "0xc11917ffedda6867648fa2cb62cca1df3c0ed485a0a0885284e93a2c5d33455c"
+    },
+    "GNS": {
+      "address": "0x6bf9104e054537301cC23A1023Ca30A6Df79eB21",
+      "initArgs": [
+        "0x7f734E995010Aa8d28b912703093d532C37b6EAb",
+        "0x71319060b9fdeD6174b6368bE04F9A1b7c9aCe48",
+        "0x5571D8FE183AD1367dF21eE9968690f0Eabdc593"
+      ],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x3c2509730e06249d970818319bb507185d4fdea13d5600cef87928a718950c19",
+      "proxy": true,
+      "implementation": {
+        "address": "0x7eCb82A9Cf9B370d3fC2Ef66E38F38EDFAeaa125",
+        "creationCodeHash": "0xb0be24e926bb24420bb5a8d3f7bd0b70a545fdddbf8cb177a42478adf4435aae",
+        "runtimeCodeHash": "0x4cb62b9def5b691e43ed06808b18efe682fcefb7739909be0d6c87f1eda724cd",
+        "txHash": "0xf1d41fc99ed716a0c890ea62e13ee108ddcb4ecfc74efb715a4ef05605ce449b"
+      }
+    },
+    "Staking": {
+      "address": "0xcd549d0C43d915aEB21d3a331dEaB9B7aF186D26",
+      "initArgs": [
+        "0x7f734E995010Aa8d28b912703093d532C37b6EAb",
+        "100000000000000000000000",
+        "6646",
+        "10000",
+        "100000",
+        "2",
+        "4",
+        "12",
+        "16",
+        "77",
+        "100"
+      ],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0xc98ebdd0a80b97ef8f6305903ef6496a7781db76a5b1b3c3c3b2b10dbd9a7af5",
+      "proxy": true,
+      "implementation": {
+        "address": "0x8E56ee65Ed613f2AecA8898D19497D288601bdeb",
+        "creationCodeHash": "0x75b63ef816627315c635cae7f95917764e2cb797496280cdeaa9b3230bf7f7bc",
+        "runtimeCodeHash": "0x461ccf91c7c6188c94c6df430b6954dfd9c5cc2a79a5e4db21422e11b663d319",
+        "txHash": "0xb9ce53dafab3dcaad25b24d9f998888225103265bd2d84cb1545b4e06e96e3b6",
+        "libraries": {
+          "LibCobbDouglas": "0x86f0f6cd9a38A851E3AB8f110be06B77C199eC1F"
+        }
+      }
+    },
+    "RewardsManager": {
+      "address": "0x5F06ABd1CfAcF7AE99530D7Fed60E085f0B15e8D",
+      "initArgs": ["0x7f734E995010Aa8d28b912703093d532C37b6EAb"],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0xd4cfa95475e9e867fb24babd6a00a5b6b01d2267533e2412986aa1ff94d51c02",
+      "proxy": true,
+      "implementation": {
+        "address": "0x80b54Ba64d8a207785969d9ae0dA984EfE8D10dF",
+        "creationCodeHash": "0x98aaabec491a17401ca37209db0613c91285de061e859574526f841a4dd60c4a",
+        "runtimeCodeHash": "0x2795a83531898957014373bd4595f1f9a381ecfaf787bdfc64380563af06f06a",
+        "txHash": "0xb4bc7ae32ec98394c448f8773bdd3049ab83e236acb6823a7a322d88ecfbfd99"
+      }
+    },
+    "DisputeManager": {
+      "address": "0x16DEF7E0108A5467A106dbD7537f8591f470342E",
+      "initArgs": [
+        "0x7f734E995010Aa8d28b912703093d532C37b6EAb",
+        "0xF89688d5d44d73cc4dE880857A3940487076e5A4",
+        "10000000000000000000000",
+        "500000",
+        "25000",
+        "25000"
+      ],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x70188c9243c2226ac793ac8c0a9eecd76c9b44e53f7f6f97fa177a34808421a0",
+      "proxy": true,
+      "implementation": {
+        "address": "0x39aEdA1d6ea3B62b76C7c439beBfFCb5369a175C",
+        "creationCodeHash": "0x2e77ad7a1627b6e04bece0fe18b3ab543ef4a2d6914f2e5e640b2c8175aca3a8",
+        "runtimeCodeHash": "0x0186afe711eff4ceea28620d091e3c6034fd15be05894119c74a38b020e3a554",
+        "txHash": "0x4efbd28e55866c0292309964f47bd805922ad417e5980e14e055ad693024582d"
+      }
+    },
+    "AllocationExchange": {
+      "address": "0x61809D6Cde07f27D2fcDCb67a42d0Af1988Be5e8",
+      "constructorArgs": [
+        "0x18C924BD5E8b83b47EFaDD632b7178E2Fd36073D",
+        "0xcd549d0C43d915aEB21d3a331dEaB9B7aF186D26",
+        "0x05F359b1319f1Ca9b799CB6386F31421c2c49dBA",
+        "0xD06f366678AE139a94b2AaC2913608De568F1D03"
+      ],
+      "creationCodeHash": "0x96c5b59557c161d80f1617775a7b9537a89b0ecf2258598b3a37724be91ae80a",
+      "runtimeCodeHash": "0xed3d9cce65ddfa8a237d4d7d294ffdb13a082e0adcda3bbd313029cfae1365f3",
+      "txHash": "0x1df63329a21dca69d20e03c076dd89c350970d35319eeefab028cebbc78d29dc"
+    },
+    "L2GraphTokenGateway": {
+      "address": "0xef2757855d2802bA53733901F90C91645973f743",
+      "initArgs": ["0x7f734E995010Aa8d28b912703093d532C37b6EAb"],
+      "creationCodeHash": "0xcdd28bb3db05f1267ca0f5ea29536c61841be5937ce711b813924f8ff38918cc",
+      "runtimeCodeHash": "0x4ca8c37c807bdfda1d6dcf441324b7ea14c6ddec5db37c20c2bf05aeae49bc0d",
+      "txHash": "0x47bde4e3ad0bc077897a3de65058c4b7dd710aa447ec25942f716321cbdc590d",
+      "proxy": true,
+      "implementation": {
+        "address": "0xc68cd0d2ca533232Fd86D6e48b907338B2E0a74A",
+        "creationCodeHash": "0xbd52455bd8b14bfc27af623388fe2f9e06ddd4c4be3fc06c51558a912de91770",
+        "runtimeCodeHash": "0x29e47f693053f978d6b2ac0a327319591bf5b5e8a6e6c0744b8afcc0250bf667",
+        "txHash": "0xf68a5e1e516ee9a646f19bbe4d58336fdfcf5fc859f84cdac5e68b00bcd3a09a"
+      }
+    }
   }
 }