Skip to content

Commit 4e62514

Browse files
minhd-vuminhd-vu
committed
feat: flag package
1 parent 3c6a40d commit 4e62514

File tree

16 files changed

+89
-82
lines changed

16 files changed

+89
-82
lines changed

‎cmd/cdk/cdk.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"time"
1313

1414
"github.com/0xPolygon/polygon-cli/custom_marshaller"
15-
"github.com/0xPolygon/polygon-cli/util"
15+
"github.com/0xPolygon/polygon-cli/flag"
1616
"github.com/ethereum/go-ethereum/accounts/abi"
1717
"github.com/ethereum/go-ethereum/common"
1818
"github.com/ethereum/go-ethereum/core/types"
@@ -105,7 +105,7 @@ var CDKCmd = &cobra.Command{
105105
Short: "Utilities for interacting with CDK networks",
106106
Long: "Basic utility commands for interacting with the cdk contracts",
107107
PersistentPreRunE: func(cmd *cobra.Command, args []string) (err error) {
108-
cdkInputArgs.rpcURL, err = util.GetRPCURL(cmd)
108+
cdkInputArgs.rpcURL, err = flag.GetRPCURL(cmd)
109109
if err != nil {
110110
return err
111111
}
@@ -635,7 +635,7 @@ func mustPrintLogs(logs []types.Log, contractInstance reflect.Value, contractABI
635635
func init() {
636636
// cdk
637637
f := CDKCmd.PersistentFlags()
638-
f.StringVar(&cdkInputArgs.rpcURL, util.FlagRPCURL, util.DefaultRPCURL, "RPC URL of network containing CDK contracts")
638+
f.StringVar(&cdkInputArgs.rpcURL, flag.FlagRPCURL, flag.DefaultRPCURL, "RPC URL of network containing CDK contracts")
639639
f.StringVar(&cdkInputArgs.forkID, ArgForkID, defaultForkId, "fork ID of CDK networks")
640640
f.StringVar(&cdkInputArgs.rollupManagerAddress, ArgRollupManagerAddress, "", "address of rollup contract")
641641

@@ -677,5 +677,5 @@ func init() {
677677
gerCmd.AddCommand(gerMonitorCmd)
678678

679679
// Mark required flags
680-
util.MarkPersistentFlagRequired(CDKCmd, util.FlagRPCURL)
680+
flag.MarkPersistentFlagRequired(CDKCmd, flag.FlagRPCURL)
681681
}

‎cmd/contract/cmd.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"math/big"
99
"strings"
1010

11-
"github.com/0xPolygon/polygon-cli/util"
11+
"github.com/0xPolygon/polygon-cli/flag"
1212
"github.com/ethereum/go-ethereum/common"
1313
"github.com/ethereum/go-ethereum/core/types"
1414
"github.com/ethereum/go-ethereum/ethclient"
@@ -44,7 +44,7 @@ var Cmd = &cobra.Command{
4444
Short: "Interact with smart contracts and fetch contract information from the blockchain",
4545
Long: usage,
4646
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
47-
inputArgs.rpcURL, err = util.GetRPCURL(cmd)
47+
inputArgs.rpcURL, err = flag.GetRPCURL(cmd)
4848
if err != nil {
4949
return err
5050
}
@@ -171,10 +171,10 @@ func fetchContractCreationTx(ctx context.Context, client *ethclient.Client, cont
171171

172172
func init() {
173173
f := Cmd.Flags()
174-
f.StringVar(&inputArgs.rpcURL, util.FlagRPCURL, util.DefaultRPCURL, "RPC URL of network containing contract")
174+
f.StringVar(&inputArgs.rpcURL, flag.FlagRPCURL, flag.DefaultRPCURL, "RPC URL of network containing contract")
175175
f.StringVar(&inputArgs.address, ArgAddress, "", "contract address")
176176

177177
// Mark required flags
178-
util.MarkFlagRequired(Cmd, ArgAddress)
179-
util.MarkFlagRequired(Cmd, util.FlagRPCURL)
178+
flag.MarkFlagRequired(Cmd, ArgAddress)
179+
flag.MarkFlagRequired(Cmd, flag.FlagRPCURL)
180180
}

‎cmd/dumpblocks/dumpblocks.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/0xPolygon/polygon-cli/proto/gen/pb"
1616
"github.com/0xPolygon/polygon-cli/rpctypes"
1717
"github.com/0xPolygon/polygon-cli/util"
18+
"github.com/0xPolygon/polygon-cli/flag"
1819
ethrpc "github.com/ethereum/go-ethereum/rpc"
1920
"github.com/rs/zerolog/log"
2021
"github.com/spf13/cobra"
@@ -55,7 +56,7 @@ var DumpblocksCmd = &cobra.Command{
5556
Short: "Export a range of blocks from a JSON-RPC endpoint.",
5657
Long: usage,
5758
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
58-
inputDumpblocks.RpcUrl, err = util.GetRPCURL(cmd)
59+
inputDumpblocks.RpcUrl, err = flag.GetRPCURL(cmd)
5960
if err != nil {
6061
return err
6162
}
@@ -195,7 +196,7 @@ func init() {
195196
f.StringVarP(&inputDumpblocks.FilterStr, "filter", "F", "{}", "filter output based on tx to and from, not setting a filter means all are allowed")
196197

197198
// Mark required flags
198-
util.MarkFlagRequired(DumpblocksCmd, util.FlagRPCURL)
199+
flag.MarkFlagRequired(DumpblocksCmd, flag.FlagRPCURL)
199200
}
200201

201202
// writeResponses writes the data to either stdout or a file if one is provided.

‎cmd/ecrecover/ecrecover.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"os"
99

1010
"github.com/0xPolygon/polygon-cli/util"
11+
"github.com/0xPolygon/polygon-cli/flag"
1112
ethcommon "github.com/ethereum/go-ethereum/common"
1213
"github.com/ethereum/go-ethereum/core/types"
1314
"github.com/ethereum/go-ethereum/ethclient"
@@ -32,7 +33,7 @@ var EcRecoverCmd = &cobra.Command{
3233
Long: usage,
3334
Args: cobra.NoArgs,
3435
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
35-
rpcUrl, err = util.GetRPCURL(cmd)
36+
rpcUrl, err = flag.GetRPCURL(cmd)
3637
if err != nil {
3738
return err
3839
}
@@ -136,5 +137,5 @@ func init() {
136137
EcRecoverCmd.MarkFlagsMutuallyExclusive("file", "block-number", "tx")
137138

138139
// Mark required flags
139-
util.MarkFlagRequired(EcRecoverCmd, util.FlagRPCURL)
140+
flag.MarkFlagRequired(EcRecoverCmd, flag.FlagRPCURL)
140141
}

‎cmd/fixnoncegap/fixnoncegap.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/0xPolygon/polygon-cli/util"
12+
"github.com/0xPolygon/polygon-cli/flag"
1313
"github.com/ethereum/go-ethereum"
1414
"github.com/ethereum/go-ethereum/accounts/abi/bind"
1515
"github.com/ethereum/go-ethereum/common"
@@ -26,11 +26,11 @@ var FixNonceGapCmd = &cobra.Command{
2626
Long: fixNonceGapUsage,
2727
Args: cobra.NoArgs,
2828
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
29-
inputFixNonceGapArgs.rpcURL, err = util.GetRPCURL(cmd)
29+
inputFixNonceGapArgs.rpcURL, err = flag.GetRPCURL(cmd)
3030
if err != nil {
3131
return err
3232
}
33-
inputFixNonceGapArgs.privateKey, err = util.GetPrivateKey(cmd)
33+
inputFixNonceGapArgs.privateKey, err = flag.GetPrivateKey(cmd)
3434
if err != nil {
3535
return err
3636
}
@@ -227,14 +227,14 @@ func fixNonceGap(cmd *cobra.Command, args []string) error {
227227

228228
func init() {
229229
f := FixNonceGapCmd.Flags()
230-
f.StringVarP(&inputFixNonceGapArgs.rpcURL, util.FlagRPCURL, "r", "http://localhost:8545", "the RPC endpoint URL")
231-
f.StringVar(&inputFixNonceGapArgs.privateKey, util.FlagPrivateKey, "", "private key to be used when sending txs to fix nonce gap")
230+
f.StringVarP(&inputFixNonceGapArgs.rpcURL, flag.FlagRPCURL, "r", "http://localhost:8545", "the RPC endpoint URL")
231+
f.StringVar(&inputFixNonceGapArgs.privateKey, flag.FlagPrivateKey, "", "private key to be used when sending txs to fix nonce gap")
232232
f.BoolVar(&inputFixNonceGapArgs.replace, ArgReplace, false, "replace the existing txs in the pool")
233233
f.Uint64Var(&inputFixNonceGapArgs.maxNonce, ArgMaxNonce, 0, "override max nonce value instead of getting it from the pool")
234234

235235
// Mark required flags
236-
util.MarkFlagRequired(FixNonceGapCmd, util.FlagRPCURL)
237-
util.MarkFlagRequired(FixNonceGapCmd, util.FlagPrivateKey)
236+
flag.MarkFlagRequired(FixNonceGapCmd, flag.FlagRPCURL)
237+
flag.MarkFlagRequired(FixNonceGapCmd, flag.FlagPrivateKey)
238238
}
239239

240240
// Wait for the transaction to be mined

‎cmd/fund/cmd.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
_ "embed"
88

9-
"github.com/0xPolygon/polygon-cli/util"
9+
"github.com/0xPolygon/polygon-cli/flag"
1010
"github.com/spf13/cobra"
1111
)
1212

@@ -48,11 +48,11 @@ var FundCmd = &cobra.Command{
4848
Short: "Bulk fund crypto wallets automatically.",
4949
Long: usage,
5050
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
51-
params.RpcUrl, err = util.GetRPCURL(cmd)
51+
params.RpcUrl, err = flag.GetRPCURL(cmd)
5252
if err != nil {
5353
return err
5454
}
55-
params.PrivateKey, err = util.GetPrivateKey(cmd)
55+
params.PrivateKey, err = flag.GetPrivateKey(cmd)
5656
if err != nil {
5757
return err
5858
}
@@ -74,7 +74,7 @@ func init() {
7474
f.BoolVar(&params.UseHDDerivation, "hd-derivation", true, "derive wallets to fund from private key in deterministic way")
7575
f.StringSliceVar(&params.WalletAddresses, "addresses", nil, "comma-separated list of wallet addresses to fund")
7676
params.FundingAmountInWei = defaultFundingInWei
77-
f.Var(&util.BigIntValue{Val: params.FundingAmountInWei}, "eth-amount", "amount of wei to send to each wallet")
77+
f.Var(&flag.BigIntValue{Val: params.FundingAmountInWei}, "eth-amount", "amount of wei to send to each wallet")
7878
f.StringVar(&params.KeyFile, "key-file", "", "file containing accounts private keys, one per line")
7979

8080
f.StringVarP(&params.OutputFile, "file", "f", "wallets.json", "output JSON file path for storing addresses and private keys of funded wallets")
@@ -90,8 +90,8 @@ func init() {
9090
FundCmd.MarkFlagsOneRequired("addresses", "key-file", "number")
9191

9292
// Mark required flags
93-
util.MarkFlagRequired(FundCmd, util.FlagRPCURL)
94-
util.MarkFlagRequired(FundCmd, util.FlagPrivateKey)
93+
flag.MarkFlagRequired(FundCmd, flag.FlagRPCURL)
94+
flag.MarkFlagRequired(FundCmd, flag.FlagPrivateKey)
9595

9696
// Funder contract parameters.
9797
f.StringVar(&params.FunderAddress, "contract-address", "", "address of pre-deployed Funder contract")

‎cmd/loadtest/app.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/0xPolygon/polygon-cli/rpctypes"
13-
"github.com/0xPolygon/polygon-cli/util"
13+
"github.com/0xPolygon/polygon-cli/flag"
1414
ethcommon "github.com/ethereum/go-ethereum/common"
1515
"github.com/rs/zerolog"
1616
"github.com/spf13/cobra"
@@ -172,11 +172,11 @@ var LoadtestCmd = &cobra.Command{
172172
Long: loadTestUsage,
173173
Args: cobra.NoArgs,
174174
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
175-
inputLoadTestParams.RPCUrl, err = util.GetRPCURL(cmd)
175+
inputLoadTestParams.RPCUrl, err = flag.GetRPCURL(cmd)
176176
if err != nil {
177177
return err
178178
}
179-
inputLoadTestParams.PrivateKey, err = util.GetPrivateKey(cmd)
179+
inputLoadTestParams.PrivateKey, err = flag.GetPrivateKey(cmd)
180180
if err != nil {
181181
return err
182182
}
@@ -270,7 +270,7 @@ func initFlags() {
270270
f.Uint64Var(&ltp.BlobFeeCap, "blob-fee-cap", 100000, "blob fee cap, or maximum blob fee per chunk, in Gwei")
271271
f.Uint64Var(&ltp.SendingAccountsCount, "sending-accounts-count", 0, "number of sending accounts to use (avoids pool account queue)")
272272
ltp.AccountFundingAmount = defaultAccountFundingAmount
273-
f.Var(&util.BigIntValue{Val: ltp.AccountFundingAmount}, "account-funding-amount", "amount in wei to fund sending accounts (set to 0 to disable)")
273+
f.Var(&flag.BigIntValue{Val: ltp.AccountFundingAmount}, "account-funding-amount", "amount in wei to fund sending accounts (set to 0 to disable)")
274274
f.BoolVar(&ltp.PreFundSendingAccounts, "pre-fund-sending-accounts", false, "fund all sending accounts at start instead of on first use")
275275
f.BoolVar(&ltp.RefundRemainingFunds, "refund-remaining-funds", false, "refund remaining balance to funding account after completion")
276276
f.StringVar(&ltp.SendingAccountsFile, "sending-accounts-file", "", "file with sending account private keys, one per line (avoids pool queue and preserves accounts across runs)")
@@ -304,8 +304,8 @@ v3, uniswapv3 - perform UniswapV3 swaps`)
304304
// TODO Compression
305305

306306
// Mark required flags
307-
util.MarkPersistentFlagRequired(LoadtestCmd, util.FlagRPCURL)
308-
util.MarkPersistentFlagRequired(LoadtestCmd, util.FlagPrivateKey)
307+
flag.MarkPersistentFlagRequired(LoadtestCmd, flag.FlagRPCURL)
308+
flag.MarkPersistentFlagRequired(LoadtestCmd, flag.FlagPrivateKey)
309309
}
310310

311311
func initSubCommands() {

‎cmd/monitor/cmd.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"time"
99

1010
"github.com/0xPolygon/polygon-cli/util"
11+
"github.com/0xPolygon/polygon-cli/flag"
1112
"github.com/spf13/cobra"
1213
)
1314

@@ -57,7 +58,7 @@ var MonitorCmd = &cobra.Command{
5758
Args: cobra.NoArgs,
5859
SilenceUsage: true,
5960
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
60-
rpcUrl, err = util.GetRPCURL(cmd)
61+
rpcUrl, err = flag.GetRPCURL(cmd)
6162
if err != nil {
6263
return err
6364
}
@@ -89,7 +90,7 @@ func init() {
8990
f.StringVarP(&intervalStr, "interval", "i", "5s", "amount of time between batch block RPC calls")
9091

9192
// Mark required flags
92-
util.MarkFlagRequired(MonitorCmd, util.FlagRPCURL)
93+
flag.MarkFlagRequired(MonitorCmd, flag.FlagRPCURL)
9394
}
9495

9596
func checkFlags() (err error) {

‎cmd/nodekey/nodekey.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
gethcrypto "github.com/ethereum/go-ethereum/crypto"
1919
gethenode "github.com/ethereum/go-ethereum/p2p/enode"
2020
libp2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
21-
"github.com/0xPolygon/polygon-cli/util"
21+
"github.com/0xPolygon/polygon-cli/flag"
2222
libp2ppeer "github.com/libp2p/go-libp2p/core/peer"
2323
"github.com/spf13/cobra"
2424
"github.com/spf13/pflag"
@@ -67,7 +67,7 @@ var NodekeyCmd = &cobra.Command{
6767
Short: "Generate node keys for different blockchain clients and protocols.",
6868
Long: usage,
6969
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
70-
inputNodeKeyPrivateKey, err = util.GetPrivateKey(cmd)
70+
inputNodeKeyPrivateKey, err = flag.GetPrivateKey(cmd)
7171
if err != nil {
7272
return err
7373
}
@@ -301,5 +301,5 @@ func init() {
301301
f.BoolVarP(&inputNodeKeyMarshalProtobuf, "marshal-protobuf", "m", false, "marshal libp2p key to protobuf format instead of raw")
302302

303303
// Mark required flags
304-
util.MarkFlagRequired(NodekeyCmd, util.FlagPrivateKey)
304+
flag.MarkFlagRequired(NodekeyCmd, flag.FlagPrivateKey)
305305
}

‎cmd/publish/publish.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
_ "embed"
66
"time"
77

8-
"github.com/0xPolygon/polygon-cli/util"
8+
"github.com/0xPolygon/polygon-cli/flag"
99
"github.com/ethereum/go-ethereum/ethclient"
1010
"github.com/rs/zerolog/log"
1111
"github.com/spf13/cobra"
@@ -24,7 +24,7 @@ var Cmd = &cobra.Command{
2424
Short: "Publish transactions to the network with high-throughput",
2525
Long: cmdUsage,
2626
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
27-
publishInputArgs.rpcURL, err = util.GetRPCURL(cmd)
27+
publishInputArgs.rpcURL, err = flag.GetRPCURL(cmd)
2828
if err != nil {
2929
return err
3030
}
@@ -138,12 +138,12 @@ func publish(cmd *cobra.Command, args []string) error {
138138

139139
func init() {
140140
f := Cmd.Flags()
141-
f.StringVar(&publishInputArgs.rpcURL, util.FlagRPCURL, util.DefaultRPCURL, "RPC URL of network")
141+
f.StringVar(&publishInputArgs.rpcURL, flag.FlagRPCURL, flag.DefaultRPCURL, "RPC URL of network")
142142
f.Uint64VarP(&publishInputArgs.concurrency, "concurrency", "c", 1, "number of txs to send concurrently (default: one at a time)")
143143
f.Uint64Var(&publishInputArgs.jobQueueSize, "job-queue-size", 100, "number of jobs we can put in the job queue for workers to process")
144144
f.StringVar(&publishInputArgs.inputFileName, "file", "", "provide a filename with transactions to publish")
145145
f.Uint64Var(&publishInputArgs.rateLimit, "rate-limit", 0, "rate limit in txs per second (default: no limit)")
146146

147147
// Mark required flags
148-
util.MarkFlagRequired(Cmd, util.FlagRPCURL)
148+
flag.MarkFlagRequired(Cmd, flag.FlagRPCURL)
149149
}

0 commit comments

Comments
 (0)