Skip to content

Commit 3fffec5

Browse files
committed
chore: update evm version
1 parent bdf59ec commit 3fffec5

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

foundry.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ src = "src"
55
out = "out"
66
libs = ["lib"]
77
solc = '0.8.28'
8+
evm_version = 'paris'
89

910
# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

script/Deploy.s.sol

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ import {console} from "forge-std/console.sol";
99

1010
contract DeployScript is Script {
1111
address public prodProxyLoaderOwner = 0xDdF32240B4ca3184De7EC8f0D5Aba27dEc8B7A5C;
12-
address public expectedProdDeployAddress = 0x39A37979BB4a14e3Cdd1D7Ba8475f588f5b13E5F;
12+
address public expectedProdDeployAddress = 0x55954b89aA546269D8eDA34d7b97C948fab74a0D;
1313
address public stgProxyLoaderOwner = 0x4F0cF2a1D11De183E989fF6287cc0973670f0583;
14-
address public expectedStgDeployAddress = 0x29902f08df26E5984dBB58131EcEeA754d15CB16;
14+
address public expectedStgDeployAddress = 0x4eb21516cdd2355CeD7a82018854BBe2E6Df018c;
1515
bool internal _isProd;
1616

1717
// Prod, 0.7 EP
18-
bytes32 public proxySalt = 0x0000000000000000000000000000000000000000d0cdac1fc979ce15f752cd13;
19-
address public proxyAddress = 0x0000000000Fe335F59B373055a9865eE4c2cFb3e;
18+
bytes32 public proxySalt = 0x00000000000000000000000000000000000000005aff81b0e059e437fe647c08;
19+
address public proxyAddress = 0x00000000000667F27D4DB42334ec11a25db7EBb4;
2020

2121
// Prod, 0.6 EP
22-
bytes32 public proxySalt2 = 0x000000000000000000000000000000000000000048994d99a8c95651d4d72027;
23-
address public proxyAddress2 = 0x0000000000785AaAA2db533cF000766a0B67DC28;
22+
bytes32 public proxySalt2 = 0x00000000000000000000000000000000000000001d26e644345a7729701286e0;
23+
address public proxyAddress2 = 0x0000000000ce04e2359130e7d0204A5249958921;
2424

2525
// Staging, 0.7 EP
26-
address public proxyAddress3 = 0x62aB4822EBc25CC30b56D874Eb36D66AaF27372e;
26+
address public proxyAddress3 = 0x0AFc5739C3312Fc5B0900fD9CA4b4e4b2B2aD085;
2727

2828
// Staging, 0.6 EP
29-
address public proxyAddress4 = 0x990A645f1d25b6BA0CA691B1353C0e3148Dd6d10;
29+
address public proxyAddress4 = 0xc4C4202DD4515678C9415d8Ebc8be116bd0d1828;
3030

3131
function run() public {
3232
vm.startBroadcast();

test/AlchemyProxyLoader.t.sol

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,34 +61,32 @@ contract AlchemyProxyLoaderTest is Test {
6161
);
6262

6363
address predicted = Create2.computeAddress(bytes32(0), bytecodeHash, CREATE2_FACTORY);
64-
assertEq(predicted, 0x39A37979BB4a14e3Cdd1D7Ba8475f588f5b13E5F);
64+
assertEq(predicted, 0x55954b89aA546269D8eDA34d7b97C948fab74a0D);
6565
}
6666

6767
function test_getDeployedProxyInitcode() public {
6868
vm.startPrank(CREATE2_FACTORY);
6969

7070
bytes32 bytecodeHash = keccak256(
7171
abi.encodePacked(
72-
type(ERC1967Proxy).creationCode, abi.encode(address(0x39A37979BB4a14e3Cdd1D7Ba8475f588f5b13E5F), "")
72+
type(ERC1967Proxy).creationCode, abi.encode(address(0x55954b89aA546269D8eDA34d7b97C948fab74a0D), "")
7373
)
7474
);
75-
assertEq(bytecodeHash, 0x6baa9034371dd10a8709f2482eb766c1feb485e65df35a46ecc2b43539ca54ec);
76-
address proxyLoader =
77-
address(new AlchemyProxyLoader{salt: 0}(address(0xDdF32240B4ca3184De7EC8f0D5Aba27dEc8B7A5C)));
78-
console.logAddress(proxyLoader);
75+
assertEq(bytecodeHash, 0x11e76045975d22e464b853fc71f1d678388eb5612cff2c12789d82fcf3f5ffc0);
76+
new AlchemyProxyLoader{salt: 0}(address(0xDdF32240B4ca3184De7EC8f0D5Aba27dEc8B7A5C));
7977

8078
address proxy = address(
81-
new ERC1967Proxy{salt: 0x0000000000000000000000000000000000000000d0cdac1fc979ce15f752cd13}(
82-
address(0x39A37979BB4a14e3Cdd1D7Ba8475f588f5b13E5F), ""
79+
new ERC1967Proxy{salt: 0x00000000000000000000000000000000000000005aff81b0e059e437fe647c08}(
80+
address(0x55954b89aA546269D8eDA34d7b97C948fab74a0D), ""
8381
)
8482
);
85-
assertEq(proxy, 0x0000000000Fe335F59B373055a9865eE4c2cFb3e);
83+
assertEq(proxy, 0x00000000000667F27D4DB42334ec11a25db7EBb4);
8684

8785
address proxy2 = address(
88-
new ERC1967Proxy{salt: 0x000000000000000000000000000000000000000048994d99a8c95651d4d72027}(
89-
address(0x39A37979BB4a14e3Cdd1D7Ba8475f588f5b13E5F), ""
86+
new ERC1967Proxy{salt: 0x00000000000000000000000000000000000000001d26e644345a7729701286e0}(
87+
address(0x55954b89aA546269D8eDA34d7b97C948fab74a0D), ""
9088
)
9189
);
92-
assertEq(proxy2, 0x0000000000785AaAA2db533cF000766a0B67DC28);
90+
assertEq(proxy2, 0x0000000000ce04e2359130e7d0204A5249958921);
9391
}
9492
}

0 commit comments

Comments
 (0)