From 7159896d88b723459d7895470edbe0419bb4aef4 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 22 Jul 2020 13:25:45 +0200 Subject: [PATCH 1/3] sdk38: Rename getNonce -> getSequence --- packages/cli/examples/delegate.ts | 2 +- .../src/cosmwasmclient.searchtx.spec.ts | 2 +- packages/cosmwasm/src/cosmwasmclient.spec.ts | 8 ++++---- packages/cosmwasm/src/cosmwasmclient.ts | 2 +- packages/cosmwasm/src/signingcosmwasmclient.ts | 18 +++++++++--------- packages/cosmwasm/types/cosmwasmclient.d.ts | 2 +- .../cosmwasm/types/signingcosmwasmclient.d.ts | 2 +- .../sdk38/src/cosmosclient.searchtx.spec.ts | 2 +- packages/sdk38/src/cosmosclient.spec.ts | 8 ++++---- packages/sdk38/src/cosmosclient.ts | 2 +- packages/sdk38/src/lcdapi/distribution.spec.ts | 2 +- packages/sdk38/src/lcdapi/gov.spec.ts | 4 ++-- packages/sdk38/src/lcdapi/lcdclient.spec.ts | 2 +- packages/sdk38/src/signingcosmosclient.ts | 6 +++--- packages/sdk38/types/cosmosclient.d.ts | 2 +- packages/sdk38/types/signingcosmosclient.d.ts | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/packages/cli/examples/delegate.ts b/packages/cli/examples/delegate.ts index 88a4a47e..f518989c 100644 --- a/packages/cli/examples/delegate.ts +++ b/packages/cli/examples/delegate.ts @@ -24,7 +24,7 @@ const memo = "Use your power wisely"; const chainId = await client.getChainId(); console.log("Connected to chain:", chainId); -const { accountNumber, sequence } = await client.getNonce(senderAddress); +const { accountNumber, sequence } = await client.getSequence(senderAddress); console.log("Account/sequence:", accountNumber, sequence); const signBytes = makeSignBytes([msg], fee, chainId, memo, accountNumber, sequence); diff --git a/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts b/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts index dc131f78..8fc6fcf0 100644 --- a/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts +++ b/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts @@ -100,7 +100,7 @@ describe("CosmWasmClient.searchTx", () => { amount: coins(2000, "ucosm"), gas: "80000", // 80k }; - const { accountNumber, sequence } = await client.getNonce(); + const { accountNumber, sequence } = await client.getSequence(); const chainId = await client.getChainId(); const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence); const signature = await wallet.sign(alice.address0, signBytes); diff --git a/packages/cosmwasm/src/cosmwasmclient.spec.ts b/packages/cosmwasm/src/cosmwasmclient.spec.ts index f41a1b40..5f4121d6 100644 --- a/packages/cosmwasm/src/cosmwasmclient.spec.ts +++ b/packages/cosmwasm/src/cosmwasmclient.spec.ts @@ -105,11 +105,11 @@ describe("CosmWasmClient", () => { }); }); - describe("getNonce", () => { + describe("getSequence", () => { it("works", async () => { pendingWithoutWasmd(); const client = new CosmWasmClient(wasmd.endpoint); - expect(await client.getNonce(unused.address)).toEqual({ + expect(await client.getSequence(unused.address)).toEqual({ accountNumber: unused.accountNumber, sequence: unused.sequence, }); @@ -119,7 +119,7 @@ describe("CosmWasmClient", () => { pendingWithoutWasmd(); const client = new CosmWasmClient(wasmd.endpoint); const missing = makeRandomAddress(); - await client.getNonce(missing).then( + await client.getSequence(missing).then( () => fail("this must not succeed"), (error) => expect(error).toMatch(/account does not exist on chain/i), ); @@ -233,7 +233,7 @@ describe("CosmWasmClient", () => { }; const chainId = await client.getChainId(); - const { accountNumber, sequence } = await client.getNonce(alice.address0); + const { accountNumber, sequence } = await client.getSequence(alice.address0); const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence); const signature = await wallet.sign(alice.address0, signBytes); const signedTx = { diff --git a/packages/cosmwasm/src/cosmwasmclient.ts b/packages/cosmwasm/src/cosmwasmclient.ts index 66bd2286..74a7b738 100644 --- a/packages/cosmwasm/src/cosmwasmclient.ts +++ b/packages/cosmwasm/src/cosmwasmclient.ts @@ -231,7 +231,7 @@ export class CosmWasmClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - public async getNonce(address: string): Promise { + public async getSequence(address: string): Promise { const account = await this.getAccount(address); if (!account) { throw new Error( diff --git a/packages/cosmwasm/src/signingcosmwasmclient.ts b/packages/cosmwasm/src/signingcosmwasmclient.ts index 35c0caea..59c18f75 100644 --- a/packages/cosmwasm/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm/src/signingcosmwasmclient.ts @@ -196,8 +196,8 @@ export class SigningCosmWasmClient extends CosmWasmClient { this.fees = { ...defaultFees, ...(customFees || {}) }; } - public async getNonce(address?: string): Promise { - return super.getNonce(address || this.senderAddress); + public async getSequence(address?: string): Promise { + return super.getSequence(address || this.senderAddress); } public async getAccount(address?: string): Promise { @@ -220,7 +220,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { }, }; const fee = this.fees.upload; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([storeCodeMsg], fee, chainId, memo, accountNumber, sequence); const signature = await this.signer.sign(this.senderAddress, signBytes); @@ -266,7 +266,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { }; const memo = options.memo || ""; const fee = this.fees.init; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([instantiateMsg], fee, chainId, memo, accountNumber, sequence); @@ -300,7 +300,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { }, }; const fee = this.fees.changeAdmin; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([updateAdminMsg], fee, chainId, memo, accountNumber, sequence); const signature = await this.signer.sign(this.senderAddress, signBytes); @@ -330,7 +330,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { }, }; const fee = this.fees.changeAdmin; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([clearAdminMsg], fee, chainId, memo, accountNumber, sequence); const signature = await this.signer.sign(this.senderAddress, signBytes); @@ -367,7 +367,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { }, }; const fee = this.fees.migrate; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([msg], fee, chainId, memo, accountNumber, sequence); const signature = await this.signer.sign(this.senderAddress, signBytes); @@ -404,7 +404,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { }, }; const fee = this.fees.exec; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([executeMsg], fee, chainId, memo, accountNumber, sequence); const signature = await this.signer.sign(this.senderAddress, signBytes); @@ -439,7 +439,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { }, }; const fee = this.fees.send; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence); const signature = await this.signer.sign(this.senderAddress, signBytes); diff --git a/packages/cosmwasm/types/cosmwasmclient.d.ts b/packages/cosmwasm/types/cosmwasmclient.d.ts index c72cdc17..6d7ed3c9 100644 --- a/packages/cosmwasm/types/cosmwasmclient.d.ts +++ b/packages/cosmwasm/types/cosmwasmclient.d.ts @@ -154,7 +154,7 @@ export declare class CosmWasmClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - getNonce(address: string): Promise; + getSequence(address: string): Promise; getAccount(address: string): Promise; /** * Gets block header and meta diff --git a/packages/cosmwasm/types/signingcosmwasmclient.d.ts b/packages/cosmwasm/types/signingcosmwasmclient.d.ts index 18949878..48e41358 100644 --- a/packages/cosmwasm/types/signingcosmwasmclient.d.ts +++ b/packages/cosmwasm/types/signingcosmwasmclient.d.ts @@ -104,7 +104,7 @@ export declare class SigningCosmWasmClient extends CosmWasmClient { customFees?: Partial, broadcastMode?: BroadcastMode, ); - getNonce(address?: string): Promise; + getSequence(address?: string): Promise; getAccount(address?: string): Promise; /** Uploads code and returns a receipt, including the code ID */ upload(wasmCode: Uint8Array, meta?: UploadMeta, memo?: string): Promise; diff --git a/packages/sdk38/src/cosmosclient.searchtx.spec.ts b/packages/sdk38/src/cosmosclient.searchtx.spec.ts index 82247d28..342db6e7 100644 --- a/packages/sdk38/src/cosmosclient.searchtx.spec.ts +++ b/packages/sdk38/src/cosmosclient.searchtx.spec.ts @@ -53,7 +53,7 @@ describe("CosmosClient.searchTx", () => { amount: coins(2000, "ucosm"), gas: "80000", // 80k }; - const { accountNumber, sequence } = await client.getNonce(); + const { accountNumber, sequence } = await client.getSequence(); const chainId = await client.getChainId(); const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence); const signature = await wallet.sign(walletAddress, signBytes); diff --git a/packages/sdk38/src/cosmosclient.spec.ts b/packages/sdk38/src/cosmosclient.spec.ts index 198b39fe..30e5d14c 100644 --- a/packages/sdk38/src/cosmosclient.spec.ts +++ b/packages/sdk38/src/cosmosclient.spec.ts @@ -94,11 +94,11 @@ describe("CosmosClient", () => { }); }); - describe("getNonce", () => { + describe("getSequence", () => { it("works", async () => { pendingWithoutWasmd(); const client = new CosmosClient(wasmd.endpoint); - expect(await client.getNonce(unused.address)).toEqual({ + expect(await client.getSequence(unused.address)).toEqual({ accountNumber: unused.accountNumber, sequence: unused.sequence, }); @@ -108,7 +108,7 @@ describe("CosmosClient", () => { pendingWithoutWasmd(); const client = new CosmosClient(wasmd.endpoint); const missing = makeRandomAddress(); - await client.getNonce(missing).then( + await client.getSequence(missing).then( () => fail("this must not succeed"), (error) => expect(error).toMatch(/account does not exist on chain/i), ); @@ -224,7 +224,7 @@ describe("CosmosClient", () => { }; const chainId = await client.getChainId(); - const { accountNumber, sequence } = await client.getNonce(faucet.address); + const { accountNumber, sequence } = await client.getSequence(faucet.address); const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence); const signature = await wallet.sign(walletAddress, signBytes); const signedTx = { diff --git a/packages/sdk38/src/cosmosclient.ts b/packages/sdk38/src/cosmosclient.ts index 0d977502..16cc4b2d 100644 --- a/packages/sdk38/src/cosmosclient.ts +++ b/packages/sdk38/src/cosmosclient.ts @@ -196,7 +196,7 @@ export class CosmosClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - public async getNonce(address: string): Promise { + public async getSequence(address: string): Promise { const account = await this.getAccount(address); if (!account) { throw new Error( diff --git a/packages/sdk38/src/lcdapi/distribution.spec.ts b/packages/sdk38/src/lcdapi/distribution.spec.ts index cfb8b3cd..e57c386e 100644 --- a/packages/sdk38/src/lcdapi/distribution.spec.ts +++ b/packages/sdk38/src/lcdapi/distribution.spec.ts @@ -45,7 +45,7 @@ describe("DistributionExtension", () => { }, }; const memo = "Test delegation for wasmd"; - const { accountNumber, sequence } = await client.getNonce(); + const { accountNumber, sequence } = await client.getSequence(); const signBytes = makeSignBytes([msg], defaultFee, chainId, memo, accountNumber, sequence); const signature = await wallet.sign(faucet.address, signBytes); const tx = { diff --git a/packages/sdk38/src/lcdapi/gov.spec.ts b/packages/sdk38/src/lcdapi/gov.spec.ts index 18ec60b1..ad379c45 100644 --- a/packages/sdk38/src/lcdapi/gov.spec.ts +++ b/packages/sdk38/src/lcdapi/gov.spec.ts @@ -49,7 +49,7 @@ describe("GovExtension", () => { }, }; const proposalMemo = "Test proposal for wasmd"; - const { accountNumber: proposalAccountNumber, sequence: proposalSequence } = await client.getNonce(); + const { accountNumber: proposalAccountNumber, sequence: proposalSequence } = await client.getSequence(); const proposalSignBytes = makeSignBytes( [proposalMsg], defaultFee, @@ -81,7 +81,7 @@ describe("GovExtension", () => { }, }; const voteMemo = "Test vote for wasmd"; - const { accountNumber: voteAccountNumber, sequence: voteSequence } = await client.getNonce(); + const { accountNumber: voteAccountNumber, sequence: voteSequence } = await client.getSequence(); const voteSignBytes = makeSignBytes( [voteMsg], defaultFee, diff --git a/packages/sdk38/src/lcdapi/lcdclient.spec.ts b/packages/sdk38/src/lcdapi/lcdclient.spec.ts index 04fa2d41..2bc4f263 100644 --- a/packages/sdk38/src/lcdapi/lcdclient.spec.ts +++ b/packages/sdk38/src/lcdapi/lcdclient.spec.ts @@ -261,7 +261,7 @@ describe("LcdClient", () => { ], gas: "80000", // 80k }; - const { accountNumber, sequence } = await client.getNonce(); + const { accountNumber, sequence } = await client.getSequence(); const chainId = await client.getChainId(); const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence); const signature = await wallet.sign(walletAddress, signBytes); diff --git a/packages/sdk38/src/signingcosmosclient.ts b/packages/sdk38/src/signingcosmosclient.ts index 50cc3496..00a8cfa8 100644 --- a/packages/sdk38/src/signingcosmosclient.ts +++ b/packages/sdk38/src/signingcosmosclient.ts @@ -66,8 +66,8 @@ export class SigningCosmosClient extends CosmosClient { this.fees = { ...defaultFees, ...(customFees || {}) }; } - public async getNonce(address?: string): Promise { - return super.getNonce(address || this.senderAddress); + public async getSequence(address?: string): Promise { + return super.getSequence(address || this.senderAddress); } public async getAccount(address?: string): Promise { @@ -88,7 +88,7 @@ export class SigningCosmosClient extends CosmosClient { }, }; const fee = this.fees.send; - const { accountNumber, sequence } = await this.getNonce(); + const { accountNumber, sequence } = await this.getSequence(); const chainId = await this.getChainId(); const signBytes = makeSignBytes([sendMsg], fee, chainId, memo, accountNumber, sequence); const signature = await this.signer.sign(this.senderAddress, signBytes); diff --git a/packages/sdk38/types/cosmosclient.d.ts b/packages/sdk38/types/cosmosclient.d.ts index 5ce6b60c..a8af386b 100644 --- a/packages/sdk38/types/cosmosclient.d.ts +++ b/packages/sdk38/types/cosmosclient.d.ts @@ -124,7 +124,7 @@ export declare class CosmosClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - getNonce(address: string): Promise; + getSequence(address: string): Promise; getAccount(address: string): Promise; /** * Gets block header and meta diff --git a/packages/sdk38/types/signingcosmosclient.d.ts b/packages/sdk38/types/signingcosmosclient.d.ts index 616b3e25..0faecda5 100644 --- a/packages/sdk38/types/signingcosmosclient.d.ts +++ b/packages/sdk38/types/signingcosmosclient.d.ts @@ -32,7 +32,7 @@ export declare class SigningCosmosClient extends CosmosClient { customFees?: Partial, broadcastMode?: BroadcastMode, ); - getNonce(address?: string): Promise; + getSequence(address?: string): Promise; getAccount(address?: string): Promise; sendTokens(recipientAddress: string, transferAmount: readonly Coin[], memo?: string): Promise; } From 96d6c4e120a3e98722554cc8f72acd7d36565a41 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 22 Jul 2020 13:27:16 +0200 Subject: [PATCH 2/3] sdk38: Rename GetNonceResult -> GetSequenceResult --- packages/cli/src/cli.ts | 2 +- packages/cosmwasm/src/cosmwasmclient.ts | 4 ++-- packages/cosmwasm/src/index.ts | 2 +- packages/cosmwasm/src/signingcosmwasmclient.ts | 4 ++-- packages/cosmwasm/types/cosmwasmclient.d.ts | 4 ++-- packages/cosmwasm/types/index.d.ts | 2 +- packages/cosmwasm/types/signingcosmwasmclient.d.ts | 4 ++-- packages/sdk38/src/cosmosclient.ts | 4 ++-- packages/sdk38/src/index.ts | 2 +- packages/sdk38/src/signingcosmosclient.ts | 4 ++-- packages/sdk38/types/cosmosclient.d.ts | 4 ++-- packages/sdk38/types/index.d.ts | 2 +- packages/sdk38/types/signingcosmosclient.d.ts | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts index 41c4474a..cb53e7b9 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -41,7 +41,7 @@ export function main(originalArgs: readonly string[]): void { "Contract", "ContractDetails", "CosmWasmClient", - "GetNonceResult", + "GetSequenceResult", "PostTxResult", "SearchByHeightQuery", "SearchByIdQuery", diff --git a/packages/cosmwasm/src/cosmwasmclient.ts b/packages/cosmwasm/src/cosmwasmclient.ts index 74a7b738..d7e458d9 100644 --- a/packages/cosmwasm/src/cosmwasmclient.ts +++ b/packages/cosmwasm/src/cosmwasmclient.ts @@ -18,7 +18,7 @@ import { setupWasmExtension, WasmExtension } from "./lcdapi/wasm"; import { Log, parseLogs } from "./logs"; import { JsonObject } from "./types"; -export interface GetNonceResult { +export interface GetSequenceResult { readonly accountNumber: number; readonly sequence: number; } @@ -231,7 +231,7 @@ export class CosmWasmClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - public async getSequence(address: string): Promise { + public async getSequence(address: string): Promise { const account = await this.getAccount(address); if (!account) { throw new Error( diff --git a/packages/cosmwasm/src/index.ts b/packages/cosmwasm/src/index.ts index 8613a66a..40161f60 100644 --- a/packages/cosmwasm/src/index.ts +++ b/packages/cosmwasm/src/index.ts @@ -11,7 +11,7 @@ export { Contract, ContractDetails, CosmWasmClient, - GetNonceResult, + GetSequenceResult, PostTxResult, SearchByHeightQuery, SearchByIdQuery, diff --git a/packages/cosmwasm/src/signingcosmwasmclient.ts b/packages/cosmwasm/src/signingcosmwasmclient.ts index 59c18f75..175176f6 100644 --- a/packages/cosmwasm/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm/src/signingcosmwasmclient.ts @@ -19,7 +19,7 @@ import { isValidBuilder } from "./builder"; import { Account, CosmWasmClient, - GetNonceResult, + GetSequenceResult, isPostTxFailure, PostTxFailure, PostTxResult, @@ -196,7 +196,7 @@ export class SigningCosmWasmClient extends CosmWasmClient { this.fees = { ...defaultFees, ...(customFees || {}) }; } - public async getSequence(address?: string): Promise { + public async getSequence(address?: string): Promise { return super.getSequence(address || this.senderAddress); } diff --git a/packages/cosmwasm/types/cosmwasmclient.d.ts b/packages/cosmwasm/types/cosmwasmclient.d.ts index 6d7ed3c9..ac245804 100644 --- a/packages/cosmwasm/types/cosmwasmclient.d.ts +++ b/packages/cosmwasm/types/cosmwasmclient.d.ts @@ -11,7 +11,7 @@ import { import { WasmExtension } from "./lcdapi/wasm"; import { Log } from "./logs"; import { JsonObject } from "./types"; -export interface GetNonceResult { +export interface GetSequenceResult { readonly accountNumber: number; readonly sequence: number; } @@ -154,7 +154,7 @@ export declare class CosmWasmClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - getSequence(address: string): Promise; + getSequence(address: string): Promise; getAccount(address: string): Promise; /** * Gets block header and meta diff --git a/packages/cosmwasm/types/index.d.ts b/packages/cosmwasm/types/index.d.ts index 6a9a884b..a6406556 100644 --- a/packages/cosmwasm/types/index.d.ts +++ b/packages/cosmwasm/types/index.d.ts @@ -10,7 +10,7 @@ export { Contract, ContractDetails, CosmWasmClient, - GetNonceResult, + GetSequenceResult, PostTxResult, SearchByHeightQuery, SearchByIdQuery, diff --git a/packages/cosmwasm/types/signingcosmwasmclient.d.ts b/packages/cosmwasm/types/signingcosmwasmclient.d.ts index 48e41358..6825aaa5 100644 --- a/packages/cosmwasm/types/signingcosmwasmclient.d.ts +++ b/packages/cosmwasm/types/signingcosmwasmclient.d.ts @@ -1,5 +1,5 @@ import { BroadcastMode, Coin, OfflineSigner, StdFee, StdSignature } from "@cosmjs/sdk38"; -import { Account, CosmWasmClient, GetNonceResult, PostTxResult } from "./cosmwasmclient"; +import { Account, CosmWasmClient, GetSequenceResult, PostTxResult } from "./cosmwasmclient"; import { Log } from "./logs"; export interface SigningCallback { (signBytes: Uint8Array): Promise; @@ -104,7 +104,7 @@ export declare class SigningCosmWasmClient extends CosmWasmClient { customFees?: Partial, broadcastMode?: BroadcastMode, ); - getSequence(address?: string): Promise; + getSequence(address?: string): Promise; getAccount(address?: string): Promise; /** Uploads code and returns a receipt, including the code ID */ upload(wasmCode: Uint8Array, meta?: UploadMeta, memo?: string): Promise; diff --git a/packages/sdk38/src/cosmosclient.ts b/packages/sdk38/src/cosmosclient.ts index 16cc4b2d..7f7ec04d 100644 --- a/packages/sdk38/src/cosmosclient.ts +++ b/packages/sdk38/src/cosmosclient.ts @@ -8,7 +8,7 @@ import { Log, parseLogs } from "./logs"; import { decodeBech32Pubkey } from "./pubkey"; import { CosmosSdkTx, PubKey, StdTx } from "./types"; -export interface GetNonceResult { +export interface GetSequenceResult { readonly accountNumber: number; readonly sequence: number; } @@ -196,7 +196,7 @@ export class CosmosClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - public async getSequence(address: string): Promise { + public async getSequence(address: string): Promise { const account = await this.getAccount(address); if (!account) { throw new Error( diff --git a/packages/sdk38/src/index.ts b/packages/sdk38/src/index.ts index 1032a86f..ff94bed9 100644 --- a/packages/sdk38/src/index.ts +++ b/packages/sdk38/src/index.ts @@ -9,7 +9,7 @@ export { Block, BlockHeader, CosmosClient, - GetNonceResult, + GetSequenceResult, IndexedTx, PostTxResult, SearchByHeightQuery, diff --git a/packages/sdk38/src/signingcosmosclient.ts b/packages/sdk38/src/signingcosmosclient.ts index 00a8cfa8..23f0013b 100644 --- a/packages/sdk38/src/signingcosmosclient.ts +++ b/packages/sdk38/src/signingcosmosclient.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { Coin, coins } from "./coins"; -import { Account, CosmosClient, GetNonceResult, PostTxResult } from "./cosmosclient"; +import { Account, CosmosClient, GetSequenceResult, PostTxResult } from "./cosmosclient"; import { makeSignBytes } from "./encoding"; import { BroadcastMode } from "./lcdapi"; import { MsgSend } from "./msgs"; @@ -66,7 +66,7 @@ export class SigningCosmosClient extends CosmosClient { this.fees = { ...defaultFees, ...(customFees || {}) }; } - public async getSequence(address?: string): Promise { + public async getSequence(address?: string): Promise { return super.getSequence(address || this.senderAddress); } diff --git a/packages/sdk38/types/cosmosclient.d.ts b/packages/sdk38/types/cosmosclient.d.ts index a8af386b..57879a30 100644 --- a/packages/sdk38/types/cosmosclient.d.ts +++ b/packages/sdk38/types/cosmosclient.d.ts @@ -2,7 +2,7 @@ import { Coin } from "./coins"; import { AuthExtension, BroadcastMode, LcdClient } from "./lcdapi"; import { Log } from "./logs"; import { CosmosSdkTx, PubKey, StdTx } from "./types"; -export interface GetNonceResult { +export interface GetSequenceResult { readonly accountNumber: number; readonly sequence: number; } @@ -124,7 +124,7 @@ export declare class CosmosClient { * * @param address returns data for this address. When unset, the client's sender adddress is used. */ - getSequence(address: string): Promise; + getSequence(address: string): Promise; getAccount(address: string): Promise; /** * Gets block header and meta diff --git a/packages/sdk38/types/index.d.ts b/packages/sdk38/types/index.d.ts index 12f5c1a6..07e7a554 100644 --- a/packages/sdk38/types/index.d.ts +++ b/packages/sdk38/types/index.d.ts @@ -7,7 +7,7 @@ export { Block, BlockHeader, CosmosClient, - GetNonceResult, + GetSequenceResult, IndexedTx, PostTxResult, SearchByHeightQuery, diff --git a/packages/sdk38/types/signingcosmosclient.d.ts b/packages/sdk38/types/signingcosmosclient.d.ts index 0faecda5..410e12db 100644 --- a/packages/sdk38/types/signingcosmosclient.d.ts +++ b/packages/sdk38/types/signingcosmosclient.d.ts @@ -1,5 +1,5 @@ import { Coin } from "./coins"; -import { Account, CosmosClient, GetNonceResult, PostTxResult } from "./cosmosclient"; +import { Account, CosmosClient, GetSequenceResult, PostTxResult } from "./cosmosclient"; import { BroadcastMode } from "./lcdapi"; import { StdFee } from "./types"; import { OfflineSigner } from "./wallet"; @@ -32,7 +32,7 @@ export declare class SigningCosmosClient extends CosmosClient { customFees?: Partial, broadcastMode?: BroadcastMode, ); - getSequence(address?: string): Promise; + getSequence(address?: string): Promise; getAccount(address?: string): Promise; sendTokens(recipientAddress: string, transferAmount: readonly Coin[], memo?: string): Promise; } From 9500a2ac1bd36b0fc3042ad308f497f8a6988984 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 22 Jul 2020 13:30:40 +0200 Subject: [PATCH 3/3] sdk38: Update documentation for getNonce renaming --- packages/cosmwasm/src/cosmwasmclient.ts | 2 +- packages/sdk38/src/cosmosclient.ts | 2 +- scripts/wasmd/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cosmwasm/src/cosmwasmclient.ts b/packages/cosmwasm/src/cosmwasmclient.ts index d7e458d9..b22f6b94 100644 --- a/packages/cosmwasm/src/cosmwasmclient.ts +++ b/packages/cosmwasm/src/cosmwasmclient.ts @@ -235,7 +235,7 @@ export class CosmWasmClient { const account = await this.getAccount(address); if (!account) { throw new Error( - "Account does not exist on chain. Send some tokens there before trying to query nonces.", + "Account does not exist on chain. Send some tokens there before trying to query sequence.", ); } return { diff --git a/packages/sdk38/src/cosmosclient.ts b/packages/sdk38/src/cosmosclient.ts index 7f7ec04d..a447f1b9 100644 --- a/packages/sdk38/src/cosmosclient.ts +++ b/packages/sdk38/src/cosmosclient.ts @@ -200,7 +200,7 @@ export class CosmosClient { const account = await this.getAccount(address); if (!account) { throw new Error( - "Account does not exist on chain. Send some tokens there before trying to query nonces.", + "Account does not exist on chain. Send some tokens there before trying to query sequence.", ); } return { diff --git a/scripts/wasmd/README.md b/scripts/wasmd/README.md index 89867154..2f8721e8 100644 --- a/scripts/wasmd/README.md +++ b/scripts/wasmd/README.md @@ -118,7 +118,7 @@ You should get output matching the following: Pubkey 2: A6e9ElvKaM0DKWh1bIdK3bgB14dyEDgIXYMA0Lbs1GoQ
Pubkey 3: AkAK5PQaucieWMb0+tTRY01feYI+upRnoNK556eD0Ibb
Pubkey 4: A5HMVEAJsupdQWItbZv5Z1xZifDixQi6tjU/hJpZY1bF -4. **Unused**: for testing account state; this account never changes balances or nonces
+4. **Unused**: for testing account state; this account never changes balances or sequences
oyster design unusual machine spread century engine gravity focus cave carry slot
ArkCaFUJ/IH+vKBmNRCdUVl3mCAhbopk9jjW4Ko4OfRQ
cosmos1cjsxept9rkggzxztslae9ndgpdyt2408lk850u