Skip to content

Commit 796807a

Browse files
authored
chore: Consolidated OP chain spoke pools (#1087)
* chore: Consolidated OP chain spoke pools Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * Deleted deploy scripts Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * Delete hardhat scripts Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * removed contract overrides Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * updated check storage layout script Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * fixed test Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com> * Updated to cctp v2 * updated storage layouts * added op storage layout * removed the rest of unused deploy scripts * removed base deploy script * removed duplicate entry --------- Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
1 parent cd0d1fa commit 796807a

25 files changed

+76
-1354
lines changed

contracts/Base_SpokePool.sol

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

contracts/DoctorWho_SpokePool.sol

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

contracts/Mode_SpokePool.sol

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

contracts/Bob_SpokePool.sol renamed to contracts/OP_SpokePool.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import "./Ovm_SpokePool.sol";
66
import "./external/interfaces/CCTPInterfaces.sol";
77

88
/**
9-
* @notice Bob Spoke pool.
9+
* @notice OP Spoke pool.
1010
* @custom:security-contact bugs@across.to
1111
*/
12-
contract Bob_SpokePool is Ovm_SpokePool {
12+
contract OP_SpokePool is Ovm_SpokePool {
1313
/// @custom:oz-upgrades-unsafe-allow constructor
1414
constructor(
1515
address _wrappedNativeTokenAddress,
@@ -28,7 +28,7 @@ contract Bob_SpokePool is Ovm_SpokePool {
2828
{} // solhint-disable-line no-empty-blocks
2929

3030
/**
31-
* @notice Construct the Bob SpokePool.
31+
* @notice Construct the OP SpokePool.
3232
* @param _initialDepositId Starting deposit ID. Set to 0 unless this is a re-deployment in order to mitigate
3333
* relay hash collisions.
3434
* @param _crossDomainAdmin Cross domain admin to set. Can be changed by admin.

contracts/Redstone_SpokePool.sol

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

contracts/Zora_SpokePool.sol

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

deploy/025_deploy_base_spokepool.ts renamed to deploy/025_deploy_op_spokepool.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { DeployFunction } from "hardhat-deploy/types";
22
import { HardhatRuntimeEnvironment } from "hardhat/types";
33
import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
4-
import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, USDC, WETH } from "./consts";
4+
import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, USDC, WETH, ZERO_ADDRESS } from "./consts";
55

66
const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
77
const { hubPool, spokeChainId } = await getSpokePoolDeploymentInfo(hre);
@@ -18,10 +18,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1818
WETH[spokeChainId],
1919
QUOTE_TIME_BUFFER,
2020
FILL_DEADLINE_BUFFER,
21-
USDC[spokeChainId],
22-
L2_ADDRESS_MAP[spokeChainId].cctpV2TokenMessenger,
21+
USDC[spokeChainId] ?? ZERO_ADDRESS,
22+
L2_ADDRESS_MAP[spokeChainId].cctpV2TokenMessenger ?? ZERO_ADDRESS,
2323
];
24-
await deployNewProxy("Base_SpokePool", constructorArgs, initArgs);
24+
await deployNewProxy("OP_SpokePool", constructorArgs, initArgs);
2525
};
2626
module.exports = func;
27-
func.tags = ["BaseSpokePool", "base"];
27+
func.tags = ["OPSpokePool", "base", "unichain", "mode", "bob", "redstone", "zora"];

deploy/039_deploy_mode_spokepool.ts

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

deploy/047_deploy_redstone_spokepool.ts

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

deploy/049_deploy_zora_spokepool.ts

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

0 commit comments

Comments
 (0)