feat: implement gas price and gas limit customization for txsim

test/cmd/txsim/cli.go

@@ -42,6 +42,8 @@ var (
 	useFeegrant, suppressLogs                         bool
 	upgradeSchedule                                   string
 	blobShareVersion                                  int
+	gasLimit                                          uint64
+	gasPrice                                          float64
 )
 
 func main() {
@@ -177,6 +179,14 @@ account that can act as the master account. The command runs until all sequences
 				opts.SuppressLogs()
 			}
 
+			if gasLimit > 0 {
+				opts.WithGasLimit(gasLimit)
+			}
+
+			if gasPrice > 0 {
+				opts.WithGasPrice(gasPrice)
+			}
+
 			encCfg := encoding.MakeConfig(app.ModuleEncodingRegisters...)
 			err = txsim.Run(
 				cmd.Context(),
@@ -217,6 +227,8 @@ func flags() *flag.FlagSet {
 	flags.BoolVar(&useFeegrant, "feegrant", false, "use the feegrant module to pay for fees")
 	flags.BoolVar(&suppressLogs, "suppressLogs", false, "disable logging")
 	flags.IntVar(&blobShareVersion, "blob-share-version", -1, "optionally specify a share version to use for the blob sequences")
+	flags.Uint64Var(&gasLimit, "gas-limit", 0, "custom gas limit to use for transactions (0 = auto-estimate)")
+	flags.Float64Var(&gasPrice, "gas-price", 0, "custom gas price to use for transactions (0 = use default)")
 	return flags
 }
 

test/txsim/account.go

@@ -32,6 +32,8 @@
 	encCfg      encoding.Config
 	pollTime    time.Duration
 	useFeegrant bool
+	gasLimit    uint64
+	gasPrice    float64
 
 	// to protect from concurrent writes to the map
 	mtx          sync.Mutex
@@ -225,11 +227,29 @@
 
 	opts := make([]user.TxOption, 0)
 	if op.GasLimit == 0 {
-		opts = append(opts, user.SetGasLimit(DefaultGasLimit), user.SetFee(defaultFee))
+		if am.gasLimit > 0 {
+			// Use the custom gas limit set on the AccountManager
+			opts = append(opts, user.SetGasLimit(am.gasLimit))
+
+			// Calculate fee based on gas price
+			var gasPrice float64
+			if am.gasPrice > 0 {
+				gasPrice = am.gasPrice
+			} else {
+				gasPrice = appconsts.DefaultMinGasPrice
+			}
+			opts = append(opts, user.SetFee(uint64(math.Ceil(float64(am.gasLimit)*gasPrice))))
+		} else {
+			// Use the default gas limit
+			opts = append(opts, user.SetGasLimit(DefaultGasLimit), user.SetFee(defaultFee))
+		}
 	} else {
 		opts = append(opts, user.SetGasLimit(op.GasLimit))
 		if op.GasPrice > 0 {
 			opts = append(opts, user.SetFee(uint64(math.Ceil(float64(op.GasLimit)*op.GasPrice))))
+		} else if am.gasPrice > 0 {
+			// Use custom gas price set on AccountManager if available
+			opts = append(opts, user.SetFee(uint64(math.Ceil(float64(op.GasLimit)*am.gasPrice))))
 		} else {
 			opts = append(opts, user.SetFee(uint64(math.Ceil(float64(op.GasLimit)*appconsts.DefaultMinGasPrice))))
 		}
@@ -409,9 +429,18 @@
 }
 
 func (am *AccountManager) nextAccountName() string {
-	am.mtx.Lock()
-	defer am.mtx.Unlock()
-	return accountName(len(am.pending) + am.accountIndex)
+	am.accountIndex++
+	return accountName(am.accountIndex)
+}
+
+// SetGasLimit sets a custom gas limit to be used for all transactions
+func (am *AccountManager) SetGasLimit(gasLimit uint64) {
+	am.gasLimit = gasLimit
+}
+
+// SetGasPrice sets a custom gas price to be used for all transactions
+func (am *AccountManager) SetGasPrice(gasPrice float64) {
+	am.gasPrice = gasPrice
 }
 
 type account struct {

test/txsim/run.go

@@ -66,6 +66,16 @@ func Run(
 		return err
 	}
 
+	// Set custom gas limit if provided
+	if opts.gasLimit > 0 {
+		manager.SetGasLimit(opts.gasLimit)
+	}
+
+	// Set custom gas price if provided
+	if opts.gasPrice > 0 {
+		manager.SetGasPrice(opts.gasPrice)
+	}
+
 	// Initialize each of the sequences by allowing them to allocate accounts.
 	for _, sequence := range sequences {
 		sequence.Init(ctx, manager.conn, manager.AllocateAccounts, r, opts.useFeeGrant)
@@ -132,6 +142,8 @@ type Options struct {
 	pollTime       time.Duration
 	useFeeGrant    bool
 	suppressLogger bool
+	gasLimit       uint64
+	gasPrice       float64
 }
 
 func (o *Options) Fill() {
@@ -174,6 +186,16 @@ func (o *Options) WithPollTime(pollTime time.Duration) *Options {
 	return o
 }
 
+func (o *Options) WithGasLimit(gasLimit uint64) *Options {
+	o.gasLimit = gasLimit
+	return o
+}
+
+func (o *Options) WithGasPrice(gasPrice float64) *Options {
+	o.gasPrice = gasPrice
+	return o
+}
+
 // buildGrpcConn applies the config if the handshake succeeds; otherwise, it falls back to an insecure connection.
 func buildGrpcConn(grpcEndpoint string, config *tls.Config) (*grpc.ClientConn, error) {
 	netConn, err := net.Dial("tcp", grpcEndpoint)