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): resolve l1 and l2 contracts tests #35

Merged
merged 4 commits into from
Dec 11, 2024
Merged

fix (protocol): resolve l1 and l2 contracts tests #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f49b3f
fix (protocol): resolve l1 and l2 contracts tests
vikinatora Dec 11, 2024
ba0f1a9
fix (protocol): adjust TestnetTierProvider
vikinatora Dec 11, 2024
18271a5
fix(protocol): spacing nitpick
vikinatora Dec 11, 2024
aa52712
fix (protocol): more line spacing nits
vikinatora Dec 11, 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 packages/protocol/contracts/layer1/based/TaikoL1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ contract TaikoL1 is EssentialContract, ITaikoL1, TaikoEvents {
/// @inheritdoc ITaikoL1
function getConfig() public pure virtual returns (TaikoData.Config memory) {
return TaikoData.Config({
chainId: 8787,
chainId: LibNetwork.TAIKO_MAINNET,
blockMaxProposals: 324_000, // = 7200 * 45
blockRingBufferSize: 360_000, // = 7200 * 50
maxBlocksToVerify: 16,
Expand All @@ -308,7 +308,7 @@ contract TaikoL1 is EssentialContract, ITaikoL1, TaikoEvents {
minGasExcess: 1_340_000_000,
maxGasIssuancePerBlock: 600_000_000 // two minutes
}),
ontakeForkHeight: 2 // = 7200 * 52
ontakeForkHeight: 374_400 // = 7200 * 52
});
}

Expand Down
57 changes: 57 additions & 0 deletions packages/protocol/contracts/layer1/testnet/TestnetTierProvider.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;

import "../../../contracts/shared/common/LibStrings.sol";
import "../../../contracts/layer1/tiers/ITierProvider.sol";
import "../../../contracts/layer1/tiers/LibTiers.sol";
import "../../../contracts/layer1/tiers/ITierRouter.sol";

/// @title TestnetTierProvider
/// @dev Labeled in AddressResolver as "tier_router"
contract TestnetTierProvider is ITierProvider, ITierRouter {
uint256[50] private __gap;

/// @inheritdoc ITierRouter
function getProvider(uint256) external view returns (address) {
return address(this);
}

/// @inheritdoc ITierProvider
function getTier(uint16 _tierId) public pure override returns (ITierProvider.Tier memory) {
if (_tierId == LibTiers.TIER_TDX) {
return ITierProvider.Tier({
verifierName: LibStrings.B_TIER_TDX,
validityBond: 250 ether, // TKO
contestBond: 1640 ether, // =250TKO * 6.5625
cooldownWindow: 1, // 1 minute
provingWindow: 60, // 1 hours
maxBlocksToVerifyPerProof: 0
});
}

if (_tierId == LibTiers.TIER_GUARDIAN) {
return ITierProvider.Tier({
verifierName: LibStrings.B_TIER_GUARDIAN,
validityBond: 0, // must be 0 for top tier
contestBond: 0, // must be 0 for top tier
cooldownWindow: 1, //1 minute
provingWindow: 2880, // 48 hours
maxBlocksToVerifyPerProof: 0
});
}

revert TIER_NOT_FOUND();
}

/// @inheritdoc ITierProvider
function getTierIds() public pure override returns (uint16[] memory tiers_) {
tiers_ = new uint16[](3);
tiers_[0] = LibTiers.TIER_TDX;
tiers_[1] = LibTiers.TIER_GUARDIAN;
}

/// @inheritdoc ITierProvider
function getMinTier(address, uint256 _rand) public pure override returns (uint16) {
return LibTiers.TIER_TDX;
}
}
4 changes: 2 additions & 2 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 @@ -25,6 +25,7 @@ import "../../contracts/layer1/mainnet/rollup/MainnetGuardianProver.sol";
import "../../contracts/layer1/mainnet/rollup/MainnetTaikoL1.sol";
import "../../contracts/layer1/mainnet/rollup/verifiers/MainnetSgxVerifier.sol";
import "../../contracts/layer1/testnet/TestnetUniFiL1.sol";
import "../../contracts/layer1/testnet/TestnetTierProvider.sol";
import "../../contracts/layer1/verifiers/ProverRegistryVerifier.sol";
import "../../contracts/layer1/mainnet/multirollup/MainnetBridge.sol";
import "../../contracts/layer1/mainnet/multirollup/MainnetERC1155Vault.sol";
Expand All @@ -37,7 +38,6 @@ import "../../contracts/layer1/tiers/TierProviderV2.sol";
import "../../contracts/layer1/token/TaikoToken.sol";
import "../../contracts/layer1/verifiers/Risc0Verifier.sol";
import "../../contracts/layer1/verifiers/SP1Verifier.sol";
import "../../test/layer1/based/TestTierProvider.sol";
import "../../test/shared/token/FreeMintERC20.sol";
import "../../test/shared/token/MayFailFreeMintERC20.sol";
import "../../test/shared/DeployCapability.sol";
Expand Down Expand Up @@ -452,7 +452,7 @@ contract DeployProtocolOnL1 is DeployCapability {
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());
return address(new TestnetTierProvider());
} else if (keccak256(abi.encode(tierProviderName)) == keccak256(abi.encode("mainnet"))) {
return address(new TierProviderV2());
} else {
Expand Down
16 changes: 8 additions & 8 deletions packages/protocol/test/layer1/based/TestTierProvider.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ contract TestTierProvider is ITierProvider, ITierRouter {
verifierName: "",
validityBond: 250 ether, // TKO
contestBond: 500 ether, // TKO
cooldownWindow: 1, // 1 minute
cooldownWindow: 1440, //24 hours
provingWindow: 30, // 0.5 hours
maxBlocksToVerifyPerProof: 0
});
}

