diff --git a/packages/cli/README.md b/packages/cli/README.md index 40da3cca..c40c677a 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -64,9 +64,8 @@ const sendTokensMsg: types.MsgSend = { }, }; -const signBytes = makeSignBytes([sendTokensMsg], defaultFee, defaultNetworkId, memo, account) as SignableBytes; -const rawSignature = await wallet.createTransactionSignature(signer, signBytes, PrehashType.Sha256); -const signature = encodeSecp256k1Signature(signer.pubkey.data, rawSignature); +const signBytes = makeSignBytes([sendTokensMsg], defaultFee, defaultNetworkId, memo, account); +const signature = encodeSecp256k1Signature(pen.pubkey, await pen.createSignature(signBytes)); const signedTx: types.StdTx = { msg: [sendTokensMsg], fee: defaultFee, diff --git a/packages/cli/examples/local_faucet.ts b/packages/cli/examples/local_faucet.ts index 2b6c6522..21199c9c 100644 --- a/packages/cli/examples/local_faucet.ts +++ b/packages/cli/examples/local_faucet.ts @@ -12,10 +12,7 @@ const defaultFee: types.StdFee = { const faucetMnemonic = "economy stock theory fatal elder harbor betray wasp final emotion task crumble siren bottom lizard educate guess current outdoor pair theory focus wife stone"; -const faucetPath = HdPaths.cosmos(0); const faucetAddress = "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6"; -const wallet = Secp256k1HdWallet.fromMnemonic(faucetMnemonic); -const signer = await wallet.createIdentity("unused_value" as ChainId, faucetPath); - +const pen = await Secp256k1Pen.fromMnemonic(faucetMnemonic); const client = new RestClient(defaultHttpUrl); diff --git a/packages/cli/package.json b/packages/cli/package.json index 44ed3548..156d8d11 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -34,10 +34,8 @@ ], "dependencies": { "@cosmwasm/sdk": "^0.0.3", - "@iov/bcp": "^2.0.0-alpha.7", "@iov/crypto": "^2.0.0-alpha.7", "@iov/encoding": "^2.0.0-alpha.7", - "@iov/keycontrol": "^2.0.0-alpha.7", "@iov/utils": "^2.0.0-alpha.7", "argparse": "^1.0.10", "babylon": "^6.18.0", diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts index 5631d517..d39287a9 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -50,29 +50,6 @@ export function main(originalArgs: readonly string[]): void { "types", ], ], - [ - "@iov/bcp", - [ - "Address", - "Algorithm", - "ChainId", - "Nonce", - "PrehashType", - "PubkeyBytes", - "SendTransaction", - "SignableBytes", - "TokenTicker", - "TransactionId", - // block info - "BlockInfoPending", - "BlockInfoSucceeded", - "BlockInfoFailed", - "BlockInfo", - "isBlockInfoPending", - "isBlockInfoSucceeded", - "isBlockInfoFailed", - ], - ], [ "@iov/crypto", [ @@ -101,20 +78,6 @@ export function main(originalArgs: readonly string[]): void { "Uint64", ], ], - [ - "@iov/keycontrol", - [ - "Ed25519HdWallet", - "HdPaths", - "Keyring", - "Secp256k1HdWallet", - "UserProfile", - "Wallet", - "WalletId", - "WalletImplementationIdString", - "WalletSerializationString", - ], - ], ["@iov/utils", ["sleep"]], ]); @@ -164,9 +127,6 @@ export function main(originalArgs: readonly string[]): void { const data = Encoding.toAscii("foo bar"); const signature = await pen.createSignature(data); - const profile = new UserProfile(); - const wallet = profile.addWallet(Ed25519HdWallet.fromMnemonic("degree tackle suggest window test behind mesh extra cover prepare oak script")); - console.info("Done testing, will exit now."); process.exit(0); `;