Skip to content
This repository has been archived by the owner on May 11, 2024. It is now read-only.

feat(prover): wip, refactor of guardian prover signing/sending #472

Merged
merged 11 commits into from
Dec 14, 2023
Merged

feat(prover): wip, refactor of guardian prover signing/sending #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c2fd2e
wip, refactor of guardian prover signing/sending
cyberhorsey Dec 12, 2023
a5bdb77
dummy url for now
cyberhorsey Dec 12, 2023
93e94f5
send prover address
cyberhorsey Dec 12, 2023
c2cacfd
dont send if not url, allows tests to not send
cyberhorsey Dec 13, 2023
a797143
change interface
cyberhorsey Dec 13, 2023
b29abcb
post refactor
cyberhorsey Dec 13, 2023
0886cad
logs
cyberhorsey Dec 13, 2023
f7a9e22
tests
cyberhorsey Dec 13, 2023
44dd2ee
cache size
cyberhorsey Dec 13, 2023
e63f26d
use memorydb
cyberhorsey Dec 13, 2023
441a6fc
resolve conflicts
cyberhorsey Dec 13, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
bin
coverage.out
prover/dbPath
dbdata

# Test binary, built with `go test -c`
*.test
Expand Down
6 changes: 6 additions & 0 deletions cmd/flags/prover.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ var (
Usage: "Amount to approve TaikoL1 contract for TaikoToken usage",
Category: proverCategory,
}
GuardianProverHealthCheckServerEndpoint = &cli.StringFlag{
Name: "prover.guardianProverHealthCheckServerEndpoint",
Usage: "HTTP endpoint for main guardian prover health check server",
Category: proverCategory,
}
)

