Skip to content

Commit 0d84913

Browse files
clauBv23clauBv23
authored
Merge pull request #96 from aragon/feat/new-dev-sepolia-network-deployment
Feat/new dev sepolia network deployment
2 parents 905c184 + f788a0d commit 0d84913

File tree

11 files changed

+208
-6
lines changed

11 files changed

+208
-6
lines changed

‎configs/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 0.7.0-alpha.1
9+
10+
## Added
11+
12+
- Add `devSepolia` network configuration. Test deployment on sepolia/
13+
814
## v0.7.0
915

1016
## Added

‎configs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@aragon/osx-commons-configs",
33
"author": "Aragon X",
4-
"version": "0.7.0",
4+
"version": "0.7.0-alpha.1",
55
"license": "AGPL-3.0-or-later",
66
"typings": "dist/index.d.ts",
77
"main": "dist/index.js",

‎configs/src/deployments/contracts.ts

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as arbitrumSepolia from './json/arbitrumSepolia.json';
44
import * as baseGoerli from './json/baseGoerli.json';
55
import * as baseMainnet from './json/baseMainnet.json';
66
import * as baseSepolia from './json/baseSepolia.json';
7+
import * as devSepolia from './json/devSepolia.json';
78
import * as goerli from './json/goerli.json';
89
import * as holesky from './json/holesky.json';
910
import * as mainnet from './json/mainnet.json';
@@ -28,6 +29,7 @@ export {
2829
arbitrumSepolia,
2930
zksyncSepolia,
3031
zksyncMainnet,
32+
devSepolia,
3133
};
3234

