Skip to content

Commit 1ac6d41

Browse files
dgusakovdgusakov
authored
Merge branch 'develop' into regression-gh-action
2 parents 3e4eebd + 618279c commit 1ac6d41

File tree

68 files changed

+5244
-3070
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+5244
-3070
lines changed

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ jobs:
130130
- name: Run unit-tests
131131
run: just test-unit
132132

133+
- name: Run tests for current state on fork
134+
run: just test-current
135+
env:
136+
CHAIN: mainnet
137+
RPC_URL: ${{ secrets.RPC_URL_MAINNET }}
138+
133139
- name: Run local deployment tests for scratch deploy
134140
run: just test-full-deploy
135141
env:

‎Justfile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ test-deployment-full-afterVote *args:
103103
test-integration *args:
104104
forge test --match-path 'test/fork/integration/*' -vvv --show-progress {{args}}
105105

106+
# Run tests for utility contracts
107+
test-utils *args:
108+
forge test --match-path 'test/fork/utils/*' -vvv --show-progress {{args}}
109+
106110
# Run tests applicable after the module upgrade vote. Does not include deployment tests
107111
test-post-upgrade *args:
108112
forge test --match-path='test/fork/*' --no-match-path 'test/fork/deployment/*' -vvv --show-progress {{args}}
@@ -344,5 +348,21 @@ test-v2-only-deploy *args:
344348

345349
just kill-fork
346350

351+
# Run tests on fork with current state
352+
test-current *args:
353+
#!/usr/bin/env bash
354+
set -euxo pipefail
355+
356+
just make-fork --silent &
357+
while ! echo exit | nc {{anvil_host}} {{anvil_port}} > /dev/null; do sleep 1; done
358+
359+
export RPC_URL={{anvil_rpc_url}}
360+
361+
export DEPLOY_CONFIG={{deploy_config_path}}
362+
363+
just test-utils
364+
365+
just kill-fork
366+
347367
_warn message:
348368
@tput setaf 3 && printf "[WARNING]" && tput sgr0 && echo " {{message}}"

