From dbfad3c9e806e4765260ee8c9edd6d8eb7f7fc4c Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 2 Dec 2020 14:44:52 +0000 Subject: [PATCH 1/4] scripts: Tidy wasmd start script --- scripts/wasmd/init.sh | 1 + scripts/wasmd/start.sh | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/scripts/wasmd/init.sh b/scripts/wasmd/init.sh index 87a22837..1a07feeb 100755 --- a/scripts/wasmd/init.sh +++ b/scripts/wasmd/init.sh @@ -28,4 +28,5 @@ SCRIPT_DIR="$(realpath "$(dirname "$0")")" # "$SCRIPT_DIR/deploy_hackatom.js" # "$SCRIPT_DIR/deploy_erc20.js" # "$SCRIPT_DIR/deploy_cw3.js" +# "$SCRIPT_DIR/deploy_cw1.js" # # "$SCRIPT_DIR/deploy_nameservice.js" diff --git a/scripts/wasmd/start.sh b/scripts/wasmd/start.sh index 5cf54867..e9e4fbd2 100755 --- a/scripts/wasmd/start.sh +++ b/scripts/wasmd/start.sh @@ -46,16 +46,6 @@ if ! timeout 180 bash -c "until [ \"\$( docker container inspect -f '{{.State.St exit 1 fi -# docker exec "$CONTAINER_NAME" \ -# wasmcli rest-server \ -# --node tcp://localhost:26657 \ -# --trust-node \ -# --unsafe-cors \ -# --laddr "tcp://0.0.0.0:$LCD_API_PORT_GUEST" \ -# > "$REST_SERVER_LOGFILE" & - -# echo "rest server running on http://localhost:$LCD_API_PORT_HOST and logging into $REST_SERVER_LOGFILE - if [ -n "${CI:-}" ]; then # Give process some time to come alive. No idea why this helps. Needed for CI. sleep 0.5 From d9430fc15fb7ec2134f9fdf45c5dbe38268c52a8 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 2 Dec 2020 14:49:44 +0000 Subject: [PATCH 2/4] scripts: Add contracts to wasmd --- scripts/wasmd/contracts/checksums.sha256 | 5 +++++ scripts/wasmd/contracts/cw-nameservice.wasm | 3 +++ scripts/wasmd/contracts/cw1_subkeys.wasm | 3 +++ scripts/wasmd/contracts/cw3_fixed_multisig.wasm | 3 +++ scripts/wasmd/contracts/cw_erc20.wasm | 3 +++ scripts/wasmd/contracts/hackatom.wasm | 3 +++ 6 files changed, 20 insertions(+) create mode 100644 scripts/wasmd/contracts/checksums.sha256 create mode 100644 scripts/wasmd/contracts/cw-nameservice.wasm create mode 100644 scripts/wasmd/contracts/cw1_subkeys.wasm create mode 100644 scripts/wasmd/contracts/cw3_fixed_multisig.wasm create mode 100644 scripts/wasmd/contracts/cw_erc20.wasm create mode 100644 scripts/wasmd/contracts/hackatom.wasm diff --git a/scripts/wasmd/contracts/checksums.sha256 b/scripts/wasmd/contracts/checksums.sha256 new file mode 100644 index 00000000..b441fcd8 --- /dev/null +++ b/scripts/wasmd/contracts/checksums.sha256 @@ -0,0 +1,5 @@ +c478a6d9d6303e67f28d7863ea6e07426e9f0082744557d503e723bc1c46ccf8 cw1_subkeys.wasm +1a4a376ef1099ad3edc33aa1d3105e4621bc49e44b1ac0a449d7b6912e40fb0a cw3_fixed_multisig.wasm +ebc2b11e2afa50d5dcd4234840cd581e948a59d888bb8d651598bba3732cd8ee cw-nameservice.wasm +d04368320ad55089384adb171aaea39e43d710d7608829adba0300ed30aa2988 cw_erc20.wasm +3defc33a41f58c71d38b176d521c411d8e74d26403fde7660486930c7579a016 hackatom.wasm diff --git a/scripts/wasmd/contracts/cw-nameservice.wasm b/scripts/wasmd/contracts/cw-nameservice.wasm new file mode 100644 index 00000000..21a6ddb8 --- /dev/null +++ b/scripts/wasmd/contracts/cw-nameservice.wasm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebc2b11e2afa50d5dcd4234840cd581e948a59d888bb8d651598bba3732cd8ee +size 117929 diff --git a/scripts/wasmd/contracts/cw1_subkeys.wasm b/scripts/wasmd/contracts/cw1_subkeys.wasm new file mode 100644 index 00000000..beeddda4 --- /dev/null +++ b/scripts/wasmd/contracts/cw1_subkeys.wasm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c478a6d9d6303e67f28d7863ea6e07426e9f0082744557d503e723bc1c46ccf8 +size 267814 diff --git a/scripts/wasmd/contracts/cw3_fixed_multisig.wasm b/scripts/wasmd/contracts/cw3_fixed_multisig.wasm new file mode 100644 index 00000000..61772386 --- /dev/null +++ b/scripts/wasmd/contracts/cw3_fixed_multisig.wasm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a4a376ef1099ad3edc33aa1d3105e4621bc49e44b1ac0a449d7b6912e40fb0a +size 247712 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/contracts/hackatom.wasm b/scripts/wasmd/contracts/hackatom.wasm new file mode 100644 index 00000000..45ba6a09 --- /dev/null +++ b/scripts/wasmd/contracts/hackatom.wasm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3defc33a41f58c71d38b176d521c411d8e74d26403fde7660486930c7579a016 +size 170947 From e33d1613076289c5175b4f33ffdb5ac81c785e05 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 2 Dec 2020 14:50:06 +0000 Subject: [PATCH 3/4] scripts: Enable contract checksums in wasmd init --- scripts/wasmd/init.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/wasmd/init.sh b/scripts/wasmd/init.sh index 1a07feeb..c091d790 100755 --- a/scripts/wasmd/init.sh +++ b/scripts/wasmd/init.sh @@ -17,14 +17,14 @@ SCRIPT_DIR="$(realpath "$(dirname "$0")")" # "$SCRIPT_DIR/send_first.js" -# # -# # CosmWasm init -# # -# ( -# echo "Ensuring contracts' checksums are correct ..." -# cd "$SCRIPT_DIR/contracts" -# sha256sum --check checksums.sha256 -# ) +# +# CosmWasm init +# +( + echo "Ensuring contracts' checksums are correct ..." + cd "$SCRIPT_DIR/contracts" + sha256sum --check checksums.sha256 +) # "$SCRIPT_DIR/deploy_hackatom.js" # "$SCRIPT_DIR/deploy_erc20.js" # "$SCRIPT_DIR/deploy_cw3.js" From c9898c79a601746caf865a80e2df2eb91f869b9e Mon Sep 17 00:00:00 2001 From: willclarktech Date: Tue, 8 Dec 2020 10:00:21 +0000 Subject: [PATCH 4/4] scripts: Update wasmd to v0.13 --- scripts/wasmd/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wasmd/env b/scripts/wasmd/env index b40497d0..2153f2ff 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.12.1" +VERSION="v0.13.0" CONTAINER_NAME="wasmd"