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

Commit

Permalink
rename some flag EnvVars or name
Browse files Browse the repository at this point in the history
  • Loading branch information
YoGhurt111 committed Apr 19, 2024
1 parent cee1121 commit b3065e9
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions cmd/flags/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var (
Name: "p2p.checkPointSyncUrl",
Usage: "HTTP RPC endpoint of another synced L2 execution engine node",
Category: driverCategory,
EnvVars: []string{"CHECK_POINT_SYNC_URL"},
EnvVars: []string{"P2P_CHECK_POINT_SYNC_URL"},
}
// syncer specific flag
MaxExponent = &cli.Uint64Flag{
Expand All @@ -37,7 +37,7 @@ var (
"0 means that it is reset to the genesis height",
Value: 0,
Category: driverCategory,
EnvVars: []string{"MAX_EXPONENT"},
EnvVars: []string{"SYNCER_MAX_EXPONENT"},
}
// blob server endpoint
BlobServerEndpoint = &cli.StringFlag{
Expand Down
22 changes: 11 additions & 11 deletions cmd/flags/proposer.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var (
EnvVars: []string{"TIER_FEE_SGX"},
}
TierFeePriceBump = &cli.Uint64Flag{
Name: "tierFee.pricebump",
Name: "tierFee.priceBump",
Usage: "Price bump percentage when no prover wants to accept the block at initial fee",
Value: 10,
Category: proposerCategory,
Expand All @@ -73,21 +73,21 @@ var (
Usage: "Minimum gas used for a transactions list to propose",
Category: proposerCategory,
Value: 0,
EnvVars: []string{"MIN_GAS_USED"},
EnvVars: []string{"EPOCH_MIN_GAS_USED"},
}
MinTxListBytes = &cli.Uint64Flag{
Name: "epoch.minTxListBytes",
Usage: "Minimum bytes for a transactions list to propose",
Category: proposerCategory,
Value: 0,
EnvVars: []string{"MIN_TX_LIST_BYTES"},
EnvVars: []string{"EPOCH_MIN_TX_LIST_BYTES"},
}
MinProposingInternal = &cli.DurationFlag{
Name: "epoch.minProposingInterval",
Usage: "Minimum time interval to force proposing a block, even if there are no transaction in mempool",
Category: proposerCategory,
Value: 0,
EnvVars: []string{"MIN_PROPOSING_INTERNAL"},
EnvVars: []string{"EPOCH_MIN_PROPOSING_INTERNAL"},
}
// Proposing metadata related.
ExtraData = &cli.StringFlag{
Expand All @@ -99,45 +99,45 @@ var (
}
// Transactions pool related.
TxPoolLocals = &cli.StringSliceFlag{
Name: "txpool.locals",
Name: "txPool.locals",
Usage: "Comma separated accounts to treat as locals (priority inclusion)",
Category: proposerCategory,
EnvVars: []string{"TX_POOL_LOCALS"},
}
TxPoolLocalsOnly = &cli.BoolFlag{
Name: "txpool.localsOnly",
Name: "txPool.localsOnly",
Usage: "If set to true, proposer will only propose transactions of local accounts",
Value: false,
Category: proposerCategory,
EnvVars: []string{"TX_POOL_LOCALS_ONLY"},
}
MaxProposedTxListsPerEpoch = &cli.Uint64Flag{
Name: "txpool.maxTxListsPerEpoch",
Name: "txPool.maxTxListsPerEpoch",
Usage: "Maximum number of transaction lists which will be proposed inside one proposing epoch",
Value: 1,
Category: proposerCategory,
EnvVars: []string{"MAX_TX_LISTS_PER_EPOCH"},
EnvVars: []string{"TX_POOL_MAX_TX_LISTS_PER_EPOCH"},
}
ProposeBlockIncludeParentMetaHash = &cli.BoolFlag{
Name: "includeParentMetaHash",
Usage: "Include parent meta hash when proposing block",
Value: false,
Category: proposerCategory,
EnvVars: []string{"INCLUDE_PARENT_METAHASH"},
EnvVars: []string{"INCLUDE_PARENT_META_HASH"},
}
// Transaction related.
BlobAllowed = &cli.BoolFlag{
Name: "l1.blobAllowed",
Usage: "Send EIP-4844 blob transactions when proposing blocks",
Value: false,
EnvVars: []string{"BLOB_ALLOWED"},
EnvVars: []string{"L1_BLOB_ALLOWED"},
}
L1BlockBuilderTip = &cli.Uint64Flag{
Name: "l1.blockBuilderTip",
Usage: "Amount you wish to tip the L1 block builder",
Value: 0,
Category: proposerCategory,
EnvVars: []string{"BLOCK_BUILDER_TIP"},
EnvVars: []string{"L1_BLOCK_BUILDER_TIP"},
}
)

Expand Down
34 changes: 17 additions & 17 deletions cmd/flags/prover.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,36 +54,36 @@ var (
Name: "prover.startingBlockID",
Usage: "If set, prover will start proving blocks from the block with this ID",
Category: proverCategory,
EnvVars: []string{"STARTING_BLOCK_ID"},
EnvVars: []string{"PROVER_STARTING_BLOCK_ID"},
}
Graffiti = &cli.StringFlag{
Name: "prover.graffiti",
Usage: "When string is passed, adds additional graffiti info to proof evidence",
Category: proverCategory,
Value: "",
EnvVars: []string{"GRAFFITI"},
EnvVars: []string{"PROVER_GRAFFITI"},
}
// Proving strategy.
ProveUnassignedBlocks = &cli.BoolFlag{
Name: "prover.proveUnassignedBlocks",
Usage: "Whether you want to prove unassigned blocks, or only work on assigned proofs",
Category: proverCategory,
Value: false,
EnvVars: []string{"PROVE_UNASSIGNED_BLOCKS"},
EnvVars: []string{"PROVER_PROVE_UNASSIGNED_BLOCKS"},
}
MinEthBalance = &cli.Float64Flag{
Name: "prover.minEthBalance",
Usage: "Minimum ETH balance (in Ether) a prover wants to keep",
Category: proverCategory,
Value: 0,
EnvVars: []string{"MIN_ETH_BALANCE"},
EnvVars: []string{"PROVER_MIN_ETH_BALANCE"},
}
MinTaikoTokenBalance = &cli.Float64Flag{
Name: "prover.minTaikoTokenBalance",
Usage: "Minimum Taiko token balance without decimal a prover wants to keep",
Category: proverCategory,
Value: 0,
EnvVars: []string{"MIN_TAIKO_TOKEN_BALANCE"},
EnvVars: []string{"PROVER_MIN_TAIKO_TOKEN_BALANCE"},
}
// Tier fee related.
MinOptimisticTierFee = &cli.Uint64Flag{
Expand Down Expand Up @@ -114,54 +114,54 @@ var (
}
// HTTP server related.
ProverHTTPServerPort = &cli.Uint64Flag{
Name: "http.port",
Name: "prover.port",
Usage: "Port to expose for http server",
Category: proverCategory,
Value: 9876,
EnvVars: []string{"PROVER_HTTP_PORT"},
EnvVars: []string{"PROVER_PORT"},
}
MaxExpiry = &cli.DurationFlag{
Name: "http.maxExpiry",
Usage: "Maximum accepted expiry in seconds for accepting proving a block",
Value: 1 * time.Hour,
Category: proverCategory,
EnvVars: []string{"MAX_EXPIRY"},
EnvVars: []string{"HTTP_MAX_EXPIRY"},
}
// Special flags for testing.
Dummy = &cli.BoolFlag{
Name: "prover.dummy",
Usage: "Produce dummy proofs, testing purposes only",
Value: false,
Category: proverCategory,
EnvVars: []string{"DUMMY"},
EnvVars: []string{"PROVER_DUMMY"},
}
// Max slippage allowed
MaxAcceptableBlockSlippage = &cli.Uint64Flag{
Name: "prover.blockSlippage",
Usage: "Maximum accepted slippage difference for blockID for accepting proving a block",
Value: 1024,
Category: proverCategory,
EnvVars: []string{"BLOCK_SLIPPAGE"},
EnvVars: []string{"PROVER_BLOCK_SLIPPAGE"},
}
// Max amount of L1 blocks that can pass before block is invalid
MaxProposedIn = &cli.Uint64Flag{
Name: "prover.maxProposedIn",
Usage: "Maximum amount of L1 blocks that can pass before block can not be proposed. 0 means no limit.",
Value: 0,
Category: proverCategory,
EnvVars: []string{"MAX_PROPOSED_IN"},
EnvVars: []string{"PROVER_MAX_PROPOSED_IN"},
}
Allowance = &cli.Float64Flag{
Name: "prover.allowance",
Usage: "Amount without decimal to approve AssignmentHook contract for TaikoToken usage",
Category: proverCategory,
EnvVars: []string{"ALLOWANCE"},
EnvVars: []string{"PROVER_ALLOWANCE"},
}
GuardianProverHealthCheckServerEndpoint = &cli.StringFlag{
Name: "prover.guardianProverHealthCheckServerEndpoint",
Usage: "HTTP endpoint for main guardian prover health check server",
Category: proverCategory,
EnvVars: []string{"GUARDIAN_PROVER_HEALTH_CHECK_SERVER_ENDPOINT"},
EnvVars: []string{"PROVER_GUARDIAN_PROVER_HEALTH_CHECK_SERVER_ENDPOINT"},
}
// Guardian prover specific flag
GuardianProver = &cli.StringFlag{
Expand All @@ -182,27 +182,27 @@ var (
Usage: "Toggles whether the proof is a dummy proof or returns keccak256(RETURN_LIVENESS_BOND) as proof",
Value: false,
Category: proverCategory,
EnvVars: []string{"ENABLE_LIVENESS_BOND_PROOF"},
EnvVars: []string{"PROVER_ENABLE_LIVENESS_BOND_PROOF"},
}
L1NodeVersion = &cli.StringFlag{
Name: "prover.l1NodeVersion",
Usage: "Version or tag or the L1 Node Version used as an L1 RPC Url by this guardian prover",
Category: proverCategory,
EnvVars: []string{"L1_NODE_VERSION"},
EnvVars: []string{"PROVER_L1_NODE_VERSION"},
}
L2NodeVersion = &cli.StringFlag{
Name: "prover.l2NodeVersion",
Usage: "Version or tag or the L2 Node Version used as an L2 RPC Url by this guardian prover",
Category: proverCategory,
EnvVars: []string{"L2_NODE_VERSION"},
EnvVars: []string{"PROVER_L2_NODE_VERSION"},
}
// Confirmations specific flag
BlockConfirmations = &cli.Uint64Flag{
Name: "prover.blockConfirmations",
Usage: "Confirmations to the latest L1 block before submitting a proof for a L2 block",
Value: 6,
Category: proverCategory,
EnvVars: []string{"BLOCK_CONFIRMATIONS"},
EnvVars: []string{"PROVER_BLOCK_CONFIRMATIONS"},
}
)

Expand Down
20 changes: 10 additions & 10 deletions cmd/flags/txmgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,72 +12,72 @@ var (
Usage: "Number of confirmations which we will wait after sending a transaction",
Value: 0,
Category: txmgrCategory,
EnvVars: []string{"NUM_CONFIRMATIONS"},
EnvVars: []string{"TX_NUM_CONFIRMATIONS"},
}
SafeAbortNonceTooLowCount = &cli.Uint64Flag{
Name: "tx.safeAbortNonceTooLowCount",
Usage: "Number of ErrNonceTooLow observations required to give up on " +
"a tx at a particular nonce without receiving confirmation",
Value: 3,
Category: txmgrCategory,
EnvVars: []string{"SAFE_ABORT_NONCE_TOO_LOW_COUNT"},
EnvVars: []string{"TX_SAFE_ABORT_NONCE_TOO_LOW_COUNT"},
}
FeeLimitMultiplier = &cli.Uint64Flag{
Name: "tx.feeLimitMultiplier",
Usage: "The multiplier applied to fee suggestions to put a hard limit on fee increases",
Value: 10,
Category: txmgrCategory,
EnvVars: []string{"FEE_LIMIT_MULTIPLIER"},
EnvVars: []string{"TX_FEE_LIMIT_MULTIPLIER"},
}
FeeLimitThreshold = &cli.Float64Flag{
Name: "tx.feeLimitThreshold",
Usage: "The minimum threshold (in GWei) at which fee bumping starts to be capped. " +
"Allows arbitrary fee bumps below this threshold.",
Value: 100.0,
Category: txmgrCategory,
EnvVars: []string{"FEE_LIMIT_THRESHOLD"},
EnvVars: []string{"TX_FEE_LIMIT_THRESHOLD"},
}
MinTipCap = &cli.Float64Flag{
Name: "tx.minTipCap",
Usage: "Enforces a minimum tip cap (in GWei) to use when determining tx fees. 1 GWei by default.",
Value: 1.0,
Category: txmgrCategory,
EnvVars: []string{"MIN_TIP_CAP"},
EnvVars: []string{"TX_MIN_TIP_CAP"},
}
MinBaseFee = &cli.Float64Flag{
Name: "tx.minBaseFee",
Usage: "Enforces a minimum base fee (in GWei) to assume when determining tx fees. 1 GWei by default.",
Value: 1.0,
Category: txmgrCategory,
EnvVars: []string{"MIN_BASE_FEE"},
EnvVars: []string{"TX_MIN_BASE_FEE"},
}
ResubmissionTimeout = &cli.DurationFlag{
Name: "tx.resubmissionTimeout",
Usage: "Duration we will wait before resubmitting a transaction to L1",
Value: 48 * time.Second,
Category: txmgrCategory,
EnvVars: []string{"RESUBMISSION_TIMEOUT"},
EnvVars: []string{"TX_RESUBMISSION_TIMEOUT"},
}
TxSendTimeout = &cli.DurationFlag{
Name: "tx.sendTimeout",
Usage: "Timeout for sending transactions. If 0 it is disabled.",
Value: 0,
Category: txmgrCategory,
EnvVars: []string{"SEND_TIMEOUT"},
EnvVars: []string{"TX_SEND_TIMEOUT"},
}
TxNotInMempoolTimeout = &cli.DurationFlag{
Name: "tx.notInMempoolTimeout",
Usage: "Timeout for aborting a tx send if the tx does not make it to the mempool.",
Value: 2 * time.Minute,
Category: txmgrCategory,
EnvVars: []string{"NOT_IN_MEMPOOL_TIMEOUT"},
EnvVars: []string{"TX_NOT_IN_MEMPOOL_TIMEOUT"},
}
ReceiptQueryInterval = &cli.DurationFlag{
Name: "tx.receiptQueryInterval",
Usage: "Frequency to poll for receipts",
Value: 12 * time.Second,
Category: txmgrCategory,
EnvVars: []string{"RECEIPT_QUERY_INTERVAL"},
EnvVars: []string{"TX_RECEIPT_QUERY_INTERVAL"},
}
TxGasLimit = &cli.Uint64Flag{
Name: "tx.gasLimit",
Expand Down

0 comments on commit b3065e9

Please sign in to comment.