3335
export const contracts: {
@@ -48,6 +50,7 @@ export const contracts: {
4850
arbitrumSepolia,
4951
zksyncSepolia,
5052
zksyncMainnet,
53+
devSepolia,
5154
local: {
5255
[SupportedVersions.V1_0_0]: {} as NetworkDeployment,
5356
[SupportedVersions.V1_3_0]: {} as NetworkDeployment,

‎configs/src/deployments/ens.ts

+4
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ export const exceptionalDomains: ENSNetworkDomainsMap = {
1111
daoEns: 'aragon-dao.eth',
1212
pluginEns: 'plugin.aragon-dao.eth',
1313
},
14+
[SupportedNetworks.DEV_SEPOLIA]: {
15+
daoEns: 'osx-aragon-dao.eth',
16+
pluginEns: 'plugin.osx-aragon-dao.eth',
17+
},
1418
};

‎configs/src/deployments/json/devSepolia.json

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
{
2+
"v1.3.0": {
3+
"DAOFactory": {
4+
"address": "0x23b2070d5f8E7B55644D86a0603e72A53393f539",
5+
"blockNumber": 6415646,
6+
"deploymentTx": "0xd37e7e180a257266587b5400fb4e1bc70abab6174a9b35136d5055a6bfa7dc96"
7+
},
8+
"DAORegistryProxy": {
9+
"address": "0x11C12ECfdDa98e19D765904DCe1Ac2C0504F64c5",
10+
"blockNumber": 6415641,
11+
"deploymentTx": "0xf10b2efb96f2833beb4a8cacfcd72bc26f8b1a834272cc59f756fa6dfb412bcd"
12+
},
13+
"DAORegistryImplementation": {
14+
"address": "0x6e78f5fb862e2eA1ef4a68d35FdDA7DDCB02096B",
15+
"blockNumber": 6415640,
16+
"deploymentTx": "0x65766b368cca6496b1375560d188f8ff36003e20131422b688b75c95284aba4b"
17+
},
18+
"DAOENSSubdomainRegistrarProxy": {
19+
"address": "0x3D38A2927CdC0b67635DF8Da641523bE0e8cC936",
20+
"blockNumber": 6415636,
21+
"deploymentTx": "0xccc1a5f327da909c269bae2bed0fe8135041cbc8a5c0386832679f8861a7d68e"
22+
},
23+
"DAOENSSubdomainRegistrarImplementation": {
24+
"address": "0x6183a5C3EC88aD1033D29Dd0CCDA35d993F41C8a",
25+
"blockNumber": 6415635,
26+
"deploymentTx": "0x426618ba0d989625c9a7dba301dc14a525bb703141480200f41b7fc51012d6b3"
27+
},
28+
"DAOBase": {
29+
"address": "0xe660682c6BB0c27435F8C9Df94840d2464d1E0E9",
30+
"blockNumber": 6415646,
31+
"deploymentTx": "0xd37e7e180a257266587b5400fb4e1bc70abab6174a9b35136d5055a6bfa7dc96"
32+
},
33+
"PluginRepoBase": {
34+
"address": "0x9C61D4266815bdd32f4D2885B6CF5763F449050B",
35+
"blockNumber": 6415644,
36+
"deploymentTx": "0xd16d911f1b49d959bb37d1b5356805c22a22481922ca798e43381b4e954e90e2"
37+
},
38+
"PluginRepoFactory": {
39+
"address": "0x9E96154Fb587285955974c9a141a093f53aBb9E3",
40+
"blockNumber": 6415644,
41+
"deploymentTx": "0xd16d911f1b49d959bb37d1b5356805c22a22481922ca798e43381b4e954e90e2"
42+
},
43+
"PluginRepoRegistryProxy": {
44+
"address": "0xf05128AaE416d6Dd5B1AcCAf18F3E5B1d489b3A4",
45+
"blockNumber": 6415643,
46+
"deploymentTx": "0xf39a760a955db7678183aa6449c0a63f4e8b4fe07c20ece4e7ed07c23e75b867"
47+
},
48+
"PluginRepoRegistryImplementation": {
49+
"address": "0xaE75D9b9791223C224419414A7462942EDcBAC9d",
50+
"blockNumber": 6415642,
51+
"deploymentTx": "0x9d852da36471b9dda36b46a170fdfe50dde1d503638bfd06631ee0879612d90a"
52+
},
53+
"PluginSetupProcessor": {
54+
"address": "0x9e99D11b513dD2cc5e117a5793412106502FF04B",
55+
"blockNumber": 6415645,
56+
"deploymentTx": "0x77e1da37eedc4d1b208ef5b94373e9f8fbf8407f2329cc64ed642bc407b60e78"
57+
},
58+
"PluginENSSubdomainRegistrarProxy": {
59+
"address": "0xE13b0AB38Acf854c3E789948ADdaD918823F0069",
60+
"blockNumber": 6415638,
61+
"deploymentTx": "0xcfc89a665a698b12225332bf5697363efe2d2ccc684b03fce2c6a35ec72fc626"
62+
},
63+
"PluginENSSubdomainRegistrarImplementation": {
64+
"address": "0xf52053738c130D847E4B0686280CeECeA506B9f3",
65+
"blockNumber": 6415637,
66+
"deploymentTx": "0x185130efd16b9868d284040b740ca0d0850c6a54bd46e3ca672434d0940f2af9"
67+
},
68+
"ManagementDAOProxy": {
69+
"address": "0x61fc858Cf5a40c5b77909Fe22d05A5Af5539b6e0",
70+
"blockNumber": 6415414,
71+
"deploymentTx": "0x403f8a9482d9583e9861e910a816e73a0a00a9164dc9cd7952ed995a9468191e"
72+
},
73+
"ManagementDAOImplementation": {
74+
"address": "0x1aE4e907234E0f99a9ae2A89a9Bf58Bec417aA71",
75+
"blockNumber": 6415412,
76+
"deploymentTx": "0xb327327c3502732f58ff0748924869841f9ac925bb04143302cdcb22068e3c37"
77+
},
78+
79+
"AdminRepoProxy": {
80+
"address": "0xEdA3074437375DC71007AFC9D421644656d72287",
81+
"blockNumber": 6422609,
82+
"deploymentTx": "0x515700b942334ab9d0d7a8eecc7d92b1deb3cc1826026ce818182cfa8205e8f5"
83+
},
84+
"AdminRepoImplementation": {
85+
"address": "0x2475F9918b366735D07cc1275fA638485B58C07c",
86+
"blockNumber": 6415644,
87+
"deploymentTx": "0xd16d911f1b49d959bb37d1b5356805c22a22481922ca798e43381b4e954e90e2"
88+
},
89+
"AdminSetup": {
90+
"address": "0x73b082b884AEF34A7B39eb1e1d0947A55F7D2e40",
91+
"blockNumber": 422609,
92+
"deploymentTx": "0x515700b942334ab9d0d7a8eecc7d92b1deb3cc1826026ce818182cfa8205e8f5"
93+
},
94+
"AdminSetupImplementation": {
95+
"address": "0x396C3898bf417281596420416413aaAe76a32C01",
96+
"blockNumber": 6418715,
97+
"deploymentTx": "0x15489a2a4b876a6094b2277cc659f157c4e9c88d1b435c6b097e91e34810ee61"
98+
},
99+
"MultisigRepoProxy": {
100+
"address": "0xA0901B5BC6e04F14a9D0d094653E047644586DdE",
101+
"blockNumber": 6416894,
102+
"deploymentTx": "0xdd388d8f9c36f6333b6cee60e84060866003c5ce31d78c7c0ca491ab2d63c535"
103+
},
104+
"MultisigRepoImplementation": {
105+
"address": "0x9C61D4266815bdd32f4D2885B6CF5763F449050B",
106+
"blockNumber": 6415644,
107+
"deploymentTx": "0xd16d911f1b49d959bb37d1b5356805c22a22481922ca798e43381b4e954e90e2"
108+
},
109+
"MultisigSetup": {
110+
"address": "0x21D379EfC583FB80a00B992B42A72D3D9db693fF",
111+
"blockNumber": 6422538,
112+
"deploymentTx": "0x249a1f763d3fc46d39258a9a6938c3f3d26d1765210690a101029c498c52d9ea"
113+
},
114+
"MultisigSetupImplementation": {
115+
"address": "0xeDf2C1708Cfc105ca2505f099cEf866D541B21ae",
116+
"blockNumber": 6422538,
117+
"deploymentTx": "0x249a1f763d3fc46d39258a9a6938c3f3d26d1765210690a101029c498c52d9ea"
118+
},
119+
"TokenVotingRepoProxy": {
120+
"address": "0x6241ad0D3f162028d2e0000f1A878DBc4F5c4aD0",
121+
"blockNumber": 6418853,
122+
"deploymentTx": "0xa70ed21d5440e3109b2a36f356b53995b58469ce9506eeca118f324bc6f4efc5"
123+
},
124+
"TokenVotingRepoImplementation": {
125+
"address": "0x9C61D4266815bdd32f4D2885B6CF5763F449050B",
126+
"blockNumber": 6415644,
127+
"deploymentTx": "0xd16d911f1b49d959bb37d1b5356805c22a22481922ca798e43381b4e954e90e2"
128+
},
129+
"TokenVotingSetup": {
130+
"address": "0xAD4f235E82BD73b5B9c93915024062D88Bf51e90",
131+
"blockNumber": 6422782,
132+
"deploymentTx": "0x9d8720d172fb75a0f044068b36b3ebc2b1bb0105eb2ed634300ccbd0b5e38e6d"
133+
},
134+
"TokenVotingSetupImplementation": {
135+
"address": "0x14828E7C567Ff951295B76b80Ed6bf38A03B5006",
136+
"blockNumber": 6422782,
137+
"deploymentTx": "0x9d8720d172fb75a0f044068b36b3ebc2b1bb0105eb2ed634300ccbd0b5e38e6d"
138+
},
139+
"GovernanceERC20": {
140+
"address": "0x70c0e74bb54712372B3aFE55b24C1ED6eDf7AA02",
141+
"blockNumber": 6418854,
142+
"deploymentTx": "0xfa5612f824dcd030e5b63014e5277534fb4fe05cb16b32d6b70e77554edfa530"
143+
},
144+
"GovernanceWrappedERC20": {
145+
"address": "0x0395CF05b10D4bDcFf8BC8C5c0e15333fDd80bDa",
146+
"blockNumber": 6418855,
147+
"deploymentTx": "0xbc3f33a9f0522e169f03125af33c354b96ca3d2619e59fe22f4c283b5db1ea58"
148+
},
149+
"StagedProposalProcessorRepoProxy": {
150+
"address": "0xE67b8E026d190876704292442A38163Ce6945d6b",
151+
"blockNumber": 6421862,
152+
"deploymentTx": "0xc9eec74e6c05b9ae7ec4b30322d11e3328056d494fc98fd8ee0b32d29e15ad96"
153+
},
154+
"StagedProposalProcessorRepoImplementation": {
155+
"address": "0x9C61D4266815bdd32f4D2885B6CF5763F449050B",
156+
"blockNumber": 6415644,
157+
"deploymentTx": "0xd16d911f1b49d959bb37d1b5356805c22a22481922ca798e43381b4e954e90e2"
158+
},
159+
"StagedProposalProcessorSetup": {
160+
"address": "0x76bE7c6f3C543BdE9791F5E6CE912729577846e7",
161+
"blockNumber": 6421862,
162+
"deploymentTx": "0x23c2821aec584085666e489e624ba7f18d8d144cefadfd5d825f2be0108fc087"
163+
},
164+
"StagedProposalProcessorSetupImplementation": {
165+
"address": "0x266054ee2c57012232aa9e66887a8C9760C12E40",
166+
"blockNumber": 6421862,
167+
"deploymentTx": "0x23c2821aec584085666e489e624ba7f18d8d144cefadfd5d825f2be0108fc087"
168+
}
169+
}
170+
}

‎configs/src/deployments/types.ts

+4
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ export enum NonFrameworkContractsNames {
6767
GOVERNANCE_ERC20 = 'GovernanceERC20',
6868
GOVERNANCE_WRAPPED_ERC20 = 'GovernanceWrappedERC20',
6969
ENS_REGISTRY = 'ENSRegistry',
70+
STAGED_PROPOSAL_PROCESSOR_REPO_PROXY = 'StagedProposalProcessorRepoProxy',
71+
STAGED_PROPOSAL_PROCESSOR_REPO_IMPLEMENTATION = 'StagedProposalProcessorRepoImplementation',
72+
STAGED_PROPOSAL_PROCESSOR_SETUP = 'StagedProposalProcessorSetup',
73+
STAGED_PROPOSAL_PROCESSOR_SETUP_IMPLEMENTATION = 'StagedProposalProcessorSetupImplementation',
7074
}
7175

7276
export type ENSNetworkDomain = {

‎configs/src/networks/getters.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@ export function getNetwork(network: SupportedNetworks): NetworkConfig | null {
1616
}
1717

1818
export function getNetworkByChainId(chainId: number): NetworkConfig | null {
19-
return (
20-
Object.values(networks).find(network => network.chainId === chainId) || null
21-
);
19+
return chainId === 0
20+
? networks[SupportedNetworks.DEV_SEPOLIA]
21+
: Object.values(networks).find(
22+
network =>
23+
network.chainId === chainId &&
24+
network.name !== SupportedNetworks.DEV_SEPOLIA
25+
) || null;
2226
}
2327

2428
/**

‎configs/src/networks/networks.ts

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ export const networks: NetworkConfigs = {
2121
name: SupportedNetworks.SEPOLIA,
2222
aliases: {},
2323
},
24+
[SupportedNetworks.DEV_SEPOLIA]: {
25+
isTestnet: true,
26+
chainId: 11155111,
27+
name: SupportedNetworks.DEV_SEPOLIA,
28+
aliases: {},
29+
},
2430
[SupportedNetworks.HOLESKY]: {
2531
isTestnet: true,
2632
chainId: 17000,
@@ -116,6 +122,7 @@ export const networksAlchemyRpcUrl: NetworkRpcUrl = {
116122
[SupportedNetworks.MAINNET]: 'https://eth-mainnet.g.alchemy.com/v2/',
117123
[SupportedNetworks.GOERLI]: 'https://eth-goerli.g.alchemy.com/v2/',
118124
[SupportedNetworks.SEPOLIA]: 'https://eth-sepolia.g.alchemy.com/v2/',
125+
[SupportedNetworks.DEV_SEPOLIA]: 'https://eth-sepolia.g.alchemy.com/v2/',
119126
[SupportedNetworks.HOLESKY]: 'https://eth-holesky.g.alchemy.com/v2/',
120127
[SupportedNetworks.POLYGON]: 'https://polygon-mainnet.g.alchemy.com/v2/',
121128
[SupportedNetworks.MUMBAI]: 'https://polygon-mumbai.g.alchemy.com/v2/',

‎configs/src/networks/types.ts

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export enum SupportedNetworks {
88
MAINNET = 'mainnet',
99
GOERLI = 'goerli',
1010
SEPOLIA = 'sepolia',
11+
DEV_SEPOLIA = 'devSepolia',
1112
HOLESKY = 'holesky',
1213
POLYGON = 'polygon',
1314
MUMBAI = 'mumbai',

‎configs/src/test/unit/deployments/ens.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('Domains', () => {
2525
for (const network of Object.values(SupportedNetworks)) {
2626
if (exceptionalDomains[network]) {
2727
expect(getPluginEnsDomain(network)).toMatch(
28-
exceptionalDomains[network]?.daoEns ?? ''
28+
exceptionalDomains[network]?.pluginEns ?? ''
2929
);
3030
} else {
3131
expect(getPluginEnsDomain(network)).toMatch(commonDomain.pluginEns);

‎configs/src/test/unit/networks.test.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ describe('Deployments', () => {
134134
it('should get the network given the chainId', () => {
135135
const inputs = Object.values(SupportedNetworks).map(network => {
136136
return {
137-
network: networks[network].chainId,
137+
network:
138+
network === SupportedNetworks.DEV_SEPOLIA
139+
? 0
140+
: networks[network].chainId,
138141
expected: networks[network],
139142
};
140143
});

0 commit comments

Comments
 (0)