diff --git a/packages/bcp/package.json b/packages/bcp/package.json index 216d6ef7a3..1b26354d1d 100644 --- a/packages/bcp/package.json +++ b/packages/bcp/package.json @@ -41,10 +41,10 @@ "dependencies": { "@cosmjs/crypto": "^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", - "@iov/utils": "^2.3.2", "bn.js": "^5.1.1", "fast-deep-equal": "^3.1.1", "readonly-date": "^1.0.0", diff --git a/packages/bcp/src/cosmosconnection.spec.ts b/packages/bcp/src/cosmosconnection.spec.ts index 0f2a903638..e47758dcf8 100644 --- a/packages/bcp/src/cosmosconnection.spec.ts +++ b/packages/bcp/src/cosmosconnection.spec.ts @@ -1,5 +1,6 @@ import { Random, Secp256k1, Secp256k1Signature, Sha256 } from "@cosmjs/crypto"; import { decodeSignature } from "@cosmjs/sdk38"; +import { assert } from "@cosmjs/utils"; import { Account, Address, @@ -20,7 +21,6 @@ import { } from "@iov/bcp"; import { Bech32, fromBase64 } from "@iov/encoding"; import { HdPaths, Secp256k1HdWallet, UserProfile } from "@iov/keycontrol"; -import { assert } from "@iov/utils"; import BN from "bn.js"; import { CosmosConnection, TokenConfiguration } from "./cosmosconnection"; diff --git a/packages/cli/package.json b/packages/cli/package.json index 9c0f7526bc..3e41754520 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -41,8 +41,8 @@ "@cosmjs/cosmwasm": "^0.8.0", "@cosmjs/crypto": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", + "@cosmjs/utils": "^0.8.0", "@iov/encoding": "^2.3.2", - "@iov/utils": "^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 34f58eee94..6b960ef5b3 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -118,7 +118,7 @@ export function main(originalArgs: readonly string[]): void { "Uint64", ], ], - ["@iov/utils", ["assert", "sleep"]], + ["@cosmjs/utils", ["assert", "sleep"]], ]); console.info(colors.green("Initializing session for you. Have fun!")); diff --git a/packages/cosmwasm/package.json b/packages/cosmwasm/package.json index 0099399f64..ccf4506929 100644 --- a/packages/cosmwasm/package.json +++ b/packages/cosmwasm/package.json @@ -38,8 +38,8 @@ "dependencies": { "@cosmjs/crypto": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", + "@cosmjs/utils": "^0.8.0", "@iov/encoding": "^2.3.2", - "@iov/utils": "^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 f278f0baf5..ca14c2d1fe 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 { Coin, CosmosSdkTx, isMsgSend, makeSignBytes, MsgSend, Secp256k1Pen } from "@cosmjs/sdk38"; +import { assert, sleep } from "@cosmjs/utils"; import { Uint53 } from "@iov/encoding"; -import { assert, sleep } from "@iov/utils"; 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 90541a88fa..744f53974b 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 { makeSignBytes, MsgSend, Secp256k1Pen, StdFee } from "@cosmjs/sdk38"; +import { assert, sleep } from "@cosmjs/utils"; import { Bech32, fromHex, fromUtf8, toAscii, toBase64 } from "@iov/encoding"; -import { assert, sleep } from "@iov/utils"; import { ReadonlyDate } from "readonly-date"; import { Code, CosmWasmClient, PrivateCosmWasmClient } from "./cosmwasmclient"; diff --git a/packages/cosmwasm/src/restclient.spec.ts b/packages/cosmwasm/src/restclient.spec.ts index c73b97e908..3789f60bab 100644 --- a/packages/cosmwasm/src/restclient.spec.ts +++ b/packages/cosmwasm/src/restclient.spec.ts @@ -15,8 +15,8 @@ import { StdSignature, StdTx, } from "@cosmjs/sdk38"; +import { assert, sleep } from "@cosmjs/utils"; import { Bech32, fromAscii, fromBase64, fromHex, toAscii, toBase64, toHex } from "@iov/encoding"; -import { assert, sleep } from "@iov/utils"; import { ReadonlyDate } from "readonly-date"; import { findAttribute, parseLogs } from "./logs"; diff --git a/packages/cosmwasm/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm/src/signingcosmwasmclient.spec.ts index 3d70157120..69d4995f8e 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 { Coin, Secp256k1Pen } from "@cosmjs/sdk38"; +import { assert } from "@cosmjs/utils"; import { toHex } from "@iov/encoding"; -import { assert } from "@iov/utils"; import { PrivateCosmWasmClient } from "./cosmwasmclient"; import { RestClient } from "./restclient"; diff --git a/packages/faucet/package.json b/packages/faucet/package.json index ed9622c196..dcaae4ff1d 100644 --- a/packages/faucet/package.json +++ b/packages/faucet/package.json @@ -37,8 +37,8 @@ "dependencies": { "@cosmjs/crypto": "^0.8.0", "@cosmjs/sdk38": "^0.8.0", + "@cosmjs/utils": "^0.8.0", "@iov/encoding": "^2.3.2", - "@iov/utils": "^2.3.2", "@koa/cors": "^3.0.0", "axios": "^0.19.0", "koa": "^2.11.0", diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts index de2721b6cc..2809cd1cb2 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 { CosmosClient } from "@cosmjs/sdk38"; +import { assert } from "@cosmjs/utils"; import { Bech32 } from "@iov/encoding"; -import { assert } from "@iov/utils"; import { Faucet } from "./faucet"; import { TokenConfiguration } from "./types"; diff --git a/packages/faucet/src/faucet.ts b/packages/faucet/src/faucet.ts index 9fe0655e1a..6e9f78fd92 100644 --- a/packages/faucet/src/faucet.ts +++ b/packages/faucet/src/faucet.ts @@ -1,5 +1,5 @@ import { CosmosClient, Pen, SigningCosmosClient } from "@cosmjs/sdk38"; -import { sleep } from "@iov/utils"; +import { sleep } from "@cosmjs/utils"; import { debugAccount, logAccountsState, logSendJob } from "./debugging"; import { createPens } from "./profile"; diff --git a/packages/sdk38/package.json b/packages/sdk38/package.json index 7287eacf93..3b655453be 100644 --- a/packages/sdk38/package.json +++ b/packages/sdk38/package.json @@ -37,8 +37,8 @@ }, "dependencies": { "@cosmjs/crypto": "^0.8.0", + "@cosmjs/utils": "^0.8.0", "@iov/encoding": "^2.3.2", - "@iov/utils": "^2.3.2", "axios": "^0.19.0", "fast-deep-equal": "^3.1.1" }, diff --git a/packages/sdk38/src/cosmosclient.searchtx.spec.ts b/packages/sdk38/src/cosmosclient.searchtx.spec.ts index 3cf19b051e..25d0670012 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 { assert, sleep } from "@cosmjs/utils"; import { Uint53 } from "@iov/encoding"; -import { assert, sleep } from "@iov/utils"; import { Coin } from "./coins"; import { CosmosClient } from "./cosmosclient"; diff --git a/packages/sdk38/src/cosmosclient.spec.ts b/packages/sdk38/src/cosmosclient.spec.ts index 12bce12b34..3f7778995d 100644 --- a/packages/sdk38/src/cosmosclient.spec.ts +++ b/packages/sdk38/src/cosmosclient.spec.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/camelcase */ -import { sleep } from "@iov/utils"; +import { sleep } from "@cosmjs/utils"; import { ReadonlyDate } from "readonly-date"; import { CosmosClient, PrivateCosmWasmClient } from "./cosmosclient"; diff --git a/packages/sdk38/src/restclient.spec.ts b/packages/sdk38/src/restclient.spec.ts index 3e919e1445..b014803a0e 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 { assert, sleep } from "@cosmjs/utils"; import { fromBase64 } from "@iov/encoding"; -import { assert, sleep } from "@iov/utils"; import { ReadonlyDate } from "readonly-date"; import { rawSecp256k1PubkeyToAddress } from "./address"; diff --git a/packages/sdk38/src/signingcosmosclient.spec.ts b/packages/sdk38/src/signingcosmosclient.spec.ts index 5054d92580..f2c186ba29 100644 --- a/packages/sdk38/src/signingcosmosclient.spec.ts +++ b/packages/sdk38/src/signingcosmosclient.spec.ts @@ -1,4 +1,4 @@ -import { assert } from "@iov/utils"; +import { assert } from "@cosmjs/utils"; import { Coin } from "./coins"; import { PrivateCosmWasmClient } from "./cosmosclient"; diff --git a/yarn.lock b/yarn.lock index 8dd5abc7f0..3c9a67f493 100644 --- a/yarn.lock +++ b/yarn.lock @@ -157,11 +157,6 @@ dependencies: xstream "^11.10.0" -"@iov/utils@^2.3.2": - version "2.3.2" - resolved "https://registry.yarnpkg.com/@iov/utils/-/utils-2.3.2.tgz#a499ec304b4febaeb3af309dedbb30e14a09c91e" - integrity sha512-mtdZ8zh/LGjwA72HofOc8JF3KN1Rc1jwaQATePLDwIIJRw0AJXx2GLRBBRjja41huuw9ND0E2mQWlYLtYsNnUA== - "@koa/cors@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-3.0.0.tgz#df021b4df2dadf1e2b04d7c8ddf93ba2d42519cb"