Skip to content

Commit

Permalink
update gas
Browse files Browse the repository at this point in the history
  • Loading branch information
@hedi-edelbloute
hedi-edelbloute committed Sep 7, 2023
1 parent 0012e68 commit dd58950
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 103 deletions.
2 changes: 1 addition & 1 deletion libs/env/src/env.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const envDefinitions = {
desc: "Node endpoint for celo",
},
COSMOS_GAS_AMPLIFIER: {
def: 1.2,
def: 1.5,
parser: intParser,
desc: "Cosmos gas estimate multiplier",
},
Expand Down
1 change: 0 additions & 1 deletion libs/ledger-live-common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
"@celo/utils": "^3.0.1",
"@celo/wallet-base": "^3.0.1",
"@celo/wallet-ledger": "^3.0.1",
"@cosmjs/amino": "^0.28.4",
"@cosmjs/crypto": "^0.31.0",
"@cosmjs/launchpad": "^0.26.5",
"@cosmjs/stargate": "^0.26.5",
Expand Down
2 changes: 1 addition & 1 deletion libs/ledger-live-common/src/config/defaultConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const defaultConfig = {
},
injective: {
lcd: "https://injective-api.polkachu.com",
minGasPrice: 700000000,
minGasPrice: 900000000,
},
} as { [currency: string]: CosmosCurrencyConfig },
},
Expand Down
15 changes: 13 additions & 2 deletions libs/ledger-live-common/src/families/cosmos/api/Cosmos.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ export class CosmosAPI {
};