// All prover flags.
Expand All @@ -191,6 +196,7 @@ var ProverFlags = MergeFlags(CommonFlags, []cli.Flag{
Dummy,
GuardianProver,
GuardianProofSubmissionDelay,
GuardianProverHealthCheckServerEndpoint,
ProofSubmissionMaxRetry,
ProveBlockTxReplacementMultiplier,
ProveBlockMaxTxGasTipCap,
Expand Down
163 changes: 87 additions & 76 deletions prover/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"crypto/ecdsa"
"fmt"
"math/big"
"net/url"
"time"

"github.com/ethereum/go-ethereum/common"
Expand All @@ -14,44 +15,45 @@ import (

// Config contains the configurations to initialize a Taiko prover.
type Config struct {
L1WsEndpoint string
L1HttpEndpoint string
L2WsEndpoint string
L2HttpEndpoint string
TaikoL1Address common.Address
TaikoL2Address common.Address
TaikoTokenAddress common.Address
AssignmentHookAddress common.Address
L1ProverPrivKey *ecdsa.PrivateKey
ZKEvmRpcdEndpoint string
ZkEvmRpcdParamsPath string
StartingBlockID *big.Int
Dummy bool
GuardianProverAddress common.Address
GuardianProofSubmissionDelay time.Duration
ProofSubmissionMaxRetry uint64
Graffiti string
BackOffMaxRetrys uint64
BackOffRetryInterval time.Duration
ProveUnassignedBlocks bool
ContesterMode bool
RPCTimeout *time.Duration
WaitReceiptTimeout time.Duration
ProveBlockGasLimit *uint64
ProveBlockTxReplacementMultiplier uint64
ProveBlockMaxTxGasTipCap *big.Int
HTTPServerPort uint64
Capacity uint64
MinOptimisticTierFee *big.Int
MinSgxTierFee *big.Int
MinPseZkevmTierFee *big.Int
MinSgxAndPseZkevmTierFee *big.Int
MaxExpiry time.Duration
MaxProposedIn uint64
MaxBlockSlippage uint64
DatabasePath string
DatabaseCacheSize uint64
Allowance *big.Int
L1WsEndpoint string
L1HttpEndpoint string
L2WsEndpoint string
L2HttpEndpoint string
TaikoL1Address common.Address
TaikoL2Address common.Address
TaikoTokenAddress common.Address
AssignmentHookAddress common.Address
L1ProverPrivKey *ecdsa.PrivateKey
ZKEvmRpcdEndpoint string
ZkEvmRpcdParamsPath string
StartingBlockID *big.Int
Dummy bool
GuardianProverAddress common.Address
GuardianProofSubmissionDelay time.Duration
ProofSubmissionMaxRetry uint64
Graffiti string
BackOffMaxRetrys uint64
BackOffRetryInterval time.Duration
ProveUnassignedBlocks bool
ContesterMode bool
RPCTimeout *time.Duration
WaitReceiptTimeout time.Duration
ProveBlockGasLimit *uint64
ProveBlockTxReplacementMultiplier uint64
ProveBlockMaxTxGasTipCap *big.Int
HTTPServerPort uint64
Capacity uint64
MinOptimisticTierFee *big.Int
MinSgxTierFee *big.Int
MinPseZkevmTierFee *big.Int
MinSgxAndPseZkevmTierFee *big.Int
MaxExpiry time.Duration
MaxProposedIn uint64
MaxBlockSlippage uint64
DatabasePath string
DatabaseCacheSize uint64
Allowance *big.Int
GuardianProverHealthCheckServerEndpoint *url.URL
}

// NewConfigFromCliContext creates a new config instance from command line flags.
Expand Down Expand Up @@ -103,44 +105,53 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
allowance = amt
}

var guardianProverHealthCheckServerEndpoint *url.URL
if c.IsSet(flags.GuardianProverHealthCheckServerEndpoint.Name) {
guardianProverHealthCheckServerEndpoint, err = url.Parse(c.String(flags.GuardianProverHealthCheckServerEndpoint.Name))
if err != nil {
return nil, err
}
}

return &Config{
L1WsEndpoint: c.String(flags.L1WSEndpoint.Name),
L1HttpEndpoint: c.String(flags.L1HTTPEndpoint.Name),
L2WsEndpoint: c.String(flags.L2WSEndpoint.Name),
L2HttpEndpoint: c.String(flags.L2HTTPEndpoint.Name),
TaikoL1Address: common.HexToAddress(c.String(flags.TaikoL1Address.Name)),
TaikoL2Address: common.HexToAddress(c.String(flags.TaikoL2Address.Name)),
TaikoTokenAddress: common.HexToAddress(c.String(flags.TaikoTokenAddress.Name)),
AssignmentHookAddress: common.HexToAddress(c.String(flags.ProverAssignmentHookAddress.Name)),
L1ProverPrivKey: l1ProverPrivKey,
ZKEvmRpcdEndpoint: c.String(flags.ZkEvmRpcdEndpoint.Name),
ZkEvmRpcdParamsPath: c.String(flags.ZkEvmRpcdParamsPath.Name),
StartingBlockID: startingBlockID,
Dummy: c.Bool(flags.Dummy.Name),
GuardianProverAddress: common.HexToAddress(c.String(flags.GuardianProver.Name)),
GuardianProofSubmissionDelay: c.Duration(flags.GuardianProofSubmissionDelay.Name),
ProofSubmissionMaxRetry: c.Uint64(flags.ProofSubmissionMaxRetry.Name),
Graffiti: c.String(flags.Graffiti.Name),
BackOffMaxRetrys: c.Uint64(flags.BackOffMaxRetrys.Name),
BackOffRetryInterval: c.Duration(flags.BackOffRetryInterval.Name),
ProveUnassignedBlocks: c.Bool(flags.ProveUnassignedBlocks.Name),
ContesterMode: c.Bool(flags.ContesterMode.Name),
RPCTimeout: timeout,
WaitReceiptTimeout: c.Duration(flags.WaitReceiptTimeout.Name),
ProveBlockGasLimit: proveBlockTxGasLimit,
Capacity: c.Uint64(flags.ProverCapacity.Name),
ProveBlockTxReplacementMultiplier: proveBlockTxReplacementMultiplier,
ProveBlockMaxTxGasTipCap: proveBlockMaxTxGasTipCap,
HTTPServerPort: c.Uint64(flags.ProverHTTPServerPort.Name),
MinOptimisticTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinOptimisticTierFee.Name)),
MinSgxTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinSgxTierFee.Name)),
MinPseZkevmTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinPseZkevmTierFee.Name)),
MinSgxAndPseZkevmTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinSgxAndPseZkevmTierFee.Name)),
MaxExpiry: c.Duration(flags.MaxExpiry.Name),
MaxBlockSlippage: c.Uint64(flags.MaxAcceptableBlockSlippage.Name),
MaxProposedIn: c.Uint64(flags.MaxProposedIn.Name),
DatabasePath: c.String(flags.DatabasePath.Name),
DatabaseCacheSize: c.Uint64(flags.DatabaseCacheSize.Name),
Allowance: allowance,
L1WsEndpoint: c.String(flags.L1WSEndpoint.Name),
L1HttpEndpoint: c.String(flags.L1HTTPEndpoint.Name),
L2WsEndpoint: c.String(flags.L2WSEndpoint.Name),
L2HttpEndpoint: c.String(flags.L2HTTPEndpoint.Name),
TaikoL1Address: common.HexToAddress(c.String(flags.TaikoL1Address.Name)),
TaikoL2Address: common.HexToAddress(c.String(flags.TaikoL2Address.Name)),
TaikoTokenAddress: common.HexToAddress(c.String(flags.TaikoTokenAddress.Name)),
AssignmentHookAddress: common.HexToAddress(c.String(flags.ProverAssignmentHookAddress.Name)),
L1ProverPrivKey: l1ProverPrivKey,
ZKEvmRpcdEndpoint: c.String(flags.ZkEvmRpcdEndpoint.Name),
ZkEvmRpcdParamsPath: c.String(flags.ZkEvmRpcdParamsPath.Name),
StartingBlockID: startingBlockID,
Dummy: c.Bool(flags.Dummy.Name),
GuardianProverAddress: common.HexToAddress(c.String(flags.GuardianProver.Name)),
GuardianProofSubmissionDelay: c.Duration(flags.GuardianProofSubmissionDelay.Name),
GuardianProverHealthCheckServerEndpoint: guardianProverHealthCheckServerEndpoint,
ProofSubmissionMaxRetry: c.Uint64(flags.ProofSubmissionMaxRetry.Name),
Graffiti: c.String(flags.Graffiti.Name),
BackOffMaxRetrys: c.Uint64(flags.BackOffMaxRetrys.Name),
BackOffRetryInterval: c.Duration(flags.BackOffRetryInterval.Name),
ProveUnassignedBlocks: c.Bool(flags.ProveUnassignedBlocks.Name),
ContesterMode: c.Bool(flags.ContesterMode.Name),
RPCTimeout: timeout,
WaitReceiptTimeout: c.Duration(flags.WaitReceiptTimeout.Name),
ProveBlockGasLimit: proveBlockTxGasLimit,
Capacity: c.Uint64(flags.ProverCapacity.Name),
ProveBlockTxReplacementMultiplier: proveBlockTxReplacementMultiplier,
ProveBlockMaxTxGasTipCap: proveBlockMaxTxGasTipCap,
HTTPServerPort: c.Uint64(flags.ProverHTTPServerPort.Name),
MinOptimisticTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinOptimisticTierFee.Name)),
MinSgxTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinSgxTierFee.Name)),
MinPseZkevmTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinPseZkevmTierFee.Name)),
MinSgxAndPseZkevmTierFee: new(big.Int).SetUint64(c.Uint64(flags.MinSgxAndPseZkevmTierFee.Name)),
MaxExpiry: c.Duration(flags.MaxExpiry.Name),
MaxBlockSlippage: c.Uint64(flags.MaxAcceptableBlockSlippage.Name),
MaxProposedIn: c.Uint64(flags.MaxProposedIn.Name),
DatabasePath: c.String(flags.DatabasePath.Name),
DatabaseCacheSize: c.Uint64(flags.DatabaseCacheSize.Name),
Allowance: allowance,
}, nil
}
Loading