From 3d260d73ba7aa3a63bdf83aad4d9ab6864cb27fc Mon Sep 17 00:00:00 2001 From: bennett Date: Wed, 13 Nov 2024 13:36:33 -0600 Subject: [PATCH] remove all calls to the shared bridge Signed-off-by: bennett --- contracts/chain-adapters/ZkStack_Adapter.sol | 2 +- contracts/chain-adapters/ZkStack_CustomGasToken_Adapter.sol | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/chain-adapters/ZkStack_Adapter.sol b/contracts/chain-adapters/ZkStack_Adapter.sol index 408d6752f..5d6668a07 100644 --- a/contracts/chain-adapters/ZkStack_Adapter.sol +++ b/contracts/chain-adapters/ZkStack_Adapter.sol @@ -153,7 +153,7 @@ contract ZkStack_Adapter is AdapterInterface { l2GasLimit: L2_GAS_LIMIT, l2GasPerPubdataByteLimit: L1_GAS_TO_L2_GAS_PER_PUB_DATA_LIMIT, refundRecipient: L2_REFUND_ADDRESS, - secondBridgeAddress: BRIDGE_HUB.sharedBridge(), + secondBridgeAddress: SHARED_BRIDGE, secondBridgeValue: 0, secondBridgeCalldata: _secondBridgeCalldata(to, l1Token, amount) }) diff --git a/contracts/chain-adapters/ZkStack_CustomGasToken_Adapter.sol b/contracts/chain-adapters/ZkStack_CustomGasToken_Adapter.sol index 08fb8b000..81602f20f 100644 --- a/contracts/chain-adapters/ZkStack_CustomGasToken_Adapter.sol +++ b/contracts/chain-adapters/ZkStack_CustomGasToken_Adapter.sol @@ -162,7 +162,7 @@ contract ZkStack_CustomGasToken_Adapter is AdapterInterface { l2GasLimit: L2_GAS_LIMIT, l2GasPerPubdataByteLimit: L1_GAS_TO_L2_GAS_PER_PUB_DATA_LIMIT, refundRecipient: L2_REFUND_ADDRESS, - secondBridgeAddress: BRIDGE_HUB.sharedBridge(), + secondBridgeAddress: SHARED_BRIDGE, secondBridgeValue: amount, secondBridgeCalldata: _secondBridgeCalldata(to, address(1), amount) }) @@ -195,7 +195,7 @@ contract ZkStack_CustomGasToken_Adapter is AdapterInterface { l2GasLimit: L2_GAS_LIMIT, l2GasPerPubdataByteLimit: L1_GAS_TO_L2_GAS_PER_PUB_DATA_LIMIT, refundRecipient: L2_REFUND_ADDRESS, - secondBridgeAddress: BRIDGE_HUB.sharedBridge(), + secondBridgeAddress: SHARED_BRIDGE, secondBridgeValue: 0, secondBridgeCalldata: _secondBridgeCalldata(to, l1Token, amount) })