diff --git a/packages/amino/src/index.ts b/packages/amino/src/index.ts index 28b4d9e5..340fd598 100644 --- a/packages/amino/src/index.ts +++ b/packages/amino/src/index.ts @@ -19,3 +19,4 @@ export { pubkeyType, } from "./pubkeys"; export { createMultisigThresholdPubkey } from "./multisig"; +export { decodeSignature, encodeSecp256k1Signature, StdSignature } from "./signature"; diff --git a/packages/launchpad/src/signature.spec.ts b/packages/amino/src/signature.spec.ts similarity index 95% rename from packages/launchpad/src/signature.spec.ts rename to packages/amino/src/signature.spec.ts index dd1d6a38..d9cd1ad5 100644 --- a/packages/launchpad/src/signature.spec.ts +++ b/packages/amino/src/signature.spec.ts @@ -1,8 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { fromBase64 } from "@cosmjs/encoding"; -import { decodeSignature, encodeSecp256k1Signature } from "./signature"; -import { StdSignature } from "./types"; +import { decodeSignature, encodeSecp256k1Signature, StdSignature } from "./signature"; describe("signature", () => { describe("encodeSecp256k1Signature", () => { diff --git a/packages/launchpad/src/signature.ts b/packages/amino/src/signature.ts similarity index 86% rename from packages/launchpad/src/signature.ts rename to packages/amino/src/signature.ts index 15f37f00..280653a2 100644 --- a/packages/launchpad/src/signature.ts +++ b/packages/amino/src/signature.ts @@ -1,8 +1,13 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { encodeSecp256k1Pubkey, pubkeyType } from "@cosmjs/amino"; import { fromBase64, toBase64 } from "@cosmjs/encoding"; -import { StdSignature } from "./types"; +import { encodeSecp256k1Pubkey } from "./encoding"; +import { Pubkey, pubkeyType } from "./pubkeys"; + +export interface StdSignature { + readonly pub_key: Pubkey; + readonly signature: string; +} /** * Takes a binary pubkey and signature to create a signature object diff --git a/packages/launchpad/src/index.ts b/packages/launchpad/src/index.ts index 14db51fa..d97792e4 100644 --- a/packages/launchpad/src/index.ts +++ b/packages/launchpad/src/index.ts @@ -2,11 +2,14 @@ export { decodeAminoPubkey, decodeBech32Pubkey, + decodeSignature, encodeAminoPubkey, encodeBech32Pubkey, encodeSecp256k1Pubkey, + encodeSecp256k1Signature, pubkeyToAddress, pubkeyType, + StdSignature, } from "@cosmjs/amino"; import { SinglePubkey } from "@cosmjs/amino"; /** @deprecated PubKey is deprecated. Use `SinglePubkey` or the more general `Pubkey` from `@cosmjs/amino`. */ @@ -139,11 +142,10 @@ export { } from "./msgs"; export { makeCosmoshubPath } from "./paths"; export { findSequenceForSignedTx } from "./sequence"; -export { encodeSecp256k1Signature, decodeSignature } from "./signature"; export { AccountData, Algo, AminoSignResponse, OfflineSigner } from "./signer"; export { CosmosFeeTable, SigningCosmosClient } from "./signingcosmosclient"; export { isStdTx, isWrappedStdTx, makeStdTx, CosmosSdkTx, StdTx, WrappedStdTx, WrappedTx } from "./tx"; -export { StdFee, StdSignature } from "./types"; +export { StdFee } from "./types"; export { executeKdf, KdfConfiguration } from "./wallet"; export { extractKdfConfiguration, Secp256k1HdWallet } from "./secp256k1hdwallet"; export { Secp256k1Wallet } from "./secp256k1wallet"; diff --git a/packages/launchpad/src/secp256k1hdwallet.ts b/packages/launchpad/src/secp256k1hdwallet.ts index fa7d8b9c..38e29a43 100644 --- a/packages/launchpad/src/secp256k1hdwallet.ts +++ b/packages/launchpad/src/secp256k1hdwallet.ts @@ -1,4 +1,4 @@ -import { rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; +import { encodeSecp256k1Signature, rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; import { Bip39, EnglishMnemonic, @@ -16,7 +16,6 @@ import { assert, isNonNullObject } from "@cosmjs/utils"; import { serializeSignDoc, StdSignDoc } from "./encoding"; import { makeCosmoshubPath } from "./paths"; -import { encodeSecp256k1Signature } from "./signature"; import { AccountData, AminoSignResponse, OfflineSigner } from "./signer"; import { decrypt, diff --git a/packages/launchpad/src/secp256k1wallet.ts b/packages/launchpad/src/secp256k1wallet.ts index 94552d84..247ba3d1 100644 --- a/packages/launchpad/src/secp256k1wallet.ts +++ b/packages/launchpad/src/secp256k1wallet.ts @@ -1,9 +1,8 @@ -import { rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; +import { encodeSecp256k1Signature, rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; import { Secp256k1, Sha256 } from "@cosmjs/crypto"; import { Bech32 } from "@cosmjs/encoding"; import { serializeSignDoc, StdSignDoc } from "./encoding"; -import { encodeSecp256k1Signature } from "./signature"; import { AccountData, AminoSignResponse, OfflineSigner } from "./signer"; /** diff --git a/packages/launchpad/src/sequence.ts b/packages/launchpad/src/sequence.ts index 3ed14221..c833107a 100644 --- a/packages/launchpad/src/sequence.ts +++ b/packages/launchpad/src/sequence.ts @@ -1,7 +1,7 @@ +import { decodeSignature } from "@cosmjs/amino"; import { Secp256k1, Secp256k1Signature, sha256 } from "@cosmjs/crypto"; import { makeSignDoc, serializeSignDoc } from "./encoding"; -import { decodeSignature } from "./signature"; import { WrappedStdTx } from "./tx"; /** diff --git a/packages/launchpad/src/signer.ts b/packages/launchpad/src/signer.ts index 57b9829c..a2f25eb1 100644 --- a/packages/launchpad/src/signer.ts +++ b/packages/launchpad/src/signer.ts @@ -1,5 +1,6 @@ +import { StdSignature } from "@cosmjs/amino"; + import { StdSignDoc } from "./encoding"; -import { StdSignature } from "./types"; export type Algo = "secp256k1" | "ed25519" | "sr25519"; diff --git a/packages/launchpad/src/tx.spec.ts b/packages/launchpad/src/tx.spec.ts index 21bf834f..848c0c56 100644 --- a/packages/launchpad/src/tx.spec.ts +++ b/packages/launchpad/src/tx.spec.ts @@ -1,8 +1,10 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import { StdSignature } from "@cosmjs/amino"; + import { coins } from "./coins"; import { makeSignDoc } from "./encoding"; import { makeStdTx } from "./tx"; -import { StdFee, StdSignature } from "./types"; +import { StdFee } from "./types"; describe("tx", () => { describe("makeStdTx", () => { diff --git a/packages/launchpad/src/tx.ts b/packages/launchpad/src/tx.ts index a466c9f4..e88ab00f 100644 --- a/packages/launchpad/src/tx.ts +++ b/packages/launchpad/src/tx.ts @@ -1,6 +1,8 @@ +import { StdSignature } from "@cosmjs/amino"; + import { StdSignDoc } from "./encoding"; import { Msg } from "./msgs"; -import { StdFee, StdSignature } from "./types"; +import { StdFee } from "./types"; /** * A Cosmos SDK StdTx diff --git a/packages/launchpad/src/types.ts b/packages/launchpad/src/types.ts index bb674bc1..91fc04c0 100644 --- a/packages/launchpad/src/types.ts +++ b/packages/launchpad/src/types.ts @@ -1,14 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { Pubkey } from "@cosmjs/amino"; - import { Coin } from "./coins"; export interface StdFee { readonly amount: readonly Coin[]; readonly gas: string; } - -export interface StdSignature { - readonly pub_key: Pubkey; - readonly signature: string; -} diff --git a/packages/proto-signing/src/directsecp256k1hdwallet.spec.ts b/packages/proto-signing/src/directsecp256k1hdwallet.spec.ts index c13e2434..59b86612 100644 --- a/packages/proto-signing/src/directsecp256k1hdwallet.spec.ts +++ b/packages/proto-signing/src/directsecp256k1hdwallet.spec.ts @@ -1,7 +1,7 @@ import { Secp256k1, Secp256k1Signature, sha256 } from "@cosmjs/crypto"; import { fromBase64, fromHex } from "@cosmjs/encoding"; -import { coins } from "@cosmjs/launchpad"; +import { coins } from "./coins"; import { DirectSecp256k1HdWallet } from "./directsecp256k1hdwallet"; import { makeAuthInfoBytes, makeSignBytes, makeSignDoc } from "./signing"; import { faucet, testVectors } from "./testutils.spec"; diff --git a/packages/proto-signing/src/directsecp256k1hdwallet.ts b/packages/proto-signing/src/directsecp256k1hdwallet.ts index cfdbc8c4..0a3f02cf 100644 --- a/packages/proto-signing/src/directsecp256k1hdwallet.ts +++ b/packages/proto-signing/src/directsecp256k1hdwallet.ts @@ -1,4 +1,4 @@ -import { rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; +import { encodeSecp256k1Signature, rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; import { Bip39, EnglishMnemonic, @@ -10,7 +10,6 @@ import { Slip10Curve, } from "@cosmjs/crypto"; import { Bech32 } from "@cosmjs/encoding"; -import { encodeSecp256k1Signature } from "@cosmjs/launchpad"; import { SignDoc } from "./codec/cosmos/tx/v1beta1/tx"; import { makeCosmoshubPath } from "./paths"; diff --git a/packages/proto-signing/src/directsecp256k1wallet.spec.ts b/packages/proto-signing/src/directsecp256k1wallet.spec.ts index 40e0773f..a90d123c 100644 --- a/packages/proto-signing/src/directsecp256k1wallet.spec.ts +++ b/packages/proto-signing/src/directsecp256k1wallet.spec.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { Secp256k1, Secp256k1Signature, sha256 } from "@cosmjs/crypto"; import { fromBase64, fromHex } from "@cosmjs/encoding"; -import { coins } from "@cosmjs/launchpad"; +import { coins } from "./coins"; import { DirectSecp256k1Wallet } from "./directsecp256k1wallet"; import { makeAuthInfoBytes, makeSignBytes, makeSignDoc } from "./signing"; import { testVectors } from "./testutils.spec"; diff --git a/packages/proto-signing/src/directsecp256k1wallet.ts b/packages/proto-signing/src/directsecp256k1wallet.ts index 9207d9c6..2193bf61 100644 --- a/packages/proto-signing/src/directsecp256k1wallet.ts +++ b/packages/proto-signing/src/directsecp256k1wallet.ts @@ -1,7 +1,6 @@ -import { rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; +import { encodeSecp256k1Signature, rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; import { Secp256k1, sha256 } from "@cosmjs/crypto"; import { Bech32 } from "@cosmjs/encoding"; -import { encodeSecp256k1Signature } from "@cosmjs/launchpad"; import { SignDoc } from "./codec/cosmos/tx/v1beta1/tx"; import { AccountData, DirectSignResponse, OfflineDirectSigner } from "./signer"; diff --git a/packages/proto-signing/src/signer.ts b/packages/proto-signing/src/signer.ts index 072f3255..65b6e6ab 100644 --- a/packages/proto-signing/src/signer.ts +++ b/packages/proto-signing/src/signer.ts @@ -1,4 +1,5 @@ -import { OfflineSigner as OfflineAminoSigner, StdSignature } from "@cosmjs/launchpad"; +import { StdSignature } from "@cosmjs/amino"; +import { OfflineSigner as OfflineAminoSigner } from "@cosmjs/launchpad"; import { SignDoc } from "./codec/cosmos/tx/v1beta1/tx";