Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: added arbitrum and arbitrumGoerli #18

Merged
merged 10 commits into from
Nov 20, 2023
Merged

chore: added arbitrum and arbitrumGoerli #18

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
27dd0bd
chore: added arbitrum and arbitrumGoerli
heueristik Nov 10, 2023
d5b3ffa
ci: fix ci pipeline by adding typescript dev dependency
heueristik Nov 10, 2023
474c6ce
ci: fix pipeline by removing leftover contracts-ethers lint
heueristik Nov 10, 2023
7caeacb
ci: do a global lint on every push
heueristik Nov 10, 2023
4e79e0e
fix: etherscan arbitrum name
heueristik Nov 10, 2023
474750f
ci: skip js-client linting
heueristik Nov 14, 2023
d0c5983
Merge branch 'main' into feature/OS-804-arbitrum-support
heueristik Nov 14, 2023
e22dbf4
Merge remote-tracking branch 'origin/main' into feature/OS-804-arbitr…
heueristik Nov 20, 2023
54d5407
build: add cross-env to fix subgraph ci
heueristik Nov 20, 2023
8db0695
refactor: add event explicitly
heueristik Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/formatting-linting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: 'formatting & linting'
on:
workflow_dispatch:
workflow_call:
push:
heueristik marked this conversation as resolved.
Show resolved Hide resolved

jobs:
checks:
Expand All @@ -29,9 +30,6 @@ jobs:
- name: 'Lint contracts ts and js'
run: yarn lint:contracts:ts >> $GITHUB_STEP_SUMMARY

- name: 'Lint contracts-ethers ts and js'
run: yarn lint:contracts-ethers:ts >> $GITHUB_STEP_SUMMARY

- name: 'Lint js-client ts and js'
run: yarn lint:js-client:ts >> $GITHUB_STEP_SUMMARY
heueristik marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
12 changes: 12 additions & 0 deletions packages/contracts/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} = {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 || '',
heueristik marked this conversation as resolved.
Show resolved Hide resolved
arbitrumGoerli: process.env.ARBISCAN_API_KEY || '',
},
customChains: [
{
Expand Down
7 changes: 4 additions & 3 deletions packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@
"solidity-coverage": "^0.8.2",
"tmp-promise": "^3.0.3",
"ts-node": "^10.9.1",
"typechain": "^8.3.2"
"typechain": "^8.3.2",
"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",
Expand Down
2 changes: 2 additions & 0 deletions packages/contracts/utils/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export const networkNameMapping: NetworkNameMapping = {
polygonMumbai: 'mumbai',
base: 'base',
baseGoerli: 'baseGoerli',
arbitrum: 'arbitrum',
arbitrumGoerli: 'arbitrumGoerli',
};

export const ERRORS = {
Expand Down
21 changes: 13 additions & 8 deletions packages/contracts/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -7294,6 +7294,11 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

typescript@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==

typical@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
Expand Down
Loading