Merge pull request #1469 from cosmos/gas-multiplier

Update gas multiplier to 1.4 and CosmWasm upload to 1.1
cosmos · Aug 21, 2023 · 8f81b50 · 8f81b50
2 parents 358260b + 9a57785
commit 8f81b50
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,16 @@ and this project adheres to
 - @cosmjs/tendermint-rpc: Add missing `earliest_*` fields to `SyncInfo` record
   returned from the `/status` RPC endpoint ([#1448]).
 
+### Changed
+
+- @cosmjs/stargate, @cosmjs/cosmwasm-stargate: Change default multiplier for gas
+  simulation from 1.3 to 1.4 to avoid out of case cases starting with Cosmos SDK
+  0.47.
+- @cosmjs/cosmwasm-stargate: Reduce default gas multiplier for
+  `SigningCosmWasmClient.upload` to 1.1. ([#1360])
+
+[#1360]: https://github.com/cosmos/cosmjs/issues/1360
+
 ## [0.31.0] - 2023-06-22
 
 ### Fixed

diff --git a/packages/cli/examples/simulate.ts b/packages/cli/examples/simulate.ts
@@ -95,7 +95,7 @@ const client = await SigningStargateClient.connectWithSigner(rpcEndpoint, wallet
     },
   };
   const memo = "With simulate";
-  const result = await client.signAndBroadcast(account.address, [sendMsg], 1.4, memo);
+  const result = await client.signAndBroadcast(account.address, [sendMsg], 1.55, memo);
   assertIsDeliverTxSuccess(result);
   console.log("Successfully broadcasted:", result);
 }

diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
@@ -297,7 +297,11 @@ export class SigningCosmWasmClient extends CosmWasmClient {
       }),
     };
 
-    const result = await this.signAndBroadcast(senderAddress, [storeCodeMsg], fee, memo);
+    // When uploading a contract, the simulation is only 1-2% away from the actual gas usage.
+    // So we have a smaller default gas multiplier than signAndBroadcast.
+    const usedFee = fee == "auto" ? 1.1 : fee;
+
+    const result = await this.signAndBroadcast(senderAddress, [storeCodeMsg], usedFee, memo);
     if (isDeliverTxFailure(result)) {
       throw new Error(createDeliverTxResponseErrorMessage(result));
     }
@@ -604,7 +608,9 @@ export class SigningCosmWasmClient extends CosmWasmClient {
     if (fee == "auto" || typeof fee === "number") {
       assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used.");
       const gasEstimation = await this.simulate(signerAddress, messages, memo);
-      const multiplier = typeof fee === "number" ? fee : 1.3;
+      // Starting with Cosmos SDK 0.47, we see many cases in which 1.3 is not enough anymore
+      // E.g. https://github.com/cosmos/cosmos-sdk/issues/16020
+      const multiplier = typeof fee === "number" ? fee : 1.4;
       usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
     } else {
       usedFee = fee;

diff --git a/packages/stargate/src/signingstargateclient.ts b/packages/stargate/src/signingstargateclient.ts
@@ -318,7 +318,9 @@ export class SigningStargateClient extends StargateClient {
     if (fee == "auto" || typeof fee === "number") {
       assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used.");
       const gasEstimation = await this.simulate(signerAddress, messages, memo);
-      const multiplier = typeof fee === "number" ? fee : 1.3;
+      // Starting with Cosmos SDK 0.47, we see many cases in which 1.3 is not enough anymore
+      // E.g. https://github.com/cosmos/cosmos-sdk/issues/16020
+      const multiplier = typeof fee === "number" ? fee : 1.4;
       usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
     } else {
       usedFee = fee;