mjs/cosmjs
mjs/cosmjs
1
0
Fork 0
mirror of https://github.com/cosmos/cosmjs.git synced 2025-03-10 21:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix inconsistent gas multiplier value between signAndBroadcast and signAndBroadcastSync methods

Browse Source
This commit is contained in:
AlexanderFSP 2024-04-29 17:28:59 -03:00
parent 5c1ec56189
commit 4d1f2e1a0e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/cosmwasm-stargate/src/signingcosmwasmclient.ts
View File

@ -202,6 +202,9 @@ export class SigningCosmWasmClient extends CosmWasmClient {
private readonly signer: OfflineSigner; private readonly signer: OfflineSigner;
private readonly aminoTypes: AminoTypes; private readonly aminoTypes: AminoTypes;
private readonly gasPrice: GasPrice | undefined; private readonly gasPrice: GasPrice | undefined;
// 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
private readonly gasMultiplier = 1.4;
/** /**
* Creates an instance by connecting to the given CometBFT RPC endpoint. * Creates an instance by connecting to the given CometBFT RPC endpoint.
@ -614,9 +617,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
if (fee == "auto" || typeof fee === "number") { if (fee == "auto" || typeof fee === "number") {
assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used."); 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 gasEstimation = await this.simulate(signerAddress, messages, memo);
// Starting with Cosmos SDK 0.47, we see many cases in which 1.3 is not enough anymore const multiplier = typeof fee === "number" ? fee : this.gasMultiplier;
// 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); usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
} else { } else {
usedFee = fee; usedFee = fee;
@ -652,7 +653,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
if (fee == "auto" || typeof fee === "number") { if (fee == "auto" || typeof fee === "number") {
assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used."); 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 gasEstimation = await this.simulate(signerAddress, messages, memo);
const multiplier = typeof fee === "number" ? fee : 1.3; const multiplier = typeof fee === "number" ? fee : this.gasMultiplier;
usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice); usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
} else { } else {
usedFee = fee; usedFee = fee;

9
packages/stargate/src/signingstargateclient.ts
View File

@ -110,6 +110,9 @@ export class SigningStargateClient extends StargateClient {
private readonly signer: OfflineSigner; private readonly signer: OfflineSigner;
private readonly aminoTypes: AminoTypes; private readonly aminoTypes: AminoTypes;
private readonly gasPrice: GasPrice | undefined; private readonly gasPrice: GasPrice | undefined;
// 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
private readonly gasMultiplier = 1.4;
/** /**
* Creates an instance by connecting to the given CometBFT RPC endpoint. * Creates an instance by connecting to the given CometBFT RPC endpoint.
@ -308,9 +311,7 @@ export class SigningStargateClient extends StargateClient {
if (fee == "auto" || typeof fee === "number") { if (fee == "auto" || typeof fee === "number") {
assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used."); 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 gasEstimation = await this.simulate(signerAddress, messages, memo);
// Starting with Cosmos SDK 0.47, we see many cases in which 1.3 is not enough anymore const multiplier = typeof fee === "number" ? fee : this.gasMultiplier;
// 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); usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
} else { } else {
usedFee = fee; usedFee = fee;
@ -337,7 +338,7 @@ export class SigningStargateClient extends StargateClient {
if (fee == "auto" || typeof fee === "number") { if (fee == "auto" || typeof fee === "number") {
assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used."); 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 gasEstimation = await this.simulate(signerAddress, messages, memo);
const multiplier = typeof fee === "number" ? fee : 1.3; const multiplier = typeof fee === "number" ? fee : this.gasMultiplier;
usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice); usedFee = calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
} else { } else {
usedFee = fee; usedFee = fee;