@@ -107,23 +107,26 @@ var CDKCmd = &cobra.Command{
107107 Short : "Utilities for interacting with CDK networks" ,
108108 Long : "Basic utility commands for interacting with the cdk contracts" ,
109109 PersistentPreRun : func (cmd * cobra.Command , args []string ) {
110- cdkInputArgs .rpcURL = flag_loader .GetRpcUrlFlagValue (cmd )
110+ rpcURL := flag_loader .GetRpcUrlFlagValue (cmd )
111+ if rpcURL != nil {
112+ cdkInputArgs .rpcURL = * rpcURL
113+ }
111114 },
112115 Args : cobra .NoArgs ,
113116}
114117
115118type inputArgs struct {
116- rpcURL * string
119+ rpcURL string
117120
118- forkID * string
121+ forkID string
119122
120- rollupManagerAddress * string
123+ rollupManagerAddress string
121124
122- rollupID * string
123- rollupChainID * string
124- rollupAddress * string
125- bridgeAddress * string
126- gerAddress * string
125+ rollupID string
126+ rollupChainID string
127+ rollupAddress string
128+ bridgeAddress string
129+ gerAddress string
127130}
128131
129132type parsedCDKArgs struct {
@@ -156,14 +159,14 @@ func checkAddressArg(argFlagName, address string) error {
156159func (inputArgs * inputArgs ) parseCDKArgs (ctx context.Context ) (parsedCDKArgs , error ) {
157160 args := parsedCDKArgs {}
158161
159- args .rpcURL = * inputArgs .rpcURL
162+ args .rpcURL = inputArgs .rpcURL
160163
161- if inputArgs . forkID != nil && len (* inputArgs .forkID ) > 0 {
162- _ , found := knownForks [* inputArgs .forkID ]
164+ if len (inputArgs .forkID ) > 0 {
165+ _ , found := knownForks [inputArgs .forkID ]
163166 if ! found {
164167 return parsedCDKArgs {}, invalidForkIDErr ()
165168 }
166- args .forkID = knownForks [* inputArgs .forkID ]
169+ args .forkID = knownForks [inputArgs .forkID ]
167170 }
168171
169172 return args , nil
@@ -172,14 +175,14 @@ func (inputArgs *inputArgs) parseCDKArgs(ctx context.Context) (parsedCDKArgs, er
172175func (inputArgs * inputArgs ) parseRollupManagerArgs (ctx context.Context , cdkArgs parsedCDKArgs ) (* parsedRollupManagerArgs , error ) {
173176 args := & parsedRollupManagerArgs {}
174177
175- if knownRollupManagerAddress , found := knownRollupManagerAddresses [* cdkInputArgs .rollupManagerAddress ]; found {
178+ if knownRollupManagerAddress , found := knownRollupManagerAddresses [cdkInputArgs .rollupManagerAddress ]; found {
176179 args .rollupManagerAddress = common .HexToAddress (knownRollupManagerAddress )
177180 } else {
178- err := checkAddressArg (ArgRollupManagerAddress , * inputArgs .rollupManagerAddress )
181+ err := checkAddressArg (ArgRollupManagerAddress , inputArgs .rollupManagerAddress )
179182 if err != nil {
180183 return nil , err
181184 }
182- args .rollupManagerAddress = common .HexToAddress (* cdkInputArgs .rollupManagerAddress )
185+ args .rollupManagerAddress = common .HexToAddress (cdkInputArgs .rollupManagerAddress )
183186 }
184187
185188 return args , nil
@@ -189,29 +192,29 @@ func (inputArgs *inputArgs) parseRollupArgs(ctx context.Context, rollupManager r
189192 args := & parsedRollupArgs {}
190193
191194 var rollupChainID uint64
192- if cdkInputArgs . rollupChainID != nil && len (* cdkInputArgs .rollupChainID ) > 0 {
193- rollupChainIDN , err := strconv .ParseInt (* cdkInputArgs .rollupChainID , 10 , 64 )
195+ if len (cdkInputArgs .rollupChainID ) > 0 {
196+ rollupChainIDN , err := strconv .ParseInt (cdkInputArgs .rollupChainID , 10 , 64 )
194197 if err != nil || rollupChainIDN < 0 {
195- return nil , fmt .Errorf ("invalid rollupChainID: %s, it must be a valid uint64" , * cdkInputArgs .rollupID )
198+ return nil , fmt .Errorf ("invalid rollupChainID: %s, it must be a valid uint64" , cdkInputArgs .rollupID )
196199 }
197200 rollupChainID = uint64 (rollupChainIDN )
198201 }
199202 args .rollupChainID = rollupChainID
200203
201204 args .rollupAddress = common.Address {}
202- if inputArgs . rollupAddress != nil && len (* inputArgs .rollupAddress ) > 0 {
203- err := checkAddressArg (ArgRollupAddress , * inputArgs .rollupAddress )
205+ if len (inputArgs .rollupAddress ) > 0 {
206+ err := checkAddressArg (ArgRollupAddress , inputArgs .rollupAddress )
204207 if err != nil {
205208 return nil , err
206209 }
207- args .rollupAddress = common .HexToAddress (* inputArgs .rollupAddress )
210+ args .rollupAddress = common .HexToAddress (inputArgs .rollupAddress )
208211 }
209212
210213 args .rollupID = 0
211- if cdkInputArgs . rollupID != nil && len (* cdkInputArgs .rollupID ) > 0 {
212- rollupIDN , err := strconv .Atoi (* cdkInputArgs .rollupID )
214+ if len (cdkInputArgs .rollupID ) > 0 {
215+ rollupIDN , err := strconv .Atoi (cdkInputArgs .rollupID )
213216 if err != nil || rollupIDN < 0 {
214- return nil , fmt .Errorf ("invalid rollupID: %s, it must be a valid uint32" , * cdkInputArgs .rollupID )
217+ return nil , fmt .Errorf ("invalid rollupID: %s, it must be a valid uint32" , cdkInputArgs .rollupID )
215218 }
216219 args .rollupID = uint32 (rollupIDN )
217220 } else {
@@ -632,22 +635,24 @@ func mustPrintLogs(logs []types.Log, contractInstance reflect.Value, contractABI
632635
633636func init () {
634637 // cdk
635- cdkInputArgs .rpcURL = CDKCmd .PersistentFlags ().String (ArgRpcURL , defaultRPCURL , "The RPC URL of the network containing the CDK contracts" )
636- cdkInputArgs .forkID = CDKCmd .PersistentFlags ().String (ArgForkID , defaultForkId , "The ForkID of the cdk networks" )
637- cdkInputArgs .rollupManagerAddress = CDKCmd .PersistentFlags ().String (ArgRollupManagerAddress , "" , "The address of the rollup contract" )
638+ f := CDKCmd .PersistentFlags ()
639+ f .StringVar (& cdkInputArgs .rpcURL , ArgRpcURL , defaultRPCURL , "RPC URL of network containing CDK contracts" )
640+ f .StringVar (& cdkInputArgs .forkID , ArgForkID , defaultForkId , "fork ID of CDK networks" )
641+ f .StringVar (& cdkInputArgs .rollupManagerAddress , ArgRollupManagerAddress , "" , "address of rollup contract" )
638642
639643 // rollup manager
640644
641645 // rollup
642- cdkInputArgs .rollupID = rollupCmd .PersistentFlags ().String (ArgRollupID , "" , "The rollup ID" )
643- cdkInputArgs .rollupChainID = rollupCmd .PersistentFlags ().String (ArgRollupChainID , "" , "The rollup chain ID" )
644- cdkInputArgs .rollupAddress = rollupCmd .PersistentFlags ().String (ArgRollupAddress , "" , "The rollup Address" )
646+ fRollup := rollupCmd .PersistentFlags ()
647+ fRollup .StringVar (& cdkInputArgs .rollupID , ArgRollupID , "" , "rollup ID" )
648+ fRollup .StringVar (& cdkInputArgs .rollupChainID , ArgRollupChainID , "" , "rollup chain ID" )
649+ fRollup .StringVar (& cdkInputArgs .rollupAddress , ArgRollupAddress , "" , "rollup address" )
645650
646651 // bridge
647- cdkInputArgs . bridgeAddress = bridgeCmd .PersistentFlags ().String ( ArgBridgeAddress , "" , "The address of the bridge contract" )
652+ bridgeCmd .PersistentFlags ().StringVar ( & cdkInputArgs . bridgeAddress , ArgBridgeAddress , "" , "address of bridge contract" )
648653
649654 // ger
650- cdkInputArgs . gerAddress = gerCmd .PersistentFlags ().String ( ArgGERAddress , "" , "The address of the GER contract" )
655+ gerCmd .PersistentFlags ().StringVar ( & cdkInputArgs . gerAddress , ArgGERAddress , "" , "address of GER contract" )
651656
652657 CDKCmd .AddCommand (rollupManagerCmd )
653658 CDKCmd .AddCommand (rollupCmd )
0 commit comments