Skip to content

fix: Rename Cher SpokePool -> Soneium #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: Rename Cher SpokePool -> Soneium #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49cae64
fix: Rename Cher SpokePool -> Soneium
pxrl Jan 28, 2025
1b059e6
Update
pxrl Jan 28, 2025
52fb81c
update
pxrl Feb 5, 2025
7f594b0
Merge branch 'master' into pxrl/renameCher
pxrl Feb 5, 2025
f935632
Update deployments/deployments.json
bmzig Feb 5, 2025
b4bf5d3
Update deploy/060_soneium_spokepool.ts
pxrl Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions contracts/Cher_SpokePool.sol → contracts/Soneium_SpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import "./external/interfaces/CCTPInterfaces.sol";
import { IOpUSDCBridgeAdapter } from "./external/interfaces/IOpUSDCBridgeAdapter.sol";

/**
* @notice Cher SpokePool.
* @notice Soneium SpokePool.
* @custom:security-contact [email protected]
*/
contract Cher_SpokePool is Ovm_SpokePool {
contract Soneium_SpokePool is Ovm_SpokePool {
using SafeERC20 for IERC20;

// Address of the custom L2 USDC bridge.
Expand All @@ -34,7 +34,7 @@ contract Cher_SpokePool is Ovm_SpokePool {
{} // solhint-disable-line no-empty-blocks

/**
* @notice Construct the OVM Cher SpokePool.
* @notice Construct the OVM Soneium SpokePool.
* @param _initialDepositId Starting deposit ID. Set to 0 unless this is a re-deployment in order to mitigate
* relay hash collisions.
* @param _crossDomainAdmin Cross domain admin to set. Can be changed by admin.
Expand All @@ -49,7 +49,7 @@ contract Cher_SpokePool is Ovm_SpokePool {
}

/**
* @notice Cher-specific logic to bridge tokens back to the hub pool contract on L1.
* @notice Soneium-specific logic to bridge tokens back to the hub pool contract on L1.
* @param amountToReturn Amount of the token to bridge back.
* @param l2TokenAddress Address of the l2 Token to bridge back. This token will either be bridged back to the token defined in the mapping `remoteL1Tokens`,
* or via the canonical mapping defined in the bridge contract retrieved from `tokenBridges`.
Expand All @@ -59,7 +59,7 @@ contract Cher_SpokePool is Ovm_SpokePool {
function _bridgeTokensToHubPool(uint256 amountToReturn, address l2TokenAddress) internal virtual override {
// Handle custom USDC bridge which doesn't conform to the standard bridge interface. In the future, CCTP may be used to bridge USDC to mainnet, in which
// case bridging logic is handled by the Ovm_SpokePool code. In the meantime, if CCTP is not enabled, then use the USDC bridge. Once CCTP is activated on
// Cher, this block of code will be unused.
// Soneium, this block of code will be unused.
if (l2TokenAddress == address(usdcToken) && !_isCCTPEnabled()) {
usdcToken.safeIncreaseAllowance(USDC_BRIDGE, amountToReturn);
IOpUSDCBridgeAdapter(USDC_BRIDGE).sendMessage(
Expand Down
4 changes: 2 additions & 2 deletions deploy/060_deploy_cher_spokepool.ts → deploy/060_soneium_spokepool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
// the cctpTokenMessenger to the zero address.
ZERO_ADDRESS,
];
await deployNewProxy("Cher_SpokePool", constructorArgs, initArgs);
await deployNewProxy("Soneium_SpokePool", constructorArgs, initArgs);
};
module.exports = func;
func.tags = ["CherSpokePool", "cher"];
func.tags = ["SoneiumSpokePool", "soneium"];
2 changes: 1 addition & 1 deletion deployments/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ This is because this `deployments.json` file is used by bots in [`@across-protoc
| AcrossConfigStore | [0x3B03509645713718B78951126E0A6de6f10043f5](https://etherscan.io/address/0x3B03509645713718B78951126E0A6de6f10043f5) |
| Across Bond Token | [0xee1dc6bcf1ee967a350e9ac6caaaa236109002ea](https://etherscan.io/address/0xee1dc6bcf1ee967a350e9ac6caaaa236109002ea) |
| MulticallHandler | [0x924a9f036260DdD5808007E1AA95f08eD08aA569](https://etherscan.io/address/0x924a9f036260DdD5808007E1AA95f08eD08aA569) |
| Cher Adapter | [0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2](https://etherscan.io/address/0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2) |
| Soneium Adapter | [0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2](https://etherscan.io/address/0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2) |

## Optimism mainnet (10)

Expand Down
2 changes: 1 addition & 1 deletion deployments/deployments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"WorldChain_Adapter": { "address": "0xA8399e221a583A57F54Abb5bA22f31b5D6C09f32", "blockNumber": 20963234 },
"AlephZero_Adapter": { "address": "0x6F4083304C2cA99B077ACE06a5DcF670615915Af", "blockNumber": 21131132 },
"Ink_Adapter": { "address": "0x7e90a40c7519b041a7df6498fbf5662e8cfc61d2", "blockNumber": 21438590 },
"Cher_Adapter": { "address": "0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2", "blockNumber": 21597341 },
"Soneium_Adapter": { "address": "0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2", "blockNumber": 21597341 },
"DoctorWho_Adapter": { "address": "0xFADcC43096756e1527306FD92982FEbBe3c629Fa", "blockNumber": 21773451 }
},
"10": {
Expand Down
Loading