From 580fa713e99d80f78067c72e25ff7edf8eda3da8 Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Mon, 7 Feb 2022 15:04:01 +0100 Subject: [PATCH 1/5] Set wasmd to v.0.23.0 --- scripts/wasmd/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wasmd/env b/scripts/wasmd/env index 8e350f38..bc58d877 100644 --- a/scripts/wasmd/env +++ b/scripts/wasmd/env @@ -1,5 +1,5 @@ # Choose from https://hub.docker.com/r/cosmwasm/wasmd/tags REPOSITORY="cosmwasm/wasmd" -VERSION="v0.21.0" +VERSION="v0.23.0" CONTAINER_NAME="wasmd" From be1cbed33339d63c1c08b8ea24a13eb012491cc7 Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Mon, 7 Feb 2022 18:20:07 +0100 Subject: [PATCH 2/5] Increase defaultSendFee from 80_000 to 200_000 --- packages/cosmwasm-stargate/src/testutils.spec.ts | 2 +- scripts/wasmd/send_first.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts index cbec10b8..cf13ffe1 100644 --- a/packages/cosmwasm-stargate/src/testutils.spec.ts +++ b/packages/cosmwasm-stargate/src/testutils.spec.ts @@ -27,7 +27,7 @@ import { SigningCosmWasmClientOptions } from "./signingcosmwasmclient"; import hackatom from "./testdata/contract.json"; export const defaultGasPrice = GasPrice.fromString("0.025ucosm"); -export const defaultSendFee = calculateFee(80_000, defaultGasPrice); +export const defaultSendFee = calculateFee(200_000, defaultGasPrice); export const defaultUploadFee = calculateFee(1_500_000, defaultGasPrice); export const defaultInstantiateFee = calculateFee(500_000, defaultGasPrice); export const defaultExecuteFee = calculateFee(200_000, defaultGasPrice); diff --git a/scripts/wasmd/send_first.js b/scripts/wasmd/send_first.js index 68998d9a..25b2356f 100755 --- a/scripts/wasmd/send_first.js +++ b/scripts/wasmd/send_first.js @@ -25,7 +25,7 @@ async function main() { const client = await SigningStargateClient.connectWithSigner(rpcUrl, wallet, { prefix: prefix }); const recipient = Bech32.encode(prefix, Random.getBytes(20)); const amount = coins(226644, "ucosm"); - const fee = calculateFee(80_000, "0.025ucosm"); + const fee = calculateFee(200_000, "0.025ucosm"); const memo = "Ensure chain has my pubkey"; const sendResult = await client.sendTokens(faucet.address0, recipient, amount, fee, memo); assertIsDeliverTxSuccess(sendResult); From 45d3a03155248858ddbf08612f26ffadc4ab57ba Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Tue, 8 Feb 2022 09:20:18 +0100 Subject: [PATCH 3/5] Update testutils --- packages/cosmwasm-stargate/src/testutils.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts index cf13ffe1..5563bf0b 100644 --- a/packages/cosmwasm-stargate/src/testutils.spec.ts +++ b/packages/cosmwasm-stargate/src/testutils.spec.ts @@ -122,17 +122,17 @@ export const deployedHackatom = { instances: [ { beneficiary: alice.address0, - address: "wasm14hj2tavq8fpesdwxxcu44rty3hh90vhujgqwg3", + address: "wasm14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s0phg4d", label: "From deploy_hackatom.js (0)", }, { beneficiary: alice.address1, - address: "wasm1suhgf5svhu4usrurvxzlgn54ksxmn8glszahxx", + address: "wasm1suhgf5svhu4usrurvxzlgn54ksxmn8gljarjtxqnapv8kjnp4nrss5maay", label: "From deploy_hackatom.js (1)", }, { beneficiary: alice.address2, - address: "wasm1yyca08xqdgvjz0psg56z67ejh9xms6l49ntww0", + address: "wasm1yyca08xqdgvjz0psg56z67ejh9xms6l436u8y58m82npdqqhmmtqas0cl7", label: "From deploy_hackatom.js (2)", }, ], @@ -143,7 +143,7 @@ export const deployedIbcReflect = { codeId: 2, instances: [ { - address: "wasm1aakfpghcanxtc45gpqlx8j3rq0zcpyf4duy76f", + address: "wasm1aakfpghcanxtc45gpqlx8j3rq0zcpyf49qmhm9mdjrfx036h4z5se0hfnq", ibcPortId: "wasm.wasm1aakfpghcanxtc45gpqlx8j3rq0zcpyf4duy76f", }, ], From 68aafae95338f89e0286c5a33c77903d6a398e83 Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Tue, 8 Feb 2022 09:41:16 +0100 Subject: [PATCH 4/5] Update Testutils --- packages/cosmwasm-stargate/src/testutils.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts index 5563bf0b..099082ca 100644 --- a/packages/cosmwasm-stargate/src/testutils.spec.ts +++ b/packages/cosmwasm-stargate/src/testutils.spec.ts @@ -72,7 +72,7 @@ export const tendermintIdMatcher = /^[0-9A-F]{64}$/; export const base64Matcher = /^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$/; // https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#bech32 -export const bech32AddressMatcher = /^[\x21-\x7e]{1,83}1[02-9ac-hj-np-z]{38}$/; +export const bech32AddressMatcher = /^[\x21-\x7e]{1,83}1[02-9ac-hj-np-z]{58}$/; export const alice = { mnemonic: "enlist hip relief stomach skate base shallow young switch frequent cry park", @@ -144,7 +144,7 @@ export const deployedIbcReflect = { instances: [ { address: "wasm1aakfpghcanxtc45gpqlx8j3rq0zcpyf49qmhm9mdjrfx036h4z5se0hfnq", - ibcPortId: "wasm.wasm1aakfpghcanxtc45gpqlx8j3rq0zcpyf4duy76f", + ibcPortId: "wasm.wasm1aakfpghcanxtc45gpqlx8j3rq0zcpyf49qmhm9mdjrfx036h4z5se0hfnq", }, ], }; From e3299d704cacad0e329afc79e5465827325f45dd Mon Sep 17 00:00:00 2001 From: Milan Steiner Date: Tue, 8 Feb 2022 10:59:44 +0100 Subject: [PATCH 5/5] extend bech32AddressMatcher in testutils --- packages/cosmwasm-stargate/src/testutils.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts index 099082ca..1a387d92 100644 --- a/packages/cosmwasm-stargate/src/testutils.spec.ts +++ b/packages/cosmwasm-stargate/src/testutils.spec.ts @@ -72,7 +72,7 @@ export const tendermintIdMatcher = /^[0-9A-F]{64}$/; export const base64Matcher = /^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$/; // https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#bech32 -export const bech32AddressMatcher = /^[\x21-\x7e]{1,83}1[02-9ac-hj-np-z]{58}$/; +export const bech32AddressMatcher = /^[\x21-\x7e]{1,83}1[02-9ac-hj-np-z]{38,58}$/; export const alice = { mnemonic: "enlist hip relief stomach skate base shallow young switch frequent cry park",