InjectiveLabs
diff --git a/‎Makefile
+7-2 b/‎Makefile
+7-2
diff --git a/‎README.md
+1-1 b/‎README.md
+1-1
diff --git a/‎auth_vote/authz_vote.go
+10-2 b/‎auth_vote/authz_vote.go
+10-2
diff --git a/‎chain/exchange/types/exchange.pb.go
+332-282 b/‎chain/exchange/types/exchange.pb.go
+332-282
diff --git a/‎chain/exchange/types/params.go
+14 b/‎chain/exchange/types/params.go
+14
diff --git a/‎chain/exchange/types/query.pb.go
+171-158 b/‎chain/exchange/types/query.pb.go
+171-158
diff --git a/‎chain/permissions/types/query.pb.go
+42-26 b/‎chain/permissions/types/query.pb.go
+42-26
diff --git a/‎chain/tokenfactory/types/tx.pb.go
+2-2 b/‎chain/tokenfactory/types/tx.pb.go
+2-2
@@ -1,10 +1,10 @@
 all:
 
 clone-injective-indexer:
-	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.14.1-RC.6 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-indexer.git -b v1.15.6 --depth 1 --single-branch
 
 clone-injective-core:
-	git clone https://github.com/InjectiveLabs/injective-core.git -b v1.14.0 --depth 1 --single-branch
+	git clone https://github.com/InjectiveLabs/injective-core.git -b v1.15.0 --depth 1 --single-branch
 
 copy-exchange-client: clone-injective-indexer
 	rm -rf exchange/*
@@ -92,6 +92,11 @@ copy-chain-types: clone-injective-core
 	mkdir -p chain/tokenfactory/types && \
 		cp injective-core/injective-chain/modules/tokenfactory/types/*.pb.go chain/tokenfactory/types && \
 		cp injective-core/injective-chain/modules/tokenfactory/types/codec.go chain/tokenfactory/types
+	mkdir -p chain/txfees/types && \
+		cp injective-core/injective-chain/modules/txfees/types/*.pb.go chain/txfees/types && \
+		cp injective-core/injective-chain/modules/txfees/types/codec.go chain/txfees/types
+	mkdir -p chain/txfees/osmosis/types && \
+		cp injective-core/injective-chain/modules/txfees/osmosis/types/*.pb.go chain/txfees/osmosis/types
 	mkdir -p chain/wasmx/types && \
 		cp injective-core/injective-chain/modules/wasmx/types/*.pb.go chain/wasmx/types && \
 		cp injective-core/injective-chain/modules/wasmx/types/authz.go chain/wasmx/types && \
 
@@ -60,7 +60,7 @@ Reach out to us at one of the following places!
 
 ## License
 
-Copyright © 2020 - 2022 Injective Labs Inc. (https://injectivelabs.org/)
+Copyright © 2020 - 2025 Injective Labs Inc. (https://injectivelabs.org/)
 
 <a href="https://drive.google.com/uc?export=view&id=1-fPQRh_D_dnun2yTtSsPW5MypVBOVYJP"><img src="https://drive.google.com/uc?export=view&id=1-fPQRh_D_dnun2yTtSsPW5MypVBOVYJP" style="width: 300px; max-width: 100%; height: auto" />
 
 
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/InjectiveLabs/sdk-go/client"
 	chainclient "github.com/InjectiveLabs/sdk-go/client/chain"
 	"github.com/InjectiveLabs/sdk-go/client/common"
 	rpchttp "github.com/cometbft/cometbft/rpc/client/http"
@@ -49,7 +48,6 @@ func main() {
 	clientCtx = clientCtx.WithNodeURI(network.TmEndpoint).WithClient(tmClient)
 
 	txFactory := chainclient.NewTxFactory(clientCtx)
-	txFactory = txFactory.WithGasPrices(client.DefaultGasPriceWithDenom)
 	chainClient, err := chainclient.NewChainClient(
 		clientCtx,
 		network,
@@ -60,6 +58,11 @@ func main() {
 		panic(err)
 	}
 
+	gasPrice := chainClient.CurrentChainGasPrice()
+	// adjust gas price to make it valid even if it changes between the time it is requested and the TX is broadcasted
+	gasPrice = int64(float64(gasPrice) * 1.1)
+	chainClient.SetGasPrice(gasPrice)
+
 	// note that we use grantee keyring to send the msg on behalf of granter here
 	// sender, subaccount are from granter
 	validators := []string{"inj156t3yxd4udv0h9gwagfcmwnmm3quy0npqc7pks", "inj16nd8yqxe9p6ggnrz58qr7dxn5y2834yendward"}
@@ -97,4 +100,9 @@ func main() {
 
 	str, _ := json.MarshalIndent(response, "", " ")
 	fmt.Print(string(str))
+
+	gasPrice = chainClient.CurrentChainGasPrice()
+	// adjust gas price to make it valid even if it changes between the time it is requested and the TX is broadcasted
+	gasPrice = int64(float64(gasPrice) * 1.1)
+	chainClient.SetGasPrice(gasPrice)
 }
@@ -222,6 +222,7 @@ func DefaultParams() Params {
 		MarginDecreasePriceTimestampThresholdSeconds: 60,
 		ExchangeAdmins:                               []string{},
 		InjAuctionMaxCap:                             DefaultInjAuctionMaxCap,
+		FixedGasEnabled:                              false,
 	}
 }
 
@@ -299,6 +300,19 @@ func (p Params) Validate() error {
 	if err := validateAdmins(p.ExchangeAdmins); err != nil {
 		return fmt.Errorf("ExchangeAdmins is incorrect: %w", err)
 	}
+
+	if err := validateFixedGasFlag(p.FixedGasEnabled); err != nil {
+		return fmt.Errorf("fixed_gas_enabled is incorrect: %w", err)
+	}
+
+	return nil
+}
+
+func validateFixedGasFlag(enabled any) error {
+	if _, ok := enabled.(bool); !ok {
+		return fmt.Errorf("invalid parameter type: %T", enabled)
+	}
+
 	return nil
 }