if (_tierId == LibTiers.TIER_TDX) {
if (_tierId == LibTiers.TIER_SGX) {
return ITierProvider.Tier({
verifierName: LibStrings.B_TIER_TDX,
verifierName: LibStrings.B_TIER_SGX,
validityBond: 250 ether, // TKO
contestBond: 1640 ether, // =250TKO * 6.5625
cooldownWindow: 1, // 1 minute
cooldownWindow: 1440, //24 hours
provingWindow: 60, // 1 hours
maxBlocksToVerifyPerProof: 0
});
Expand All @@ -46,7 +46,7 @@ contract TestTierProvider is ITierProvider, ITierRouter {
verifierName: LibStrings.B_TIER_GUARDIAN,
validityBond: 0, // must be 0 for top tier
contestBond: 0, // must be 0 for top tier
cooldownWindow: 1, //1 minute
cooldownWindow: 60, //1 hours
provingWindow: 2880, // 48 hours
maxBlocksToVerifyPerProof: 0
});
Expand All @@ -59,14 +59,14 @@ contract TestTierProvider is ITierProvider, ITierRouter {
function getTierIds() public pure override returns (uint16[] memory tiers_) {
tiers_ = new uint16[](3);
tiers_[0] = LibTiers.TIER_OPTIMISTIC;
tiers_[1] = LibTiers.TIER_TDX;
tiers_[1] = LibTiers.TIER_SGX;
tiers_[2] = LibTiers.TIER_GUARDIAN;
}

/// @inheritdoc ITierProvider
function getMinTier(address, uint256 _rand) public pure override returns (uint16) {
// 10% will be selected to require TDX proofs.
if (_rand % 10 == 0) return LibTiers.TIER_TDX;
// 10% will be selected to require SGX proofs.
if (_rand % 10 == 0) return LibTiers.TIER_SGX;
// Other blocks are optimistic, without validity proofs.
return LibTiers.TIER_OPTIMISTIC;
}
Expand Down
Loading