chore: added arbitrum and arbitrumGoerli (#18)

* chore: added arbitrum and arbitrumGoerli * ci: fix ci pipeline by adding typescript dev dependency * ci: fix pipeline by removing leftover contracts-ethers lint * ci: do a global lint on every push * fix: etherscan arbitrum name * ci: skip js-client linting * build: add cross-env to fix subgraph ci * refactor: add event explicitly
aragon · Nov 20, 2023 · d2394e6 · d2394e6
1 parent da4da85
commit d2394e6
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 12 deletions.
diff --git a/.env.example b/.env.example
@@ -19,6 +19,7 @@ COINMARKETCAP_API_KEY="zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz"
 ETHERSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
 POLYGONSCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
 BASESCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
+ARBISCAN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
 
 # SUBGRAPH
 

diff --git a/.github/workflows/formatting-linting.yml b/.github/workflows/formatting-linting.yml
@@ -3,6 +3,7 @@ name: 'formatting & linting'
 on:
   workflow_dispatch:
   workflow_call:
+  push:
 
 jobs:
   checks:

diff --git a/packages/contracts/deploy/01_repo/10_create_repo.ts b/packages/contracts/deploy/01_repo/10_create_repo.ts
@@ -1,5 +1,6 @@
 import {PLUGIN_REPO_ENS_NAME} from '../../plugin-settings';
 import {ENS__factory} from '../../typechain';
+import {PluginRepoRegisteredEvent} from '../../typechain/@aragon/osx/framework/plugin/repo/PluginRepoRegistry';
 import {
   findEventTopicLog,
   addDeployedRepo as addCreatedRepo,
@@ -38,7 +39,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     deployer.address
   );
 
-  const eventLog = await findEventTopicLog(
+  const eventLog = await findEventTopicLog<PluginRepoRegisteredEvent>(
     tx,
     PluginRepoRegistry__factory.createInterface(),
     'PluginRepoRegistered'

diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
@@ -29,6 +29,8 @@ const apiUrls: NetworkNameMapping = {
   polygonMumbai: 'https://polygon-mumbai.infura.io/v3/',
   base: 'https://mainnet.base.org',
   baseGoerli: 'https://goerli.base.org',
+  arbitrum: 'https://arbitrum-mainnet.infura.io/v3/',
+  arbitrumGoerli: 'https://arbitrum-goerli.infura.io/v3/',
 };
 
 export const networks: {[index: string]: NetworkUserConfig} = {
@@ -70,6 +72,14 @@ export const networks: {[index: string]: NetworkUserConfig} = {
     url: `${apiUrls.baseGoerli}`,
     gasPrice: ethers.utils.parseUnits('0.0000001', 'gwei').toNumber(),
   },
+  abitrum: {
+    chainId: 42161,
+    url: `${apiUrls.abitrum}${process.env.INFURA_API_KEY}`,
+  },
+  arbitrumGoerli: {
+    chainId: 421613,
+    url: `${apiUrls.arbitrumGoerli}${process.env.INFURA_API_KEY}`,
+  },
 };
 
 // Uses hardhats private key if none is set. DON'T USE THIS ACCOUNT FOR DEPLOYMENTS
@@ -104,6 +114,8 @@ const config: HardhatUserConfig = {
       polygonMumbai: process.env.POLYGONSCAN_API_KEY || '',
       base: process.env.BASESCAN_API_KEY || '',
       baseGoerli: process.env.BASESCAN_API_KEY || '',
+      arbitrumOne: process.env.ARBISCAN_API_KEY || '',
+      arbitrumGoerli: process.env.ARBISCAN_API_KEY || '',
     },
     customChains: [
       {

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -40,8 +40,8 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@aragon/osx": "^1.3.0-rc0.3",
-    "@aragon/osx-ethers": "^1.3.0-rc0.3",
+    "@aragon/osx": "^1.3.0-rc0.4",
+    "@aragon/osx-ethers": "^1.3.0-rc0.4",
     "@ensdomains/ens-contracts": "0.0.20",
     "@openzeppelin/contracts": "^4.8.2",
     "@openzeppelin/contracts-upgradeable": "^4.8.2",

diff --git a/packages/contracts/utils/helpers.ts b/packages/contracts/utils/helpers.ts
@@ -29,6 +29,8 @@ export const networkNameMapping: NetworkNameMapping = {
   polygonMumbai: 'mumbai',
   base: 'base',
   baseGoerli: 'baseGoerli',
+  arbitrum: 'arbitrum',
+  arbitrumGoerli: 'arbitrumGoerli',
 };
 
 export const ERRORS = {

diff --git a/packages/contracts/yarn.lock b/packages/contracts/yarn.lock
@@ -2,17 +2,17 @@
 # yarn lockfile v1
 
 
-"@aragon/osx-ethers@^1.3.0-rc0.3":
-  version "1.3.0-rc0.3"
-  resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.3.0-rc0.3.tgz#53c7ee2888e25704932e4450c1518014cb383093"
-  integrity sha512-8hjNtAni7rGygtZDScJuCUh0QnA5q6gF8zhQycyhCvvjwakxWouLFEySpBPIYoFsMziqFa4E2uu/XyNHQb+YiQ==
+"@aragon/osx-ethers@^1.3.0-rc0.4":
+  version "1.3.0-rc0.4"
+  resolved "https://registry.yarnpkg.com/@aragon/osx-ethers/-/osx-ethers-1.3.0-rc0.4.tgz#878af071e454ef068801104deae8439f0f8f1720"
+  integrity sha512-FDuF6LC1OLnjFK4C8+P4Wf0sORrrUQ/JtUAxL5ABVtBD8JpyyhtdWGDiv/yWIooLyC2l8aqbDLPuiYWhw1DjEQ==
   dependencies:
     ethers "^5.6.2"
 
-"@aragon/osx@^1.3.0-rc0.3":
-  version "1.3.0-rc0.3"
-  resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.3.0-rc0.3.tgz#d35ff40ccbb1b7e24f0c74ecb31953e14d79be73"
-  integrity sha512-QRxS2jXxYir6p94zjhjfc6HH1R+3D48p0DcMU0nYAzKIhjPXORfEpLTk49CkqldhQkCZZXXKYCwNZ97XzHC00g==
+"@aragon/osx@^1.3.0-rc0.4":
+  version "1.3.0-rc0.4"
+  resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.3.0-rc0.4.tgz#c42eba799d9ac57fbe10d5c73bf02681c5d4328d"
+  integrity sha512-vE+zW5LUaPFDvsWWDCESFjibERvWtwsOyqb1pUaB+OS8j9eEZVxsRaSWhe23Nx2vAhUtTF9p77e1vWtCfP/BvQ==
   dependencies:
     "@ensdomains/ens-contracts" "0.0.11"
     "@openzeppelin/contracts" "4.8.1"

diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json
@@ -23,6 +23,7 @@
     "osx-ethersV120": "npm:@aragon/[email protected]",
     "@graphprotocol/graph-cli": "^0.51.0",
     "@graphprotocol/graph-ts": "^0.31.0",
+    "cross-env": "^7.0.3",
     "matchstick-as": "^0.5.2",
     "mustache": "^4.2.0",
     "ts-morph": "^17.0.1",

diff --git a/packages/subgraph/yarn.lock b/packages/subgraph/yarn.lock
@@ -1424,7 +1424,14 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-[email protected], cross-spawn@^7.0.3:
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
+  dependencies:
+    cross-spawn "^7.0.1"
+
+[email protected], cross-spawn@^7.0.1, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ name: 'formatting & linting' @@
     on:
       workflow_dispatch:
       workflow_call:
+      push:
     jobs:
       checks:
@@ Expand Down @@