Skip to content

Commit 8db5451

Browse files
zguesmizguesmi
authored
chore: Clean config.json files (#283)
1 parent 5857e81 commit 8db5451

File tree

13 files changed

+115
-316
lines changed

13 files changed

+115
-316
lines changed

‎.env.template‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
# Also defined in Github environments
2-
# Hardhat Account #0 (0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266)
3-
DEPLOYER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
4-
# Hardhat Account #1 (0x70997970C51812dc3A010C7d01b50e0d17dc79C8)
5-
ADMIN_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
62
EXPLORER_API_KEY=
73
IS_VERIFICATION_API_V2=
84
ARBISCAN_API_KEY=
95

106
# Local development
11-
FUJI_RPC_URL=
127
ARBITRUM_SEPOLIA_RPC_URL=

‎.github/workflows/deploy.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- hardhat
1212
- arbitrumSepolia
1313
- arbitrum
14-
- avalancheFujiTestnet
1514
- bellecour
1615
default: 'hardhat'
1716

@@ -47,8 +46,6 @@ jobs:
4746
# run: |
4847
# if [ "${{ inputs.network }}" == "arbitrumSepolia" ]; then
4948
# npm run test:arbitrumSepolia
50-
# elif [ "${{ inputs.network }}" == "avalancheFujiTestnet" ]; then
51-
# npm run test:fuji
5249
# fi
5350

5451
- name: Deploy contracts

‎config/config.json‎

Lines changed: 49 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
},
3434
"chains": {
3535
"1": {
36-
"_comment": "asset should be Token or Native",
36+
"name": "Ethereum Mainnet",
37+
"deployer": "TODO",
38+
"owner": "TODO",
3739
"asset": "Token",
3840
"token": "0x607F4C5BB672230e8672085532f7e901544a7375",
3941
"uniswap": true,
@@ -50,82 +52,11 @@
5052
"WorkerpoolRegistry": "0xC76A18c78B7e530A165c5683CB1aB134E21938B4"
5153
}
5254
},
53-
"3": {
54-
"_comment": "asset should be Token or Native",
55-
"asset": "Token",
56-
"token": "0x7314Dc4d7794b5E7894212CA1556ae8e3De58621",
57-
"uniswap": true,
58-
"v3": {
59-
"Hub": null,
60-
"AppRegistry": null,
61-
"DatasetRegistry": null,
62-
"WorkerpoolRegistry": null
63-
},
64-
"v5": {
65-
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
66-
}
67-
},
68-
"4": {
69-
"_comment": "asset should be Token or Native",
70-
"asset": "Token",
71-
"token": "0xf1e6Ad3a7eF0c86c915F0feDF80eD851809bEA90",
72-
"uniswap": true,
73-
"v3": {
74-
"Hub": null,
75-
"AppRegistry": null,
76-
"DatasetRegistry": null,
77-
"WorkerpoolRegistry": null
78-
},
79-
"v5": {
80-
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
81-
}
82-
},
83-
"5": {
84-
"_comment": "asset should be Token or Native",
85-
"asset": "Token",
86-
"uniswap": true,
87-
"token": "0xe0d00540a3729B4fdB96f92534dA97DC7973Af8b",
88-
"etoken": "0x381790F5602401F46C2a447355d84715d744f273",
89-
"v3": {
90-
"Hub": "0x99d8717A84d1E97422d04d9a2a82694038470753",
91-
"AppRegistry": "0x221b9a91320a601b30992610425A960B1949B22d",
92-
"DatasetRegistry": "0x8Dc0a7d917aeF68E340DBF68eF4ECB36d1Ca941b",
93-
"WorkerpoolRegistry": "0xdAD30AAb14F569830bFd26EdF72df876dc30D20c"
94-
},
95-
"v5": {
96-
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
97-
}
98-
},
99-
"42": {
100-
"_comment": "asset should be Token or Native",
101-
"asset": "Token",
102-
"uniswap": true,
103-
"token": "0xc57538846Ec405Ea25Deb00e0f9B29a432D53507",
104-
"v3": {
105-
"Hub": "0xb3901d04CF645747b99DBbe8f2eE9cb41A89CeBF",
106-
"AppRegistry": "0xd4945a24566AbF3517F81230Ff89820C3Dd39E33",
107-
"DatasetRegistry": "0x1d7b69669e5781c3bCe590da74Ecf88Da5e12A9D",
108-
"WorkerpoolRegistry": "0x3f4C18C322064576C048b1284b700288ffEf126B"
109-
},
110-
"v5": {
111-
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
112-
}
113-
},
114-
"133": {
115-
"_comment": "asset should be Token or Native",
116-
"asset": "Native",
117-
"v3": {
118-
"Hub": "0x4735e4BC6B143099fDF14224a82429aA34ba4d04",
119-
"AppRegistry": "0x65313a6EDD5fF1E7d8C6cb235C09A82DbC159798",
120-
"DatasetRegistry": "0x4D9080a52F13f6a1794Fd849Adb6e77DF35EBfA5",
121-
"WorkerpoolRegistry": "0x1Cae59C7745A61dD37CD17f174745959D0f3f400"
122-
},
123-
"v5": {
124-
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
125-
}
126-
},
12755
"134": {
128-
"_comment": "asset should be Token or Native",
56+
"name": "Bellecour Sidechain",
57+
"deployer": "TODO",
58+
"owner": "0x4611B943AA1d656Fc669623b5DA08756A7e288E9",
59+
"_ownerComment": "Timelock contract",
12960
"asset": "Native",
13061
"v3": {
13162
"Hub": "0xD5125A2d186E5266dA60e958043d32fE6fBA662f",
@@ -142,19 +73,12 @@
14273
}
14374
},
14475
"42161": {
145-
"_comment": "Arbitrum One Mainnet",
146-
"asset": "Token",
147-
"token": "0xe649e6a1F2afc63ca268C2363691ceCAF75CF47C",
148-
"richman": "",
76+
"name": "Arbitrum One Mainnet",
14977
"deployer": "0x111167a21d2bdb8e10b84aee3501059d50756b67",
15078
"owner": "0x111165e3c379e4f8285df34d7137b433c30afa66",
151-
"uniswap": false,
152-
"v3": {
153-
"Hub": null,
154-
"AppRegistry": null,
155-
"DatasetRegistry": null,
156-
"WorkerpoolRegistry": null
157-
},
79+
"asset": "Token",
80+
"token": "0xe649e6a1F2afc63ca268C2363691ceCAF75CF47C",
81+
"v3": {},
15882
"v5": {
15983
"factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
16084
"factoryType": "createx",
@@ -163,39 +87,14 @@
16387
"IexecLibOrders_v5": "0x1Ecf986A719271846a04F095c426D90d564e4842"
16488
}
16589
},
166-
"43113": {
167-
"_comment": "Avalanche Fuji Testnet",
168-
"asset": "Token",
169-
"token": "0xb96484C8B0e27B08a86661a3c19A028f4d3e89ad",
170-
"richman": "0xd88CF17D89533816E99C0427581aa8C72129037D",
171-
"uniswap": false,
172-
"v3": {
173-
"Hub": null,
174-
"AppRegistry": null,
175-
"DatasetRegistry": null,
176-
"WorkerpoolRegistry": null
177-
},
178-
"v5": {
179-
"factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
180-
"factoryType": "createx",
181-
"ERC1538Proxy": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
182-
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
183-
}
184-
},
18590
"421614": {
186-
"_comment": "Arbitrum Sepolia Testnet",
91+
"name": "Arbitrum Sepolia Testnet",
92+
"deployer": "0x9990cfb1Feb7f47297F54bef4d4EbeDf6c5463a3",
93+
"owner": "0x9990cfb1Feb7f47297F54bef4d4EbeDf6c5463a3",
18794
"asset": "Token",
18895
"token": "0x9923eD3cbd90CD78b910c475f9A731A6e0b8C963",
18996
"richman": "0x9990cfb1Feb7f47297F54bef4d4EbeDf6c5463a3",
190-
"deployer": "0x9990cfb1Feb7f47297F54bef4d4EbeDf6c5463a3",
191-
"owner": "0x9990cfb1Feb7f47297F54bef4d4EbeDf6c5463a3",
192-
"uniswap": false,
193-
"v3": {
194-
"Hub": null,
195-
"AppRegistry": null,
196-
"DatasetRegistry": null,
197-
"WorkerpoolRegistry": null
198-
},
97+
"v3": {},
19998
"v5": {
20099
"factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
201100
"factoryType": "createx",
@@ -204,18 +103,50 @@
204103
"IexecLibOrders_v5": "0x1Ecf986A719271846a04F095c426D90d564e4842"
205104
}
206105
},
207-
"default": {
208-
"_comment": "asset should be Token or Native",
106+
"31337": {
107+
"name": "Hardhat network (also PoCo chain)",
108+
"deployer": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
109+
"owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
209110
"asset": "Token",
111+
"v3": {},
112+
"v5": {
113+
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
114+
}
115+
},
116+
"65535": {
117+
"name": "PoCo chain native",
118+
"deployer": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
119+
"owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
120+
"asset": "Native",
121+
"v3": {},
122+
"v5": {
123+
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
124+
}
125+
},
126+
"<networkId>": {
127+
"name": "<networkName>",
128+
"deployer": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
129+
"_deployerComment": "Hardhat account #0",
130+
"owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
131+
"_ownerComment": "Hardhat account #0",
132+
"asset": "Token",
133+
"_assetComment": "asset should be `Token` or `Native`",
210134
"token": null,
135+
"_tokenComment": "Address of the RLC token contract",
136+
"richman": null,
211137
"uniswap": false,
138+
"_uniswapComment": "TODO remove when removing `IexecEscrowTokenSwap`",
212139
"v3": {
213140
"Hub": null,
214141
"AppRegistry": null,
215142
"DatasetRegistry": null,
216143
"WorkerpoolRegistry": null
217144
},
218145
"v5": {
146+
"DiamondProxy": "<address>",
147+
"IexecLibOrders_v5": "<address>",
148+
"factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
149+
"factoryType": "createx",
219150
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
220151
}
221152
}

‎config/config_native.json‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎config/config_token.json‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎deploy/0_deploy.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ export default async function deploy() {
5353
const { deployer } = await getDeployerAndOwnerSigners();
5454
console.log(`Deployer: ${deployer.address}`);
5555
console.log(`Network: ${network.name} (${chainId})`);
56-
const deploymentOptions = config.getChainConfigOrDefault(chainId);
57-
// TODO: remove the fallback on deployer address to avoid deployement
58-
// misconfiguration.
59-
const ownerAddress = deploymentOptions.owner || deployer.address;
56+
const deploymentOptions = config.getChainConfig(chainId);
57+
const ownerAddress = deploymentOptions.owner;
6058
factoryDeployer = new FactoryDeployer(deployer, chainId);
6159
// Deploy RLC
6260
const isTokenMode = !config.isNativeChain(deploymentOptions);

0 commit comments

Comments
 (0)