Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/actions/install_dependencies/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ runs:

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: v1.4.4

- name: Install Bun
uses: oven-sh/setup-bun@v2
Expand Down
10 changes: 4 additions & 6 deletions contracts/script/configure/AllowRouterToTransfer.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,15 @@ contract AllowRouterToTransfer is Script {
T1StandardERC20(ERC20s[i]).allowance(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR, permit2)
< type(uint160).max / 2
) {
IL1ERC20Gateway(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR).allowRouterToTransfer(
ERC20s[i], type(uint160).max, uint48(block.timestamp + 10_000_000)
);
IL1ERC20Gateway(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR)
.allowRouterToTransfer(ERC20s[i], type(uint160).max, uint48(block.timestamp + 10_000_000));
}
}

// Check allowance for WETH
if (T1StandardERC20(wethAddress).allowance(L1_WETH_GATEWAY_PROXY_ADDR, permit2) < type(uint160).max / 2) {
IL1ERC20Gateway(L1_WETH_GATEWAY_PROXY_ADDR).allowRouterToTransfer(
wethAddress, type(uint160).max, uint48(block.timestamp + 10_000_000)
);
IL1ERC20Gateway(L1_WETH_GATEWAY_PROXY_ADDR)
.allowRouterToTransfer(wethAddress, type(uint160).max, uint48(block.timestamp + 10_000_000));
}

vm.stopBroadcast();
Expand Down
15 changes: 9 additions & 6 deletions contracts/script/configure/SetMM.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ contract SetMM is Script {

// Check if the market maker is set to this address
if (IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).marketMaker() != newMarketMaker) {
T1Owner(payable(L1_T1_OWNER_ADDR)).execute(
L1_GATEWAY_ROUTER_PROXY_ADDR,
0,
abi.encodeWithSelector(IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).setMM.selector, newMarketMaker),
SECURITY_COUNCIL_NO_DELAY_ROLE
);
T1Owner(payable(L1_T1_OWNER_ADDR))
.execute(
L1_GATEWAY_ROUTER_PROXY_ADDR,
0,
abi.encodeWithSelector(
IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).setMM.selector, newMarketMaker
),
SECURITY_COUNCIL_NO_DELAY_ROLE
);
}

console.log("[%s] is the new market maker", IL1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).marketMaker());
Expand Down
4 changes: 3 additions & 1 deletion contracts/script/deploy/DeployArbT1Messenger.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import { Script } from "forge-std/Script.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { TransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

