From c7fa220b6a980501afff92b0d74ec9f61b9b4f1b Mon Sep 17 00:00:00 2001 From: Ratan Kaliani Date: Wed, 15 Jan 2025 16:53:10 -0800 Subject: [PATCH] clean --- book/advanced/proposer.md | 5 +++++ proposer/op/proposer/config.go | 9 --------- proposer/op/proposer/flags/flags.go | 19 ------------------- proposer/op/proposer/service.go | 6 ------ 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/book/advanced/proposer.md b/book/advanced/proposer.md index 6eb26fbf..1300dc72 100644 --- a/book/advanced/proposer.md +++ b/book/advanced/proposer.md @@ -51,6 +51,11 @@ Before starting the proposer, ensure you have deployed the L2 Output Oracle and ### `op-succinct/op-proposer` | Parameter | Description | +|-----------|-------------| +| `L1_RPC` | L1 Archive Node. | +| `L1_BEACON_RPC` | L1 Consensus (Beacon) Node. | +| `L2_RPC` | L2 Execution Node (`op-geth`). | +| `L2_NODE_RPC` | L2 Rollup Node (`op-node`). | | `L2OO_ADDRESS` | Address of the `OPSuccinctL2OutputOracle` contract. | | `PRIVATE_KEY` | Private key for the account that will be posting output roots to L1. | diff --git a/proposer/op/proposer/config.go b/proposer/op/proposer/config.go index ebe0abac..a8a01889 100644 --- a/proposer/op/proposer/config.go +++ b/proposer/op/proposer/config.go @@ -79,8 +79,6 @@ type CLIConfig struct { // L1 Beacon RPC URL used to determine span batch boundaries. BeaconRpc string - // Directory to store the transaction cache when determining span batch boundaries. - TxCacheOutDir string // The max size (in blocks) of a proof we will attempt to generate. If span batches are larger, we break them up. MaxBlockRangePerSpanProof uint64 // The max number of concurrent witness generation processes. @@ -95,10 +93,6 @@ type CLIConfig struct { OPSuccinctServerUrl string // The maximum proofs that can be requested from the server concurrently. MaxConcurrentProofRequests uint64 - // The batch inbox on L1 to read batches from. Note that this is ignored if L2 Chain ID is in rollup config. - BatchInbox string - // The batcher address to include transactions from. Note that this is ignored if L2 Chain ID is in rollup config. - BatcherAddress string // Mock is a flag to use the mock OP Succinct server. Mock bool } @@ -166,11 +160,8 @@ func NewConfig(ctx *cli.Context) *CLIConfig { MaxConcurrentWitnessGen: ctx.Uint64(flags.MaxConcurrentWitnessGenFlag.Name), WitnessGenTimeout: ctx.Uint64(flags.WitnessGenTimeoutFlag.Name), ProofTimeout: ctx.Uint64(flags.ProofTimeoutFlag.Name), - TxCacheOutDir: ctx.String(flags.TxCacheOutDirFlag.Name), OPSuccinctServerUrl: ctx.String(flags.OPSuccinctServerUrlFlag.Name), MaxConcurrentProofRequests: ctx.Uint64(flags.MaxConcurrentProofRequestsFlag.Name), - BatchInbox: ctx.String(flags.BatchInboxFlag.Name), - BatcherAddress: ctx.String(flags.BatcherAddressFlag.Name), Mock: ctx.Bool(flags.MockFlag.Name), } } diff --git a/proposer/op/proposer/flags/flags.go b/proposer/op/proposer/flags/flags.go index ea591acd..fe73b11e 100644 --- a/proposer/op/proposer/flags/flags.go +++ b/proposer/op/proposer/flags/flags.go @@ -129,22 +129,6 @@ var ( Value: 20, EnvVars: prefixEnvVars("MAX_CONCURRENT_PROOF_REQUESTS"), } - TxCacheOutDirFlag = &cli.StringFlag{ - Name: "tx-cache-out-dir", - Usage: "Cache directory for the found transactions to determine span batch boundaries", - Value: "/tmp/batch_decoder/transactions_cache", - EnvVars: prefixEnvVars("TX_CACHE_OUT_DIR"), - } - BatchInboxFlag = &cli.StringFlag{ - Name: "batch-inbox", - Usage: "Batch Inbox Address", - EnvVars: prefixEnvVars("BATCH_INBOX"), - } - BatcherAddressFlag = &cli.StringFlag{ - Name: "batcher-address", - Usage: "Batch Sender Address", - EnvVars: prefixEnvVars("BATCHER_ADDRESS"), - } MockFlag = &cli.BoolFlag{ Name: "mock", Usage: "Use the mock OP Succinct server", @@ -175,12 +159,9 @@ var optionalFlags = []cli.Flag{ SlackTokenFlag, MaxBlockRangePerSpanProofFlag, MaxConcurrentWitnessGenFlag, - TxCacheOutDirFlag, OPSuccinctServerUrlFlag, ProofTimeoutFlag, MaxConcurrentProofRequestsFlag, - BatchInboxFlag, - BatcherAddressFlag, MockFlag, WitnessGenTimeoutFlag, } diff --git a/proposer/op/proposer/service.go b/proposer/op/proposer/service.go index 1aea3ea8..ff6840ab 100644 --- a/proposer/op/proposer/service.go +++ b/proposer/op/proposer/service.go @@ -57,7 +57,6 @@ type ProposerConfig struct { SlackToken string BeaconRpc string RollupRpc string - TxCacheOutDir string MaxBlockRangePerSpanProof uint64 MaxConcurrentWitnessGen uint64 WitnessGenTimeout uint64 @@ -65,8 +64,6 @@ type ProposerConfig struct { ProofTimeout uint64 OPSuccinctServerUrl string MaxConcurrentProofRequests uint64 - BatchInbox common.Address - BatcherAddress common.Address Mock bool } @@ -122,7 +119,6 @@ func (ps *ProposerService) initFromCLIConfig(ctx context.Context, version string ps.SlackToken = cfg.SlackToken ps.BeaconRpc = cfg.BeaconRpc ps.RollupRpc = cfg.RollupRpc - ps.TxCacheOutDir = cfg.TxCacheOutDir ps.MaxBlockRangePerSpanProof = cfg.MaxBlockRangePerSpanProof ps.MaxConcurrentWitnessGen = cfg.MaxConcurrentWitnessGen ps.WitnessGenTimeout = cfg.WitnessGenTimeout @@ -130,8 +126,6 @@ func (ps *ProposerService) initFromCLIConfig(ctx context.Context, version string ps.ProofTimeout = cfg.ProofTimeout ps.L2ChainID = cfg.L2ChainID ps.MaxConcurrentProofRequests = cfg.MaxConcurrentProofRequests - ps.BatchInbox = common.HexToAddress(cfg.BatchInbox) - ps.BatcherAddress = common.HexToAddress(cfg.BatcherAddress) ps.Mock = cfg.Mock ps.initL2ooAddress(cfg)