feat: bump up wasmvm from v1.1.1 to v1.4.1

.github/workflows/builds_and_tests.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.60.0
+          toolchain: 1.67.0
           target: wasm32-unknown-unknown
           profile: minimal
           override: true
@@ -19,7 +19,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cargo
-          key: cargocache-v2-libwasmvm_sanity-rust:1.60.0-${{ hashFiles('Cargo.lock') }}
+          key: cargocache-v2-libwasmvm_sanity-rust:1.67.0-${{ hashFiles('Cargo.lock') }}
       - name: Install shellcheck
         run: sudo apt install shellcheck
       - name: Show version information
@@ -133,7 +133,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.60.0
+          toolchain: 1.67.0
           target: x86_64-unknown-linux-gnu
           profile: minimal
           override: true
@@ -143,7 +143,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cargo
-          key: cargocache-v2-build_shared_library-rust:1.60.0-${{ hashFiles('Cargo.lock') }}
+          key: cargocache-v2-build_shared_library-rust:1.67.0-${{ hashFiles('Cargo.lock') }}
       - name: Show version information
         run: rustc --version; cargo --version; rustup --version
       - name: Create release build of libwasmvm

.github/workflows/deploy_to_git.yml

@@ -176,7 +176,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.60.0
+          toolchain: 1.67.0
           profile: minimal
           override: true
       - name: Checkout

.github/workflows/lint-go.yml

@@ -0,0 +1,55 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  # pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+          cache: false
+      - name: golangci-lint
+        uses: golangci/[email protected]
+        with:
+          # Require: The version of golangci-lint to use.
+          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
+          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
+          version: v1.53
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          #
+          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
+          # The location of the configuration file can be changed by using `--config=`
+          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true, then all caching functionality will be completely disabled,
+          #           takes precedence over all other caching options.
+          # skip-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true
+
+          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
+          # install-mode: "goinstall"

.gitignore

@@ -6,12 +6,10 @@
 .vscode
 
 # no static libraries (35MB+)
-lib*.a
+/internal/api/lib*.a
 
 # artifacts from compile tests
-artifacts/
-muslc.exe
-static.exe
+/build/
 /demo
 tmp
 a.out

.prettierrc.json