contract DeployArbT1MessengerProxy is Script, DeploymentUtils {
uint256 private deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
Expand Down
4 changes: 3 additions & 1 deletion contracts/script/deploy/DeployBaseT1Messenger.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import { Script } from "forge-std/Script.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { TransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

contract DeployBaseT1MessengerProxy is Script, DeploymentUtils {
uint256 private deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
Expand Down
30 changes: 16 additions & 14 deletions contracts/script/deploy/InitializeL1BridgeContracts.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ pragma solidity ^0.8.25;
import { Script } from "forge-std/Script.sol";

import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import { L1ETHGateway } from "../../src/L1/gateways/L1ETHGateway.sol";
import { L1GatewayRouter } from "../../src/L1/gateways/L1GatewayRouter.sol";
Expand Down Expand Up @@ -49,7 +51,8 @@ contract InitializeL1BridgeContracts is Script {
vm.envAddress("L1_STANDARD_ERC20_GATEWAY_IMPLEMENTATION_ADDR");
address private L1_WETH_GATEWAY_PROXY_ADDR = vm.envAddress("L1_WETH_GATEWAY_PROXY_ADDR");
address private L1_WETH_GATEWAY_IMPLEMENTATION_ADDR = vm.envAddress("L1_WETH_GATEWAY_IMPLEMENTATION_ADDR");
address private L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR = vm.envAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR");
address private L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR =
vm.envAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR");

address private L2_T1_MESSENGER_PROXY_ADDR = vm.envAddress("L2_T1_MESSENGER_PROXY_ADDR");
address private L2_ETH_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ETH_GATEWAY_PROXY_ADDR");
Expand Down Expand Up @@ -78,22 +81,22 @@ contract InitializeL1BridgeContracts is Script {
T1Chain(L1_T1_CHAIN_PROXY_ADDR).addProver(L1_POSTMAN_SIGNER_ADDRESS);

// initialize L2GasPriceOracle
L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize(
21_000, // _txGas
53_000, // _txGasContractCreation
4, // _zeroGas
16 // _nonZeroGas
);
L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR)
.initialize(
21_000, // _txGas
53_000, // _txGasContractCreation
4, // _zeroGas
16 // _nonZeroGas
);
L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).updateWhitelist(L1_WHITELIST_ADDR);

// initialize L1MessageQueueWithGasPriceOracle
proxyAdmin.upgrade(
ITransparentUpgradeableProxy(L1_MESSAGE_QUEUE_PROXY_ADDR), L1_MESSAGE_QUEUE_IMPLEMENTATION_ADDR
);

L1MessageQueueWithGasPriceOracle(L1_MESSAGE_QUEUE_PROXY_ADDR).initialize(
L2_GAS_PRICE_ORACLE_PROXY_ADDR, MAX_L1_MESSAGE_GAS_LIMIT
);
L1MessageQueueWithGasPriceOracle(L1_MESSAGE_QUEUE_PROXY_ADDR)
.initialize(L2_GAS_PRICE_ORACLE_PROXY_ADDR, MAX_L1_MESSAGE_GAS_LIMIT);

L1MessageQueueWithGasPriceOracle(L1_MESSAGE_QUEUE_PROXY_ADDR).initializeV2();

Expand All @@ -105,9 +108,8 @@ contract InitializeL1BridgeContracts is Script {
L1T1Messenger(payable(L1_T1_MESSENGER_PROXY_ADDR)).initialize(L1_FEE_VAULT_ADDR);

// initialize L1GatewayRouter
L1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).initialize(
L1_ETH_GATEWAY_PROXY_ADDR, L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR, L1_PERMIT2
);
L1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR)
.initialize(L1_ETH_GATEWAY_PROXY_ADDR, L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR, L1_PERMIT2);

// initialize L1ETHGateway
proxyAdmin.upgrade(ITransparentUpgradeableProxy(L1_ETH_GATEWAY_PROXY_ADDR), L1_ETH_GATEWAY_IMPLEMENTATION_ADDR);
Expand Down
3 changes: 2 additions & 1 deletion contracts/script/deploy/InitializeL1T1Owner.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ contract InitializeL1T1Owner is Script {
address private L1_ETH_GATEWAY_PROXY_ADDR = vm.envAddress("L1_ETH_GATEWAY_PROXY_ADDR");
address private L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
address private L1_WETH_GATEWAY_PROXY_ADDR = vm.envAddress("L1_WETH_GATEWAY_PROXY_ADDR");
address private L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR = vm.envAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR");
address private L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR =
vm.envAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR");
address private L1_WHITELIST_ADDR = vm.envAddress("L1_WHITELIST_ADDR");

T1Owner private owner;
Expand Down
14 changes: 7 additions & 7 deletions contracts/script/deploy/InitializeL2BridgeContracts.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ pragma solidity ^0.8.25;
import { Script } from "forge-std/Script.sol";

import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import { L2T1Messenger } from "../../src/L2/L2T1Messenger.sol";
import { L2ETHGateway } from "../../src/L2/gateways/L2ETHGateway.sol";
Expand Down Expand Up @@ -68,9 +70,8 @@ contract InitializeL2BridgeContracts is Script {
L2T1Messenger(payable(L2_T1_MESSENGER_PROXY_ADDR)).initialize(L1_T1_MESSENGER_PROXY_ADDR, network);

// initialize L2GatewayRouter
L2GatewayRouter(L2_GATEWAY_ROUTER_PROXY_ADDR).initialize(
L2_ETH_GATEWAY_PROXY_ADDR, L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR
);
L2GatewayRouter(L2_GATEWAY_ROUTER_PROXY_ADDR)
.initialize(L2_ETH_GATEWAY_PROXY_ADDR, L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR);

// initialize L2ETHGateway
proxyAdmin.upgrade(ITransparentUpgradeableProxy(L2_ETH_GATEWAY_PROXY_ADDR), L2_ETH_GATEWAY_IMPLEMENTATION_ADDR);
Expand Down Expand Up @@ -102,9 +103,8 @@ contract InitializeL2BridgeContracts is Script {
}

// initialize T1StandardERC20Factory
T1StandardERC20Factory(L2_T1_STANDARD_ERC20_FACTORY_ADDR).transferOwnership(
L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR
);
T1StandardERC20Factory(L2_T1_STANDARD_ERC20_FACTORY_ADDR)
.transferOwnership(L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR);

vm.stopBroadcast();
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/script/deploy/xYield/DeployMintableERC20.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ contract DeployMintableERC20 is DeploymentUtils {
MintableERC20 private token;

function deploy() external {
selectMainnetOrSepoliaFork("base");
selectMainnetOrSepoliaFork("arbitrum");
startBroadcastWithDeployerKeyIfItExists();

token = new MintableERC20(address(0x6c8E1d54297aAe7C34f1F5cF73559e621a394eFb), "xyUSDC", "xyUSDC");
token = new MintableERC20(address(0x8764BD4c58cc71bEe12C36deA228fd22a1B2723C), "xyUSDC", "xyUSDC");

vm.stopBroadcast();
}
Expand Down
9 changes: 5 additions & 4 deletions contracts/script/test/7683/T1ERC7683ArbToBase.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,11 @@ contract SolverFillScript is Script {
bytes memory originData = hex"";

// Approve output tokens
ERC20(vm.envAddress("BASE_SEPOLIA_USDT_ADDR")).approve(
address(l2_7683),
AMOUNT_IN // match amount from order
);
ERC20(vm.envAddress("BASE_SEPOLIA_USDT_ADDR"))
.approve(
address(l2_7683),
AMOUNT_IN // match amount from order
);

// NOTE - Use values from a won Sealed Bid Auction
uint256 bidAmountOut = 0;
Expand Down
9 changes: 5 additions & 4 deletions contracts/script/test/7683/T1ERC7683BaseToArb.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,11 @@ contract SolverFillScript is Script {
bytes memory originData = hex"";

// Approve output tokens
ERC20(vm.envAddress("ARBITRUM_SEPOLIA_USDT_ADDR")).approve(
address(l2_7683),
AMOUNT_IN // match amount from order
);
ERC20(vm.envAddress("ARBITRUM_SEPOLIA_USDT_ADDR"))
.approve(
address(l2_7683),
AMOUNT_IN // match amount from order
);

// NOTE - Use values from a won Sealed Bid Auction
uint256 bidAmountOut = 0;
Expand Down
9 changes: 5 additions & 4 deletions contracts/script/test/7683/T1ERC7683L1ToL2.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ contract SolverFillScript is Script {
bytes memory originData = hex"";

// Approve output tokens
ERC20(vm.envAddress("L2_USDT_ADDR")).approve(
address(l2_7683),
HUNDRED_USDT // match amount from order
);
ERC20(vm.envAddress("L2_USDT_ADDR"))
.approve(
address(l2_7683),
HUNDRED_USDT // match amount from order
);

bytes memory fillerData = abi.encode(TypeCasts.addressToBytes32(solver));
l2_7683.fill(orderId, originData, fillerData);
Expand Down
9 changes: 5 additions & 4 deletions contracts/script/test/7683/T1ERC7683L2ToL1.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ contract SolverFillScript is Script {
bytes memory originData = hex"";

// Approve output tokens
ERC20(vm.envAddress("L1_USDT_ADDR")).approve(
address(l1_7683),
HUNDRED_USDT // match amount from order
);
ERC20(vm.envAddress("L1_USDT_ADDR"))
.approve(
address(l1_7683),
HUNDRED_USDT // match amount from order
);

// Fill the order
bytes memory fillerData = abi.encode(TypeCasts.addressToBytes32(solver));
Expand Down
10 changes: 3 additions & 7 deletions contracts/script/test/SwapERC20.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ contract SwapERC20 is Script, PermitSignature {
});

IL1GatewayRouter.Witness memory witness = IL1GatewayRouter.Witness({
direction: 0,
priceAfterSlippage: 0,
outputTokenAddress: L1_USDT_ADDR,
outputTokenAmount: outputTokenAmount
direction: 0, priceAfterSlippage: 0, outputTokenAddress: L1_USDT_ADDR, outputTokenAmount: outputTokenAmount
});

bytes32 witnessEncoded = keccak256(abi.encode(T1Constants.WITNESS_TYPEHASH, witness));
Expand Down Expand Up @@ -74,9 +71,8 @@ contract SwapERC20 is Script, PermitSignature {
// Check if the ERC20 gateway has approved the permit2 to transfer USDT
if (T1StandardERC20(L1_USDT_ADDR).allowance(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR, permit2) < outputTokenAmount)
{
IL1ERC20Gateway(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR).allowRouterToTransfer(
L1_USDT_ADDR, type(uint160).max, uint48(block.timestamp + 10_000_000)
);
IL1ERC20Gateway(L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR)
.allowRouterToTransfer(L1_USDT_ADDR, type(uint160).max, uint48(block.timestamp + 10_000_000));
}

// Check if the ERC20 gateway has enough USDT to swap
Expand Down
4 changes: 3 additions & 1 deletion contracts/script/upgrade/UpgradeArbT17683.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
pragma solidity ^0.8.25;

import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import { DeploymentUtils } from "../lib/DeploymentUtils.sol";
import { T1ERC7683 } from "../../src/7683/T1ERC7683.sol";
import { T1Constants } from "../../src/libraries/constants/T1Constants.sol";
Expand Down
4 changes: 3 additions & 1 deletion contracts/script/upgrade/UpgradeBaseT17683.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
pragma solidity ^0.8.25;

import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import { DeploymentUtils } from "../lib/DeploymentUtils.sol";

Expand Down
28 changes: 16 additions & 12 deletions contracts/script/upgrade/UpgradeT1Chain.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import { console } from "forge-std/console.sol";
import { DeploymentUtils } from "../lib/DeploymentUtils.sol";

import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import { T1Chain } from "../../src/L1/rollup/T1Chain.sol";
import { T1Owner } from "../../src/misc/T1Owner.sol";
Expand Down Expand Up @@ -42,7 +44,8 @@ contract UpgradeT1Chain is Script, DeploymentUtils {
address private L1_T1_OWNER_ADDR = vm.envAddress("L1_T1_OWNER_ADDR");
address private L1_T1_CHAIN_PROXY_ADDR = vm.envAddress("L1_T1_CHAIN_PROXY_ADDR");
address private L1_MESSAGE_QUEUE_PROXY_ADDR = vm.envAddress("L1_MESSAGE_QUEUE_PROXY_ADDR");
address private L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR = vm.envAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR");
address private L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR =
vm.envAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR");

// Chain configuration
uint64 private CHAIN_ID_L2 = uint64(vm.envUint("CHAIN_ID_L2"));
Expand Down Expand Up @@ -71,16 +74,17 @@ contract UpgradeT1Chain is Script, DeploymentUtils {
vm.toString(address(t1ChainImplementation))
);

try T1Owner(payable(L1_T1_OWNER_ADDR)).execute(
L1_PROXY_ADMIN_ADDR,
0,
abi.encodeWithSelector(
proxyAdmin.upgrade.selector,
ITransparentUpgradeableProxy(L1_T1_CHAIN_PROXY_ADDR),
address(t1ChainImplementation)
),
SECURITY_COUNCIL_NO_DELAY_ROLE
) {
try T1Owner(payable(L1_T1_OWNER_ADDR))
.execute(
L1_PROXY_ADMIN_ADDR,
0,
abi.encodeWithSelector(
proxyAdmin.upgrade.selector,
ITransparentUpgradeableProxy(L1_T1_CHAIN_PROXY_ADDR),
address(t1ChainImplementation)
),
SECURITY_COUNCIL_NO_DELAY_ROLE
) {
console.log("T1Chain upgrade successful");

// Verify the upgrade was successful
Expand Down
21 changes: 12 additions & 9 deletions contracts/script/upgrade/UpgradeT1XChainReaderLogic.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import { console } from "forge-std/console.sol";
import { DeploymentUtils } from "../lib/DeploymentUtils.sol";

import { ProxyAdmin } from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import { ITransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {
ITransparentUpgradeableProxy
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import { T1XChainReader } from "../../src/libraries/xChain/T1XChainReader.sol";
import { T1Owner } from "../../src/misc/T1Owner.sol";
Expand Down Expand Up @@ -63,14 +65,15 @@ abstract contract UpgradeT1XChainReaderLogic is Script, DeploymentUtils {
vm.toString(newImplementation)
);

try T1Owner(payable(t1OwnerAddr)).execute(
proxyAdminAddr,
0,
abi.encodeWithSelector(
proxyAdmin.upgrade.selector, ITransparentUpgradeableProxy(xChainReaderProxyAddr), newImplementation
),
SECURITY_COUNCIL_NO_DELAY_ROLE
) {
try T1Owner(payable(t1OwnerAddr))
.execute(
proxyAdminAddr,
0,
abi.encodeWithSelector(
proxyAdmin.upgrade.selector, ITransparentUpgradeableProxy(xChainReaderProxyAddr), newImplementation
),
SECURITY_COUNCIL_NO_DELAY_ROLE
) {
console.log("T1XChainReader upgrade successful");
_verifyUpgrade(proxyAdminAddr, xChainReaderProxyAddr, newImplementation);
} catch Error(string memory reason) {
Expand Down
Loading