Skip to content
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

fix(protocol): fix issue in mainnet deployment script #18283

Merged
merged 6 commits into from
Oct 23, 2024
Merged

fix(protocol): fix issue in mainnet deployment script #18283

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
15fceef
fix issue in mainnet deployment script
dantaik Oct 23, 2024
c955880
Update DeployProtocolOnL1.s.sol
dantaik Oct 23, 2024
edc0278
rename
dantaik Oct 23, 2024
d4840fd
more
dantaik Oct 23, 2024
bb6d80f
rename
dantaik Oct 23, 2024
6492aab
fix
dantaik Oct 23, 2024
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
4 changes: 2 additions & 2 deletions ...acts/layer1/devnet/DevnetTierProvider.sol → ...tracts/layer1/devnet/DevnetTierRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ pragma solidity ^0.8.24;
import "../tiers/TierProviderBase.sol";
import "../tiers/ITierRouter.sol";

/// @title DevnetTierProvider
/// @title DevnetTierRouter
/// @custom:security-contact security@taiko.xyz
contract DevnetTierProvider is TierProviderBase, ITierRouter {
contract DevnetTierRouter is TierProviderBase, ITierRouter {
/// @inheritdoc ITierRouter
function getProvider(uint256) external view returns (address) {
return address(this);
Expand Down
25 changes: 12 additions & 13 deletions packages/protocol/script/layer1/DeployProtocolOnL1.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import "src/layer1/automata-attestation/AutomataDcapV3Attestation.sol";
import "src/layer1/automata-attestation/lib/PEMCertChainLib.sol";
import "src/layer1/automata-attestation/utils/SigVerifyLib.sol";
import "src/layer1/devnet/DevnetTaikoL1.sol";
import "src/layer1/devnet/DevnetTierProvider.sol";
import "src/layer1/devnet/DevnetTierRouter.sol";
import "src/layer1/mainnet/rollup/MainnetGuardianProver.sol";
import "src/layer1/mainnet/rollup/MainnetTaikoL1.sol";
import "src/layer1/mainnet/rollup/MainnetTierRouter.sol";
import "src/layer1/mainnet/rollup/verifiers/MainnetSgxVerifier.sol";
import "src/layer1/mainnet/multirollup/MainnetBridge.sol";
import "src/layer1/mainnet/multirollup/MainnetERC1155Vault.sol";
Expand All @@ -30,11 +31,10 @@ import "src/layer1/mainnet/multirollup/MainnetERC721Vault.sol";
import "src/layer1/mainnet/multirollup/MainnetSignalService.sol";
import "src/layer1/provers/GuardianProver.sol";
import "src/layer1/provers/ProverSet.sol";
import "src/layer1/tiers/TierProviderV2.sol";
import "src/layer1/token/TaikoToken.sol";
import "src/layer1/verifiers/Risc0Verifier.sol";
import "src/layer1/verifiers/SP1Verifier.sol";
import "test/layer1/based/TestTierProvider.sol";
import "test/layer1/based/TestTierRouter.sol";
import "test/shared/token/FreeMintERC20.sol";
import "test/shared/token/MayFailFreeMintERC20.sol";
import "test/shared/DeployCapability.sol";
Expand Down Expand Up @@ -291,8 +291,7 @@ contract DeployProtocolOnL1 is DeployCapability {
});

TaikoL1 taikoL1;
if (keccak256(abi.encode(vm.envString("TIER_PROVIDER"))) == keccak256(abi.encode("devnet")))
{
if (keccak256(abi.encode(vm.envString("TIER_ROUTER"))) == keccak256(abi.encode("devnet"))) {
taikoL1 = TaikoL1(address(new DevnetTaikoL1()));
} else {
taikoL1 = TaikoL1(address(new TaikoL1()));
Expand Down Expand Up @@ -353,7 +352,7 @@ contract DeployProtocolOnL1 is DeployCapability {
register(
rollupAddressManager,
"tier_router",
address(deployTierProvider(vm.envString("TIER_PROVIDER")))
address(deployTierRouter(vm.envString("TIER_ROUTER")))
);

address[] memory guardians = vm.envAddress("GUARDIAN_PROVERS", ",");
Expand Down Expand Up @@ -427,13 +426,13 @@ contract DeployProtocolOnL1 is DeployCapability {
});
}

function deployTierProvider(string memory tierProviderName) private returns (address) {
if (keccak256(abi.encode(tierProviderName)) == keccak256(abi.encode("devnet"))) {
return address(new DevnetTierProvider());
} else if (keccak256(abi.encode(tierProviderName)) == keccak256(abi.encode("testnet"))) {
return address(new TestTierProvider());
} else if (keccak256(abi.encode(tierProviderName)) == keccak256(abi.encode("mainnet"))) {
return address(new TierProviderV2());
function deployTierRouter(string memory tierRouterName) private returns (address) {
if (keccak256(abi.encode(tierRouterName)) == keccak256(abi.encode("devnet"))) {
return address(new DevnetTierRouter());
} else if (keccak256(abi.encode(tierRouterName)) == keccak256(abi.encode("testnet"))) {
return address(new TestTierRouter());
} else if (keccak256(abi.encode(tierRouterName)) == keccak256(abi.encode("mainnet"))) {
return address(new MainnetTierRouter());
} else {
revert("invalid tier provider");
}
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/script/layer1/deploy_protocol_on_l1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PAUSE_TAIKO_L1=true \
PAUSE_BRIDGE=true \
NUM_MIN_MAJORITY_GUARDIANS=7 \
NUM_MIN_MINORITY_GUARDIANS=2 \
TIER_PROVIDER="devnet" \
TIER_ROUTER="devnet" \
FOUNDRY_PROFILE="layer1" \
forge script ./script/layer1/DeployProtocolOnL1.s.sol:DeployProtocolOnL1 \
--fork-url http://localhost:8545 \
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/test/layer1/TaikoL1Test.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "src/layer1/verifiers/Risc0Verifier.sol";
import "src/layer1/provers/GuardianProver.sol";
import "src/layer1/team/airdrop/ERC20Airdrop.sol";
import "src/shared/bridge/QuotaManager.sol";
import "../layer1/based/TestTierProvider.sol";
import "../layer1/based/TestTierRouter.sol";
import "../shared/TaikoTest.sol";

abstract contract TaikoL1Test is TaikoTest { }
4 changes: 2 additions & 2 deletions packages/protocol/test/layer1/based/TaikoL1.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,13 @@ contract TaikoL1Tests is TaikoL1TestBase {
}

function test_getTierIds() external {
uint16[] memory tiers = cp.getTierIds();
uint16[] memory tiers = tr.getTierIds();
assertEq(tiers[0], LibTiers.TIER_OPTIMISTIC);
assertEq(tiers[1], LibTiers.TIER_SGX);
assertEq(tiers[2], LibTiers.TIER_GUARDIAN);

vm.expectRevert();
cp.getTier(123);
tr.getTier(123);
}

function proposeButRevert(address proposer, uint24 txListSize, bytes4 revertReason) internal {
Expand Down
6 changes: 3 additions & 3 deletions packages/protocol/test/layer1/based/TaikoL1TestBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ abstract contract TaikoL1TestBase is TaikoTest {
SP1Verifier public sp1;
SgxVerifier public sv;
GuardianProver public gp;
TestTierProvider public cp;
TestTierRouter public tr;
Bridge public bridge;

bytes32 public GENESIS_BLOCK_HASH = keccak256("GENESIS_BLOCK_HASH");
Expand Down Expand Up @@ -75,7 +75,7 @@ abstract contract TaikoL1TestBase is TaikoTest {

setupGuardianProverMultisig();

cp = new TestTierProvider();
tr = new TestTierRouter();

bridge = Bridge(
payable(
Expand All @@ -91,7 +91,7 @@ abstract contract TaikoL1TestBase is TaikoTest {
registerAddress("taiko", address(L1));
registerAddress("tier_sgx", address(sv));
registerAddress("tier_guardian", address(gp));
registerAddress("tier_router", address(cp));
registerAddress("tier_router", address(tr));
registerAddress("signal_service", address(ss));
registerL2Address("taiko", address(L2));
registerL2Address("signal_service", address(L2SS));
Expand Down
12 changes: 6 additions & 6 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup1.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {

giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -117,7 +117,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {

giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -212,7 +212,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
giveEthAndTko(Alice, 10_000 ether, 1000 ether);

giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -263,7 +263,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
giveEthAndTko(Alice, 10_000 ether, 1000 ether);

giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -314,7 +314,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {

giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -364,7 +364,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {

giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
8 changes: 4 additions & 4 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup2.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ contract TaikoL1TestGroup2 is TaikoL1TestGroupBase {

giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = TestTierProvider(cp).getTier(LibTiers.TIER_SGX);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = ITierProvider(tr).getTier(LibTiers.TIER_SGX);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -123,8 +123,8 @@ contract TaikoL1TestGroup2 is TaikoL1TestGroupBase {

giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = TestTierProvider(cp).getTier(LibTiers.TIER_SGX);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = ITierProvider(tr).getTier(LibTiers.TIER_SGX);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
8 changes: 4 additions & 4 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup3.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ contract TaikoL1TestGroup3 is TaikoL1TestGroupBase {
giveEthAndTko(James, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = TestTierProvider(cp).getTier(LibTiers.TIER_SGX);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = ITierProvider(tr).getTier(LibTiers.TIER_SGX);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -131,8 +131,8 @@ contract TaikoL1TestGroup3 is TaikoL1TestGroupBase {
giveEthAndTko(James, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = TestTierProvider(cp).getTier(LibTiers.TIER_SGX);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = ITierProvider(tr).getTier(LibTiers.TIER_SGX);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
8 changes: 4 additions & 4 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup4.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ contract TaikoL1TestGroup4 is TaikoL1TestGroupBase {
giveEthAndTko(Alice, 10_000 ether, 1000 ether);

giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = TestTierProvider(cp).getTier(LibTiers.TIER_SGX);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = ITierProvider(tr).getTier(LibTiers.TIER_SGX);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -95,8 +95,8 @@ contract TaikoL1TestGroup4 is TaikoL1TestGroupBase {

giveEthAndTko(David, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = TestTierProvider(cp).getTier(LibTiers.TIER_SGX);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = ITierProvider(tr).getTier(LibTiers.TIER_SGX);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup5.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {
giveEthAndTko(Alice, 10_000 ether, 1000 ether);

giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -223,7 +223,7 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {

giveEthAndTko(David, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup6.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ contract TaikoL1TestGroup6 is TaikoL1TestGroupBase {

giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = TestTierProvider(cp).getTier(LibTiers.TIER_SGX);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierSgx = ITierProvider(tr).getTier(LibTiers.TIER_SGX);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup7.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ contract TaikoL1TestGroup7 is TaikoL1TestGroupBase {

giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -52,7 +52,7 @@ contract TaikoL1TestGroup7 is TaikoL1TestGroupBase {
giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(Taylor, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
4 changes: 2 additions & 2 deletions packages/protocol/test/layer1/based/TaikoL1TestGroup9.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {

giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down Expand Up @@ -249,7 +249,7 @@ contract TaikoL1TestGroup5 is TaikoL1TestGroupBase {
giveEthAndTko(Alice, 10_000 ether, 1000 ether);
giveEthAndTko(Carol, 10_000 ether, 1000 ether);
giveEthAndTko(William, 10_000 ether, 1000 ether);
ITierProvider.Tier memory tierOp = TestTierProvider(cp).getTier(LibTiers.TIER_OPTIMISTIC);
ITierProvider.Tier memory tierOp = ITierProvider(tr).getTier(LibTiers.TIER_OPTIMISTIC);

console2.log("====== Alice propose a block");
TaikoData.BlockMetadata memory meta = proposeBlock(Alice, "");
Expand Down
4 changes: 2 additions & 2 deletions ...ol/test/layer1/based/TestTierProvider.sol → ...ocol/test/layer1/based/TestTierRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import "src/layer1/tiers/ITierProvider.sol";
import "src/layer1/tiers/LibTiers.sol";
import "src/layer1/tiers/ITierRouter.sol";

/// @title TestTierProvider
/// @title TestTierRouter
/// @dev Labeled in AddressResolver as "tier_router"
/// @custom:security-contact security@taiko.xyz
contract TestTierProvider is ITierProvider, ITierRouter {
contract TestTierRouter is ITierProvider, ITierRouter {
uint256[50] private __gap;

/// @inheritdoc ITierRouter
Expand Down
2 changes: 1 addition & 1 deletion packages/taiko-client/integration_test/l1_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export PROVER_SET_ADMIN=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
export TAIKO_TOKEN_PREMINT_RECIPIENT=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
export TAIKO_TOKEN_NAME="Taiko Token Test"
export TAIKO_TOKEN_SYMBOL="TTKOt"
export TIER_PROVIDER="devnet"
export TIER_ROUTER="devnet"
export PAUSE_TAIKO_L1="false"
export PAUSE_BRIDGE="false"
export TAIKO_TOKEN=0x0000000000000000000000000000000000000000
Expand Down
Loading