From 628132b1955953d245db32616a1b5fef58f6c185 Mon Sep 17 00:00:00 2001 From: tre Date: Fri, 22 Nov 2024 14:52:28 -0800 Subject: [PATCH] feat: update optimism submodule to latest develop commit --- packages/contracts/foundry.toml | 1 + packages/contracts/lib/optimism | 2 +- packages/contracts/test/SuperchainERC20.t.sol | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/contracts/foundry.toml b/packages/contracts/foundry.toml index d29ea51..f8557e5 100644 --- a/packages/contracts/foundry.toml +++ b/packages/contracts/foundry.toml @@ -20,5 +20,6 @@ remappings = [ "@contracts-bedrock/=lib/optimism/packages/contracts-bedrock/src/", "@solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src/", "@openzeppelin/contracts-v5=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts-v5/contracts/", + "@openzeppelin/contracts/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts/contracts/", "@solady-v0.0.245/=lib/optimism/packages/contracts-bedrock/lib/solady-v0.0.245/src/" ] diff --git a/packages/contracts/lib/optimism b/packages/contracts/lib/optimism index 7b119c5..80465cd 160000 --- a/packages/contracts/lib/optimism +++ b/packages/contracts/lib/optimism @@ -1 +1 @@ -Subproject commit 7b119c533f22bd5ef86bed2455b945987ca319a9 +Subproject commit 80465cd6c428d13166fce351741492f354621643 diff --git a/packages/contracts/test/SuperchainERC20.t.sol b/packages/contracts/test/SuperchainERC20.t.sol index cfcf065..9cd56d3 100644 --- a/packages/contracts/test/SuperchainERC20.t.sol +++ b/packages/contracts/test/SuperchainERC20.t.sol @@ -10,7 +10,7 @@ import {IERC20} from "@openzeppelin/contracts-v5/token/ERC20/IERC20.sol"; // Target contract import {SuperchainERC20} from "@contracts-bedrock/L2/SuperchainERC20.sol"; -import {ICrosschainERC20} from "@contracts-bedrock/L2/interfaces/ICrosschainERC20.sol"; +import {IERC7802} from "@contracts-bedrock/L2/interfaces/IERC7802.sol"; import {ISuperchainERC20} from "@contracts-bedrock/L2/interfaces/ISuperchainERC20.sol"; import {L2NativeSuperchainERC20} from "src/L2NativeSuperchainERC20.sol"; @@ -62,7 +62,7 @@ contract SuperchainERC20Test is Test { // Look for the emit of the `CrosschainMint` event vm.expectEmit(address(superchainERC20)); - emit ICrosschainERC20.CrosschainMint(_to, _amount); + emit IERC7802.CrosschainMint(_to, _amount, SUPERCHAIN_TOKEN_BRIDGE); // Call the `mint` function with the bridge caller vm.prank(SUPERCHAIN_TOKEN_BRIDGE); @@ -105,7 +105,7 @@ contract SuperchainERC20Test is Test { // Look for the emit of the `CrosschainBurn` event vm.expectEmit(address(superchainERC20)); - emit ICrosschainERC20.CrosschainBurn(_from, _amount); + emit IERC7802.CrosschainBurn(_from, _amount, SUPERCHAIN_TOKEN_BRIDGE); // Call the `burn` function with the bridge caller vm.prank(SUPERCHAIN_TOKEN_BRIDGE);