From b843b0b75104d2f98140cd192fc457834e782226 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Thu, 3 Jun 2021 13:15:44 +0200 Subject: [PATCH] proto-signing: Use cosmjs-types --- packages/proto-signing/src/decode.ts | 2 +- packages/proto-signing/src/directsecp256k1hdwallet.ts | 2 +- packages/proto-signing/src/directsecp256k1wallet.ts | 2 +- packages/proto-signing/src/pubkey.spec.ts | 2 +- packages/proto-signing/src/pubkey.ts | 7 +++---- packages/proto-signing/src/registry.spec.ts | 6 +++--- packages/proto-signing/src/registry.ts | 9 ++++----- packages/proto-signing/src/signer.ts | 3 +-- packages/proto-signing/src/signing.spec.ts | 4 ++-- packages/proto-signing/src/signing.ts | 9 ++++----- 10 files changed, 21 insertions(+), 25 deletions(-) diff --git a/packages/proto-signing/src/decode.ts b/packages/proto-signing/src/decode.ts index e55906a3..c3b8a965 100644 --- a/packages/proto-signing/src/decode.ts +++ b/packages/proto-signing/src/decode.ts @@ -1,4 +1,4 @@ -import { AuthInfo, TxBody, TxRaw } from "./codec/cosmos/tx/v1beta1/tx"; +import { AuthInfo, TxBody, TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx"; export interface DecodedTxRaw { readonly authInfo: AuthInfo; diff --git a/packages/proto-signing/src/directsecp256k1hdwallet.ts b/packages/proto-signing/src/directsecp256k1hdwallet.ts index d2dac3cf..2c280749 100644 --- a/packages/proto-signing/src/directsecp256k1hdwallet.ts +++ b/packages/proto-signing/src/directsecp256k1hdwallet.ts @@ -14,8 +14,8 @@ import { } from "@cosmjs/crypto"; import { Bech32, fromBase64, fromUtf8, toBase64, toUtf8 } from "@cosmjs/encoding"; import { assert, isNonNullObject } from "@cosmjs/utils/build"; +import { SignDoc } from "cosmjs-types/cosmos/tx/v1beta1/tx"; -import { SignDoc } from "./codec/cosmos/tx/v1beta1/tx"; import { AccountData, DirectSignResponse, OfflineDirectSigner } from "./signer"; import { makeSignBytes } from "./signing"; import { diff --git a/packages/proto-signing/src/directsecp256k1wallet.ts b/packages/proto-signing/src/directsecp256k1wallet.ts index 2193bf61..2f8bdd2b 100644 --- a/packages/proto-signing/src/directsecp256k1wallet.ts +++ b/packages/proto-signing/src/directsecp256k1wallet.ts @@ -1,8 +1,8 @@ import { encodeSecp256k1Signature, rawSecp256k1PubkeyToRawAddress } from "@cosmjs/amino"; import { Secp256k1, sha256 } from "@cosmjs/crypto"; import { Bech32 } from "@cosmjs/encoding"; +import { SignDoc } from "cosmjs-types/cosmos/tx/v1beta1/tx"; -import { SignDoc } from "./codec/cosmos/tx/v1beta1/tx"; import { AccountData, DirectSignResponse, OfflineDirectSigner } from "./signer"; import { makeSignBytes } from "./signing"; diff --git a/packages/proto-signing/src/pubkey.spec.ts b/packages/proto-signing/src/pubkey.spec.ts index 1f5fa27e..fe7f9d56 100644 --- a/packages/proto-signing/src/pubkey.spec.ts +++ b/packages/proto-signing/src/pubkey.spec.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { fromBase64 } from "@cosmjs/encoding"; +import { Any } from "cosmjs-types/google/protobuf/any"; -import { Any } from "./codec/google/protobuf/any"; import { decodePubkey, encodePubkey } from "./pubkey"; describe("pubkey", () => { diff --git a/packages/proto-signing/src/pubkey.ts b/packages/proto-signing/src/pubkey.ts index b04c1673..9af1af61 100644 --- a/packages/proto-signing/src/pubkey.ts +++ b/packages/proto-signing/src/pubkey.ts @@ -9,10 +9,9 @@ import { } from "@cosmjs/amino"; import { fromBase64 } from "@cosmjs/encoding"; import { Uint53 } from "@cosmjs/math"; - -import { LegacyAminoPubKey } from "./codec/cosmos/crypto/multisig/keys"; -import { PubKey } from "./codec/cosmos/crypto/secp256k1/keys"; -import { Any } from "./codec/google/protobuf/any"; +import { LegacyAminoPubKey } from "cosmjs-types/cosmos/crypto/multisig/keys"; +import { PubKey } from "cosmjs-types/cosmos/crypto/secp256k1/keys"; +import { Any } from "cosmjs-types/google/protobuf/any"; export function encodePubkey(pubkey: Pubkey): Any { if (isSecp256k1Pubkey(pubkey)) { diff --git a/packages/proto-signing/src/registry.spec.ts b/packages/proto-signing/src/registry.spec.ts index d4622092..ae32381a 100644 --- a/packages/proto-signing/src/registry.spec.ts +++ b/packages/proto-signing/src/registry.spec.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { fromHex } from "@cosmjs/encoding"; import { assert } from "@cosmjs/utils"; +import { MsgSend as IMsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx"; +import { TxBody } from "cosmjs-types/cosmos/tx/v1beta1/tx"; +import { Any } from "cosmjs-types/google/protobuf/any"; import Long from "long"; import { Field, Type } from "protobufjs"; -import { MsgSend as IMsgSend } from "./codec/cosmos/bank/v1beta1/tx"; -import { TxBody } from "./codec/cosmos/tx/v1beta1/tx"; -import { Any } from "./codec/google/protobuf/any"; import { isPbjsGeneratedType, isTsProtoGeneratedType, Registry } from "./registry"; describe("registry demo", () => { diff --git a/packages/proto-signing/src/registry.ts b/packages/proto-signing/src/registry.ts index e0e53afa..7ed3cbd5 100644 --- a/packages/proto-signing/src/registry.ts +++ b/packages/proto-signing/src/registry.ts @@ -1,12 +1,11 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx"; +import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin"; +import { TxBody } from "cosmjs-types/cosmos/tx/v1beta1/tx"; +import { Any } from "cosmjs-types/google/protobuf/any"; import Long from "long"; import protobuf from "protobufjs"; -import { MsgSend } from "./codec/cosmos/bank/v1beta1/tx"; -import { Coin } from "./codec/cosmos/base/v1beta1/coin"; -import { TxBody } from "./codec/cosmos/tx/v1beta1/tx"; -import { Any } from "./codec/google/protobuf/any"; - /** * A type generated by [ts-proto](https://github.com/stephenh/ts-proto). */ diff --git a/packages/proto-signing/src/signer.ts b/packages/proto-signing/src/signer.ts index dd6a8f3b..321588a7 100644 --- a/packages/proto-signing/src/signer.ts +++ b/packages/proto-signing/src/signer.ts @@ -1,6 +1,5 @@ import { OfflineAminoSigner, StdSignature } from "@cosmjs/amino"; - -import { SignDoc } from "./codec/cosmos/tx/v1beta1/tx"; +import { SignDoc } from "cosmjs-types/cosmos/tx/v1beta1/tx"; /** * This is the same as Algo from @cosmjs/launchpad but those might diverge in the future. diff --git a/packages/proto-signing/src/signing.spec.ts b/packages/proto-signing/src/signing.spec.ts index 0267a78b..260e75a0 100644 --- a/packages/proto-signing/src/signing.spec.ts +++ b/packages/proto-signing/src/signing.spec.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { fromBase64, fromHex, toHex } from "@cosmjs/encoding"; +import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing"; +import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx"; -import { SignMode } from "./codec/cosmos/tx/signing/v1beta1/signing"; -import { TxRaw } from "./codec/cosmos/tx/v1beta1/tx"; import { decodeTxRaw } from "./decode"; import { DirectSecp256k1HdWallet } from "./directsecp256k1hdwallet"; import { Registry } from "./registry"; diff --git a/packages/proto-signing/src/signing.ts b/packages/proto-signing/src/signing.ts index 146749c7..20b687e5 100644 --- a/packages/proto-signing/src/signing.ts +++ b/packages/proto-signing/src/signing.ts @@ -1,11 +1,10 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin"; +import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing"; +import { AuthInfo, SignDoc, SignerInfo } from "cosmjs-types/cosmos/tx/v1beta1/tx"; +import { Any } from "cosmjs-types/google/protobuf/any"; import Long from "long"; -import { Coin } from "./codec/cosmos/base/v1beta1/coin"; -import { SignMode } from "./codec/cosmos/tx/signing/v1beta1/signing"; -import { AuthInfo, SignDoc, SignerInfo } from "./codec/cosmos/tx/v1beta1/tx"; -import { Any } from "./codec/google/protobuf/any"; - /** * Creates and serializes an AuthInfo document using SIGN_MODE_DIRECT. */