Skip to content

Commit 7d12e34

Browse files
feat: address type same as contract name
1 parent e4cecb1 commit 7d12e34

File tree

4 files changed

+126
-141
lines changed

4 files changed

+126
-141
lines changed

deployments/5.json

-11
This file was deleted.

deployments/addresses.json

+100-104
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,118 @@
11
{
22
"56": {
3-
"counter": "0x3cD9C9Aa2f262339Cc994466a12F9A4c7A267827",
4-
"hasher": "0x60cFB68094955777FCE61C3Eeafb3f5eC080E114",
5-
"notary": "0x4f960040E588B8A7a76a4d0066F55EB432e3B1b2",
6-
"signatureVerifier": "0x38CbBc8F45A350aAcaf8c1bb680633149604cca3",
7-
"socket": "0x38e55351Dc02320A555b137e559D71f213694c15",
8-
"vault": "0xbf40F1c17471C04eaca8927252bCF2360082c901",
9-
"verifier": "0x7539351956f3271CdaF1fb1a440CA9BE2BfbF2ED",
10-
"fastAccum": {
11-
"137": "0xCb0308e4eE03EE67BBda15EebdE09526F3072306"
3+
"Counter": "0x3cD9C9Aa2f262339Cc994466a12F9A4c7A267827",
4+
"Hasher": "0x60cFB68094955777FCE61C3Eeafb3f5eC080E114",
5+
"AdminNotary": "0x4f960040E588B8A7a76a4d0066F55EB432e3B1b2",
6+
"SignatureVerifier": "0x38CbBc8F45A350aAcaf8c1bb680633149604cca3",
7+
"Socket": "0x38e55351Dc02320A555b137e559D71f213694c15",
8+
"Vault": "0xbf40F1c17471C04eaca8927252bCF2360082c901",
9+
"Verifier": "0x7539351956f3271CdaF1fb1a440CA9BE2BfbF2ED",
10+
"SingleAccum": {
11+
"FAST": {
12+
"137": "0xCb0308e4eE03EE67BBda15EebdE09526F3072306"
13+
},
14+
"SLOW": {
15+
"137": "0xd1fABF290235a830367c753D890256eba0Ac903a"
16+
}
1217
},
13-
"slowAccum": {
14-
"137": "0xd1fABF290235a830367c753D890256eba0Ac903a"
15-
},
16-
"deaccum": {
17-
"137": "0xCA9Ea302739796C223a2D6B95efB9c0Cf9E9D468"
18-
}
18+
"SingleDeaccum": "0xCA9Ea302739796C223a2D6B95efB9c0Cf9E9D468"
1919
},
2020
"137": {
21-
"counter": "0x3cD9C9Aa2f262339Cc994466a12F9A4c7A267827",
22-
"hasher": "0x60cFB68094955777FCE61C3Eeafb3f5eC080E114",
23-
"notary": "0x4f960040E588B8A7a76a4d0066F55EB432e3B1b2",
24-
"signatureVerifier": "0x38CbBc8F45A350aAcaf8c1bb680633149604cca3",
25-
"socket": "0x38e55351Dc02320A555b137e559D71f213694c15",
26-
"vault": "0xbf40F1c17471C04eaca8927252bCF2360082c901",
27-
"verifier": "0x7539351956f3271CdaF1fb1a440CA9BE2BfbF2ED",
28-
"fastAccum": {
29-
"56": "0xCb0308e4eE03EE67BBda15EebdE09526F3072306"
30-
},
31-
"slowAccum": {
32-
"56": "0xd1fABF290235a830367c753D890256eba0Ac903a"
21+
"Counter": "0x3cD9C9Aa2f262339Cc994466a12F9A4c7A267827",
22+
"Hasher": "0x60cFB68094955777FCE61C3Eeafb3f5eC080E114",
23+
"AdminNotary": "0x4f960040E588B8A7a76a4d0066F55EB432e3B1b2",
24+
"SignatureVerifier": "0x38CbBc8F45A350aAcaf8c1bb680633149604cca3",
25+
"Socket": "0x38e55351Dc02320A555b137e559D71f213694c15",
26+
"Vault": "0xbf40F1c17471C04eaca8927252bCF2360082c901",
27+
"Verifier": "0x7539351956f3271CdaF1fb1a440CA9BE2BfbF2ED",
28+
"SingleAccum": {
29+
"FAST": {
30+
"56": "0xCb0308e4eE03EE67BBda15EebdE09526F3072306"
31+
},
32+
"SLOW": {
33+
"56": "0xd1fABF290235a830367c753D890256eba0Ac903a"
34+
}
3335
},
34-
"deaccum": {
35-
"56": "0xCA9Ea302739796C223a2D6B95efB9c0Cf9E9D468"
36-
}
36+
"SingleDeaccum": "0xCA9Ea302739796C223a2D6B95efB9c0Cf9E9D468"
3737
},
3838
"420": {
39-
"counter": "0x8b79a1cEc8c234055E89A0313F8fCFcD04422e52",
40-
"hasher": "0x818C8977Eed2Dd55A591672e18c9446090057881",
41-
"notary": "0x6F1912DC9631E8aFC89e7D95Afd7e467845FF6F2",
42-
"signatureVerifier": "0x501fCBa3e6F92b2D1d89038FeD56EdacaaF5f7c2",
43-
"socket": "0x05501406bCC171b543db0A2C547b7cB68D9D69E3",
44-
"vault": "0xB42BBBd8f725186BBC74AFF6A5e0f15F1c786db2",
45-
"verifier": "0xae69069B4eb0ff55f68d3b9700337eC3d1353785",
46-
"fastAccum": {
47-
"421613": "0xBc3Ff3923b36F1590C16363b09c4759654d7B6d4",
48-
"80001": "0x97DA2F820BC684A4dfA2082906706b8c604625Ea"
49-
},
50-
"slowAccum": {
51-
"421613": "0xE593288228d17a6D057D9a61a35F32166A6B4191",
52-
"80001": "0xEa0814C572cDD329380ddf345463E3fb7E342a93"
39+
"Counter": "0x8b79a1cEc8c234055E89A0313F8fCFcD04422e52",
40+
"Hasher": "0x818C8977Eed2Dd55A591672e18c9446090057881",
41+
"AdminNotary": "0x6F1912DC9631E8aFC89e7D95Afd7e467845FF6F2",
42+
"SignatureVerifier": "0x501fCBa3e6F92b2D1d89038FeD56EdacaaF5f7c2",
43+
"Socket": "0x05501406bCC171b543db0A2C547b7cB68D9D69E3",
44+
"Vault": "0xB42BBBd8f725186BBC74AFF6A5e0f15F1c786db2",
45+
"Verifier": "0xae69069B4eb0ff55f68d3b9700337eC3d1353785",
46+
"SingleAccum": {
47+
"FAST": {
48+
"80001": "0x97DA2F820BC684A4dfA2082906706b8c604625Ea",
49+
"421613": "0xBc3Ff3923b36F1590C16363b09c4759654d7B6d4"
50+
},
51+
"SLOW": {
52+
"80001": "0xEa0814C572cDD329380ddf345463E3fb7E342a93",
53+
"421613": "0xE593288228d17a6D057D9a61a35F32166A6B4191"
54+
}
5355
},
54-
"deaccum": {
55-
"421613": "0x803001d0c9Ef1f125bAd73C215556D9dC9b527b0",
56-
"80001": "0x76c8d762b11321837D4A2Fa1Fd19651Ca365F0BE"
57-
}
56+
"SingleDeaccum": "0x76c8d762b11321837D4A2Fa1Fd19651Ca365F0BE"
5857
},
5958
"80001": {
60-
"counter": "0x643105248b0929EE45CeC6aa60111bcbea4213d1",
61-
"hasher": "0x803001d0c9Ef1f125bAd73C215556D9dC9b527b0",
62-
"notary": "0xE593288228d17a6D057D9a61a35F32166A6B4191",
63-
"signatureVerifier": "0xBc3Ff3923b36F1590C16363b09c4759654d7B6d4",
64-
"socket": "0xEa0814C572cDD329380ddf345463E3fb7E342a93",
65-
"vault": "0x97DA2F820BC684A4dfA2082906706b8c604625Ea",
66-
"verifier": "0xD8e4ffBC4F59AD06d2Ce332250Dc4528FEB15A14",
67-
"fastAccum": {
68-
"421613": "0x6ba1161bbBC353F4173eB9f785E3A0513264769d",
69-
"420": "0xd6F28a78735FF7c830cBE284C50fE4087c5ce3Fa"
70-
},
71-
"slowAccum": {
72-
"421613": "0xeF603b22c3D812d2B94890561cb947BD56B9D90b",
73-
"420": "0xe4c97C8A10C24d8498b2beeaeb356c4A09f9444c"
74-
},
75-
"deaccum": {
76-
"421613": "0x3220A83DD6AE50653503Ee0276adE22C9ba6ab0E",
77-
"420": "0x11675c3726904523889BF029c016937240Ca461d"
78-
}
79-
},
80-
"421613": {
81-
"counter": "0xd0580065858313f0300eBb6e7970cD3699323985",
82-
"hasher": "0x9Cc1081e978E423aaB37b878051f703cF41CA688",
83-
"notary": "0xCA9Ea302739796C223a2D6B95efB9c0Cf9E9D468",
84-
"signatureVerifier": "0xd1fABF290235a830367c753D890256eba0Ac903a",
85-
"socket": "0xeBc0357398a403b78F2Ce5B08CDc10E01f35BBDc",
86-
"vault": "0xEd7f855da2609ede9659709612a743E8b415F9D2",
87-
"verifier": "0x337bD38dA8833ee5B7202e53315293A1776BB7e6",
88-
"fastAccum": {
89-
"420": "0x88fd79Fa0030d38437b6c4077AD8f1c4e4a18C92",
90-
"80001": "0x1d7C105919E4D75e30581D4a5B3724F8D6159251"
91-
},
92-
"slowAccum": {
93-
"420": "0xd114Ae62B472a6AB334525fE9F6dcB3C65F5D3f4",
94-
"80001": "0xA90d1A1C11807c3632d7E227d2b055DD38AD3659"
59+
"Counter": "0x643105248b0929EE45CeC6aa60111bcbea4213d1",
60+
"Hasher": "0x803001d0c9Ef1f125bAd73C215556D9dC9b527b0",
61+
"AdminNotary": "0xE593288228d17a6D057D9a61a35F32166A6B4191",
62+
"SignatureVerifier": "0xBc3Ff3923b36F1590C16363b09c4759654d7B6d4",
63+
"Socket": "0xEa0814C572cDD329380ddf345463E3fb7E342a93",
64+
"Vault": "0x97DA2F820BC684A4dfA2082906706b8c604625Ea",
65+
"Verifier": "0xD8e4ffBC4F59AD06d2Ce332250Dc4528FEB15A14",
66+
"SingleAccum": {
67+
"FAST": {
68+
"420": "0xd6F28a78735FF7c830cBE284C50fE4087c5ce3Fa",
69+
"421613": "0x6ba1161bbBC353F4173eB9f785E3A0513264769d"
70+
},
71+
"SLOW": {
72+
"420": "0xe4c97C8A10C24d8498b2beeaeb356c4A09f9444c",
73+
"421613": "0xeF603b22c3D812d2B94890561cb947BD56B9D90b"
74+
}
9575
},
96-
"deaccum": {
97-
"420": "0x151b980575Aff0b4AA9c327F476681d2E0FB36f3",
98-
"80001": "0x68e0B4C64F427D3a3526e6088bA52e2003426303"
99-
}
76+
"SingleDeaccum": "0x11675c3726904523889BF029c016937240Ca461d"
10077
},
10178
"421611": {
102-
"counter": "0xF6bc9bC110464f7544507B574bEC357403171156",
103-
"hasher": "0xFDC28fA368c33DEC7853d63B65FC5Cfe01B212fc",
104-
"notary": "0x50cD99661C604da8d36Db001e86Df976E13A7Cf0",
105-
"signatureVerifier": "0xfc2140e9A83693CBd8b54C42AFf83ecb627c2Ec7",
106-
"socket": "0x86350a98802C71A143644Ca740D40e00AAA2F3bE",
107-
"vault": "0x6b4338D5adCB6704E235E7BCeDBbaaD602a0340a",
108-
"verifier": "0x255f9F9aB7eE46cb59a2Ed57a852304faD701C8d",
109-
"fastAccum": {
110-
"80001": "0xB39Cb89dfD708115616fdA1a2735613931B14181",
111-
"420": "0xfCa282147D5E9b14c208D09dbEbC7Eb5C3814dC5"
79+
"Counter": "0xF6bc9bC110464f7544507B574bEC357403171156",
80+
"Hasher": "0xFDC28fA368c33DEC7853d63B65FC5Cfe01B212fc",
81+
"AdminNotary": "0x50cD99661C604da8d36Db001e86Df976E13A7Cf0",
82+
"SignatureVerifier": "0xfc2140e9A83693CBd8b54C42AFf83ecb627c2Ec7",
83+
"Socket": "0x86350a98802C71A143644Ca740D40e00AAA2F3bE",
84+
"Vault": "0x6b4338D5adCB6704E235E7BCeDBbaaD602a0340a",
85+
"Verifier": "0x255f9F9aB7eE46cb59a2Ed57a852304faD701C8d",
86+
"SingleAccum": {
87+
"FAST": {
88+
"420": "0xfCa282147D5E9b14c208D09dbEbC7Eb5C3814dC5",
89+
"80001": "0xB39Cb89dfD708115616fdA1a2735613931B14181"
90+
},
91+
"SLOW": {
92+
"420": "0xF4b503a883C6E63dF1DCbCC560a6FBd28a2e9Ac5",
93+
"80001": "0x1d6E46fd4DFdfe063f9096Dc2C0862D36A25b1aD"
94+
}
11295
},
113-
"slowAccum": {
114-
"80001": "0x1d6E46fd4DFdfe063f9096Dc2C0862D36A25b1aD",
115-
"420": "0xF4b503a883C6E63dF1DCbCC560a6FBd28a2e9Ac5"
96+
"SingleDeaccum": "0x611479e7F3fF0B5805FdF4bC917f3F0EB505C7Ef"
97+
},
98+
"421613": {
99+
"Counter": "0xd0580065858313f0300eBb6e7970cD3699323985",
100+
"Hasher": "0x9Cc1081e978E423aaB37b878051f703cF41CA688",
101+
"AdminNotary": "0xCA9Ea302739796C223a2D6B95efB9c0Cf9E9D468",
102+
"SignatureVerifier": "0xd1fABF290235a830367c753D890256eba0Ac903a",
103+
"Socket": "0xeBc0357398a403b78F2Ce5B08CDc10E01f35BBDc",
104+
"Vault": "0xEd7f855da2609ede9659709612a743E8b415F9D2",
105+
"Verifier": "0x337bD38dA8833ee5B7202e53315293A1776BB7e6",
106+
"SingleAccum": {
107+
"FAST": {
108+
"420": "0x88fd79Fa0030d38437b6c4077AD8f1c4e4a18C92",
109+
"80001": "0x1d7C105919E4D75e30581D4a5B3724F8D6159251"
110+
},
111+
"SLOW": {
112+
"420": "0xd114Ae62B472a6AB334525fE9F6dcB3C65F5D3f4",
113+
"80001": "0xA90d1A1C11807c3632d7E227d2b055DD38AD3659"
114+
}
116115
},
117-
"deaccum": {
118-
"80001": "0x0EA425AeB75F5B2027Cbe8c70b821E3D3490da8e",
119-
"420": "0x611479e7F3fF0B5805FdF4bC917f3F0EB505C7Ef"
120-
}
116+
"SingleDeaccum": "0x68e0B4C64F427D3a3526e6088bA52e2003426303"
121117
}
122118
}

scripts/deploy/types.ts

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// TODO: Import from ll-core?
2+
export enum ChainId {
3+
CHAIN_ID_56 = 56,
4+
CHAIN_ID_137 = 137,
5+
CHAIN_ID_420 = 420,
6+
CHAIN_ID_80001 = 80001,
7+
CHAIN_ID_421611 = 421611,
8+
CHAIN_ID_421613 = 421613,
9+
}
10+
11+
export type ChainAddresses = { [chainId in ChainId]?: string }
12+
export type IntegrationTypeAddresses = { string: ChainAddresses }
13+
14+
export interface ChainSocketAddresses {
15+
Counter: string,
16+
Hasher: string,
17+
AdminNotary: string,
18+
SignatureVerifier: string,
19+
Socket: string,
20+
Vault: string,
21+
Verifier: string,
22+
SingleAccum: IntegrationTypeAddresses,
23+
SingleDeaccum: IntegrationTypeAddresses
24+
}
25+
26+
export type DeploymentAddresses = { [chainId in ChainId]?: ChainSocketAddresses }

scripts/types.ts

-26
This file was deleted.

0 commit comments

Comments
 (0)