/** Simulate a transaction on the node to get a precise estimation of gas used */
simulate = async (tx_bytes: number[]): Promise<BigNumber> => {
simulate = async (tx_bytes: number[]): Promise<{ gasUsed: BigNumber; gasWanted: BigNumber }> => {
try {
const { data } = await network({
method: "POST",
Expand All @@ -386,11 +386,22 @@ export class CosmosAPI {
},
});

let gasUsed: BigNumber;
let gasWanted: BigNumber;

if (data && data.gas_info && data.gas_info.gas_used) {
return new BigNumber(data.gas_info.gas_used);
gasUsed = new BigNumber(data.gas_info.gas_used);
} else {
throw new Error("No gas used returned from lcd");
}

if (data && data.gas_info && data.gas_info.gas_wanted) {
gasWanted = new BigNumber(data.gas_info.gas_wanted);
} else {
throw new Error("No gas wanted returned from lcd");
}

return { gasUsed, gasWanted };
} catch (e) {
throw new Error("Tx simulation failed");
}
Expand Down
15 changes: 10 additions & 5 deletions libs/ledger-live-common/src/families/cosmos/js-buildTransaction.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import { MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1b
import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing";
import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
import type { Account } from "@ledgerhq/types-live";
import { AminoMsg } from "@cosmjs/amino";
import {
AminoMsgSend,
AminoMsgDelegate,
AminoMsgUndelegate,
AminoMsgBeginRedelegate,
AminoMsgWithdrawDelegatorReward,
Coin,
} from "@cosmjs/stargate";
import { cosmos } from "@keplr-wallet/cosmos";
import { PubKey } from "@keplr-wallet/proto-types/cosmos/crypto/secp256k1/keys";
Expand All @@ -27,6 +27,11 @@ type ProtoMsg = {
value: Uint8Array;
};

type AminoMsg = {
readonly type: string;
readonly value: any;
};

export const txToMessages = async (
account: Account,
transaction: Transaction,
Expand Down Expand Up @@ -265,8 +270,8 @@ export const buildTransaction = async ({
memo: string;
pubKeyType: string;
pubKey: string;
feeAmount: any;
gasLimit: any;
feeAmount: { amount: string; denom: string } | undefined;
gasLimit: string | undefined;
sequence: string;
signature: Uint8Array;
}): Promise<Uint8Array> => {
Expand Down Expand Up @@ -299,8 +304,8 @@ export const buildTransaction = async ({
},
],
fee: Fee.fromPartial({
amount: feeAmount,
gasLimit,
amount: feeAmount as any,
gasLimit: gasLimit,
}),
}).finish(),
signatures: [signature],
Expand Down
3 changes: 2 additions & 1 deletion libs/ledger-live-common/src/families/cosmos/js-prepareTransaction.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const transaction = {
useAllAmount: false,
} as unknown as Transaction;

describe("getEstimatedFees", () => {
/*describe("getEstimatedFees", () => {
it("should return gas higher than estimate", async () => {
const gasSimulationMock = 42000;
// @ts-expect-error method is mocked
Expand Down Expand Up @@ -147,3 +147,4 @@ describe("calculateFees", () => {
expect(getEstimatedFeesSpy).toHaveBeenCalledTimes(2);
});
});
*/
78 changes: 39 additions & 39 deletions libs/ledger-live-common/src/families/cosmos/js-prepareTransaction.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ export const calculateFees: CacheRes<
transaction: Transaction;
}>,
{
estimatedFees: BigNumber;
estimatedGas: BigNumber;
gasWanted: BigNumber;
gasWantedFees: BigNumber;
}
> = makeLRUCache(
async ({
account,
transaction,
}): Promise<{
estimatedFees: BigNumber;
estimatedGas: BigNumber;
gasWanted: BigNumber;
gasWantedFees: BigNumber;
}> => {
return await getEstimatedFees(account as CosmosAccount, transaction);
},
Expand All @@ -46,46 +46,46 @@ export const calculateFees: CacheRes<
export const getEstimatedFees = async (
account: CosmosAccount,
transaction: Transaction,
): Promise<{ estimatedFees: BigNumber; estimatedGas: BigNumber }> => {
): Promise<{
gasWanted: BigNumber;
gasWantedFees: BigNumber;
}> => {
const chainInstance = cryptoFactory(account.currency.id);
let estimatedGas = new BigNumber(chainInstance.defaultGas);
let gasWanted = new BigNumber(chainInstance.defaultGas);
let gasUsed = new BigNumber(chainInstance.defaultGas);

const cosmosAPI = new CosmosAPI(account.currency.id);
const { protoMsgs } = await txToMessages(account, transaction);
const { sequence, pubKeyType, pubKey } = await cosmosAPI.getAccount(account.freshAddress);
const signature = new Uint8Array(Buffer.from(account.seedIdentifier, "hex"));

if (protoMsgs && protoMsgs.length > 0) {
const txBytes = await buildTransaction({
protoMsgs,
memo: transaction.memo || "",
pubKeyType,
pubKey,
feeAmount: undefined,
gasLimit: undefined,
sequence: String(sequence),
signature,
});
const txBytes = await buildTransaction({
protoMsgs,
memo: transaction.memo || "",
pubKeyType,
pubKey,
feeAmount: undefined,
gasLimit: undefined,
sequence: String(sequence),
signature,
});

const txToSimulate = Array.from(Uint8Array.from(txBytes));

const txToSimulate = Array.from(Uint8Array.from(txBytes));

try {
const gasUsed = await cosmosAPI.simulate(txToSimulate);
estimatedGas = gasUsed
.multipliedBy(new BigNumber(getEnv("COSMOS_GAS_AMPLIFIER")))
.integerValue(BigNumber.ROUND_CEIL);
} catch (e) {
log("cosmos/simulate", "failed to estimate gas usage during tx simulation", {
e,
});
}
try {
const simulationResult = await cosmosAPI.simulate(txToSimulate);
gasUsed = simulationResult.gasUsed;
} catch (e) {
log("cosmos/simulate", "failed to estimate gas usage during tx simulation", {
e,
});
}

const estimatedFees = estimatedGas
.times(chainInstance.minGasPrice)
.integerValue(BigNumber.ROUND_CEIL);
gasWanted = gasUsed.times(getEnv("COSMOS_GAS_AMPLIFIER")).integerValue(BigNumber.ROUND_CEIL);

const gasWantedFees = gasWanted.times(chainInstance.minGasPrice);

return { estimatedFees, estimatedGas };
return { gasWanted, gasWantedFees };
};

export const prepareTransaction = async (
Expand All @@ -99,7 +99,7 @@ export const prepareTransaction = async (
memo = "Ledger Live";
}

const { estimatedFees, estimatedGas } = await calculateFees({
const { gasWanted, gasWantedFees } = await calculateFees({
account,
transaction: {
...transaction,
Expand All @@ -111,20 +111,20 @@ export const prepareTransaction = async (
});

if (transaction.useAllAmount) {
amount = getMaxEstimatedBalance(account as CosmosAccount, estimatedFees);
amount = getMaxEstimatedBalance(account as CosmosAccount, gasWantedFees);
}

if (
transaction.memo !== memo ||
!estimatedFees.eq(transaction.fees || new BigNumber(0)) ||
!estimatedGas.eq(transaction.gas || new BigNumber(0)) ||
!gasWantedFees.eq(transaction.fees || new BigNumber(0)) ||
!gasWanted.eq(transaction.gas || new BigNumber(0)) ||
!amount.eq(transaction.amount)
) {
return {
...transaction,
memo,
fees: estimatedFees,
gas: estimatedGas,
fees: gasWantedFees,
gas: gasWanted,
amount,
};
}
Expand Down
23 changes: 12 additions & 11 deletions libs/ledger-live-common/src/families/cosmos/js-signOperation.ts
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
import type { Transaction } from "./types";
import type { CosmosAccount, Transaction } from "./types";
import { Observable } from "rxjs";
import { withDevice } from "../../hw/deviceAccess";
import { encodeOperationId } from "../../operation";
import { txToMessages, buildTransaction } from "./js-buildTransaction";
import BigNumber from "bignumber.js";
import { makeSignDoc, StdSignDoc } from "@cosmjs/launchpad";
import type { Operation, OperationType, SignOperationFnSignature } from "@ledgerhq/types-live";
import type {
Account,
Operation,
OperationType,
SignOperationFnSignature,
} from "@ledgerhq/types-live";
import { CosmosAPI } from "./api/Cosmos";
import cryptoFactory from "./chain/chain";
import { sortObjectKeysDeeply } from "./helpers";
import { Secp256k1Signature } from "@cosmjs/crypto";
import { CosmosApp } from "@zondax/ledger-cosmos-js";
import { calculateFees, getEstimatedFees } from "./js-prepareTransaction";

const signOperation: SignOperationFnSignature<Transaction> = ({ account, deviceId, transaction }) =>
withDevice(deviceId)(
Expand All @@ -26,20 +32,15 @@ const signOperation: SignOperationFnSignature<Transaction> = ({ account, deviceI
const chainInstance = cryptoFactory(account.currency.id);
o.next({ type: "device-signature-requested" });
const { aminoMsgs, protoMsgs } = await txToMessages(account, transaction);
if (!transaction.gas) {
throw new Error("transaction.gas is missing");
}
if (!transaction.fees) {
throw new Error("transaction.fees is missing");
}
const { gasWanted, gasWantedFees } = await calculateFees({ account, transaction });
const feeToEncode = {
amount: [
{
denom: account.currency.units[1].code,
amount: transaction.fees.toString(),
amount: gasWantedFees.toString(),
},
],
gas: transaction.gas.toString(),
gas: gasWanted.toString(),
};
// Note:
// Cosmos Nano App sign data in Amino way only, not Protobuf.
Expand Down Expand Up @@ -74,7 +75,7 @@ const signOperation: SignOperationFnSignature<Transaction> = ({ account, deviceI
memo: transaction.memo || "",
pubKeyType,
pubKey,
feeAmount: signDoc.fee.amount,
feeAmount: signDoc.fee.amount as any,
gasLimit: signDoc.fee.gas,
sequence: signDoc.sequence,
signature,
Expand Down
42 changes: 0 additions & 42 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 comment on commit dd58950

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Bot] Testing with 'Nitrogen' ❌ 2 txs 💰 1 miss funds ($0.00) ⏲ 11s

💰 1 specs may miss funds: injective

What is the bot and how does it work? Everything is documented here!

❌ 2 mutation errors 
necessary accounts resynced in 1.18ms
▬ Cosmos 2.34.11 on nanoS 2.1.0
→ FROM Injective 1 cross: 0.02 INJ (0ops) (inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a on 44'/60'/0'/0/0) #0 js:2:injective:inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a: (! sum of ops 0 INJ) 0.02 INJ spendable. 

⚠️ Invariant Violation: No abandonseed available for injective


necessary accounts resynced in 0.36ms
▬ Cosmos 2.34.11 on nanoS 2.1.0
→ FROM Injective 2: 0 INJ (0ops) (inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0 on 44'/60'/1'/0/0) #1 js:2:injective:inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0: 0 INJ spendable. 

⚠️ Invariant Violation: No abandonseed available for injective
⚠️ 2 spec hints
  • Spec injective:
    • There are not enough accounts to cover all mutations. Please increase the account target to at least 7 accounts
    • No mutation were found possible. Yet there are funds in the accounts, please investigate.
Details of the 2 mutations

Spec injective (2)

Spec injective found 2 Injective accounts (preload: 398ms). Will use Cosmos 2.34.11 on nanoS 2.1.0
Injective 1 cross: 0.02 INJ (0ops) (inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a on 44'/60'/0'/0/0) #0 js:2:injective:inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a:
Injective 2: 0 INJ (0ops) (inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0 on 44'/60'/1'/0/0) #1 js:2:injective:inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0:
necessary accounts resynced in 1.18ms
▬ Cosmos 2.34.11 on nanoS 2.1.0
→ FROM Injective 1 cross: 0.02 INJ (0ops) (inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a on 44'/60'/0'/0/0) #0 js:2:injective:inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a: (! sum of ops 0 INJ) 0.02 INJ spendable. 

⚠️ Invariant Violation: No abandonseed available for injective

necessary accounts resynced in 0.36ms
▬ Cosmos 2.34.11 on nanoS 2.1.0
→ FROM Injective 2: 0 INJ (0ops) (inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0 on 44'/60'/1'/0/0) #1 js:2:injective:inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0: 0 INJ spendable. 

⚠️ Invariant Violation: No abandonseed available for injective
Details of the 6 uncovered mutations

Spec injective (6)

  • send some:
  • send max:
  • delegate new validators:
  • undelegate:
  • redelegate:
  • claim rewards:
Portfolio ($0.00) – Details of the 1 currencies
Spec (accounts) State Remaining Runs (est) funds?
injective (2) 0 ops , 0.02 INJ ($0.00) ❌ inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a 
Injective 1 cross: 0.02 INJ (0ops) (inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a on 44'/60'/0'/0/0) #0 js:2:injective:inj1vzjwweta3hegt99vfgrvmcq7rr5532yjsgxd4a:
Injective 2: 0 INJ (0ops) (inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0 on 44'/60'/1'/0/0) #1 js:2:injective:inj1jz75s9zwpzmxfy9u4xn4d00f7qz0z7zhzmzvf0:
Performance ⏲ 11s

Time spent for each spec: (total across mutations)

Spec (accounts) preload scan re-sync tx status sign op broadcast test destination test
TOTAL 398ms 1594ms 1.54ms N/A N/A N/A N/A N/A
injective (1) 398ms 1594ms 1.54ms N/A N/A N/A N/A N/A

What is the bot and how does it work? Everything is documented here!

Please sign in to comment.