diff --git a/packages/ledger-amino/src/demo/node.ts b/packages/ledger-amino/src/demo/node.ts index 396a0814..7ab4a689 100644 --- a/packages/ledger-amino/src/demo/node.ts +++ b/packages/ledger-amino/src/demo/node.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import { makeCosmoshubPath, makeSignDoc, StdFee, StdSignature } from "@cosmjs/amino"; import { toBase64 } from "@cosmjs/encoding"; -import { makeCosmoshubPath, makeSignDoc, StdFee, StdSignature } from "@cosmjs/launchpad"; import TransportNodeHid from "@ledgerhq/hw-transport-node-hid"; import { LedgerSigner } from "../ledgersigner"; diff --git a/packages/ledger-amino/src/demo/web.ts b/packages/ledger-amino/src/demo/web.ts index cc8fa459..028b0f11 100644 --- a/packages/ledger-amino/src/demo/web.ts +++ b/packages/ledger-amino/src/demo/web.ts @@ -1,5 +1,5 @@ +import { AccountData, makeCosmoshubPath, StdSignDoc } from "@cosmjs/amino"; import { toBase64 } from "@cosmjs/encoding"; -import { AccountData, makeCosmoshubPath, StdSignDoc } from "@cosmjs/launchpad"; import { Uint53 } from "@cosmjs/math"; import { assert } from "@cosmjs/utils"; import TransportWebUSB from "@ledgerhq/hw-transport-webusb"; diff --git a/packages/ledger-amino/src/launchpadledger.ts b/packages/ledger-amino/src/launchpadledger.ts index a3f42e27..01eb512a 100644 --- a/packages/ledger-amino/src/launchpadledger.ts +++ b/packages/ledger-amino/src/launchpadledger.ts @@ -1,6 +1,6 @@ +import { makeCosmoshubPath } from "@cosmjs/amino"; import { HdPath, Secp256k1Signature } from "@cosmjs/crypto"; import { fromUtf8 } from "@cosmjs/encoding"; -import { makeCosmoshubPath } from "@cosmjs/launchpad"; import { assert } from "@cosmjs/utils"; import Transport from "@ledgerhq/hw-transport"; import CosmosApp, { diff --git a/packages/ledger-amino/src/ledgersigner.spec.ts b/packages/ledger-amino/src/ledgersigner.spec.ts index 53be6c16..c3883d47 100644 --- a/packages/ledger-amino/src/ledgersigner.spec.ts +++ b/packages/ledger-amino/src/ledgersigner.spec.ts @@ -1,16 +1,18 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import { + AminoMsg, + coins, + makeCosmoshubPath, + makeSignDoc, + Secp256k1HdWallet, + serializeSignDoc, + StdFee, +} from "@cosmjs/amino"; import { Secp256k1, Secp256k1Signature, sha256 } from "@cosmjs/crypto"; import { fromBase64 } from "@cosmjs/encoding"; import { assertIsBroadcastTxSuccess as assertIsBroadcastTxSuccessLaunchpad, - coins, - makeCosmoshubPath, - makeSignDoc, - Msg, - Secp256k1HdWallet, - serializeSignDoc, SigningCosmosClient, - StdFee, } from "@cosmjs/launchpad"; import { assertIsBroadcastTxSuccess as assertIsBroadcastTxSuccessStargate, @@ -131,7 +133,7 @@ describe("LedgerSigner", () => { const [firstAccount] = await signer.getAccounts(); - const msgs: readonly Msg[] = [ + const msgs: readonly AminoMsg[] = [ { type: "cosmos-sdk/MsgSend", value: { diff --git a/packages/ledger-amino/src/ledgersigner.ts b/packages/ledger-amino/src/ledgersigner.ts index 464842b7..dc3cd0d8 100644 --- a/packages/ledger-amino/src/ledgersigner.ts +++ b/packages/ledger-amino/src/ledgersigner.ts @@ -1,17 +1,18 @@ -import { HdPath } from "@cosmjs/crypto"; import { AccountData, + AminoSignResponse, encodeSecp256k1Signature, makeCosmoshubPath, - OfflineSigner, + OfflineAminoSigner, + serializeSignDoc, StdSignDoc, -} from "@cosmjs/launchpad"; -import { AminoSignResponse, serializeSignDoc } from "@cosmjs/launchpad"; +} from "@cosmjs/amino"; +import { HdPath } from "@cosmjs/crypto"; import Transport from "@ledgerhq/hw-transport"; import { LaunchpadLedger, LaunchpadLedgerOptions } from "./launchpadledger"; -export class LedgerSigner implements OfflineSigner { +export class LedgerSigner implements OfflineAminoSigner { private readonly ledger: LaunchpadLedger; private readonly hdPaths: readonly HdPath[]; private accounts?: readonly AccountData[];