fix: Use gas for claim and proof txs

Author: red-0ne

makefiles/relay.mk

@@ -7,7 +7,7 @@ send_relay_path_JSONRPC: test_e2e_env ## Send a JSONRPC relay through PATH to a
 	curl -X POST -H "Content-Type: application/json" \
 		-H "X-App-Address: pokt1mrqt5f7qh8uxs27cjm9t7v9e74a9vvdnq5jva4" \
 		--data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}' \
-		http://anvil.localhost:3000/v1
+		http://anvil.localhost:3000/v1/
 # $(subst http://,http://anvil.,$(PATH_URL))/v1
 
 # TODO_MAINNET(@red-0ne): Re-enable this once PATH Gateway supports REST.

pkg/client/interface.go

@@ -81,6 +81,8 @@ type SupplierClient interface {
 type TxClient interface {
 	SignAndBroadcast(
 		ctx context.Context,
+		gasLimit int64,
+		gasPrice int64,
 		msgs ...cosmostypes.Msg,
 	) either.AsyncError
 }

pkg/client/supplier/client.go

@@ -15,6 +15,15 @@ import (
 
 var _ client.SupplierClient = (*supplierClient)(nil)
 
+const (
+	// TODO_TECHDEBT: Gas limit and price should have their dedicated configuration entry.
+	// gasLimit is the default gas limit of the relay miner transactions.
+	gasLimit = 100000
+
+	// gasPrice is the gas price used to calculate the fee of the relay miner transactions.
+	gasPrice = 1
+)
+
 // supplierClient
 type supplierClient struct {
 	// signingKeyName is the name of the operator key in the keyring that will be
@@ -82,7 +91,7 @@ func (sClient *supplierClient) SubmitProofs(
 
 	// TODO(@bryanchriswhite): reconcile splitting of supplier & proof modules
 	//  with off-chain pkgs/nomenclature.
-	eitherErr := sClient.txClient.SignAndBroadcast(ctx, msgs...)
+	eitherErr := sClient.txClient.SignAndBroadcast(ctx, gasLimit, gasPrice, msgs...)
 	err, errCh := eitherErr.SyncOrAsyncError()
 	if err != nil {
 		return err
@@ -128,7 +137,7 @@ func (sClient *supplierClient) CreateClaims(
 
 	// TODO(@bryanchriswhite): reconcile splitting of supplier & proof modules
 	//  with off-chain pkgs/nomenclature.
-	eitherErr := sClient.txClient.SignAndBroadcast(ctx, msgs...)
+	eitherErr := sClient.txClient.SignAndBroadcast(ctx, gasLimit, gasPrice, msgs...)
 	err, errCh := eitherErr.SyncOrAsyncError()
 	if err != nil {
 		return err

pkg/client/tx/client.go

@@ -213,6 +213,8 @@ func NewTxClient(
 // transaction results in an asynchronous error or times out.
 func (txnClient *txClient) SignAndBroadcast(
 	ctx context.Context,
+	gasLimit int64,
+	gasPrice int64,
 	msgs ...cosmostypes.Msg,
 ) either.AsyncError {
 	var validationErrs error
@@ -240,8 +242,9 @@ func (txnClient *txClient) SignAndBroadcast(
 	timeoutHeight := txnClient.blockClient.LastBlock(ctx).
 		Height() + txnClient.commitTimeoutHeightOffset
 
-	// TODO_TECHDEBT: this should be configurable
-	txBuilder.SetGasLimit(690000042)
+	fee := cosmostypes.NewCoins(cosmostypes.NewInt64Coin("upokt", gasLimit*gasPrice))
+	txBuilder.SetGasLimit(uint64(gasLimit))
+	txBuilder.SetFeeAmount(fee)
 	txBuilder.SetTimeoutHeight(uint64(timeoutHeight))
 
 	// sign transactions

pkg/client/tx/client_integration_test.go

@@ -20,6 +20,12 @@ import (
 	apptypes "github.com/pokt-network/poktroll/x/application/types"
 )
 
+const (
+	// Set gas limit and price to 0 since tests do not need require actual gas.
+	gasLimit = 0
+	gasPrice = 0
+)
+
 func TestTxClient_SignAndBroadcast_Integration(t *testing.T) {
 	t.Skip(
 		"TODO_TECHDEBT: this test depends on some setup which is currently not implemented in this test: staked application and servicer with matching services",
@@ -62,7 +68,7 @@ func TestTxClient_SignAndBroadcast_Integration(t *testing.T) {
 	}
 
 	// Sign and broadcast the message.
-	eitherErr := txClient.SignAndBroadcast(ctx, appStakeMsg)
+	eitherErr := txClient.SignAndBroadcast(ctx, gasLimit, gasPrice, appStakeMsg)
 	err, _ = eitherErr.SyncOrAsyncError()
 	require.NoError(t, err)
 }

pkg/client/tx/client_test.go

@@ -38,6 +38,10 @@ const (
 	// maxServiceIdLen.
 	testServiceIdPrefix = "testsvc"
 	txCommitTimeout     = 10 * time.Millisecond
+
+	// Set gas limit and price to 0 since tests do not need require actual gas.
+	txGasLimit = 0
+	txGasPrice = 0
 )
 
 // TODO_TECHDEBT: add coverage for the transactions client handling an events bytes error either.
@@ -106,7 +110,7 @@ func TestTxClient_SignAndBroadcast_Succeeds(t *testing.T) {
 	}
 
 	// Sign and broadcast the message.
-	eitherErr := txClient.SignAndBroadcast(ctx, appStakeMsg)
+	eitherErr := txClient.SignAndBroadcast(ctx, txGasLimit, txGasPrice, appStakeMsg)
 	err, errCh := eitherErr.SyncOrAsyncError()
 	require.NoError(t, err)
 
@@ -265,7 +269,7 @@ func TestTxClient_SignAndBroadcast_SyncError(t *testing.T) {
 		// NB: explicitly omitting required fields
 	}
 
-	eitherErr := txClient.SignAndBroadcast(ctx, appStakeMsg)
+	eitherErr := txClient.SignAndBroadcast(ctx, gasLimit, gasPrice, appStakeMsg)
 	err, _ = eitherErr.SyncOrAsyncError()
 	require.ErrorIs(t, err, tx.ErrInvalidMsg)
 
@@ -343,7 +347,7 @@ $ go test -v -count=1 -run TestTxClient_SignAndBroadcast_CheckTxError ./pkg/clie
 	}
 
 	// Sign and broadcast the message.
-	eitherErr := txClient.SignAndBroadcast(ctx, appStakeMsg)
+	eitherErr := txClient.SignAndBroadcast(ctx, gasLimit, gasPrice, appStakeMsg)
 	err, _ = eitherErr.SyncOrAsyncError()
 	require.ErrorIs(t, err, tx.ErrCheckTx)
 	require.ErrorContains(t, err, expectedErrMsg)
@@ -415,7 +419,7 @@ func TestTxClient_SignAndBroadcast_Timeout(t *testing.T) {
 	}
 
 	// Sign and broadcast the message in a transaction.
-	eitherErr := txClient.SignAndBroadcast(ctx, appStakeMsg)
+	eitherErr := txClient.SignAndBroadcast(ctx, gasLimit, gasPrice, appStakeMsg)
 	err, errCh := eitherErr.SyncOrAsyncError()
 	require.NoError(t, err)
 

pkg/client/tx/context.go

@@ -86,7 +86,9 @@ func (txCtx cosmosTxContext) EncodeTx(txBuilder cosmosclient.TxBuilder) ([]byte,
 // ABCI operation completes and returns a TxResponse of the transaction status at that point in time.
 func (txCtx cosmosTxContext) BroadcastTx(txBytes []byte) (*cosmostypes.TxResponse, error) {
 	clientCtx := cosmosclient.Context(txCtx.clientCtx)
-	return clientCtx.BroadcastTxAsync(txBytes)
+	// BroadcastTxSync is used to capture any transaction error that occurs during
+	// the check-tx ABCI operation, otherwise errors would be returned.
+	return clientCtx.BroadcastTxSync(txBytes)
 }
 
 // QueryTx queries the transaction based on its hash and optionally provides proof

testutil/testclient/testtx/client.go

@@ -73,6 +73,8 @@ func NewOneTimeSignAndBroadcastTxClient(
 	txClient.EXPECT().SignAndBroadcast(
 		gomock.Eq(ctx),
 		gomock.Any(),
+		gomock.Any(),
+		gomock.Any(),
 	).DoAndReturn(signAndBroadcast).Times(1)
 
 	return txClient