From 88faba8bedad5e9632a22b5a5219e73d14bb6541 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 9 Jun 2020 17:54:17 +0200 Subject: [PATCH] Replace internal usages of @iov/encoding with @cosmjs/{encoding,math} --- packages/bcp/package.json | 3 ++- packages/bcp/src/address.spec.ts | 2 +- packages/bcp/src/address.ts | 2 +- packages/bcp/src/caip5.ts | 2 +- packages/bcp/src/cosmoscodec.spec.ts | 2 +- packages/bcp/src/cosmoscodec.ts | 2 +- packages/bcp/src/cosmosconnection.spec.ts | 2 +- packages/bcp/src/cosmosconnection.ts | 3 ++- packages/bcp/src/decode.spec.ts | 2 +- packages/bcp/src/decode.ts | 3 ++- packages/bcp/src/encode.spec.ts | 2 +- packages/bcp/src/encode.ts | 2 +- packages/bcp/src/testdata.spec.ts | 2 +- packages/bcp/types/decode.d.ts | 2 +- packages/cli/package.json | 3 ++- packages/cli/src/cli.ts | 25 ++++--------------- packages/cosmwasm/package.json | 3 ++- .../src/cosmwasmclient.searchtx.spec.ts | 2 +- packages/cosmwasm/src/cosmwasmclient.spec.ts | 2 +- packages/cosmwasm/src/cosmwasmclient.ts | 2 +- packages/cosmwasm/src/logs.ts | 2 +- packages/cosmwasm/src/restclient.spec.ts | 2 +- packages/cosmwasm/src/restclient.ts | 2 +- .../src/signingcosmwasmclient.spec.ts | 2 +- .../cosmwasm/src/signingcosmwasmclient.ts | 2 +- packages/cosmwasm/src/testutils.spec.ts | 2 +- packages/cosmwasm/src/types.ts | 2 +- packages/crypto/package.json | 4 ++- packages/crypto/src/bip39.spec.ts | 2 +- packages/crypto/src/bip39.ts | 2 +- packages/crypto/src/englishmnemonic.spec.ts | 2 +- packages/crypto/src/hmac.spec.ts | 2 +- packages/crypto/src/keccak.spec.ts | 2 +- packages/crypto/src/libsodium.spec.ts | 2 +- packages/crypto/src/random.spec.ts | 2 +- packages/crypto/src/ripemd.spec.ts | 2 +- packages/crypto/src/secp256k1.spec.ts | 2 +- packages/crypto/src/secp256k1.ts | 2 +- .../crypto/src/secp256k1signature.spec.ts | 2 +- packages/crypto/src/sha.spec.ts | 2 +- packages/crypto/src/slip10.spec.ts | 2 +- packages/crypto/src/slip10.ts | 3 ++- packages/crypto/types/slip10.d.ts | 2 +- packages/faucet/package.json | 3 ++- packages/faucet/src/addresses.ts | 2 +- packages/faucet/src/debugging.ts | 2 +- packages/faucet/src/faucet.spec.ts | 2 +- packages/faucet/src/tokenmanager.ts | 2 +- packages/sdk38/package.json | 3 ++- packages/sdk38/src/address.spec.ts | 2 +- packages/sdk38/src/address.ts | 2 +- .../sdk38/src/cosmosclient.searchtx.spec.ts | 2 +- packages/sdk38/src/cosmosclient.ts | 2 +- packages/sdk38/src/encoding.ts | 2 +- packages/sdk38/src/logs.ts | 2 +- packages/sdk38/src/pen.spec.ts | 2 +- packages/sdk38/src/pubkey.spec.ts | 2 +- packages/sdk38/src/pubkey.ts | 2 +- packages/sdk38/src/restclient.spec.ts | 2 +- packages/sdk38/src/restclient.ts | 3 ++- packages/sdk38/src/signature.spec.ts | 2 +- packages/sdk38/src/signature.ts | 2 +- packages/sdk38/src/testutils.spec.ts | 2 +- packages/utils/types/index.d.ts | 1 + packages/utils/types/typechecks.d.ts | 8 ++++++ 65 files changed, 87 insertions(+), 82 deletions(-) create mode 100644 packages/utils/types/typechecks.d.ts diff --git a/packages/bcp/package.json b/packages/bcp/package.json index 1b26354d..a89269db 100644 --- a/packages/bcp/package.json +++ b/packages/bcp/package.json @@ -40,10 +40,11 @@ }, "dependencies": { "@cosmjs/crypto": "^0.8.0", + "@cosmjs/encoding": "^0.8.0", + "@cosmjs/math": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", "@cosmjs/utils": "^0.8.0", "@iov/bcp": "^2.3.2", - "@iov/encoding": "^2.3.2", "@iov/stream": "^2.3.2", "bn.js": "^5.1.1", "fast-deep-equal": "^3.1.1", diff --git a/packages/bcp/src/address.spec.ts b/packages/bcp/src/address.spec.ts index aa077b0a..d6dbe3ff 100644 --- a/packages/bcp/src/address.spec.ts +++ b/packages/bcp/src/address.spec.ts @@ -1,5 +1,5 @@ +import { fromBase64, fromHex } from "@cosmjs/encoding"; import { Algorithm, PubkeyBytes } from "@iov/bcp"; -import { fromBase64, fromHex } from "@iov/encoding"; import { pubkeyToAddress } from "./address"; diff --git a/packages/bcp/src/address.ts b/packages/bcp/src/address.ts index 83b4c2f1..413f8b14 100644 --- a/packages/bcp/src/address.ts +++ b/packages/bcp/src/address.ts @@ -1,7 +1,7 @@ import { Secp256k1 } from "@cosmjs/crypto"; +import { toBase64 } from "@cosmjs/encoding"; import { PubKey, pubkeyToAddress as sdkPubkeyToAddress, pubkeyType } from "@cosmjs/sdk38"; import { Address, Algorithm, PubkeyBundle } from "@iov/bcp"; -import { toBase64 } from "@iov/encoding"; // See https://github.com/tendermint/tendermint/blob/f2ada0a604b4c0763bda2f64fac53d506d3beca7/docs/spec/blockchain/encoding.md#public-key-cryptography export function pubkeyToAddress(pubkey: PubkeyBundle, prefix: string): Address { diff --git a/packages/bcp/src/caip5.ts b/packages/bcp/src/caip5.ts index 95de524f..8c789ffe 100644 --- a/packages/bcp/src/caip5.ts +++ b/packages/bcp/src/caip5.ts @@ -1,6 +1,6 @@ import { Sha256 } from "@cosmjs/crypto"; +import { toHex, toUtf8 } from "@cosmjs/encoding"; import { ChainId } from "@iov/bcp"; -import { toHex, toUtf8 } from "@iov/encoding"; const hashedPrefix = "hashed-"; diff --git a/packages/bcp/src/cosmoscodec.spec.ts b/packages/bcp/src/cosmoscodec.spec.ts index 49437f9a..0540ca28 100644 --- a/packages/bcp/src/cosmoscodec.spec.ts +++ b/packages/bcp/src/cosmoscodec.spec.ts @@ -1,5 +1,5 @@ +import { toUtf8 } from "@cosmjs/encoding"; import { PostableBytes, PrehashType } from "@iov/bcp"; -import { toUtf8 } from "@iov/encoding"; import { CosmosCodec } from "./cosmoscodec"; import { chainId, nonce, sendTxJson, signedTxBin, signedTxEncodedJson, signedTxJson } from "./testdata.spec"; diff --git a/packages/bcp/src/cosmoscodec.ts b/packages/bcp/src/cosmoscodec.ts index fa5b3c24..2a4eaff0 100644 --- a/packages/bcp/src/cosmoscodec.ts +++ b/packages/bcp/src/cosmoscodec.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { Bech32, fromUtf8, toUtf8 } from "@cosmjs/encoding"; import { isStdTx, makeSignBytes, StdTx } from "@cosmjs/sdk38"; import { Address, @@ -14,7 +15,6 @@ import { TxCodec, UnsignedTransaction, } from "@iov/bcp"; -import { Bech32, fromUtf8, toUtf8 } from "@iov/encoding"; import { pubkeyToAddress } from "./address"; import { Caip5 } from "./caip5"; diff --git a/packages/bcp/src/cosmosconnection.spec.ts b/packages/bcp/src/cosmosconnection.spec.ts index e47758dc..efcd9eb2 100644 --- a/packages/bcp/src/cosmosconnection.spec.ts +++ b/packages/bcp/src/cosmosconnection.spec.ts @@ -1,4 +1,5 @@ import { Random, Secp256k1, Secp256k1Signature, Sha256 } from "@cosmjs/crypto"; +import { Bech32, fromBase64 } from "@cosmjs/encoding"; import { decodeSignature } from "@cosmjs/sdk38"; import { assert } from "@cosmjs/utils"; import { @@ -19,7 +20,6 @@ import { TransactionState, UnsignedTransaction, } from "@iov/bcp"; -import { Bech32, fromBase64 } from "@iov/encoding"; import { HdPaths, Secp256k1HdWallet, UserProfile } from "@iov/keycontrol"; import BN from "bn.js"; diff --git a/packages/bcp/src/cosmosconnection.ts b/packages/bcp/src/cosmosconnection.ts index 83e55905..32036c6c 100644 --- a/packages/bcp/src/cosmosconnection.ts +++ b/packages/bcp/src/cosmosconnection.ts @@ -1,3 +1,5 @@ +import { fromUtf8 } from "@cosmjs/encoding"; +import { Uint53 } from "@cosmjs/math"; import { CosmosClient, findSequenceForSignedTx, @@ -35,7 +37,6 @@ import { TxCodec, UnsignedTransaction, } from "@iov/bcp"; -import { fromUtf8, Uint53 } from "@iov/encoding"; import { concat, DefaultValueProducer, ValueAndUpdates } from "@iov/stream"; import equal from "fast-deep-equal"; import { ReadonlyDate } from "readonly-date"; diff --git a/packages/bcp/src/decode.spec.ts b/packages/bcp/src/decode.spec.ts index e43aa110..ef4f96b1 100644 --- a/packages/bcp/src/decode.spec.ts +++ b/packages/bcp/src/decode.spec.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { fromBase64, fromHex } from "@cosmjs/encoding"; import { Coin, IndexedTx, Msg, PubKey, StdSignature } from "@cosmjs/sdk38"; import { Address, Algorithm, SendTransaction, TokenTicker } from "@iov/bcp"; -import { fromBase64, fromHex } from "@iov/encoding"; import { decodeAmount, diff --git a/packages/bcp/src/decode.ts b/packages/bcp/src/decode.ts index d7316ec4..d1812bd8 100644 --- a/packages/bcp/src/decode.ts +++ b/packages/bcp/src/decode.ts @@ -1,3 +1,5 @@ +import { fromBase64 } from "@cosmjs/encoding"; +import { Decimal } from "@cosmjs/math"; import { Coin, IndexedTx, @@ -29,7 +31,6 @@ import { TransactionId, UnsignedTransaction, } from "@iov/bcp"; -import { Decimal, fromBase64 } from "@iov/encoding"; import { BankToken } from "./types"; diff --git a/packages/bcp/src/encode.spec.ts b/packages/bcp/src/encode.spec.ts index b6bd153d..c31fc507 100644 --- a/packages/bcp/src/encode.spec.ts +++ b/packages/bcp/src/encode.spec.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { fromBase64 } from "@cosmjs/encoding"; import { Address, Algorithm, @@ -11,7 +12,6 @@ import { SignedTransaction, TokenTicker, } from "@iov/bcp"; -import { fromBase64 } from "@iov/encoding"; import { buildSignedTx, diff --git a/packages/bcp/src/encode.ts b/packages/bcp/src/encode.ts index c6861285..371ecc95 100644 --- a/packages/bcp/src/encode.ts +++ b/packages/bcp/src/encode.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/camelcase */ import { Secp256k1 } from "@cosmjs/crypto"; +import { toBase64 } from "@cosmjs/encoding"; import { Coin, CosmosSdkTx, @@ -20,7 +21,6 @@ import { SignedTransaction, UnsignedTransaction, } from "@iov/bcp"; -import { toBase64 } from "@iov/encoding"; import { BankToken } from "./types"; diff --git a/packages/bcp/src/testdata.spec.ts b/packages/bcp/src/testdata.spec.ts index 6dc2c519..c95749a0 100644 --- a/packages/bcp/src/testdata.spec.ts +++ b/packages/bcp/src/testdata.spec.ts @@ -1,3 +1,4 @@ +import { fromBase64, toUtf8 } from "@cosmjs/encoding"; import { Address, Algorithm, @@ -12,7 +13,6 @@ import { TokenTicker, TransactionId, } from "@iov/bcp"; -import { fromBase64, toUtf8 } from "@iov/encoding"; import data from "./testdata/cosmoshub.json"; diff --git a/packages/bcp/types/decode.d.ts b/packages/bcp/types/decode.d.ts index 5e89d64c..b2825da9 100644 --- a/packages/bcp/types/decode.d.ts +++ b/packages/bcp/types/decode.d.ts @@ -1,3 +1,4 @@ +import { Decimal } from "@cosmjs/math"; import { Coin, IndexedTx, Msg, PubKey, StdFee, StdSignature, StdTx } from "@cosmjs/sdk38"; import { Amount, @@ -12,7 +13,6 @@ import { SignedTransaction, UnsignedTransaction, } from "@iov/bcp"; -import { Decimal } from "@iov/encoding"; import { BankToken } from "./types"; export declare function decodePubkey(pubkey: PubKey): PubkeyBundle; export declare function decodeSignature(signature: string): SignatureBytes; diff --git a/packages/cli/package.json b/packages/cli/package.json index 3e417545..93f05d03 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,9 +40,10 @@ "dependencies": { "@cosmjs/cosmwasm": "^0.8.0", "@cosmjs/crypto": "^0.8.0", + "@cosmjs/encoding": "^0.8.0", + "@cosmjs/math": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", "@cosmjs/utils": "^0.8.0", - "@iov/encoding": "^2.3.2", "axios": "^0.19.2", "babylon": "^6.18.0", "colors": "^1.3.3", diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts index 6b960ef5..1e612b3d 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -75,6 +75,11 @@ export function main(originalArgs: readonly string[]): void { "Slip10RawIndex", ], ], + [ + "@cosmjs/encoding", + ["fromAscii", "fromBase64", "fromHex", "fromUtf8", "toAscii", "toBase64", "toHex", "toUtf8", "Bech32"], + ], + ["@cosmjs/math", ["Decimal", "Int53", "Uint32", "Uint53", "Uint64"]], [ "@cosmjs/sdk38", [ @@ -98,26 +103,6 @@ export function main(originalArgs: readonly string[]): void { "StdTx", ], ], - [ - "@iov/encoding", - [ - "fromAscii", - "fromBase64", - "fromHex", - "fromUtf8", - "toAscii", - "toBase64", - "toHex", - "toUtf8", - "Bech32", - "Decimal", - // integers - "Int53", - "Uint32", - "Uint53", - "Uint64", - ], - ], ["@cosmjs/utils", ["assert", "sleep"]], ]); diff --git a/packages/cosmwasm/package.json b/packages/cosmwasm/package.json index ccf45069..3d57d0e8 100644 --- a/packages/cosmwasm/package.json +++ b/packages/cosmwasm/package.json @@ -37,9 +37,10 @@ }, "dependencies": { "@cosmjs/crypto": "^0.8.0", + "@cosmjs/encoding": "^0.8.0", + "@cosmjs/math": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", "@cosmjs/utils": "^0.8.0", - "@iov/encoding": "^2.3.2", "axios": "^0.19.0", "fast-deep-equal": "^3.1.1", "pako": "^1.0.11" diff --git a/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts b/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts index ca14c2d1..f6bef50d 100644 --- a/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts +++ b/packages/cosmwasm/src/cosmwasmclient.searchtx.spec.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { Uint53 } from "@cosmjs/math"; import { Coin, CosmosSdkTx, isMsgSend, makeSignBytes, MsgSend, Secp256k1Pen } from "@cosmjs/sdk38"; import { assert, sleep } from "@cosmjs/utils"; -import { Uint53 } from "@iov/encoding"; import { CosmWasmClient } from "./cosmwasmclient"; import { isMsgExecuteContract, isMsgInstantiateContract } from "./msgs"; diff --git a/packages/cosmwasm/src/cosmwasmclient.spec.ts b/packages/cosmwasm/src/cosmwasmclient.spec.ts index 744f5397..b28fe430 100644 --- a/packages/cosmwasm/src/cosmwasmclient.spec.ts +++ b/packages/cosmwasm/src/cosmwasmclient.spec.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/camelcase */ import { Sha256 } from "@cosmjs/crypto"; +import { Bech32, fromHex, fromUtf8, toAscii, toBase64 } from "@cosmjs/encoding"; import { makeSignBytes, MsgSend, Secp256k1Pen, StdFee } from "@cosmjs/sdk38"; import { assert, sleep } from "@cosmjs/utils"; -import { Bech32, fromHex, fromUtf8, toAscii, toBase64 } from "@iov/encoding"; import { ReadonlyDate } from "readonly-date"; import { Code, CosmWasmClient, PrivateCosmWasmClient } from "./cosmwasmclient"; diff --git a/packages/cosmwasm/src/cosmwasmclient.ts b/packages/cosmwasm/src/cosmwasmclient.ts index ef24e064..886b860a 100644 --- a/packages/cosmwasm/src/cosmwasmclient.ts +++ b/packages/cosmwasm/src/cosmwasmclient.ts @@ -1,4 +1,5 @@ import { Sha256 } from "@cosmjs/crypto"; +import { fromBase64, fromHex, toHex } from "@cosmjs/encoding"; import { BroadcastMode, Coin, @@ -8,7 +9,6 @@ import { PubKey, StdTx, } from "@cosmjs/sdk38"; -import { fromBase64, fromHex, toHex } from "@iov/encoding"; import { Log, parseLogs } from "./logs"; import { RestClient } from "./restclient"; diff --git a/packages/cosmwasm/src/logs.ts b/packages/cosmwasm/src/logs.ts index e1eaa1cb..f37ff56c 100644 --- a/packages/cosmwasm/src/logs.ts +++ b/packages/cosmwasm/src/logs.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/camelcase */ -import { isNonNullObject } from "@iov/encoding"; +import { isNonNullObject } from "@cosmjs/utils"; export interface Attribute { readonly key: string; diff --git a/packages/cosmwasm/src/restclient.spec.ts b/packages/cosmwasm/src/restclient.spec.ts index 3789f60b..007291b1 100644 --- a/packages/cosmwasm/src/restclient.spec.ts +++ b/packages/cosmwasm/src/restclient.spec.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/camelcase */ import { Sha256 } from "@cosmjs/crypto"; +import { Bech32, fromAscii, fromBase64, fromHex, toAscii, toBase64, toHex } from "@cosmjs/encoding"; import { Coin, encodeBech32Pubkey, @@ -16,7 +17,6 @@ import { StdTx, } from "@cosmjs/sdk38"; import { assert, sleep } from "@cosmjs/utils"; -import { Bech32, fromAscii, fromBase64, fromHex, toAscii, toBase64, toHex } from "@iov/encoding"; import { ReadonlyDate } from "readonly-date"; import { findAttribute, parseLogs } from "./logs"; diff --git a/packages/cosmwasm/src/restclient.ts b/packages/cosmwasm/src/restclient.ts index 7beb90ff..8da81232 100644 --- a/packages/cosmwasm/src/restclient.ts +++ b/packages/cosmwasm/src/restclient.ts @@ -1,5 +1,5 @@ +import { fromBase64, fromUtf8, toHex, toUtf8 } from "@cosmjs/encoding"; import { BroadcastMode, CosmosSdkTx, RestClient as BaseRestClient } from "@cosmjs/sdk38"; -import { fromBase64, fromUtf8, toHex, toUtf8 } from "@iov/encoding"; import { JsonObject, Model, parseWasmData, WasmData } from "./types"; diff --git a/packages/cosmwasm/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm/src/signingcosmwasmclient.spec.ts index 69d4995f..aab2c4b2 100644 --- a/packages/cosmwasm/src/signingcosmwasmclient.spec.ts +++ b/packages/cosmwasm/src/signingcosmwasmclient.spec.ts @@ -1,7 +1,7 @@ import { Sha256 } from "@cosmjs/crypto"; +import { toHex } from "@cosmjs/encoding"; import { Coin, Secp256k1Pen } from "@cosmjs/sdk38"; import { assert } from "@cosmjs/utils"; -import { toHex } from "@iov/encoding"; import { PrivateCosmWasmClient } from "./cosmwasmclient"; import { RestClient } from "./restclient"; diff --git a/packages/cosmwasm/src/signingcosmwasmclient.ts b/packages/cosmwasm/src/signingcosmwasmclient.ts index 9f5ad298..7dd234fe 100644 --- a/packages/cosmwasm/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm/src/signingcosmwasmclient.ts @@ -1,6 +1,6 @@ import { Sha256 } from "@cosmjs/crypto"; +import { toBase64, toHex } from "@cosmjs/encoding"; import { BroadcastMode, Coin, coins, makeSignBytes, MsgSend, StdFee, StdSignature } from "@cosmjs/sdk38"; -import { toBase64, toHex } from "@iov/encoding"; import pako from "pako"; import { isValidBuilder } from "./builder"; diff --git a/packages/cosmwasm/src/testutils.spec.ts b/packages/cosmwasm/src/testutils.spec.ts index bd106923..82c745a0 100644 --- a/packages/cosmwasm/src/testutils.spec.ts +++ b/packages/cosmwasm/src/testutils.spec.ts @@ -1,5 +1,5 @@ import { Random } from "@cosmjs/crypto"; -import { Bech32, fromBase64 } from "@iov/encoding"; +import { Bech32, fromBase64 } from "@cosmjs/encoding"; import hackatom from "./testdata/contract.json"; diff --git a/packages/cosmwasm/src/types.ts b/packages/cosmwasm/src/types.ts index f04c6982..bba7fc95 100644 --- a/packages/cosmwasm/src/types.ts +++ b/packages/cosmwasm/src/types.ts @@ -1,4 +1,4 @@ -import { fromBase64, fromHex } from "@iov/encoding"; +import { fromBase64, fromHex } from "@cosmjs/encoding"; export interface WasmData { // key is hex-encoded diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 6c626d87..a94e89c9 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -41,7 +41,9 @@ "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" }, "dependencies": { - "@iov/encoding": "^2.3.2", + "@cosmjs/encoding": "^0.8.0", + "@cosmjs/math": "^0.8.0", + "@cosmjs/utils": "^0.8.0", "bip39": "^3.0.2", "bn.js": "^4.11.8", "elliptic": "^6.4.0", diff --git a/packages/crypto/src/bip39.spec.ts b/packages/crypto/src/bip39.spec.ts index 3e2b7a2b..d77298ee 100644 --- a/packages/crypto/src/bip39.spec.ts +++ b/packages/crypto/src/bip39.spec.ts @@ -1,4 +1,4 @@ -import { fromHex } from "@iov/encoding"; +import { fromHex } from "@cosmjs/encoding"; import { Bip39 } from "./bip39"; import { EnglishMnemonic } from "./englishmnemonic"; diff --git a/packages/crypto/src/bip39.ts b/packages/crypto/src/bip39.ts index 89980e46..f16d6dea 100644 --- a/packages/crypto/src/bip39.ts +++ b/packages/crypto/src/bip39.ts @@ -1,4 +1,4 @@ -import { fromHex, toHex } from "@iov/encoding"; +import { fromHex, toHex } from "@cosmjs/encoding"; import * as bip39 from "bip39"; import { pbkdf2 } from "pbkdf2"; import * as unorm from "unorm"; diff --git a/packages/crypto/src/englishmnemonic.spec.ts b/packages/crypto/src/englishmnemonic.spec.ts index f1260dc5..e365c0b9 100644 --- a/packages/crypto/src/englishmnemonic.spec.ts +++ b/packages/crypto/src/englishmnemonic.spec.ts @@ -1,4 +1,4 @@ -import { fromAscii, fromBase64, fromHex } from "@iov/encoding"; +import { fromAscii, fromBase64, fromHex } from "@cosmjs/encoding"; import { EnglishMnemonic } from "./englishmnemonic"; import { Sha256 } from "./sha"; diff --git a/packages/crypto/src/hmac.spec.ts b/packages/crypto/src/hmac.spec.ts index a89fc29b..2a992c2b 100644 --- a/packages/crypto/src/hmac.spec.ts +++ b/packages/crypto/src/hmac.spec.ts @@ -1,4 +1,4 @@ -import { fromHex } from "@iov/encoding"; +import { fromHex } from "@cosmjs/encoding"; import { Hmac } from "./hmac"; import { Sha1, Sha256, Sha512 } from "./sha"; diff --git a/packages/crypto/src/keccak.spec.ts b/packages/crypto/src/keccak.spec.ts index e82c8a73..ee1f20c7 100644 --- a/packages/crypto/src/keccak.spec.ts +++ b/packages/crypto/src/keccak.spec.ts @@ -1,4 +1,4 @@ -import { fromHex, toHex } from "@iov/encoding"; +import { fromHex, toHex } from "@cosmjs/encoding"; import { Keccak256 } from "./keccak"; import keccakVectors from "./testdata/keccak.json"; diff --git a/packages/crypto/src/libsodium.spec.ts b/packages/crypto/src/libsodium.spec.ts index d29f28f8..cc8bc8bc 100644 --- a/packages/crypto/src/libsodium.spec.ts +++ b/packages/crypto/src/libsodium.spec.ts @@ -1,5 +1,5 @@ /* eslint-disable no-bitwise */ -import { fromHex, toAscii } from "@iov/encoding"; +import { fromHex, toAscii } from "@cosmjs/encoding"; import { Argon2id, diff --git a/packages/crypto/src/random.spec.ts b/packages/crypto/src/random.spec.ts index 6f9511b5..c5af21d7 100644 --- a/packages/crypto/src/random.spec.ts +++ b/packages/crypto/src/random.spec.ts @@ -1,4 +1,4 @@ -import { isUint8Array } from "@iov/encoding"; +import { isUint8Array } from "@cosmjs/utils"; import { Random } from "./random"; diff --git a/packages/crypto/src/ripemd.spec.ts b/packages/crypto/src/ripemd.spec.ts index d3a8dd37..234691c2 100644 --- a/packages/crypto/src/ripemd.spec.ts +++ b/packages/crypto/src/ripemd.spec.ts @@ -1,4 +1,4 @@ -import { fromHex } from "@iov/encoding"; +import { fromHex } from "@cosmjs/encoding"; import { Ripemd160 } from "./ripemd"; import ripemdVectors from "./testdata/ripemd.json"; diff --git a/packages/crypto/src/secp256k1.spec.ts b/packages/crypto/src/secp256k1.spec.ts index 6af91378..36833fdf 100644 --- a/packages/crypto/src/secp256k1.spec.ts +++ b/packages/crypto/src/secp256k1.spec.ts @@ -1,5 +1,5 @@ /* eslint-disable no-bitwise */ -import { fromHex } from "@iov/encoding"; +import { fromHex } from "@cosmjs/encoding"; import { Secp256k1 } from "./secp256k1"; import { ExtendedSecp256k1Signature, Secp256k1Signature } from "./secp256k1signature"; diff --git a/packages/crypto/src/secp256k1.ts b/packages/crypto/src/secp256k1.ts index e0f1eb15..ec05ed8e 100644 --- a/packages/crypto/src/secp256k1.ts +++ b/packages/crypto/src/secp256k1.ts @@ -1,4 +1,4 @@ -import { fromHex, toHex } from "@iov/encoding"; +import { fromHex, toHex } from "@cosmjs/encoding"; import BN from "bn.js"; import elliptic from "elliptic"; import { As } from "type-tagger"; diff --git a/packages/crypto/src/secp256k1signature.spec.ts b/packages/crypto/src/secp256k1signature.spec.ts index 041f29e5..27b58767 100644 --- a/packages/crypto/src/secp256k1signature.spec.ts +++ b/packages/crypto/src/secp256k1signature.spec.ts @@ -1,4 +1,4 @@ -import { fromHex } from "@iov/encoding"; +import { fromHex } from "@cosmjs/encoding"; import { ExtendedSecp256k1Signature, Secp256k1Signature } from "./secp256k1signature"; diff --git a/packages/crypto/src/sha.spec.ts b/packages/crypto/src/sha.spec.ts index e0384da4..3549164b 100644 --- a/packages/crypto/src/sha.spec.ts +++ b/packages/crypto/src/sha.spec.ts @@ -1,4 +1,4 @@ -import { fromHex, toHex } from "@iov/encoding"; +import { fromHex, toHex } from "@cosmjs/encoding"; import { Sha256 } from "./sha"; import shaVectors from "./testdata/sha.json"; diff --git a/packages/crypto/src/slip10.spec.ts b/packages/crypto/src/slip10.spec.ts index 36838f6d..52718df8 100644 --- a/packages/crypto/src/slip10.spec.ts +++ b/packages/crypto/src/slip10.spec.ts @@ -1,4 +1,4 @@ -import { fromHex } from "@iov/encoding"; +import { fromHex } from "@cosmjs/encoding"; import { pathToString, diff --git a/packages/crypto/src/slip10.ts b/packages/crypto/src/slip10.ts index a2e37b63..9f507954 100644 --- a/packages/crypto/src/slip10.ts +++ b/packages/crypto/src/slip10.ts @@ -1,4 +1,5 @@ -import { fromHex, toAscii, Uint32, Uint53 } from "@iov/encoding"; +import { fromHex, toAscii } from "@cosmjs/encoding"; +import { Uint32, Uint53 } from "@cosmjs/math"; import BN from "bn.js"; import elliptic from "elliptic"; diff --git a/packages/crypto/types/slip10.d.ts b/packages/crypto/types/slip10.d.ts index 328116be..ffd92295 100644 --- a/packages/crypto/types/slip10.d.ts +++ b/packages/crypto/types/slip10.d.ts @@ -1,4 +1,4 @@ -import { Uint32 } from "@iov/encoding"; +import { Uint32 } from "@cosmjs/math"; export interface Slip10Result { readonly chainCode: Uint8Array; readonly privkey: Uint8Array; diff --git a/packages/faucet/package.json b/packages/faucet/package.json index dcaae4ff..8d660574 100644 --- a/packages/faucet/package.json +++ b/packages/faucet/package.json @@ -36,9 +36,10 @@ }, "dependencies": { "@cosmjs/crypto": "^0.8.0", + "@cosmjs/encoding": "^0.8.0", + "@cosmjs/math": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", "@cosmjs/utils": "^0.8.0", - "@iov/encoding": "^2.3.2", "@koa/cors": "^3.0.0", "axios": "^0.19.0", "koa": "^2.11.0", diff --git a/packages/faucet/src/addresses.ts b/packages/faucet/src/addresses.ts index 6b1f8ddf..bafe414b 100644 --- a/packages/faucet/src/addresses.ts +++ b/packages/faucet/src/addresses.ts @@ -1,4 +1,4 @@ -import { Bech32 } from "@iov/encoding"; +import { Bech32 } from "@cosmjs/encoding"; export function isValidAddress(input: string, requiredPrefix: string): boolean { try { diff --git a/packages/faucet/src/debugging.ts b/packages/faucet/src/debugging.ts index 24b79804..1db74139 100644 --- a/packages/faucet/src/debugging.ts +++ b/packages/faucet/src/debugging.ts @@ -1,5 +1,5 @@ +import { Decimal } from "@cosmjs/math"; import { Coin } from "@cosmjs/sdk38"; -import { Decimal } from "@iov/encoding"; import { MinimalAccount, SendJob, TokenConfiguration } from "./types"; diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts index 2809cd1c..3d0320e3 100644 --- a/packages/faucet/src/faucet.spec.ts +++ b/packages/faucet/src/faucet.spec.ts @@ -1,7 +1,7 @@ import { Random } from "@cosmjs/crypto"; +import { Bech32 } from "@cosmjs/encoding"; import { CosmosClient } from "@cosmjs/sdk38"; import { assert } from "@cosmjs/utils"; -import { Bech32 } from "@iov/encoding"; import { Faucet } from "./faucet"; import { TokenConfiguration } from "./types"; diff --git a/packages/faucet/src/tokenmanager.ts b/packages/faucet/src/tokenmanager.ts index 1036c9a0..88996eee 100644 --- a/packages/faucet/src/tokenmanager.ts +++ b/packages/faucet/src/tokenmanager.ts @@ -1,5 +1,5 @@ +import { Decimal, Uint53 } from "@cosmjs/math"; import { Coin } from "@cosmjs/sdk38"; -import { Decimal, Uint53 } from "@iov/encoding"; import { BankTokenMeta, MinimalAccount, TokenConfiguration } from "./types"; diff --git a/packages/sdk38/package.json b/packages/sdk38/package.json index 3b655453..1764aa82 100644 --- a/packages/sdk38/package.json +++ b/packages/sdk38/package.json @@ -37,8 +37,9 @@ }, "dependencies": { "@cosmjs/crypto": "^0.8.0", + "@cosmjs/encoding": "^0.8.0", + "@cosmjs/math": "^0.8.0", "@cosmjs/utils": "^0.8.0", - "@iov/encoding": "^2.3.2", "axios": "^0.19.0", "fast-deep-equal": "^3.1.1" }, diff --git a/packages/sdk38/src/address.spec.ts b/packages/sdk38/src/address.spec.ts index 2a9de080..f5e3b627 100644 --- a/packages/sdk38/src/address.spec.ts +++ b/packages/sdk38/src/address.spec.ts @@ -1,4 +1,4 @@ -import { fromHex, toBase64 } from "@iov/encoding"; +import { fromHex, toBase64 } from "@cosmjs/encoding"; import { pubkeyToAddress } from "./address"; diff --git a/packages/sdk38/src/address.ts b/packages/sdk38/src/address.ts index cfdd153a..5f48efa0 100644 --- a/packages/sdk38/src/address.ts +++ b/packages/sdk38/src/address.ts @@ -1,5 +1,5 @@ import { Ripemd160, Sha256 } from "@cosmjs/crypto"; -import { Bech32, fromBase64 } from "@iov/encoding"; +import { Bech32, fromBase64 } from "@cosmjs/encoding"; import { PubKey, pubkeyType } from "./types"; diff --git a/packages/sdk38/src/cosmosclient.searchtx.spec.ts b/packages/sdk38/src/cosmosclient.searchtx.spec.ts index 25d06700..c75c5e88 100644 --- a/packages/sdk38/src/cosmosclient.searchtx.spec.ts +++ b/packages/sdk38/src/cosmosclient.searchtx.spec.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { Uint53 } from "@cosmjs/math"; import { assert, sleep } from "@cosmjs/utils"; -import { Uint53 } from "@iov/encoding"; import { Coin } from "./coins"; import { CosmosClient } from "./cosmosclient"; diff --git a/packages/sdk38/src/cosmosclient.ts b/packages/sdk38/src/cosmosclient.ts index 44232426..4c42f385 100644 --- a/packages/sdk38/src/cosmosclient.ts +++ b/packages/sdk38/src/cosmosclient.ts @@ -1,5 +1,5 @@ import { Sha256 } from "@cosmjs/crypto"; -import { fromBase64, toHex } from "@iov/encoding"; +import { fromBase64, toHex } from "@cosmjs/encoding"; import { Coin } from "./coins"; import { Log, parseLogs } from "./logs"; diff --git a/packages/sdk38/src/encoding.ts b/packages/sdk38/src/encoding.ts index 2d03e0f4..30a3193e 100644 --- a/packages/sdk38/src/encoding.ts +++ b/packages/sdk38/src/encoding.ts @@ -1,4 +1,4 @@ -import { toUtf8 } from "@iov/encoding"; +import { toUtf8 } from "@cosmjs/encoding"; import { Msg, StdFee } from "./types"; diff --git a/packages/sdk38/src/logs.ts b/packages/sdk38/src/logs.ts index e1eaa1cb..f37ff56c 100644 --- a/packages/sdk38/src/logs.ts +++ b/packages/sdk38/src/logs.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/camelcase */ -import { isNonNullObject } from "@iov/encoding"; +import { isNonNullObject } from "@cosmjs/utils"; export interface Attribute { readonly key: string; diff --git a/packages/sdk38/src/pen.spec.ts b/packages/sdk38/src/pen.spec.ts index 13bf1b5c..89b37d1b 100644 --- a/packages/sdk38/src/pen.spec.ts +++ b/packages/sdk38/src/pen.spec.ts @@ -1,5 +1,5 @@ import { Secp256k1, Secp256k1Signature, Sha256 } from "@cosmjs/crypto"; -import { fromHex, toAscii } from "@iov/encoding"; +import { fromHex, toAscii } from "@cosmjs/encoding"; import { Secp256k1Pen } from "./pen"; import { decodeSignature } from "./signature"; diff --git a/packages/sdk38/src/pubkey.spec.ts b/packages/sdk38/src/pubkey.spec.ts index f9054ace..03253695 100644 --- a/packages/sdk38/src/pubkey.spec.ts +++ b/packages/sdk38/src/pubkey.spec.ts @@ -1,4 +1,4 @@ -import { fromBase64 } from "@iov/encoding"; +import { fromBase64 } from "@cosmjs/encoding"; import { decodeBech32Pubkey, encodeBech32Pubkey, encodeSecp256k1Pubkey } from "./pubkey"; import { PubKey } from "./types"; diff --git a/packages/sdk38/src/pubkey.ts b/packages/sdk38/src/pubkey.ts index ada06a75..2095c05a 100644 --- a/packages/sdk38/src/pubkey.ts +++ b/packages/sdk38/src/pubkey.ts @@ -1,4 +1,4 @@ -import { Bech32, fromBase64, fromHex, toBase64, toHex } from "@iov/encoding"; +import { Bech32, fromBase64, fromHex, toBase64, toHex } from "@cosmjs/encoding"; import equal from "fast-deep-equal"; import { PubKey, pubkeyType } from "./types"; diff --git a/packages/sdk38/src/restclient.spec.ts b/packages/sdk38/src/restclient.spec.ts index b014803a..92d3f0ed 100644 --- a/packages/sdk38/src/restclient.spec.ts +++ b/packages/sdk38/src/restclient.spec.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { fromBase64 } from "@cosmjs/encoding"; import { assert, sleep } from "@cosmjs/utils"; -import { fromBase64 } from "@iov/encoding"; import { ReadonlyDate } from "readonly-date"; import { rawSecp256k1PubkeyToAddress } from "./address"; diff --git a/packages/sdk38/src/restclient.ts b/packages/sdk38/src/restclient.ts index 6a1363ba..7fbdf8f8 100644 --- a/packages/sdk38/src/restclient.ts +++ b/packages/sdk38/src/restclient.ts @@ -1,4 +1,5 @@ -import { fromBase64, isNonNullObject } from "@iov/encoding"; +import { fromBase64 } from "@cosmjs/encoding"; +import { isNonNullObject } from "@cosmjs/utils"; import axios, { AxiosError, AxiosInstance } from "axios"; import { Coin } from "./coins"; diff --git a/packages/sdk38/src/signature.spec.ts b/packages/sdk38/src/signature.spec.ts index 7466caca..6d29d18a 100644 --- a/packages/sdk38/src/signature.spec.ts +++ b/packages/sdk38/src/signature.spec.ts @@ -1,4 +1,4 @@ -import { fromBase64 } from "@iov/encoding"; +import { fromBase64 } from "@cosmjs/encoding"; import { decodeSignature, encodeSecp256k1Signature } from "./signature"; import { StdSignature } from "./types"; diff --git a/packages/sdk38/src/signature.ts b/packages/sdk38/src/signature.ts index fd89da65..bd38fde6 100644 --- a/packages/sdk38/src/signature.ts +++ b/packages/sdk38/src/signature.ts @@ -1,4 +1,4 @@ -import { fromBase64, toBase64 } from "@iov/encoding"; +import { fromBase64, toBase64 } from "@cosmjs/encoding"; import { encodeSecp256k1Pubkey } from "./pubkey"; import { pubkeyType, StdSignature } from "./types"; diff --git a/packages/sdk38/src/testutils.spec.ts b/packages/sdk38/src/testutils.spec.ts index 6864b7ef..b04b1de5 100644 --- a/packages/sdk38/src/testutils.spec.ts +++ b/packages/sdk38/src/testutils.spec.ts @@ -1,5 +1,5 @@ import { Random } from "@cosmjs/crypto"; -import { Bech32 } from "@iov/encoding"; +import { Bech32 } from "@cosmjs/encoding"; export function makeRandomAddress(): string { return Bech32.encode("cosmos", Random.getBytes(20)); diff --git a/packages/utils/types/index.d.ts b/packages/utils/types/index.d.ts index 3e156674..ea096301 100644 --- a/packages/utils/types/index.d.ts +++ b/packages/utils/types/index.d.ts @@ -1,2 +1,3 @@ export { assert } from "./assert"; export { sleep } from "./sleep"; +export { isNonNullObject, isUint8Array } from "./typechecks"; diff --git a/packages/utils/types/typechecks.d.ts b/packages/utils/types/typechecks.d.ts new file mode 100644 index 00000000..3e911797 --- /dev/null +++ b/packages/utils/types/typechecks.d.ts @@ -0,0 +1,8 @@ +/** + * Checks if data is a non-null object (i.e. matches the TypeScript object type) + */ +export declare function isNonNullObject(data: unknown): data is object; +/** + * Checks if data is an Uint8Array. Note: Buffer is treated as not a Uint8Array + */ +export declare function isUint8Array(data: unknown): data is Uint8Array;