@@ -0,0 +1,10 @@
+{
+  "overrides": [
+    {
+      "files": "*.md",
+      "options": {
+        "proseWrap": "always"
+      }
+    }
+  ]
+}

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased](https://github.com/Finschia/wasmvm/compare/v1.1.1-0.11.6...HEAD)
+
+### Features
+* bump up wasmvm from v1.1.1 to v1.4.1 ([#136](https://github.com/Finschia/wasmvm/pull/136))
+
 ## [[1.1.1-0.11.6](https://github.com/Finschia/wasmvm/compare/v1.1.1+0.11.5...v1.1.1-0.11.6)] - 2023-10-18
 ### Changes
 * revert: use pre-release versioning and set version to 1.1.1-0.11.6 ([#130](https://github.com/Finschia/wasmvm/pull/130))

Makefile

@@ -54,6 +54,7 @@ build-rust-release:
 
 build-go:
 	go build ./...
+	go build -o build/demo ./cmd/demo
 
 test:
 	# Use package list mode to include all subdirectores. The -count=1 turns off caching.
@@ -65,7 +66,9 @@ test-safety:
 
 # Creates a release build in a containerized build environment of the static library for Alpine Linux (.a)
 release-build-alpine:
-	rm -rf libwasmvm/target/release
+	# Builders should not write their target folder into the host file system (https://github.com/CosmWasm/wasmvm/issues/437)
+	rm -rf libwasmvm/target/aarch64-unknown-linux-musl/release
+	rm -rf libwasmvm/target/x86_64-unknown-linux-musl/release
 	# build the muslc *.a file
 	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-alpine
 	cp libwasmvm/artifacts/libwasmvm_muslc.a internal/api
@@ -78,14 +81,17 @@ release-build-alpine:
 
 # Creates a release build in a containerized build environment of the shared library for glibc Linux (.so)
 release-build-linux:
-	rm -rf libwasmvm/target/release
-	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-centos7
+	# Builders should not write their target folder into the host file system (https://github.com/CosmWasm/wasmvm/issues/437)
+	rm -rf libwasmvm/target/x86_64-unknown-linux-gnu/release
+	rm -rf libwasmvm/target/aarch64-unknown-linux-gnu/release
+	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-centos7 build_linux.sh
 	cp libwasmvm/artifacts/libwasmvm.x86_64.so internal/api
 	cp libwasmvm/artifacts/libwasmvm.aarch64.so internal/api
 	make update-bindings
 
 # Creates a release build in a containerized build environment of the shared library for macOS (.dylib)
 release-build-macos:
+	# Builders should not write their target folder into the host file system (https://github.com/CosmWasm/wasmvm/issues/437)
 	rm -rf libwasmvm/target/x86_64-apple-darwin/release
 	rm -rf libwasmvm/target/aarch64-apple-darwin/release
 	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-cross build_macos.sh
@@ -94,18 +100,17 @@ release-build-macos:
 
 # Creates a release build in a containerized build environment of the static library for macOS (.a)
 release-build-macos-static:
+	# Builders should not write their target folder into the host file system (https://github.com/CosmWasm/wasmvm/issues/437)
 	rm -rf libwasmvm/target/x86_64-apple-darwin/release
 	rm -rf libwasmvm/target/aarch64-apple-darwin/release
-	docker run --rm -u $(USER_ID):$(USER_GROUP) \
-		-v $(shell pwd)/libwasmvm:/code \
-		-v $(shell pwd)/builders/guest/build_macos_static.sh:/usr/local/bin/build_macos_static.sh \
-		$(BUILDERS_PREFIX)-cross build_macos_static.sh
+	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-cross build_macos_static.sh
 	cp libwasmvm/artifacts/libwasmvmstatic_darwin.a internal/api/libwasmvmstatic_darwin.a
 	make update-bindings
 
 # Creates a release build in a containerized build environment of the shared library for Windows (.dll)
 release-build-windows:
-	rm -rf libwasmvm/target/release
+	# Builders should not write their target folder into the host file system (https://github.com/CosmWasm/wasmvm/issues/437)
+	rm -rf libwasmvm/target/x86_64-pc-windows-gnu/release
 	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-cross build_windows.sh
 	cp libwasmvm/target/x86_64-pc-windows-gnu/release/wasmvm.dll internal/api
 	make update-bindings
@@ -144,3 +149,13 @@ test-alpine: release-build-alpine
 
 	@# Run binary locally if you are on Linux
 	@# ./demo ./testdata/hackatom.wasm
+
+.PHONY: format
+format:
+	find . -name '*.go' -type f | xargs gofumpt -w -s
+	find . -name '*.go' -type f | xargs misspell -w
+	find . -name '*.go' -type f | xargs goimports -w -local github.com/CosmWasm/wasmvm
+
+.PHONY: lint
+lint:
+	golangci-lint run

builders/Dockerfile.alpine

@@ -2,7 +2,7 @@
 # 1. Build the static Rust library
 # 2. Execute Go tests that use and test this library
 # For 2. we define the Go image here. For 1. we install Rust below.
-FROM golang:1.20-alpine
+FROM golang:1.19.7-alpine
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
@@ -16,7 +16,7 @@ RUN set -eux \
 
 RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init" \
   && chmod +x rustup-init \
-  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.63.0 \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.69.0 \
   && rm rustup-init \
   && chmod -R a+w $RUSTUP_HOME $CARGO_HOME
 

builders/Dockerfile.centos7

@@ -26,25 +26,21 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 
 RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \
   && chmod +x rustup-init \
-  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.60.0 \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.69.0 \
   && rm rustup-init \
   && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
   && rustup --version \
   && cargo --version \
-  && rustc --version
-
-# Add aarch64 as a target of compilation
-RUN rustup target add aarch64-unknown-linux-gnu
-
-# allow non-root user to download more deps later
-RUN chmod -R 777 /usr/local/cargo
+  && rustc --version \
+  && chmod -R 777 /usr/local/cargo \
+  && rustup target add aarch64-unknown-linux-gnu
 
 ## COPY BUILD SCRIPTS
 
 WORKDIR /code
 
-COPY guest/*.sh /opt/
-RUN chmod +x /opt/*.sh
+COPY guest/*.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/*.sh
 
 RUN mkdir /.cargo
 RUN chmod +rx /.cargo
@@ -57,4 +53,4 @@ RUN wget http://mirror.centos.org/altarch/7/os/aarch64/Packages/libgcc-4.8.5-44.
   && cp /code/lib64/libgcc_s-4.8.5-20150702.so.1 /usr/lib/gcc/aarch64-linux-gnu/4.8.5/libgcc_s.so \
   && rm libgcc-*.el7.aarch64.rpm
 
-CMD ["/opt/build_linux.sh"]
+CMD ["bash", "-c", "echo 'Argument missing. Pass one build script (e.g. build_linux.sh) to docker run' && exit 1"]

builders/Dockerfile.cross

@@ -1,4 +1,4 @@
-FROM rust:1.63.0-bullseye
+FROM rust:1.69.0-bullseye
 
 # Install build dependencies
 RUN apt-get update \

builders/README.md

@@ -1,15 +1,15 @@
 # Cross Compilation Scripts
 
 As this library is targetting go developers, we cannot assume a properly set up
-rust environment on their system. Further, when importing this library, there is no
-clean way to add a `libwasmvm.{so,dll,dylib}`. It needs to be committed with the
-tagged (go) release in order to be easily usable.
+rust environment on their system. Further, when importing this library, there is
+no clean way to add a `libwasmvm.{so,dll,dylib}`. It needs to be committed with
+the tagged (go) release in order to be easily usable.
 
-The solution is to precompile the rust code into libraries for the major platforms
-(Linux, Windows, MacOS) and commit them to the repository at each tagged release.
-This should be doable from one host machine, but is a bit tricky. This folder
-contains build scripts and a Docker image to create all dynamic libraries from one
-host. In general this is set up for a Linux host, but any machine that can run Docker
-can do the cross-compilation.
+The solution is to precompile the rust code into libraries for the major
+platforms (Linux, Windows, MacOS) and commit them to the repository at each
+tagged release. This should be doable from one host machine, but is a bit
+tricky. This folder contains build scripts and a Docker image to create all
+dynamic libraries from one host. In general this is set up for a Linux host, but
+any machine that can run Docker can do the cross-compilation.
 
 For more information visit [here](https://github.com/CosmWasm/wasmvm/tree/main/builders#readme).

builders/guest/build_gnu_aarch64.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -o errexit -o nounset -o pipefail
+
+export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+
+# See https://github.com/CosmWasm/wasmvm/issues/222#issuecomment-880616953 for two approaches to
+# enable stripping through cargo (if that is desired).
+
+echo "Starting aarch64-unknown-linux-gnu build"
+export CC=clang
+export CXX=clang++
+export qemu_aarch64="qemu-aarch64 -L /usr/aarch64-linux-gnu"
+export CC_aarch64_unknown_linux_gnu=clang
+export AR_aarch64_unknown_linux_gnu=llvm-ar
+export CFLAGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu"
+export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
+export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="$qemu_aarch64"
+cargo build --release --target aarch64-unknown-linux-gnu
+cp target/aarch64-unknown-linux-gnu/release/libwasmvm.so artifacts/libwasmvm.aarch64.so

builders/guest/build_gnu_x86_64.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit -o nounset -o pipefail
+
+export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+
+# See https://github.com/CosmWasm/wasmvm/issues/222#issuecomment-880616953 for two approaches to
+# enable stripping through cargo (if that is desired).
+
+echo "Starting x86_64-unknown-linux-gnu build"
+export CC=clang
+export CXX=clang++
+cargo build --release --target x86_64-unknown-linux-gnu
+cp target/x86_64-unknown-linux-gnu/release/libwasmvm.so artifacts/libwasmvm.x86_64.so

builders/guest/build_linux.sh

@@ -1,21 +1,5 @@
 #!/bin/bash
 set -o errexit -o nounset -o pipefail
 
-# See https://github.com/CosmWasm/wasmvm/issues/222#issuecomment-880616953 for two approaches to
-# enable stripping through cargo (if that is desired).
-
-echo "Starting x86_64-unknown-linux-gnu build"
-export CC=clang
-export CXX=clang++
-cargo build --release --target x86_64-unknown-linux-gnu
-cp target/x86_64-unknown-linux-gnu/release/libwasmvm.so artifacts/libwasmvm.x86_64.so
-
-echo "Starting aarch64-unknown-linux-gnu build"
-export qemu_aarch64="qemu-aarch64 -L /usr/aarch64-linux-gnu"
-export CC_aarch64_unknown_linux_gnu=clang
-export AR_aarch64_unknown_linux_gnu=llvm-ar
-export CFLAGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu"
-export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
-export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="$qemu_aarch64"
-cargo build --release --target aarch64-unknown-linux-gnu
-cp target/aarch64-unknown-linux-gnu/release/libwasmvm.so artifacts/libwasmvm.aarch64.so
+build_gnu_x86_64.sh
+build_gnu_aarch64.sh

builders/guest/build_macos.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -o errexit -o nounset -o pipefail
 
+export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+
 # ref: https://wapl.es/rust/2019/02/17/rust-cross-compile-linux-to-macos.html
 export PATH="/opt/osxcross/target/bin:$PATH"
 export LIBZ_SYS_STATIC=1

builders/guest/build_macos_static.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -o errexit -o nounset -o pipefail
 
+export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+
 # ref: https://wapl.es/rust/2019/02/17/rust-cross-compile-linux-to-macos.html
 export PATH="/opt/osxcross/target/bin:$PATH"
 export LIBZ_SYS_STATIC=1

builders/guest/build_muslc.sh

@@ -1,16 +1,18 @@
 #!/bin/sh
 set -e # Note we are not using bash here but the Alpine default shell
 
+export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+
 # See https://github.com/CosmWasm/wasmvm/issues/222#issuecomment-880616953 for two approaches to
 # enable stripping through cargo (if that is desired).
 
 echo "Starting aarch64-unknown-linux-musl build"
 export CC=/opt/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
-cargo build --release --target aarch64-unknown-linux-musl --example muslc
+cargo build --release --target aarch64-unknown-linux-musl --example wasmvmstatic
 unset CC
 
 echo "Starting x86_64-unknown-linux-musl build"
-cargo build --release --target x86_64-unknown-linux-musl --example muslc
+cargo build --release --target x86_64-unknown-linux-musl --example wasmvmstatic
 
-cp target/aarch64-unknown-linux-musl/release/examples/libmuslc.a artifacts/libwasmvm_muslc.aarch64.a
-cp target/x86_64-unknown-linux-musl/release/examples/libmuslc.a artifacts/libwasmvm_muslc.a
+cp target/aarch64-unknown-linux-musl/release/examples/libwasmvmstatic.a artifacts/libwasmvm_muslc.aarch64.a
+cp target/x86_64-unknown-linux-musl/release/examples/libwasmvmstatic.a artifacts/libwasmvm_muslc.a