Skip to content

Commit ae04d5f

Browse files
fusmaniifusmanii
committed
Updated constants.json keys
Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
1 parent 4677066 commit ae04d5f

File tree

3 files changed

+64
-64
lines changed

3 files changed

+64
-64
lines changed

‎script/utils/Constants.sol‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ contract Constants is Script {
2020
}
2121

2222
function getChainId(string memory chainName) public view returns (uint256) {
23-
return vm.parseJsonUint(file, string.concat(".chainIds.", chainName));
23+
return vm.parseJsonUint(file, string.concat(".CHAIN_IDs.", chainName));
2424
}
2525

2626
function QUOTE_TIME_BUFFER() public view returns (uint256) {
27-
return vm.parseJsonUint(file, ".timeConstants.QUOTE_TIME_BUFFER");
27+
return vm.parseJsonUint(file, ".TIME_CONSTANTS.QUOTE_TIME_BUFFER");
2828
}
2929

3030
function FILL_DEADLINE_BUFFER() public view returns (uint256) {
31-
return vm.parseJsonUint(file, ".timeConstants.FILL_DEADLINE_BUFFER");
31+
return vm.parseJsonUint(file, ".TIME_CONSTANTS.FILL_DEADLINE_BUFFER");
3232
}
3333

3434
// L1 Address Map
@@ -95,106 +95,106 @@ contract Constants is Script {
9595
if (chainId == getChainId("MAINNET") || chainId == getChainId("SEPOLIA")) {
9696
return
9797
L1Addresses({
98-
finder: vm.parseJsonAddress(file, string.concat(".l1Addresses.", chainIdString, ".finder")),
98+
finder: vm.parseJsonAddress(file, string.concat(".L1_ADDRESS_MAP.", chainIdString, ".finder")),
9999
l1ArbitrumInbox: vm.parseJsonAddress(
100100
file,
101-
string.concat(".l1Addresses.", chainIdString, ".l1ArbitrumInbox")
101+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".l1ArbitrumInbox")
102102
),
103103
l1ERC20GatewayRouter: vm.parseJsonAddress(
104104
file,
105-
string.concat(".l1Addresses.", chainIdString, ".l1ERC20GatewayRouter")
105+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".l1ERC20GatewayRouter")
106106
),
107107
polygonRootChainManager: vm.parseJsonAddress(
108108
file,
109-
string.concat(".l1Addresses.", chainIdString, ".polygonRootChainManager")
109+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".polygonRootChainManager")
110110
),
111111
polygonFxRoot: vm.parseJsonAddress(
112112
file,
113-
string.concat(".l1Addresses.", chainIdString, ".polygonFxRoot")
113+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".polygonFxRoot")
114114
),
115115
polygonERC20Predicate: vm.parseJsonAddress(
116116
file,
117-
string.concat(".l1Addresses.", chainIdString, ".polygonERC20Predicate")
117+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".polygonERC20Predicate")
118118
),
119119
polygonRegistry: vm.parseJsonAddress(
120120
file,
121-
string.concat(".l1Addresses.", chainIdString, ".polygonRegistry")
121+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".polygonRegistry")
122122
),
123123
polygonDepositManager: vm.parseJsonAddress(
124124
file,
125-
string.concat(".l1Addresses.", chainIdString, ".polygonDepositManager")
125+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".polygonDepositManager")
126126
),
127127
cctpTokenMessenger: vm.parseJsonAddress(
128128
file,
129-
string.concat(".l1Addresses.", chainIdString, ".cctpTokenMessenger")
129+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".cctpTokenMessenger")
130130
),
131131
cctpV2TokenMessenger: vm.parseJsonAddress(
132132
file,
133-
string.concat(".l1Addresses.", chainIdString, ".cctpV2TokenMessenger")
133+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".cctpV2TokenMessenger")
134134
),
135135
cctpMessageTransmitter: vm.parseJsonAddress(
136136
file,
137-
string.concat(".l1Addresses.", chainIdString, ".cctpMessageTransmitter")
137+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".cctpMessageTransmitter")
138138
),
139139
lineaMessageService: vm.parseJsonAddress(
140140
file,
141-
string.concat(".l1Addresses.", chainIdString, ".lineaMessageService")
141+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".lineaMessageService")
142142
),
143143
lineaTokenBridge: vm.parseJsonAddress(
144144
file,
145-
string.concat(".l1Addresses.", chainIdString, ".lineaTokenBridge")
145+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".lineaTokenBridge")
146146
),
147147
scrollERC20GatewayRouter: vm.parseJsonAddress(
148148
file,
149-
string.concat(".l1Addresses.", chainIdString, ".scrollERC20GatewayRouter")
149+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".scrollERC20GatewayRouter")
150150
),
151151
scrollMessengerRelay: vm.parseJsonAddress(
152152
file,
153-
string.concat(".l1Addresses.", chainIdString, ".scrollMessengerRelay")
153+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".scrollMessengerRelay")
154154
),
155155
scrollGasPriceOracle: vm.parseJsonAddress(
156156
file,
157-
string.concat(".l1Addresses.", chainIdString, ".scrollGasPriceOracle")
157+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".scrollGasPriceOracle")
158158
),
159159
blastYieldManager: vm.parseJsonAddress(
160160
file,
161-
string.concat(".l1Addresses.", chainIdString, ".blastYieldManager")
161+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".blastYieldManager")
162162
),
163163
blastDaiRetriever: vm.parseJsonAddress(
164164
file,
165-
string.concat(".l1Addresses.", chainIdString, ".blastDaiRetriever")
165+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".blastDaiRetriever")
166166
),
167167
l1AlephZeroInbox: vm.parseJsonAddress(
168168
file,
169-
string.concat(".l1Addresses.", chainIdString, ".l1AlephZeroInbox")
169+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".l1AlephZeroInbox")
170170
),
171171
l1AlephZeroERC20GatewayRouter: vm.parseJsonAddress(
172172
file,
173-
string.concat(".l1Addresses.", chainIdString, ".l1AlephZeroERC20GatewayRouter")
173+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".l1AlephZeroERC20GatewayRouter")
174174
),
175175
adapterStore: vm.parseJsonAddress(
176176
file,
177-
string.concat(".l1Addresses.", chainIdString, ".adapterStore")
177+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".adapterStore")
178178
),
179179
donationBox: vm.parseJsonAddress(
180180
file,
181-
string.concat(".l1Addresses.", chainIdString, ".donationBox")
181+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".donationBox")
182182
),
183183
hubPoolStore: vm.parseJsonAddress(
184184
file,
185-
string.concat(".l1Addresses.", chainIdString, ".hubPoolStore")
185+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".hubPoolStore")
186186
),
187187
zkBridgeHub: vm.parseJsonAddress(
188188
file,
189-
string.concat(".l1Addresses.", chainIdString, ".zkBridgeHub")
189+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".zkBridgeHub")
190190
),
191191
zkUsdcSharedBridge_232: vm.parseJsonAddress(
192192
file,
193-
string.concat(".l1Addresses.", chainIdString, ".zkUsdcSharedBridge_232")
193+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".zkUsdcSharedBridge_232")
194194
),
195195
zkUsdcSharedBridge_324: vm.parseJsonAddress(
196196
file,
197-
string.concat(".l1Addresses.", chainIdString, ".zkUsdcSharedBridge_324")
197+
string.concat(".L1_ADDRESS_MAP.", chainIdString, ".zkUsdcSharedBridge_324")
198198
)
199199
});
200200
}
@@ -206,7 +206,7 @@ contract Constants is Script {
206206
uint256 spokeChainId
207207
) public view returns (OpStackAddresses memory) {
208208
string memory path = string.concat(
209-
".opStackAddresses.",
209+
".OP_STACK_ADDRESS_MAP.",
210210
vm.toString(hubChainId),
211211
".",
212212
vm.toString(spokeChainId)
@@ -223,12 +223,12 @@ contract Constants is Script {
223223

224224
// Circle domain IDs mapping
225225
function getCircleDomainId(uint256 chainId) public view returns (uint32) {
226-
return uint32(vm.parseJsonUint(file, string.concat(".circleDomainIds.", vm.toString(chainId))));
226+
return uint32(vm.parseJsonUint(file, string.concat(".CIRCLE_DOMAIN_IDs.", vm.toString(chainId))));
227227
}
228228

229229
// Get WETH address for any supported chain
230230
function getWrappedNativeToken(uint256 chainId) public view returns (WETH9Interface) {
231-
return WETH9Interface(vm.parseJsonAddress(file, string.concat(".wrappedNativeTokens.", vm.toString(chainId))));
231+
return WETH9Interface(vm.parseJsonAddress(file, string.concat(".WETH.", vm.toString(chainId))));
232232
}
233233

234234
// Helper function to convert chain ID to chain name
@@ -276,7 +276,7 @@ contract Constants is Script {
276276
*/
277277
function getL2Address(uint256 chainId, string memory addressType) public view returns (address) {
278278
string memory chainName = _getChainName(chainId);
279-
string memory jsonPath = string(abi.encodePacked(".l2Addresses.", chainName, ".", addressType));
279+
string memory jsonPath = string(abi.encodePacked(".L2_ADDRESS_MAP.", chainName, ".", addressType));
280280
return vm.parseJsonAddress(file, jsonPath);
281281
}
282282

@@ -287,7 +287,7 @@ contract Constants is Script {
287287
*/
288288
function getUSDCAddress(uint256 chainId) public view returns (address) {
289289
string memory chainName = _getChainName(chainId);
290-
string memory jsonPath = string(abi.encodePacked(".usdcAddresses.", chainName));
290+
string memory jsonPath = string(abi.encodePacked(".USDC.", chainName));
291291
return vm.parseJsonAddress(file, jsonPath);
292292
}
293293

@@ -298,7 +298,7 @@ contract Constants is Script {
298298
*/
299299
function getUSDCeAddress(uint256 chainId) public view returns (address) {
300300
string memory chainName = _getChainName(chainId);
301-
string memory jsonPath = string(abi.encodePacked(".usdceAddresses.", chainName));
301+
string memory jsonPath = string(abi.encodePacked(".USDCe.", chainName));
302302
return vm.parseJsonAddress(file, jsonPath);
303303
}
304304

@@ -309,12 +309,12 @@ contract Constants is Script {
309309
*/
310310
function getWghoAddress(uint256 chainId) public view returns (address) {
311311
string memory chainName = _getChainName(chainId);
312-
string memory jsonPath = string(abi.encodePacked(".wghoAddresses.", chainName));
312+
string memory jsonPath = string(abi.encodePacked(".WGHO.", chainName));
313313
return vm.parseJsonAddress(file, jsonPath);
314314
}
315315

316316
function getOftEid(uint256 chainId) public view returns (uint256) {
317317
string memory chainName = _getChainName(chainId);
318-
return vm.parseJsonUint(file, string.concat(".oftEids.", chainName));
318+
return vm.parseJsonUint(file, string.concat(".OFT_EIDs.", chainName));
319319
}
320320
}

‎script/utils/GenerateConstantsJson.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ function filterInvalidValues(values: { [key: string]: number }): { [key: string]
5353
// Generate the constants.json structure
5454
function generateConstantsJson() {
5555
const constants = {
56-
chainIds: convertChainIdsToObject(CHAIN_IDs),
57-
oftEids: filterInvalidValues(Object.fromEntries(OFT_EIDs)),
58-
wrappedNativeTokens: WETH,
59-
l2Addresses: L2_ADDRESS_MAP,
60-
l1Addresses: L1_ADDRESS_MAP,
61-
opStackAddresses: OP_STACK_ADDRESS_MAP,
62-
circleDomainIds: filterInvalidValues(CIRCLE_DOMAIN_IDs),
63-
timeConstants: {
56+
CHAIN_IDs: convertChainIdsToObject(CHAIN_IDs),
57+
OFT_EIDs: filterInvalidValues(Object.fromEntries(OFT_EIDs)),
58+
WETH,
59+
L2_ADDRESS_MAP,
60+
L1_ADDRESS_MAP,
61+
OP_STACK_ADDRESS_MAP,
62+
CIRCLE_DOMAIN_IDs: filterInvalidValues(CIRCLE_DOMAIN_IDs),
63+
TIME_CONSTANTS: {
6464
QUOTE_TIME_BUFFER,
6565
FILL_DEADLINE_BUFFER,
6666
},
67-
usdcAddresses: USDC,
68-
usdceAddresses: USDCe,
69-
wghoAddresses: WGHO,
70-
otherConstants: {
67+
USDC,
68+
USDCe,
69+
WGHO,
70+
OTHER_CONSTANTS: {
7171
ZERO_ADDRESS,
7272
ARBITRUM_MAX_SUBMISSION_COST,
7373
CIRCLE_UNINITIALIZED_DOMAIN_ID,
@@ -99,9 +99,9 @@ function main() {
9999
fs.writeFileSync(outputPath, JSON.stringify(constants, null, 2));
100100

101101
console.log(`✅ Successfully generated constants.json at ${outputPath}`);
102-
console.log(`📊 Generated ${Object.keys(constants.chainIds).length} chain IDs`);
103-
console.log(`📊 Generated ${Object.keys(constants.l1Addresses).length} L1 address mappings`);
104-
console.log(`📊 Generated ${Object.keys(constants.l2Addresses).length} L2 address mappings`);
102+
console.log(`📊 Generated ${Object.keys(constants.CHAIN_IDs).length} chain IDs`);
103+
console.log(`📊 Generated ${Object.keys(constants.L1_ADDRESS_MAP).length} L1 address mappings`);
104+
console.log(`📊 Generated ${Object.keys(constants.L2_ADDRESS_MAP).length} L2 address mappings`);
105105
} catch (error) {
106106
console.error("❌ Error generating constants.json:", error);
107107
process.exit(1);

‎script/utils/constants.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"chainIds": {
2+
"CHAIN_IDs": {
33
"ALEPH_ZERO": 41455,
44
"ARBITRUM": 42161,
55
"BASE": 8453,
@@ -41,7 +41,7 @@
4141
"ZK_SYNC_SEPOLIA": 300,
4242
"SOLANA_DEVNET": 133268194659241
4343
},
44-
"oftEids": {
44+
"OFT_EIDs": {
4545
"1": 30101,
4646
"10": 30111,
4747
"56": 30102,
@@ -61,7 +61,7 @@
6161
"34268394551451": 30168,
6262
"133268194659241": 40168
6363
},
64-
"wrappedNativeTokens": {
64+
"WETH": {
6565
"1": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
6666
"10": "0x4200000000000000000000000000000000000006",
6767
"56": "0x2170Ed0880ac9A755fd29B2688956BD959F933F8",
@@ -98,7 +98,7 @@
9898
"11155420": "0x4200000000000000000000000000000000000006",
9999
"168587773": "0x4200000000000000000000000000000000000023"
100100
},
101-
"l2Addresses": {
101+
"L2_ADDRESS_MAP": {
102102
"10": {
103103
"cctpTokenMessenger": "0x2B4069517957735bE00ceE0fadAE88a26365528f",
104104
"cctpMessageTransmitter": "0x4d41f22c5a0e5c74090899e5a8fb597a8842b3e8",
@@ -226,7 +226,7 @@
226226
"uniswapV3SwapRouter": "0xd8866E76441df243fc98B892362Fc6264dC3ca80"
227227
}
228228
},
229-
"l1Addresses": {
229+
"L1_ADDRESS_MAP": {
230230
"1": {
231231
"finder": "0x40f941E48A552bF496B154Af6bf55725f18D77c3",
232232
"l1ArbitrumInbox": "0x4Dbd4fc535Ac27206064B68FfCf827b0A60BAB3f",
@@ -278,7 +278,7 @@
278278
"permit2": "0x000000000022D473030F116dDEE9F6B43aC78BA3"
279279
}
280280
},
281-
"opStackAddresses": {
281+
"OP_STACK_ADDRESS_MAP": {
282282
"1": {
283283
"10": {
284284
"L1CrossDomainMessenger": "0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1",
@@ -362,7 +362,7 @@
362362
}
363363
}
364364
},
365-
"circleDomainIds": {
365+
"CIRCLE_DOMAIN_IDs": {
366366
"1": 0,
367367
"10": 2,
368368
"130": 10,
@@ -380,11 +380,11 @@
380380
"34268394551451": 5,
381381
"133268194659241": 5
382382
},
383-
"timeConstants": {
383+
"TIME_CONSTANTS": {
384384
"QUOTE_TIME_BUFFER": 3600,
385385
"FILL_DEADLINE_BUFFER": 21600
386386
},
387-
"usdcAddresses": {
387+
"USDC": {
388388
"1": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
389389
"10": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
390390
"130": "0x078D782b760474a361dDA0AF3839290b0EF57AD6",
@@ -404,7 +404,7 @@
404404
"34268394551451": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
405405
"133268194659241": "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
406406
},
407-
"usdceAddresses": {
407+
"USDCe": {
408408
"1": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
409409
"10": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
410410
"137": "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
@@ -417,11 +417,11 @@
417417
"42161": "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8",
418418
"11155420": "0x9552a0a6624A23B848060AE5901659CDDa1f83f8"
419419
},
420-
"wghoAddresses": {
420+
"WGHO": {
421421
"1": "0x1ff1dC3cB9eeDbC6Eb2d99C03b30A05cA625fB5a",
422422
"232": "0x6bDc36E20D267Ff0dd6097799f82e78907105e2F"
423423
},
424-
"otherConstants": {
424+
"OTHER_CONSTANTS": {
425425
"ZERO_ADDRESS": "0x0000000000000000000000000000000000000000",
426426
"ARBITRUM_MAX_SUBMISSION_COST": "10000000000000000",
427427
"CIRCLE_UNINITIALIZED_DOMAIN_ID": 4294967295,

0 commit comments

Comments
 (0)