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

refactor(protocol): add MainnetSgxVerifier #17803

Merged
merged 3 commits into from
Jul 16, 2024
Merged

refactor(protocol): add MainnetSgxVerifier #17803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8434456
add MainnetSgxVerifier
dantaik Jul 16, 2024
16eda66
Update DeployOnL1.s.sol
dantaik Jul 16, 2024
928626b
Update packages/protocol/contracts/mainnet/MainnetSgxVerifier.sol
dantaik Jul 16, 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
17 changes: 17 additions & 0 deletions packages/protocol/contracts/mainnet/MainnetSgxVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.24;

import "../verifiers/SgxVerifier.sol";
import "./LibRollupAddressCache.sol";

/// @title MainnetSgxVerifier
/// @dev This contract shall be deployed to replace its parent contract on Ethereum for Taiko
/// mainnet to reduce gas cost.
/// @notice See the documentation in {SgxVerifier}.
/// @custom:security-contact [email protected]
contract MainnetSgxVerifier is SgxVerifier {
function _getAddress(uint64 _chainId, bytes32 _name) internal view override returns (address) {
(bool found, address addr) = LibRollupAddressCache.getAddress(_chainId, _name);
return found ? addr : super._getAddress(_chainId, _name);
}
}
8 changes: 4 additions & 4 deletions ...rotocol/contracts/L1/tiers/TierRouter.sol → ...l/contracts/mainnet/MainnetTierRouter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.24;

import "./ITierRouter.sol";
import "../L1/tiers/ITierRouter.sol";

/// @title TierRouter
/// @title MainnetTierRouter
/// @dev Labeled in AddressResolver as "tier_router"
/// @custom:security-contact [email protected]
contract TierRouter is ITierRouter {
contract MainnetTierRouter is ITierRouter {
/// @inheritdoc ITierRouter
function getProvider(uint256 /*_blockId*/ ) external pure returns (address) {
return 0x4cffe56C947E26D07C14020499776DB3e9AE3a23;
return 0x4cffe56C947E26D07C14020499776DB3e9AE3a23; // TierProviderV2
}
}
8 changes: 7 additions & 1 deletion packages/protocol/script/DeployOnL1.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import "../contracts/mainnet/MainnetSignalService.sol";
import "../contracts/automata-attestation/AutomataDcapV3Attestation.sol";
import "../contracts/automata-attestation/utils/SigVerifyLib.sol";
import "../contracts/automata-attestation/lib/PEMCertChainLib.sol";
import "../contracts/verifiers/SgxVerifier.sol";
import "../contracts/mainnet/MainnetSgxVerifier.sol";
import "../contracts/team/proving/ProverSet.sol";
import "../test/common/erc20/FreeMintERC20.sol";
import "../test/common/erc20/MayFailFreeMintERC20.sol";
Expand Down Expand Up @@ -299,6 +299,12 @@ contract DeployOnL1 is DeployCapability {
registerTo: rollupAddressManager
});

deployProxy({
name: "mainnet_tier_sgx",
impl: address(new MainnetSgxVerifier()),
data: abi.encodeCall(SgxVerifier.init, (owner, rollupAddressManager))
});

deployProxy({
name: "tier_sgx",
impl: address(new SgxVerifier()),
Expand Down