Skip to content

Commit

Permalink
clean
Browse files Browse the repository at this point in the history
  • Loading branch information
ratankaliani committed Jan 16, 2025
1 parent 76f9670 commit c7fa220
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 34 deletions.
5 changes: 5 additions & 0 deletions book/advanced/proposer.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. |

Expand Down
9 changes: 0 additions & 9 deletions proposer/op/proposer/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
}
Expand Down Expand Up @@ -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),
}
}
19 changes: 0 additions & 19 deletions proposer/op/proposer/flags/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -175,12 +159,9 @@ var optionalFlags = []cli.Flag{
SlackTokenFlag,
MaxBlockRangePerSpanProofFlag,
MaxConcurrentWitnessGenFlag,
TxCacheOutDirFlag,
OPSuccinctServerUrlFlag,
ProofTimeoutFlag,
MaxConcurrentProofRequestsFlag,
BatchInboxFlag,
BatcherAddressFlag,
MockFlag,
WitnessGenTimeoutFlag,
}
Expand Down
6 changes: 0 additions & 6 deletions proposer/op/proposer/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,13 @@ type ProposerConfig struct {
SlackToken string
BeaconRpc string
RollupRpc string
TxCacheOutDir string
MaxBlockRangePerSpanProof uint64
MaxConcurrentWitnessGen uint64
WitnessGenTimeout uint64
L2ChainID uint64
ProofTimeout uint64
OPSuccinctServerUrl string
MaxConcurrentProofRequests uint64
BatchInbox common.Address
BatcherAddress common.Address
Mock bool
}

Expand Down Expand Up @@ -122,16 +119,13 @@ 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
ps.OPSuccinctServerUrl = cfg.OPSuccinctServerUrl
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)
Expand Down

0 comments on commit c7fa220

Please sign in to comment.