Skip to content

Commit

Permalink
Add: Support for base sepolia and arbitrum sepolia (#320)
Browse files Browse the repository at this point in the history
* add support foir base and arbitrum sepolia

* update changelog

* add networks to additional networks
  • Loading branch information
josemarinas authored Jan 12, 2024
1 parent 4ee1a00 commit 7e106b5
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 314 deletions.
7 changes: 7 additions & 0 deletions modules/client-common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ TEMPLATE:

## [UPCOMING]

### Added

- Support for arbitrum sepolia network
- Support for base sepolia network

## [1.13.0]

### Changed

-Update `osx-ethers` to v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions modules/client-common/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aragon/sdk-client-common",
"author": "Aragon Association",
"version": "1.13.0",
"version": "1.14.0",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/sdk-client-common.esm.js",
Expand Down Expand Up @@ -58,7 +58,7 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@aragon/osx-ethers": "^1.3.0",
"@aragon/osx-ethers": "^1.3.1",
"@aragon/osx-ethers-v1.0.0": "npm:@aragon/[email protected]",
"@aragon/sdk-ipfs": "^1.1.0",
"@ethersproject/abstract-signer": "^5.5.0",
Expand Down
169 changes: 85 additions & 84 deletions modules/client-common/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ type GraphqlNetworks =
| "mumbai"
| "baseGoerli"
| "baseMainnet"
| "baseSepolia"
| "local"
| "sepolia"
| "arbitrum-one"
| "arbitrum-goerli";
| "arbitrum"
| "arbitrumSepolia"
| "arbitrumGoerli";

const SupportedNetworksToGraphqlNetworks: {
[K in SupportedNetwork]: GraphqlNetworks;
Expand All @@ -30,11 +32,13 @@ const SupportedNetworksToGraphqlNetworks: {
[SupportedNetwork.POLYGON]: "polygon",
[SupportedNetwork.MUMBAI]: "mumbai",
[SupportedNetwork.BASE_GOERLI]: "baseGoerli",
[SupportedNetwork.BASE_SEPOLIA]: "baseSepolia",
[SupportedNetwork.BASE]: "baseMainnet",
[SupportedNetwork.LOCAL]: "local",
[SupportedNetwork.SEPOLIA]: "sepolia",
[SupportedNetwork.ARBITRUM]: "arbitrum-one",
[SupportedNetwork.ARBITRUM_GOERLI]: "arbitrum-goerli",
[SupportedNetwork.ARBITRUM]: "arbitrum",
[SupportedNetwork.ARBITRUM_GOERLI]: "arbitrumGoerli",
[SupportedNetwork.ARBITRUM_SEPOLIA]: "arbitrumSepolia",
};

export const UNSUPPORTED_PROPOSAL_METADATA_LINK: ProposalMetadata = {
Expand Down Expand Up @@ -75,6 +79,9 @@ export const GRAPHQL_NODES: { [K in SupportedNetwork]: { url: string }[] } = {
[SupportedNetwork.BASE_GOERLI]: [{
url: getGraphqlNode(SupportedNetwork.BASE_GOERLI),
}],
[SupportedNetwork.BASE_SEPOLIA]: [{
url: getGraphqlNode(SupportedNetwork.BASE_SEPOLIA),
}],
[SupportedNetwork.LOCAL]: [{ url: getGraphqlNode(SupportedNetwork.LOCAL) }],
[SupportedNetwork.SEPOLIA]: [{
url: getGraphqlNode(SupportedNetwork.SEPOLIA),
Expand All @@ -85,6 +92,9 @@ export const GRAPHQL_NODES: { [K in SupportedNetwork]: { url: string }[] } = {
[SupportedNetwork.ARBITRUM_GOERLI]: [{
url: getGraphqlNode(SupportedNetwork.ARBITRUM_GOERLI),
}],
[SupportedNetwork.ARBITRUM_SEPOLIA]: [{
url: getGraphqlNode(SupportedNetwork.ARBITRUM_SEPOLIA),
}],
};

const IPFS_ENDPOINTS = {
Expand Down Expand Up @@ -118,10 +128,26 @@ export const IPFS_NODES: {
[SupportedNetwork.MUMBAI]: IPFS_ENDPOINTS.test,
[SupportedNetwork.BASE]: IPFS_ENDPOINTS.prod,
[SupportedNetwork.BASE_GOERLI]: IPFS_ENDPOINTS.test,
[SupportedNetwork.BASE_SEPOLIA]: IPFS_ENDPOINTS.test,
[SupportedNetwork.LOCAL]: IPFS_ENDPOINTS.test,
[SupportedNetwork.SEPOLIA]: IPFS_ENDPOINTS.test,
[SupportedNetwork.ARBITRUM]: IPFS_ENDPOINTS.prod,
[SupportedNetwork.ARBITRUM_GOERLI]: IPFS_ENDPOINTS.test,
[SupportedNetwork.ARBITRUM_SEPOLIA]: IPFS_ENDPOINTS.test,
};

const EMPTY_DEPLOYMENT = {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
multisigRepoAddress: "",
adminRepoAddress: "",
addresslistVotingRepoAddress: "",
tokenVotingRepoAddress: "",
multisigSetupAddress: "",
adminSetupAddress: "",
addresslistVotingSetupAddress: "",
tokenVotingSetupAddress: "",
ensRegistryAddress: "",
};

export const LIVE_CONTRACTS: {
Expand Down Expand Up @@ -198,84 +224,14 @@ export const LIVE_CONTRACTS: {
activeContractsListV1_0_0.mumbai.TokenVotingSetup,
ensRegistryAddress: activeContractsListV1_0_0.mumbai.ENSRegistry,
},
[SupportedNetwork.BASE]: {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
multisigRepoAddress: "",
adminRepoAddress: "",
addresslistVotingRepoAddress: "",
tokenVotingRepoAddress: "",
multisigSetupAddress: "",
adminSetupAddress: "",
addresslistVotingSetupAddress: "",
tokenVotingSetupAddress: "",
ensRegistryAddress: "",
},
[SupportedNetwork.BASE_GOERLI]: {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
multisigRepoAddress: "",
adminRepoAddress: "",
addresslistVotingRepoAddress: "",
tokenVotingRepoAddress: "",
multisigSetupAddress: "",
adminSetupAddress: "",
addresslistVotingSetupAddress: "",
tokenVotingSetupAddress: "",
ensRegistryAddress: "",
},
[SupportedNetwork.LOCAL]: {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
multisigRepoAddress: "",
adminRepoAddress: "",
addresslistVotingRepoAddress: "",
tokenVotingRepoAddress: "",
multisigSetupAddress: "",
adminSetupAddress: "",
addresslistVotingSetupAddress: "",
tokenVotingSetupAddress: "",
ensRegistryAddress: "",
},
[SupportedNetwork.SEPOLIA]: {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
multisigRepoAddress: "",
adminRepoAddress: "",
addresslistVotingRepoAddress: "",
tokenVotingRepoAddress: "",
multisigSetupAddress: "",
adminSetupAddress: "",
addresslistVotingSetupAddress: "",
tokenVotingSetupAddress: "",
ensRegistryAddress: "",
},
[SupportedNetwork.ARBITRUM]: {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
multisigRepoAddress: "",
adminRepoAddress: "",
addresslistVotingRepoAddress: "",
tokenVotingRepoAddress: "",
multisigSetupAddress: "",
adminSetupAddress: "",
addresslistVotingSetupAddress: "",
tokenVotingSetupAddress: "",
ensRegistryAddress: "",
},
[SupportedNetwork.ARBITRUM_GOERLI]: {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
multisigRepoAddress: "",
adminRepoAddress: "",
addresslistVotingRepoAddress: "",
tokenVotingRepoAddress: "",
multisigSetupAddress: "",
adminSetupAddress: "",
addresslistVotingSetupAddress: "",
tokenVotingSetupAddress: "",
ensRegistryAddress: "",
},
[SupportedNetwork.BASE]: EMPTY_DEPLOYMENT,
[SupportedNetwork.BASE_GOERLI]: EMPTY_DEPLOYMENT,
[SupportedNetwork.BASE_SEPOLIA]: EMPTY_DEPLOYMENT,
[SupportedNetwork.LOCAL]: EMPTY_DEPLOYMENT,
[SupportedNetwork.SEPOLIA]: EMPTY_DEPLOYMENT,
[SupportedNetwork.ARBITRUM]: EMPTY_DEPLOYMENT,
[SupportedNetwork.ARBITRUM_GOERLI]: EMPTY_DEPLOYMENT,
[SupportedNetwork.ARBITRUM_SEPOLIA]: EMPTY_DEPLOYMENT,
},
[SupportedVersion.V1_3_0]: {
[SupportedNetwork.MAINNET]: {
Expand Down Expand Up @@ -374,6 +330,23 @@ export const LIVE_CONTRACTS: {
tokenVotingSetupAddress: activeContractsList.baseGoerli.TokenVotingSetup,
ensRegistryAddress: activeContractsList.baseGoerli.ENSRegistry,
},
[SupportedNetwork.BASE_SEPOLIA]: {
daoFactoryAddress: activeContractsList.baseSepolia.DAOFactory,
pluginSetupProcessorAddress:
activeContractsList.baseSepolia.PluginSetupProcessor,
multisigRepoAddress: activeContractsList.baseSepolia["multisig-repo"],
adminRepoAddress: activeContractsList.baseSepolia["admin-repo"],
addresslistVotingRepoAddress:
activeContractsList.baseSepolia["address-list-voting-repo"],
tokenVotingRepoAddress:
activeContractsList.baseSepolia["token-voting-repo"],
multisigSetupAddress: activeContractsList.baseSepolia.MultisigSetup,
adminSetupAddress: activeContractsList.baseSepolia.AdminSetup,
addresslistVotingSetupAddress:
activeContractsList.baseSepolia.AddresslistVotingSetup,
tokenVotingSetupAddress: activeContractsList.baseSepolia.TokenVotingSetup,
ensRegistryAddress: activeContractsList.baseSepolia.ENSRegistry,
},
[SupportedNetwork.LOCAL]: {
daoFactoryAddress: "",
pluginSetupProcessorAddress: "",
Expand Down Expand Up @@ -419,6 +392,24 @@ export const LIVE_CONTRACTS: {
tokenVotingSetupAddress: activeContractsList.arbitrum.TokenVotingSetup,
ensRegistryAddress: activeContractsList.arbitrum.ENSRegistry,
},
[SupportedNetwork.ARBITRUM_SEPOLIA]: {
daoFactoryAddress: activeContractsList.arbitrumSepolia.DAOFactory,
pluginSetupProcessorAddress:
activeContractsList.arbitrumSepolia.PluginSetupProcessor,
multisigRepoAddress: activeContractsList.arbitrumSepolia["multisig-repo"],
adminRepoAddress: activeContractsList.arbitrumSepolia["admin-repo"],
addresslistVotingRepoAddress:
activeContractsList.arbitrumSepolia["address-list-voting-repo"],
tokenVotingRepoAddress:
activeContractsList.arbitrumSepolia["token-voting-repo"],
multisigSetupAddress: activeContractsList.arbitrumSepolia.MultisigSetup,
adminSetupAddress: activeContractsList.arbitrumSepolia.AdminSetup,
addresslistVotingSetupAddress:
activeContractsList.arbitrumSepolia.AddresslistVotingSetup,
tokenVotingSetupAddress:
activeContractsList.arbitrumSepolia.TokenVotingSetup,
ensRegistryAddress: activeContractsList.arbitrumSepolia.ENSRegistry,
},
[SupportedNetwork.ARBITRUM_GOERLI]: {
daoFactoryAddress: activeContractsList.arbitrumGoerli.DAOFactory,
pluginSetupProcessorAddress:
Expand All @@ -427,12 +418,14 @@ export const LIVE_CONTRACTS: {
adminRepoAddress: activeContractsList.arbitrumGoerli["admin-repo"],
addresslistVotingRepoAddress:
activeContractsList.arbitrumGoerli["address-list-voting-repo"],
tokenVotingRepoAddress: activeContractsList.arbitrumGoerli["token-voting-repo"],
tokenVotingRepoAddress:
activeContractsList.arbitrumGoerli["token-voting-repo"],
multisigSetupAddress: activeContractsList.arbitrumGoerli.MultisigSetup,
adminSetupAddress: activeContractsList.arbitrumGoerli.AdminSetup,
addresslistVotingSetupAddress:
activeContractsList.arbitrumGoerli.AddresslistVotingSetup,
tokenVotingSetupAddress: activeContractsList.arbitrumGoerli.TokenVotingSetup,
tokenVotingSetupAddress:
activeContractsList.arbitrumGoerli.TokenVotingSetup,
ensRegistryAddress: activeContractsList.arbitrumGoerli.ENSRegistry,
},
},
Expand All @@ -446,6 +439,10 @@ export const ADDITIONAL_NETWORKS: Network[] = [
name: "base",
chainId: 8453,
},
{
name: "baseSepolia",
chainId: 84532,
},
{
name: "arbitrum",
chainId: 42161,
Expand All @@ -454,6 +451,10 @@ export const ADDITIONAL_NETWORKS: Network[] = [
name: "arbitrumGoerli",
chainId: 421613,
},
{
name: "arbitrumSepolia",
chainId: 421614,
},
{
name: "sepolia",
chainId: 11155111,
Expand Down
2 changes: 2 additions & 0 deletions modules/client-common/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ export enum SupportedNetwork {
MUMBAI = "maticmum",
BASE = "base",
BASE_GOERLI = "baseGoerli",
BASE_SEPOLIA = "baseSepolia",
LOCAL = "local",
SEPOLIA = "sepolia",
ARBITRUM = "arbitrum",
ARBITRUM_GOERLI = "arbitrumGoerli",
ARBITRUM_SEPOLIA = "arbitrumSepolia",
}

export const SupportedNetworksArray = Object.values(SupportedNetwork);
Expand Down
8 changes: 8 additions & 0 deletions modules/client/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ TEMPLATE:
-->

## [UPCOMING]

### Added

- Support for arbitrum sepolia network
- Support for base sepolia network

## [1.21.2]

### Fixed
- Compare with dao address in `validatePluginUpdateProposal`

Expand Down
4 changes: 2 additions & 2 deletions modules/client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aragon/sdk-client",
"author": "Aragon Association",
"version": "1.21.2",
"version": "1.22.0",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/sdk-client.esm.js",
Expand Down Expand Up @@ -68,7 +68,7 @@
},
"dependencies": {
"@aragon/osx-ethers": "1.3.0",
"@aragon/sdk-client-common": "^1.13.0",
"@aragon/sdk-client-common": "^1.14.0",
"@aragon/sdk-ipfs": "^1.1.0",
"@ethersproject/abstract-signer": "^5.5.0",
"@ethersproject/bignumber": "^5.6.0",
Expand Down
Loading

0 comments on commit 7e106b5

Please sign in to comment.