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.

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

feat(protocol): allow multiple Taiko deployments to sync signals #13565

Merged
merged 24 commits into from
Apr 8, 2023
Merged
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions packages/protocol/contracts/L1/TaikoConfig.sol
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@ library TaikoConfig {
// Moving average factors
feeBaseMAF: 1024,
txListCacheExpiry: 0,
relaySignalRoot: false,
enableSoloProposer: false,
enableOracleProver: true,
enableTokenomics: true,
1 change: 1 addition & 0 deletions packages/protocol/contracts/L1/TaikoData.sol
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ library TaikoData {
// Moving average factors
uint256 feeBaseMAF;
uint256 txListCacheExpiry;
bool relaySignalRoot;
bool enableSoloProposer;
bool enableOracleProver;
bool enableTokenomics;
3 changes: 3 additions & 0 deletions packages/protocol/contracts/L1/TaikoL1.sol
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@ contract TaikoL1 is EssentialContract, IXchainSync, TaikoEvents, TaikoErrors {
LibVerifying.verifyBlocks({
state: state,
config: config,
resolver: AddressResolver(this),
maxBlocks: config.maxVerificationsPerTx
});
}
@@ -122,6 +123,7 @@ contract TaikoL1 is EssentialContract, IXchainSync, TaikoEvents, TaikoErrors {
LibVerifying.verifyBlocks({
state: state,
config: config,
resolver: AddressResolver(this),
maxBlocks: config.maxVerificationsPerTx
});
}
@@ -136,6 +138,7 @@ contract TaikoL1 is EssentialContract, IXchainSync, TaikoEvents, TaikoErrors {
LibVerifying.verifyBlocks({
state: state,
config: getConfig(),
resolver: AddressResolver(this),
maxBlocks: maxBlocks
});
}
10 changes: 10 additions & 0 deletions packages/protocol/contracts/L1/libs/LibVerifying.sol
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
pragma solidity ^0.8.18;

import {AddressResolver} from "../../common/AddressResolver.sol";
import {ISignalService} from "../../signal/ISignalService.sol";
import {LibTokenomics} from "./LibTokenomics.sol";
import {LibUtils} from "./LibUtils.sol";
import {
@@ -57,6 +58,7 @@ library LibVerifying {
function verifyBlocks(
TaikoData.State storage state,
TaikoData.Config memory config,
AddressResolver resolver,
uint256 maxBlocks
) internal {
uint256 i = state.lastVerifiedBlockId;
@@ -106,6 +108,14 @@ library LibVerifying {
unchecked {
state.lastVerifiedBlockId += processed;
}

if (config.relaySignalRoot) {
// Send the L2's signal root to the signal service so other TaikoL1
// deployments, if they share the same signal service, can relay the
// signal to their corresponding TaikoL2 contract.
ISignalService(resolver.resolve("signal_service", false))
.sendSignal(signalRoot);
Brechtpd marked this conversation as resolved.
Show resolved Hide resolved
}
emit XchainSynced(state.lastVerifiedBlockId, blockHash, signalRoot);
}
}
30 changes: 20 additions & 10 deletions packages/protocol/script/DeployOnL1.s.sol
Original file line number Diff line number Diff line change
@@ -32,10 +32,12 @@ contract DeployOnL1 is Script, AddressResolver {

address public owner = vm.envAddress("OWNER");

address public oracleProver = vm.envAddress("ORACLE_PROVER_ADDRESS");
address public oracleProver = vm.envAddress("ORACLE_PROVER");

address public soloProposer = vm.envAddress("SOLO_PROPOSER");

address public sharedSignalService = vm.envAddress("SHARED_SIGNAL_SERVICE");

address public treasure = vm.envAddress("TREASURE");

address public taikoTokenPremintRecipient =
@@ -143,15 +145,23 @@ contract DeployOnL1 is Script, AddressResolver {
);

// SignalService
SignalService signalService = new SignalService();
deployProxy(
"signal_service",
address(signalService),
bytes.concat(
signalService.init.selector,
abi.encode(addressManagerProxy)
)
);
if (sharedSignalService == address(0)) {
SignalService signalService = new SignalService();
deployProxy(
"signal_service",
address(signalService),
bytes.concat(
signalService.init.selector,
abi.encode(addressManagerProxy)
)
);
} else {
console.log(
"Warining: using shared signal service: ",
sharedSignalService
);
setAddress("signal_service", sharedSignalService);
}

// PlonkVerifier
deployPlonkVerifiers();
3 changes: 2 additions & 1 deletion packages/protocol/script/deploy_on_l1.sh
Original file line number Diff line number Diff line change
@@ -4,7 +4,8 @@
set -e

PRIVATE_KEY=ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \
ORACLE_PROVER_ADDRESS=0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 \
SHARED_SIGNAL_SERVICE=0x0000000000000000000000000000000000000000 \
ORACLE_PROVER=0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 \
SOLO_PROPOSER=0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 \
OWNER=0x70997970C51812dc3A010C7d01b50e0d17dc79C8 \
TAIKO_L2_ADDRESS=0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 \
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ struct Config {
uint256 proposerDepositPctg;
uint256 feeBaseMAF;
uint256 txListCacheExpiry;
bool relaySignalRoot;
bool enableSoloProposer;
bool enableOracleProver;
bool enableTokenomics;

This file was deleted.