Skip to content

Commit 11f3c5d

Browse files
chore(zkgm): evm: sunset weth
1 parent e0558ba commit 11f3c5d

File tree

4 files changed

+0
-46
lines changed

4 files changed

+0
-46
lines changed

evm/contracts/apps/ucs/03-zkgm/IWETH.sol

Lines changed: 0 additions & 8 deletions
This file was deleted.

evm/contracts/apps/ucs/03-zkgm/Zkgm.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import "../../../core/24-host/IBCCommitment.sol";
2323
import "./IEurekaModule.sol";
2424
import "./IZkgmERC20.sol";
2525
import "./ZkgmERC20.sol";
26-
import "./IWETH.sol";
2726

2827
struct ZkgmPacket {
2928
bytes32 salt;

evm/scripts/Deploy.s.sol

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {StateLensIcs23SmtClient} from
2222
"../contracts/clients/StateLensIcs23SmtClient.sol";
2323
import "../contracts/apps/ucs/00-pingpong/PingPong.sol";
2424
import "../contracts/apps/ucs/03-zkgm/Zkgm.sol";
25-
import "../contracts/apps/ucs/03-zkgm/IWETH.sol";
2625
import "../contracts/lib/Hex.sol";
2726

2827
import "./Deployer.sol";
@@ -853,8 +852,6 @@ contract DryUpgradeUCS03 is Script {
853852

854853
console.log(string(abi.encodePacked("UCS03: ", ucs03.toHexString())));
855854

856-
IWETH weth = IWETH(vm.envAddress("WETH"));
857-
858855
address newImplementation = address(new UCS03Zkgm());
859856
vm.prank(owner);
860857
UCS03Zkgm(ucs03).upgradeToAndCall(newImplementation, new bytes(0));
@@ -888,8 +885,6 @@ contract UpgradeUCS03 is Script {
888885

889886
console.log(string(abi.encodePacked("UCS03: ", ucs03.toHexString())));
890887

891-
IWETH weth = IWETH(vm.envAddress("WETH"));
892-
893888
vm.startBroadcast(privateKey);
894889
address newImplementation = address(new UCS03Zkgm());
895890
UCS03Zkgm(ucs03).upgradeToAndCall(newImplementation, new bytes(0));

evm/tests/src/05-app/Zkgm.t.sol

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -125,36 +125,6 @@ contract TestIBCHandler is IIBCModulePacket {
125125
}
126126
}
127127

128-
contract TestWETH is ERC20, IWETH {
129-
error ETHTransferFailed();
130-
131-
constructor() ERC20("Wrapped Ether", "WETH") {}
132-
133-
function deposit() public payable virtual {
134-
_mint(msg.sender, msg.value);
135-
}
136-
137-
function withdraw(
138-
uint256 amount
139-
) public virtual {
140-
_burn(msg.sender, amount);
141-
assembly {
142-
if iszero(
143-
call(
144-
gas(), caller(), amount, codesize(), 0x00, codesize(), 0x00
145-
)
146-
) {
147-
mstore(0x00, 0xb12d13eb) // `ETHTransferFailed()`.
148-
revert(0x1c, 0x04)
149-
}
150-
}
151-
}
152-
153-
receive() external payable virtual {
154-
deposit();
155-
}
156-
}
157-
158128
contract TestERC20 is ERC20 {
159129
uint8 _decimals;
160130

@@ -236,7 +206,6 @@ contract ZkgmTests is Test {
236206
TestMultiplexTarget multiplexTarget;
237207
TestIBCHandler handler;
238208
TestERC20 erc20;
239-
TestWETH weth;
240209
TestZkgm zkgm;
241210

242211
Instruction dummyMultiplex = Instruction({
@@ -254,7 +223,6 @@ contract ZkgmTests is Test {
254223

255224
function setUp() public {
256225
erc20 = new TestERC20("Test", "T", 18);
257-
weth = new TestWETH();
258226
handler = new TestIBCHandler();
259227
TestZkgm implementation = new TestZkgm();
260228
ERC1967Proxy proxy = new ERC1967Proxy(

0 commit comments

Comments
 (0)