update feegrant in price-feeder tool

Author: vuong177

.gitignore

@@ -10,3 +10,4 @@ bin
 # emacs editor config
 \#*\#
 .\#*
+*.toml

price-feeder/cmd/price-feeder.go

@@ -142,6 +142,7 @@ func priceFeederCmdHandler(cmd *cobra.Command, args []string) error {
 		cfg.RPC.GRPCEndpoint,
 		cfg.GasAdjustment,
 		cfg.GasPrice,
+		cfg.FeeGrantAddress,
 	)
 	if err != nil {
 		return err

price-feeder/config.toml

@@ -1,7 +1,7 @@
 gas_adjustment = 1.5
 provider_min_override = true
 gas_price = "0.0001stake"
-fee_grant_address = "juno1ej3gmuwr5t6jm928fze9dwfd8qu6226uxcwskq"
+fee_grant_address = ""
 
 [server]
 listen_addr = "0.0.0.0:7171"
@@ -89,7 +89,7 @@ prefix = "juno"
 
 [keyring]
 backend = "test"
-dir = "/home/vuong/.juno"
+dir = "/home/<user>/.juno"
 
 [rpc]
 grpc_endpoint = "localhost:9090"

price-feeder/config/config.go

@@ -78,6 +78,7 @@ type (
 		ProviderMinOverride bool                `mapstructure:"provider_min_override"`
 		ProviderEndpoints   []provider.Endpoint `mapstructure:"provider_endpoints" validate:"dive"`
 		GasPrice            string              `mapstructure:"gas_price"`
+		FeeGrantAddress     string              `mapstructure:"fee_grant_address"`
 	}
 
 	// Server defines the API server configuration.

price-feeder/oracle/client/client.go

@@ -41,6 +41,7 @@ type (
 		ValidatorAddrString string
 		Encoding            junoparams.EncodingConfig
 		GasPrices           string
+		FeeGrantAddress     string
 		GasAdjustment       float64
 		GRPCEndpoint        string
 		KeyringPassphrase   string
@@ -67,6 +68,7 @@ func NewOracleClient(
 	grpcEndpoint string,
 	gasAdjustment float64,
 	gasPrice string,
+	feeGrantAddress string,
 ) (OracleClient, error) {
 
 	oracleAddr, err := sdk.AccAddressFromBech32(oracleAddrString)
@@ -89,6 +91,7 @@ func NewOracleClient(
 		GasAdjustment:       gasAdjustment,
 		GRPCEndpoint:        grpcEndpoint,
 		GasPrices:           gasPrice,
+		FeeGrantAddress:     feeGrantAddress,
 	}
 
 	clientCtx, err := oracleClient.CreateClientContext()
@@ -164,6 +167,13 @@ func (oc OracleClient) BroadcastTx(nextBlockHeight, timeoutHeight int64, msgs ..
 
 		// set last check height to latest block height
 		lastCheckHeight = latestBlockHeight
+		if oc.FeeGrantAddress != "" {
+			feeGrandAccAddress, err := sdk.AccAddressFromBech32(oc.FeeGrantAddress)
+			if err != nil {
+				return err
+			}
+			clientCtx = clientCtx.WithFeeGranterAddress(feeGrandAccAddress)
+		}
 
 		resp, err := BroadcastTx(clientCtx, factory, oc.GasPrices, msgs...)
 		if resp != nil && resp.Code != 0 {

price-feeder/oracle/client/tx.go

@@ -33,8 +33,8 @@ func BroadcastTx(clientCtx client.Context, txf tx.Factory, gasPrice string, msgs
 
 	feeAmount, err := calculateFeeAmount(gasPrice, adjusted)
 	unsignedTx.SetFeeAmount(feeAmount)
-
 	unsignedTx.SetFeeGranter(clientCtx.GetFeeGranterAddress())
+
 	// unsignedTx.SetFeePayer(clientCtx.GetFeePayerAddress())
 
 	if err = tx.Sign(txf, clientCtx.GetFromName(), unsignedTx, true); err != nil {