‎artifacts/hoodi/deploy-hoodi.json‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
{
2-
"CSAccounting": "0xA54b90BA34C5f326BC1485054080994e38FB4C60",
3-
"CSAccountingImpl": "0x6ea494156df0a823368ec3748eec0b2963b02c30",
4-
"CSEarlyAdoption": "0x3281b9E45518F462E594697f8fba1896a8B43939",
5-
"CSFeeDistributor": "0xaCd9820b0A2229a82dc1A0770307ce5522FF3582",
6-
"CSFeeDistributorImpl": "0x3d392a854392d11d85a57bc35b061f896169edda",
7-
"CSFeeOracle": "0xe7314f561B2e72f9543F1004e741bab6Fc51028B",
8-
"CSFeeOracleImpl": "0x7139fff000129958ebc2c6a1c1bfed17d3f16b0f",
2+
"Accounting": "0xA54b90BA34C5f326BC1485054080994e38FB4C60",
3+
"AccountingImpl": "0xD32b59d6054b94516f8EEE2A84C3c33DaF1d06B8",
4+
"Ejector": "0x777bd76326E4aDcD353b03AD45b33BAF41048476",
5+
"ExitPenalties": "0xD259b31083Be841E5C85b2D481Cfc17C14276800",
6+
"ExitPenaltiesImpl": "0xF8CC5BFFC0580395a5D8bBE3C4CD07ce3F623d89",
7+
"FeeDistributor": "0xaCd9820b0A2229a82dc1A0770307ce5522FF3582",
8+
"FeeDistributorImpl": "0x1B952bd0C5d65B86d4F1F29589A31584e2bE038f",
9+
"FeeOracle": "0xe7314f561B2e72f9543F1004e741bab6Fc51028B",
10+
"FeeOracleImpl": "0x2fcc1bE07eAf30FC7daC541327B96B038C73eE7a",
911
"CSModule": "0x79CEf36D84743222f37765204Bec41E92a93E59d",
10-
"CSModuleImpl": "0x184739402fe64b4bcb8d8e7027aa3b5a0c7b68e7",
11-
"CSVerifier": "0xB6bafBD970a4537077dE59cebE33081d794513d6",
12+
"CSModuleImpl": "0x6140195075a2BFaE0C332377af1f1461Fced0791",
13+
"ParametersRegistry": "0xA4aD5236963f9Fe4229864712269D8d79B65C5Ad",
14+
"ParametersRegistryImpl": "0xae34514B7A5B402264dB13ac8ffe25766173B3cc",
15+
"ValidatorStrikes": "0x8fBA385C3c334D251eE413e79d4D3890db98693c",
16+
"ValidatorStrikesImpl": "0xF9CcA99e34197E5fc70aB05F5dEb112EcD2367e9",
17+
"Verifier": "0x1773b2Ff99A030F6000554Cb8A5Ec93145650cbA",
1218
"ChainId": 560048,
13-
"DeployParams": "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000e2ef9536daaaebff5b1c130957ab3e80056b06d80000000000000000000000000534aa41907c9631fae990960bcc72d75fa7cfed00000000000000000000000079a20FD0FA36453B2F45eAbab19bfef43575Ba9E0000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da53000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000067d8111800000000000000000000000000000000000000000000000000000000000006270000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001f400000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000003b000000000000000000000000000000000000000000000000000000000000e1c00400000000000000000000000000000000000000000000000000560000000000280000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000052000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001e13380000000000000000000000000000000000000000000000000000000000049d4000000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da530000000000000000000000000534aa41907c9631fae990960bcc72d75fa7cfed636f6d6d756e6974792d6f6e636861696e2d76310000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000016345785d8a0000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000b1a2bc2ec500000000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da53359e02c5c065c682839661c9bdfaf38db472629bf5f7a7e8f0261b31dc9332c20000000000000000000000000000000000000000000000000000000000000580000000000000000000000000a402349f560d45310d301e92b1aa4decabe147b30000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da53000000000000000000000000000000000000000000000000000000000007e9000000000000000000000000000000000000000000000000000000000069ba4b540000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da530000000000000000000000000000000000000000000000000000000000000002000000000000000000000000ca80ee7313a315879f326105134f938676cfd7a9000000000000000000000000f03b8dc8762b97f13ac82e6f94be3ed002ff74590000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000214e8348c4f0000000000000000000000000000000000000000000000000000033590a6584f20000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000014d1120d7b16000000000000000000000000000000000000000000000000000026db992a3b180000",
14-
"GateSeal": "0xEe1f7f0ebB5900F348f2CfbcC641FB1681359B8a",
19+
"DeployParams": "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000e2ef9536daaaebff5b1c130957ab3e80056b06d80000000000000000000000000534aa41907c9631fae990960bcc72d75fa7cfed00000000000000000000000079a20fd0fa36453b2f45eabab19bfef43575ba9e0000000000000000000000000534aa41907c9631fae990960bcc72d75fa7cfed000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000067d81118000000000000000000000000000000000000000000000000000000000000062700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000094000000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000161c0040000000000000000000000000000000000000000000000000096000000000028000000000000000000000000000000000000000000000000000000b600000018000000000000000000000000000000000000000000000000000000000040000d000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ae00000000000000000000000000000000000000000000000000000000000000b800000000000000000000000000000000000000000000000000000000000000c2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001e13380000000000000000000000000000000000000000000000000000000000049d4000000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da530000000000000000000000000534aa41907c9631fae990960bcc72d75fa7cfed0000000000000000000000000000000000000000000000000000000000000004636f6d6d756e6974792d6f6e636861696e2d76310000000000000000000000000000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da53000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000470de4df820000000000000000000000000000000000000000000000000000016345785d8a0000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000016ca00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000039499a2100d00000000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000054600000000000000000000000000000000000000000000000000016345785d8a0000000000000000000000000000000000000000000000000000016345785d8a00000000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da53000000000000000000000000000000000000000000000000000000000000000230e01b38a2c9a20b4f530f068d9277700f9d19f3e06098509d4034888ee0ac7c0000000000000000000000000000000000000000000000000000000000000c400000000000000000000000000000000000000000000000000000000000000ca0000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000b1a2bc2ec5000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000d400000000000000000000000000000000000000000000000000000000000000de0000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000002631116b55e0000000000000000000000000000000000000000000000000000000000000000003600000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000006978000000000000000000000000000000000000000000000000000b1a2bc2ec50000000000000000000000000000000000000000000000000000016345785d8a0000000000000000000000000000a402349f560d45310d301e92b1aa4decabe147b30000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da5300000000000000000000000000000000000000000000000000000000000e8080000000000000000000000000000000000000000000000000000000006a58da8c00000000000000000000000005172cbcdb7307228f781436b327679e4dae166b0000000000000000000000004af43ee34a6fcd1feca1e1f832124c763561da53000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000ca80ee7313a315879f326105134f938676cfd7a9000000000000000000000000f03b8dc8762b97f13ac82e6f94be3ed002ff74590000000000000000000000001932f53b1457a5987791a40ba91f71c5efd5788f0000000000000000000000004c75fa734a39f3a21c57e583c1c29942f021c6b700000000000000000000000099b2b75f490ffc9a29e4e1f5987be8e30e690adf000000000000000000000000219743f1911d84b32599bdc2df21fc8dba6f81a2000000000000000000000000d3b1e36a372ca250eeff61f90e833ca070559970000000000000000000000000f7ae520e99ed3c41180b5e12681d31aa7302e4e5000000000000000000000000b1cc91878c1831893d39c2bb0988404ca5fa7918000000000000000000000000fe43a8b0b481ae9fb1862d31826532047d2d538c00000000000000000000000043c45c2455c49eed320f463ff4f1ece3d2bf5ae2000000000000000000000000948a62cc0414979dc7aa9364ba5b96ecb29f873600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000214e8348c4f000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000120a871cc00200000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000014d1120d7b1600000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000120a871cc00200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003b6261666b726569676476746977757366726864376b746f6e72777069716c71676132337573676876346f64676a746a346e757971736d763579797500000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000014d1120d7b1600000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000120a871cc00200000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001f40000000000000000000000000000000000000000000000000000000000000097000000000000000000000000000000000000000000000000000000000000012c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000000000000000001100000000000000000000000000000000000000000000000000000000000016ca",
20+
"GateSeal": "0x725166f143DdcD9EC1b96dfb70f16E3f44968A65",
1521
"HashConsensus": "0x54f74a10e4397dDeF85C4854d9dfcA129D72C637",
16-
"LidoLocator": "0xe2EF9536DAAAEBFf5b1c130957AB3E80056b06D8"
22+
"LidoLocator": "0xe2EF9536DAAAEBFf5b1c130957AB3E80056b06D8",
23+
"PermissionlessGate": "0x5553077102322689876A6AdFd48D75014c28acfb",
24+
"VettedGate": "0x10a254E724fe2b7f305F76f3F116a3969c53845f",
25+
"VettedGateFactory": "0xF83E476B65ae80695f76A87e1E181e3e8976ae00",
26+
"VettedGateImpl": "0x86915F7D0C68A627385eF36DdB40A48391118882",
27+
"git-ref": "0e4b562719cca51070c9cede5e5a8505eca18684"
1728
}

0 commit comments

Comments
 (0)