From 4dd356c7e42d4e1830ed26b398c0e1b43c7bcc9e Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 15 Oct 2020 11:35:22 +0200 Subject: [PATCH 1/2] Update and re-enable erc20 contract --- .circleci/config.yml | 6 +++--- packages/cosmwasm/src/testutils.spec.ts | 12 ++++++------ scripts/wasmd/contracts/checksums.sha256 | 2 +- scripts/wasmd/contracts/cw-erc20.wasm | 3 --- scripts/wasmd/contracts/cw_erc20.wasm | 3 +++ scripts/wasmd/deploy_erc20.js | 6 +++--- scripts/wasmd/init.sh | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 scripts/wasmd/contracts/cw-erc20.wasm create mode 100644 scripts/wasmd/contracts/cw_erc20.wasm diff --git a/.circleci/config.yml b/.circleci/config.yml index 11491d63..2db2007b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,7 +136,7 @@ jobs: - run: environment: WASMD_ENABLED: 1 - # ERC20_ENABLED: 1 + ERC20_ENABLED: 1 SIMAPP_ENABLED: 1 TENDERMINT_ENABLED: 1 SOCKETSERVER_ENABLED: 1 @@ -245,7 +245,7 @@ jobs: - run: environment: WASMD_ENABLED: 1 - # ERC20_ENABLED: 1 + ERC20_ENABLED: 1 SIMAPP_ENABLED: 1 TENDERMINT_ENABLED: 1 SOCKETSERVER_ENABLED: 1 @@ -335,7 +335,7 @@ jobs: - run: environment: WASMD_ENABLED: 1 - # ERC20_ENABLED: 1 + ERC20_ENABLED: 1 SIMAPP_ENABLED: 1 TENDERMINT_ENABLED: 1 SOCKETSERVER_ENABLED: 1 diff --git a/packages/cosmwasm/src/testutils.spec.ts b/packages/cosmwasm/src/testutils.spec.ts index c9004c41..d80c2e55 100644 --- a/packages/cosmwasm/src/testutils.spec.ts +++ b/packages/cosmwasm/src/testutils.spec.ts @@ -81,13 +81,13 @@ export const deployedHackatom = { /** Deployed as part of scripts/wasmd/init.sh */ export const deployedErc20 = { codeId: 2, - source: "https://crates.io/api/v1/crates/cw-erc20/not-yet-released/download", - builder: "cosmwasm/rust-optimizer:0.9.0", - checksum: "0f14abcc6fed08f2dd06896db974989db97dbcc6e8e30188b73fe5ab427c7785", + source: "https://crates.io/api/v1/crates/cw-erc20/0.7.0/download", + builder: "cosmwasm/rust-optimizer:0.10.4", + checksum: "d04368320ad55089384adb171aaea39e43d710d7608829adba0300ed30aa2988", instances: [ - "cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5", // HASH - "cosmos1hqrdl6wstt8qzshwc6mrumpjk9338k0lr4dqxd", // ISA - "cosmos18r5szma8hm93pvx6lwpjwyxruw27e0k5uw835c", // JADE + "cosmos1vjecguu37pmd577339wrdp208ddzymkudc46zj", // HASH + "cosmos1ym5m5dw7pttft5w430nxx6uat8f84ck4algmhg", // ISA + "cosmos1gv07846a3867ezn3uqkk082c5ftke7hpllcu8q", // JADE ], }; diff --git a/scripts/wasmd/contracts/checksums.sha256 b/scripts/wasmd/contracts/checksums.sha256 index 3eb0171a..6dcac988 100644 --- a/scripts/wasmd/contracts/checksums.sha256 +++ b/scripts/wasmd/contracts/checksums.sha256 @@ -1,3 +1,3 @@ -0f14abcc6fed08f2dd06896db974989db97dbcc6e8e30188b73fe5ab427c7785 cw-erc20.wasm ebc2b11e2afa50d5dcd4234840cd581e948a59d888bb8d651598bba3732cd8ee cw-nameservice.wasm +d04368320ad55089384adb171aaea39e43d710d7608829adba0300ed30aa2988 cw_erc20.wasm 3defc33a41f58c71d38b176d521c411d8e74d26403fde7660486930c7579a016 hackatom.wasm diff --git a/scripts/wasmd/contracts/cw-erc20.wasm b/scripts/wasmd/contracts/cw-erc20.wasm deleted file mode 100644 index 3abe49e7..00000000 --- a/scripts/wasmd/contracts/cw-erc20.wasm +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f14abcc6fed08f2dd06896db974989db97dbcc6e8e30188b73fe5ab427c7785 -size 121327 diff --git a/scripts/wasmd/contracts/cw_erc20.wasm b/scripts/wasmd/contracts/cw_erc20.wasm new file mode 100644 index 00000000..03236721 --- /dev/null +++ b/scripts/wasmd/contracts/cw_erc20.wasm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d04368320ad55089384adb171aaea39e43d710d7608829adba0300ed30aa2988 +size 137244 diff --git a/scripts/wasmd/deploy_erc20.js b/scripts/wasmd/deploy_erc20.js index 1219d7f4..ec45e679 100755 --- a/scripts/wasmd/deploy_erc20.js +++ b/scripts/wasmd/deploy_erc20.js @@ -22,8 +22,8 @@ const guest = { }; const codeMeta = { - source: "https://crates.io/api/v1/crates/cw-erc20/not-yet-released/download", - builder: "cosmwasm/rust-optimizer:0.9.0", + source: "https://crates.io/api/v1/crates/cw-erc20/0.7.0/download", + builder: "cosmwasm/rust-optimizer:0.10.4", }; const initDataHash = { @@ -137,7 +137,7 @@ async function main() { const wallet = await Secp256k1HdWallet.fromMnemonic(alice.mnemonic); const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet); - const wasm = fs.readFileSync(__dirname + "/contracts/cw-erc20.wasm"); + const wasm = fs.readFileSync(__dirname + "/contracts/cw_erc20.wasm"); const uploadReceipt = await client.upload(wasm, codeMeta, "Upload ERC20 contract"); console.info(`Upload succeeded. Receipt: ${JSON.stringify(uploadReceipt)}`); diff --git a/scripts/wasmd/init.sh b/scripts/wasmd/init.sh index 22e316c9..617001f2 100755 --- a/scripts/wasmd/init.sh +++ b/scripts/wasmd/init.sh @@ -25,5 +25,5 @@ SCRIPT_DIR="$(realpath "$(dirname "$0")")" sha256sum --check checksums.sha256 ) "$SCRIPT_DIR/deploy_hackatom.js" -# "$SCRIPT_DIR/deploy_erc20.js" +"$SCRIPT_DIR/deploy_erc20.js" # "$SCRIPT_DIR/deploy_nameservice.js" From ed120b6383ff543acba2ac085ff4eca1fed20cc6 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Thu, 15 Oct 2020 11:36:25 +0200 Subject: [PATCH 2/2] Fix wasmd start script --- scripts/wasmd/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wasmd/start.sh b/scripts/wasmd/start.sh index a5cbe716..816b1ea6 100755 --- a/scripts/wasmd/start.sh +++ b/scripts/wasmd/start.sh @@ -37,7 +37,7 @@ echo "wasmd running and logging into $WASMD_LOGFILE" # sleep 3 && cat "$WASMD_LOGFILE" # Use a large timeout because of potentially long image download in `docker run` -if ! timeout 180 bash -c "until docker inspect -f '{{.State.Running}}' '$CONTAINER_NAME' &> /dev/null; do sleep 0.5; done"; then +if ! timeout 180 bash -c "until [ \"\$( docker container inspect -f '{{.State.Status}}' \"$CONTAINER_NAME\" 2> /dev/null )\" = \"running\" ]; do sleep 0.5; done"; then echo "Container named '$CONTAINER_NAME' not running. We cannot continue." \ "This can happen when 'docker run' needs too long to download and start." \ "It might be worth retrying this step once the image is in the local docker cache."