diff --git a/packages/bcp/package.json b/packages/bcp/package.json index 22f56d73..216d6ef7 100644 --- a/packages/bcp/package.json +++ b/packages/bcp/package.json @@ -39,9 +39,9 @@ "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" }, "dependencies": { + "@cosmjs/crypto": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", "@iov/bcp": "^2.3.2", - "@iov/crypto": "^2.3.2", "@iov/encoding": "^2.3.2", "@iov/stream": "^2.3.2", "@iov/utils": "^2.3.2", diff --git a/packages/bcp/src/address.ts b/packages/bcp/src/address.ts index f77490aa..83b4c2f1 100644 --- a/packages/bcp/src/address.ts +++ b/packages/bcp/src/address.ts @@ -1,6 +1,6 @@ +import { Secp256k1 } from "@cosmjs/crypto"; import { PubKey, pubkeyToAddress as sdkPubkeyToAddress, pubkeyType } from "@cosmjs/sdk38"; import { Address, Algorithm, PubkeyBundle } from "@iov/bcp"; -import { Secp256k1 } from "@iov/crypto"; import { toBase64 } from "@iov/encoding"; // See https://github.com/tendermint/tendermint/blob/f2ada0a604b4c0763bda2f64fac53d506d3beca7/docs/spec/blockchain/encoding.md#public-key-cryptography diff --git a/packages/bcp/src/caip5.ts b/packages/bcp/src/caip5.ts index 11438339..95de524f 100644 --- a/packages/bcp/src/caip5.ts +++ b/packages/bcp/src/caip5.ts @@ -1,5 +1,5 @@ +import { Sha256 } from "@cosmjs/crypto"; import { ChainId } from "@iov/bcp"; -import { Sha256 } from "@iov/crypto"; import { toHex, toUtf8 } from "@iov/encoding"; const hashedPrefix = "hashed-"; diff --git a/packages/bcp/src/cosmosconnection.spec.ts b/packages/bcp/src/cosmosconnection.spec.ts index e08f55a2..0f2a9036 100644 --- a/packages/bcp/src/cosmosconnection.spec.ts +++ b/packages/bcp/src/cosmosconnection.spec.ts @@ -1,3 +1,4 @@ +import { Random, Secp256k1, Secp256k1Signature, Sha256 } from "@cosmjs/crypto"; import { decodeSignature } from "@cosmjs/sdk38"; import { Account, @@ -17,7 +18,6 @@ import { TransactionState, UnsignedTransaction, } from "@iov/bcp"; -import { Random, Secp256k1, Secp256k1Signature, Sha256 } from "@iov/crypto"; import { Bech32, fromBase64 } from "@iov/encoding"; import { HdPaths, Secp256k1HdWallet, UserProfile } from "@iov/keycontrol"; import { assert } from "@iov/utils"; diff --git a/packages/bcp/src/encode.ts b/packages/bcp/src/encode.ts index 2eacaaef..c6861285 100644 --- a/packages/bcp/src/encode.ts +++ b/packages/bcp/src/encode.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { Secp256k1 } from "@cosmjs/crypto"; import { Coin, CosmosSdkTx, @@ -19,7 +20,6 @@ import { SignedTransaction, UnsignedTransaction, } from "@iov/bcp"; -import { Secp256k1 } from "@iov/crypto"; import { toBase64 } from "@iov/encoding"; import { BankToken } from "./types"; diff --git a/packages/cli/package.json b/packages/cli/package.json index 935873ef..9c0f7526 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -39,8 +39,8 @@ ], "dependencies": { "@cosmjs/cosmwasm": "^0.8.0", + "@cosmjs/crypto": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", - "@iov/crypto": "^2.3.2", "@iov/encoding": "^2.3.2", "@iov/utils": "^2.3.2", "axios": "^0.19.2", diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts index a7237820..34f58eee 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -59,6 +59,22 @@ export function main(originalArgs: readonly string[]): void { "UploadResult", ], ], + [ + "@cosmjs/crypto", + [ + "Bip39", + "Ed25519", + "Ed25519Keypair", + "EnglishMnemonic", + "Random", + "Secp256k1", + "Sha256", + "Sha512", + "Slip10", + "Slip10Curve", + "Slip10RawIndex", + ], + ], [ "@cosmjs/sdk38", [ @@ -82,22 +98,6 @@ export function main(originalArgs: readonly string[]): void { "StdTx", ], ], - [ - "@iov/crypto", - [ - "Bip39", - "Ed25519", - "Ed25519Keypair", - "EnglishMnemonic", - "Random", - "Secp256k1", - "Sha256", - "Sha512", - "Slip10", - "Slip10Curve", - "Slip10RawIndex", - ], - ], [ "@iov/encoding", [ diff --git a/packages/cosmwasm/package.json b/packages/cosmwasm/package.json index 9ce6c070..0099399f 100644 --- a/packages/cosmwasm/package.json +++ b/packages/cosmwasm/package.json @@ -36,8 +36,8 @@ "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" }, "dependencies": { + "@cosmjs/crypto": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", - "@iov/crypto": "^2.3.2", "@iov/encoding": "^2.3.2", "@iov/utils": "^2.3.2", "axios": "^0.19.0", diff --git a/packages/cosmwasm/src/cosmwasmclient.spec.ts b/packages/cosmwasm/src/cosmwasmclient.spec.ts index e2143f96..90541a88 100644 --- a/packages/cosmwasm/src/cosmwasmclient.spec.ts +++ b/packages/cosmwasm/src/cosmwasmclient.spec.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { Sha256 } from "@cosmjs/crypto"; import { makeSignBytes, MsgSend, Secp256k1Pen, StdFee } from "@cosmjs/sdk38"; -import { Sha256 } from "@iov/crypto"; import { Bech32, fromHex, fromUtf8, toAscii, toBase64 } from "@iov/encoding"; import { assert, sleep } from "@iov/utils"; import { ReadonlyDate } from "readonly-date"; diff --git a/packages/cosmwasm/src/cosmwasmclient.ts b/packages/cosmwasm/src/cosmwasmclient.ts index d22be7aa..ef24e064 100644 --- a/packages/cosmwasm/src/cosmwasmclient.ts +++ b/packages/cosmwasm/src/cosmwasmclient.ts @@ -1,3 +1,4 @@ +import { Sha256 } from "@cosmjs/crypto"; import { BroadcastMode, Coin, @@ -7,7 +8,6 @@ import { PubKey, StdTx, } from "@cosmjs/sdk38"; -import { Sha256 } from "@iov/crypto"; import { fromBase64, fromHex, toHex } from "@iov/encoding"; import { Log, parseLogs } from "./logs"; diff --git a/packages/cosmwasm/src/restclient.spec.ts b/packages/cosmwasm/src/restclient.spec.ts index ab94b1da..c73b97e9 100644 --- a/packages/cosmwasm/src/restclient.spec.ts +++ b/packages/cosmwasm/src/restclient.spec.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/camelcase */ +import { Sha256 } from "@cosmjs/crypto"; import { Coin, encodeBech32Pubkey, @@ -14,7 +15,6 @@ import { StdSignature, StdTx, } from "@cosmjs/sdk38"; -import { Sha256 } from "@iov/crypto"; import { Bech32, fromAscii, fromBase64, fromHex, toAscii, toBase64, toHex } from "@iov/encoding"; import { assert, sleep } from "@iov/utils"; import { ReadonlyDate } from "readonly-date"; diff --git a/packages/cosmwasm/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm/src/signingcosmwasmclient.spec.ts index 75aba69a..3d701571 100644 --- a/packages/cosmwasm/src/signingcosmwasmclient.spec.ts +++ b/packages/cosmwasm/src/signingcosmwasmclient.spec.ts @@ -1,5 +1,5 @@ +import { Sha256 } from "@cosmjs/crypto"; import { Coin, Secp256k1Pen } from "@cosmjs/sdk38"; -import { Sha256 } from "@iov/crypto"; import { toHex } from "@iov/encoding"; import { assert } from "@iov/utils"; diff --git a/packages/cosmwasm/src/signingcosmwasmclient.ts b/packages/cosmwasm/src/signingcosmwasmclient.ts index f46e8034..9f5ad298 100644 --- a/packages/cosmwasm/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm/src/signingcosmwasmclient.ts @@ -1,5 +1,5 @@ +import { Sha256 } from "@cosmjs/crypto"; import { BroadcastMode, Coin, coins, makeSignBytes, MsgSend, StdFee, StdSignature } from "@cosmjs/sdk38"; -import { Sha256 } from "@iov/crypto"; import { toBase64, toHex } from "@iov/encoding"; import pako from "pako"; diff --git a/packages/cosmwasm/src/testutils.spec.ts b/packages/cosmwasm/src/testutils.spec.ts index c4854b0f..bd106923 100644 --- a/packages/cosmwasm/src/testutils.spec.ts +++ b/packages/cosmwasm/src/testutils.spec.ts @@ -1,4 +1,4 @@ -import { Random } from "@iov/crypto"; +import { Random } from "@cosmjs/crypto"; import { Bech32, fromBase64 } from "@iov/encoding"; import hackatom from "./testdata/contract.json"; diff --git a/packages/faucet/package.json b/packages/faucet/package.json index e686f072..ed9622c1 100644 --- a/packages/faucet/package.json +++ b/packages/faucet/package.json @@ -35,8 +35,8 @@ "test": "yarn build-or-skip && yarn test-node" }, "dependencies": { + "@cosmjs/crypto": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", - "@iov/crypto": "^2.3.2", "@iov/encoding": "^2.3.2", "@iov/utils": "^2.3.2", "@koa/cors": "^3.0.0", diff --git a/packages/faucet/src/actions/generate.ts b/packages/faucet/src/actions/generate.ts index 46590838..096b18f7 100644 --- a/packages/faucet/src/actions/generate.ts +++ b/packages/faucet/src/actions/generate.ts @@ -1,4 +1,4 @@ -import { Bip39, Random } from "@iov/crypto"; +import { Bip39, Random } from "@cosmjs/crypto"; import * as constants from "../constants"; import { createPens } from "../profile"; diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts index 9c6e8f6c..de2721b6 100644 --- a/packages/faucet/src/faucet.spec.ts +++ b/packages/faucet/src/faucet.spec.ts @@ -1,5 +1,5 @@ +import { Random } from "@cosmjs/crypto"; import { CosmosClient } from "@cosmjs/sdk38"; -import { Random } from "@iov/crypto"; import { Bech32 } from "@iov/encoding"; import { assert } from "@iov/utils"; diff --git a/packages/faucet/src/profile.ts b/packages/faucet/src/profile.ts index 186993f0..7aaf70e8 100644 --- a/packages/faucet/src/profile.ts +++ b/packages/faucet/src/profile.ts @@ -1,5 +1,5 @@ +import { pathToString } from "@cosmjs/crypto"; import { makeCosmoshubPath, Pen, Secp256k1Pen } from "@cosmjs/sdk38"; -import { pathToString } from "@iov/crypto"; export async function createPens( mnemonic: string, diff --git a/packages/sdk38/package.json b/packages/sdk38/package.json index 2ef9efa8..7287eacf 100644 --- a/packages/sdk38/package.json +++ b/packages/sdk38/package.json @@ -36,7 +36,7 @@ "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" }, "dependencies": { - "@iov/crypto": "^2.3.2", + "@cosmjs/crypto": "^0.8.0", "@iov/encoding": "^2.3.2", "@iov/utils": "^2.3.2", "axios": "^0.19.0", diff --git a/packages/sdk38/src/address.ts b/packages/sdk38/src/address.ts index 44ab1e18..cfdd153a 100644 --- a/packages/sdk38/src/address.ts +++ b/packages/sdk38/src/address.ts @@ -1,4 +1,4 @@ -import { Ripemd160, Sha256 } from "@iov/crypto"; +import { Ripemd160, Sha256 } from "@cosmjs/crypto"; import { Bech32, fromBase64 } from "@iov/encoding"; import { PubKey, pubkeyType } from "./types"; diff --git a/packages/sdk38/src/cosmosclient.ts b/packages/sdk38/src/cosmosclient.ts index 3a390e6a..44232426 100644 --- a/packages/sdk38/src/cosmosclient.ts +++ b/packages/sdk38/src/cosmosclient.ts @@ -1,4 +1,4 @@ -import { Sha256 } from "@iov/crypto"; +import { Sha256 } from "@cosmjs/crypto"; import { fromBase64, toHex } from "@iov/encoding"; import { Coin } from "./coins"; diff --git a/packages/sdk38/src/pen.spec.ts b/packages/sdk38/src/pen.spec.ts index 2cb7caaf..13bf1b5c 100644 --- a/packages/sdk38/src/pen.spec.ts +++ b/packages/sdk38/src/pen.spec.ts @@ -1,4 +1,4 @@ -import { Secp256k1, Secp256k1Signature, Sha256 } from "@iov/crypto"; +import { Secp256k1, Secp256k1Signature, Sha256 } from "@cosmjs/crypto"; import { fromHex, toAscii } from "@iov/encoding"; import { Secp256k1Pen } from "./pen"; diff --git a/packages/sdk38/src/pen.ts b/packages/sdk38/src/pen.ts index 936abc0e..1c65a0da 100644 --- a/packages/sdk38/src/pen.ts +++ b/packages/sdk38/src/pen.ts @@ -7,7 +7,7 @@ import { Slip10, Slip10Curve, Slip10RawIndex, -} from "@iov/crypto"; +} from "@cosmjs/crypto"; import { rawSecp256k1PubkeyToAddress } from "./address"; import { encodeSecp256k1Signature } from "./signature"; diff --git a/packages/sdk38/src/sequence.ts b/packages/sdk38/src/sequence.ts index 5cf2a738..cc9a8a38 100644 --- a/packages/sdk38/src/sequence.ts +++ b/packages/sdk38/src/sequence.ts @@ -1,4 +1,4 @@ -import { Secp256k1, Secp256k1Signature, Sha256 } from "@iov/crypto"; +import { Secp256k1, Secp256k1Signature, Sha256 } from "@cosmjs/crypto"; import { makeSignBytes } from "./encoding"; import { decodeSignature } from "./signature"; diff --git a/packages/sdk38/src/testutils.spec.ts b/packages/sdk38/src/testutils.spec.ts index e4d7ca7b..6864b7ef 100644 --- a/packages/sdk38/src/testutils.spec.ts +++ b/packages/sdk38/src/testutils.spec.ts @@ -1,4 +1,4 @@ -import { Random } from "@iov/crypto"; +import { Random } from "@cosmjs/crypto"; import { Bech32 } from "@iov/encoding"; export function makeRandomAddress(): string { diff --git a/packages/sdk38/types/pen.d.ts b/packages/sdk38/types/pen.d.ts index 068db3cb..39e899f4 100644 --- a/packages/sdk38/types/pen.d.ts +++ b/packages/sdk38/types/pen.d.ts @@ -1,4 +1,4 @@ -import { Slip10RawIndex } from "@iov/crypto"; +import { Slip10RawIndex } from "@cosmjs/crypto"; import { StdSignature } from "./types"; export declare type PrehashType = "sha256" | "sha512" | null; /**