diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bde8b06ac..2e187adc7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https:// - mixnode: the mixnode learned how to shutdown gracefully. - vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275]) - native & socks5 clients: fail early when clients try to re-init with a different gateway, which is not supported yet ([#1322]) +- validator: fixed local docker-compose setup to work on Apple M1 ([#1329]) ### Changed @@ -61,6 +62,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https:// [#1318]: https://github.com/nymtech/nym/pull/1318 [#1322]: https://github.com/nymtech/nym/pull/1322 [#1328]: https://github.com/nymtech/nym/pull/1328 +[#1329]: https://github.com/nymtech/nym/pull/1329 ## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04) diff --git a/docker-compose.yml b/docker-compose.yml index 5e979080f6..b7ce864070 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,7 @@ x-network: &NETWORK BECH32_PREFIX: nymt DENOM: nymt STAKE_DENOM: nyxt - WASMD_VERSION: v0.26.0 - WASMD_COMMIT_HASH: dc5ef6fe84f0a5e3b0894692a18cc48fb5b00adf + WASMD_VERSION: v0.27.0 services: genesis_validator: diff --git a/docker/validator/Dockerfile b/docker/validator/Dockerfile index d7b11c2e56..cfcc007931 100644 --- a/docker/validator/Dockerfile +++ b/docker/validator/Dockerfile @@ -7,6 +7,6 @@ RUN ./setup.sh FROM ubuntu:20.04 COPY --from=go_builder /go/wasmd/build/nymd /root/nymd -COPY --from=go_builder /go/wasmd/build/libwasmvm.so /root/libwasmvm.so +COPY --from=go_builder /go/wasmd/build/libwasmvm*.so /root COPY init_and_start.sh . ENTRYPOINT ["./init_and_start.sh"] diff --git a/docker/validator/setup.sh b/docker/validator/setup.sh index 07eb96e224..efd40f0e14 100755 --- a/docker/validator/setup.sh +++ b/docker/validator/setup.sh @@ -1,8 +1,11 @@ #!/bin/sh +set -ue + git clone https://github.com/CosmWasm/wasmd.git cd wasmd git checkout "${WASMD_VERSION}" +WASMD_COMMIT_HASH=$(git rev-parse HEAD) mkdir build go build \ -o build/nymd -mod=readonly -tags "netgo,ledger" \ @@ -14,5 +17,4 @@ go build \ -X github.com/CosmWasm/wasmd/app.Bech32Prefix=${BECH32_PREFIX} \ -X 'github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger'" \ -trimpath ./cmd/wasmd -WASMVM_SO=$(ldd build/nymd | grep libwasmvm.so | awk '{ print $3 }') -cp "${WASMVM_SO}" build/ +find .. -type f -name 'libwasm*.so' -exec cp {} build \;