Skip to content

Commit 955c47b

Browse files
hamdiallamhamdiallam
authored
feat: add uniV4 deployments to supersim (#397)
* supersim.uniswap * update interop applier * typo
1 parent 94a2cc1 commit 955c47b

File tree

17 files changed

+551
-156
lines changed

17 files changed

+551
-156
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
[submodule "contracts/lib/interop-lib"]
88
path = contracts/lib/interop-lib
99
url = https://github.com/ethereum-optimism/interop-lib
10+
[submodule "contracts/lib/v4-periphery"]
11+
path = contracts/lib/v4-periphery
12+
url = https://github.com/uniswap/v4-periphery

‎contracts/foundry.toml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[profile.default]
22
src = "src"
33
test = "test"
4+
optimizer_runs = 1
5+
via_ir = true
46
script = "script"
57
out = "out"
68
libs = ["lib"]
@@ -13,8 +15,11 @@ remappings = [
1315
"@contracts-bedrock-interfaces/=lib/optimism/packages/contracts-bedrock/interfaces/",
1416
"@solady-v0.0.245/=lib/optimism/packages/contracts-bedrock/lib/solady-v0.0.245/src/",
1517
"@solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src/",
16-
"@openzeppelin/contracts=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts/contracts",
17-
"@interop-lib/=lib/interop-lib/src/"
18+
"@openzeppelin/contracts/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts/contracts",
19+
"@interop-lib/=lib/interop-lib/src/",
20+
"@permit2/=lib/v4-periphery/lib/permit2/src",
21+
"@uniswap-v4-core/=lib/v4-periphery/lib/v4-core/src",
22+
"@uniswap-v4-periphery/=lib/v4-periphery/src",
1823
]
1924

2025
[rpc_endpoints]

‎contracts/lib/interop-lib‎

‎contracts/lib/v4-periphery‎

Submodule v4-periphery added at ad04c9f

‎contracts/script/DeployL2AuxiliaryContracts.s.sol‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
// SPDX-License-Identifier: UNLICENSED
2+
pragma solidity 0.8.26;
3+
4+
import {Script, console} from "forge-std/Script.sol";
5+
6+
import {PoolManager} from "@uniswap-v4-core/PoolManager.sol";
7+
import {IPoolManager} from "@uniswap-v4-core/interfaces/IPoolManager.sol";
8+
import {Currency} from "@uniswap-v4-core/types/Currency.sol";
9+
10+
import {PositionManager} from "@uniswap-v4-periphery/PositionManager.sol";
11+
import {PositionDescriptor} from "@uniswap-v4-periphery/PositionDescriptor.sol";
12+
import {StateView} from "@uniswap-v4-periphery/lens/StateView.sol";
13+
import {V4Router} from "@uniswap-v4-periphery/V4Router.sol";
14+
15+
import {Predeploys} from "@contracts-bedrock/libraries/Predeploys.sol";
16+
import {Preinstalls} from "@contracts-bedrock/libraries/Preinstalls.sol";
17+
18+
import {Router} from "../src/uniswap/Router.sol";
19+
import {PositionManagerLib} from "../src/uniswap/PositionManager.sol";
20+
21+
interface ICreate2Deployer {
22+
function computeAddress(bytes32 salt, bytes32 codeHash) external view returns (address);
23+
function deploy(uint256 value, bytes32 salt, bytes memory code) external;
24+
}
25+
26+
contract DeployL2AuxiliaryContracts is Script {
27+
/// @notice Permit2 address.
28+
address _permit2 = Preinstalls.Permit2;
29+
30+
/// @notice Create2 deployer address.
31+
ICreate2Deployer internal constant _deployer = ICreate2Deployer(Preinstalls.Create2Deployer);
32+
33+
/// @notice Create2Deployer creationCode.
34+
bytes internal constant _deployerCode =
35+
hex"6080604052600436106100435760003560e01c8063076c37b21461004f578063481286e61461007157806356299481146100ba57806366cfa057146100da57600080fd5b3661004a57005b600080fd5b34801561005b57600080fd5b5061006f61006a366004610327565b6100fa565b005b34801561007d57600080fd5b5061009161008c366004610327565b61014a565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b3480156100c657600080fd5b506100916100d5366004610349565b61015d565b3480156100e657600080fd5b5061006f6100f53660046103ca565b610172565b61014582826040518060200161010f9061031a565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe082820381018352601f90910116604052610183565b505050565b600061015683836102e7565b9392505050565b600061016a8484846102f0565b949350505050565b61017d838383610183565b50505050565b6000834710156101f4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f437265617465323a20696e73756666696369656e742062616c616e636500000060448201526064015b60405180910390fd5b815160000361025f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f437265617465323a2062797465636f6465206c656e677468206973207a65726f60448201526064016101eb565b8282516020840186f5905073ffffffffffffffffffffffffffffffffffffffff8116610156576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f437265617465323a204661696c6564206f6e206465706c6f790000000000000060448201526064016101eb565b60006101568383305b6000604051836040820152846020820152828152600b8101905060ff815360559020949350505050565b61014e806104ad83390190565b6000806040838503121561033a57600080fd5b50508035926020909101359150565b60008060006060848603121561035e57600080fd5b8335925060208401359150604084013573ffffffffffffffffffffffffffffffffffffffff8116811461039057600080fd5b809150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000806000606084860312156103df57600080fd5b8335925060208401359150604084013567ffffffffffffffff8082111561040557600080fd5b818601915086601f83011261041957600080fd5b81358181111561042b5761042b61039b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156104715761047161039b565b8160405282815289602084870101111561048a57600080fd5b826020860160208301376000602084830101528095505050505050925092509256fe608060405234801561001057600080fd5b5061012e806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063249cb3fa14602d575b600080fd5b603c603836600460b1565b604e565b60405190815260200160405180910390f35b60008281526020818152604080832073ffffffffffffffffffffffffffffffffffffffff8516845290915281205460ff16608857600060aa565b7fa2ef4600d742022d532d4747cb3547474667d6f13804902513b2ec01c848f4b45b9392505050565b6000806040838503121560c357600080fd5b82359150602083013573ffffffffffffffffffffffffffffffffffffffff8116811460ed57600080fd5b80915050925092905056fea26469706673582212205ffd4e6cede7d06a5daf93d48d0541fc68189eeb16608c1999a82063b666eb1164736f6c63430008130033a2646970667358221220fdc4a0fe96e3b21c108ca155438d37c9143fb01278a3c1d274948bad89c564ba64736f6c63430008130033";
36+
37+
/// @notice Salt used for all create2 deployments
38+
bytes32 internal constant _salt = bytes32(0);
39+
40+
function run() public {
41+
// setup the create2 deployer
42+
vm.etch(address(_deployer), _deployerCode);
43+
44+
console.log("Deploying L2AuxilliaryContracts");
45+
deployUniswapV4();
46+
}
47+
48+
function deployUniswapV4() public {
49+
console.log("Deploying UniswapV4");
50+
51+
PoolManager poolManager = deployUniswapV4PoolManager();
52+
console.log("PoolManager deployed at", address(poolManager));
53+
54+
PositionDescriptor positionDescriptor = deployUniswapV4PositionDescriptor(address(poolManager));
55+
console.log("PositionDescriptor deployed at", address(positionDescriptor));
56+
57+
PositionManager positionManager = deployUniswapV4PositionManager(address(poolManager), address(positionDescriptor));
58+
console.log("PositionManager deployed at", address(positionManager));
59+
60+
StateView stateView = deployUniswapStateView(address(poolManager));
61+
console.log("StateView deployed at", address(stateView));
62+
63+
V4Router router = deployUniswapV4Router(address(poolManager));
64+
console.log("Router deployed at", address(router));
65+
}
66+
67+
function deployUniswapV4PoolManager() internal returns (PoolManager) {
68+
bytes memory args = abi.encode(address(0));
69+
bytes memory initcode = abi.encodePacked(type(PoolManager).creationCode, args);
70+
71+
address addr = _deployer.computeAddress(_salt, keccak256(initcode));
72+
_deployer.deploy(0, _salt, initcode);
73+
return PoolManager(addr);
74+
}
75+
76+
function deployUniswapV4PositionDescriptor(address _manager) internal returns (PositionDescriptor) {
77+
bytes memory args = abi.encode(_manager, Predeploys.WETH, "ETH");
78+
bytes memory initcode = abi.encodePacked(type(PositionDescriptor).creationCode, args);
79+
address addr = _deployer.computeAddress(_salt, keccak256(initcode));
80+
_deployer.deploy(0, _salt, initcode);
81+
return PositionDescriptor(addr);
82+
}
83+
84+
function deployUniswapV4PositionManager(address _manager, address _positionsDescriptor)
85+
internal
86+
returns (PositionManager)
87+
{
88+
//bytes memory args = abi.encode(_manager, _permit2, 300_000, _positionsDescriptor, Predeploys.WETH);
89+
//bytes memory initcode = abi.encodePacked(type(PositionManager).creationCode, args);
90+
91+
bytes memory args = abi.encode(_manager, _positionsDescriptor);
92+
bytes memory initcode = abi.encodePacked(PositionManagerLib.MODIFIED_BYTECODE, args);
93+
94+
address addr = _deployer.computeAddress(_salt, keccak256(initcode));
95+
_deployer.deploy(0, _salt, initcode);
96+
return PositionManager(payable(addr));
97+
}
98+
99+
function deployUniswapStateView(address _manager) internal returns (StateView) {
100+
bytes memory args = abi.encode(_manager);
101+
bytes memory initcode = abi.encodePacked(type(StateView).creationCode, args);
102+
address addr = _deployer.computeAddress(_salt, keccak256(initcode));
103+
_deployer.deploy(0, _salt, initcode);
104+
return StateView(addr);
105+
}
106+
107+
function deployUniswapV4Router(address _manager) internal returns (V4Router) {
108+
bytes memory args = abi.encode(_manager);
109+
bytes memory initcode = abi.encodePacked(type(Router).creationCode, args);
110+
address addr = _deployer.computeAddress(_salt, keccak256(initcode));
111+
_deployer.deploy(0, _salt, initcode);
112+
return V4Router(payable(addr));
113+
}
114+
}

‎contracts/src/L2NativeSuperchainERC20.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.25;
2+
pragma solidity ^0.8.25;
33

44
import {SuperchainERC20} from "@contracts-bedrock/L2/SuperchainERC20.sol";
55
import {ISemver} from "@contracts-bedrock-interfaces/universal/ISemver.sol";

‎contracts/src/uniswap/PositionManager.sol‎

Lines changed: 38 additions & 0 deletions
Large diffs are not rendered by default.

‎contracts/src/uniswap/Router.sol‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// SPDX-License-Identifier: UNLICENSED
2+
pragma solidity 0.8.26;
3+
4+
import {ERC20} from "@solady-v0.0.245/tokens/ERC20.sol";
5+
6+
import {Currency} from "@uniswap-v4-core/types/Currency.sol";
7+
import {IPoolManager} from "@uniswap-v4-core/interfaces/IPoolManager.sol";
8+
9+
import {V4Router} from "@uniswap-v4-periphery/V4Router.sol";
10+
import {ReentrancyLock} from "@uniswap-v4-periphery/base/ReentrancyLock.sol";
11+
12+
import {IAllowanceTransfer} from "@permit2/interfaces/IAllowanceTransfer.sol";
13+
14+
import {Predeploys} from "@contracts-bedrock/libraries/Predeploys.sol";
15+
import {Preinstalls} from "@contracts-bedrock/libraries/Preinstalls.sol";
16+
17+
contract Router is V4Router, ReentrancyLock {
18+
/// @notice Permit2 address.
19+
IAllowanceTransfer internal constant _permit2 = IAllowanceTransfer(Preinstalls.Permit2);
20+
21+
constructor(IPoolManager _manager) V4Router(_manager) {}
22+
23+
function executeActions(bytes calldata params) external payable isNotLocked {
24+
_executeActions(params);
25+
}
26+
27+
function msgSender() public view override returns (address) {
28+
return _getLocker();
29+
}
30+
31+
receive() external payable {}
32+
33+
function _pay(Currency token, address payer, uint256 amount) internal override {
34+
if (payer == address(this)) {
35+
token.transfer(address(poolManager), amount);
36+
} else {
37+
// @dev supersim version swaps the permit2 with a direct transferFrom call
38+
ERC20(Currency.unwrap(token)).transferFrom(payer, address(poolManager), amount);
39+
//_permit2.transferFrom(payer, address(poolManager), uint160(amount), Currency.unwrap(token));
40+
}
41+
}
42+
}

‎genesis/generated/900-l1-genesis.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939
},
4040
"nonce": "0x0",
41-
"timestamp": "0x687004c0",
41+
"timestamp": "0x687963d7",
4242
"extraData": "0x",
4343
"gasLimit": "0x1c9c380",
4444
"difficulty": "0x0",
@@ -361,7 +361,7 @@
361361
"0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000003feb7f8765b9341b054eb4671cc47d3e33d1606d0001",
362362
"0x0000000000000000000000000000000000000000000000000000000000000001": "0x00000000000000000000000051095eac6e2b6da9811c6febbdd67add79135ce0",
363363
"0x0000000000000000000000000000000000000000000000000000000000000003": "0xdead000000000000000000000000000000000000000000000000000000000000",
364-
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687004c000000001",
364+
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687963d700000001",
365365
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x00000000000000000000000050a19fef2ae17260798f0a0adf180868844af1a3",
366366
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x000000000000000000000000489d547a66233f1e476d4657cccd753a5629fe8c"
367367
},
@@ -398,7 +398,7 @@
398398
"0x0000000000000000000000000000000000000000000000000000000000000000": "0x00000000000000000000522b0d266cce6225a8bd3d359d03221e7212bf570001",
399399
"0x0000000000000000000000000000000000000000000000000000000000000001": "0x000000000000000000000000ee802cf29f1d865cf754629d660f5be0635ca756",
400400
"0x0000000000000000000000000000000000000000000000000000000000000003": "0xdead000000000000000000000000000000000000000000000000000000000000",
401-
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687004c000000001",
401+
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687963d700000001",
402402
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x00000000000000000000000050a19fef2ae17260798f0a0adf180868844af1a3",
403403
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x000000000000000000000000f6f324097a98dbeb92ec661c7a87f6586ecb38d3"
404404
},
@@ -1210,7 +1210,7 @@
12101210
"0x0000000000000000000000000000000000000000000000000000000000000000": "0x00000000000000000000e9adb6f1fcf6483303ba1ae5d6d567c81d8d11540001",
12111211
"0x0000000000000000000000000000000000000000000000000000000000000001": "0x000000000000000000000000222f7ecdd4103e9e5abf27f3e1d4fe4d0149260d",
12121212
"0x0000000000000000000000000000000000000000000000000000000000000003": "0xdead000000000000000000000000000000000000000000000000000000000000",
1213-
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687004c000000001",
1213+
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687963d700000001",
12141214
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x00000000000000000000000050a19fef2ae17260798f0a0adf180868844af1a3",
12151215
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x000000000000000000000000cdfa36ba62b6ee90949b9b6168951f9469f9e045"
12161216
},
@@ -1238,7 +1238,7 @@
12381238
"0x0000000000000000000000000000000000000000000000000000000000000000": "0x00000000000000000000fac884bb6214e8996e1450c23742340fd8ef82c60001",
12391239
"0x0000000000000000000000000000000000000000000000000000000000000001": "0x00000000000000000000000077bca78b72fe096e6009847aee0db96b4b516db9",
12401240
"0x0000000000000000000000000000000000000000000000000000000000000003": "0xdead000000000000000000000000000000000000000000000000000000000000",
1241-
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687004c000000001",
1241+
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687963d700000001",
12421242
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x00000000000000000000000050a19fef2ae17260798f0a0adf180868844af1a3",
12431243
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x00000000000000000000000061118a6f1bcabdf1f4881c1d8f8fe7664e631625"
12441244
},
@@ -1300,7 +1300,7 @@
13001300
"0x0000000000000000000000000000000000000000000000000000000000000000": "0x00000000000000000000c535519f1e5660a2c2fb2b9bb3abac94447f53400001",
13011301
"0x0000000000000000000000000000000000000000000000000000000000000001": "0x000000000000000000000000bd6b0d1587614c5825c35a7670c947cf5ac1200f",
13021302
"0x0000000000000000000000000000000000000000000000000000000000000003": "0xdead000000000000000000000000000000000000000000000000000000000000",
1303-
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687004c000000001",
1303+
"0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000687963d700000001",
13041304
"0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": "0x00000000000000000000000050a19fef2ae17260798f0a0adf180868844af1a3",
13051305
"0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103": "0x000000000000000000000000b3b3e30b90e2c400d5b7c1bddcf0a8d2317d2941"
13061306
},

0 commit comments

Comments
 (0)