feat: add static linking of wasmvm (CosmWasm#46)

Cargo.toml

@@ -13,10 +13,10 @@ exclude = [".circleci/*", ".gitignore"]
 [lib]
 crate-type = ["cdylib"]
 
-# the example is to allow us to compile a muslc static lib with the same codebase as we compile the
+# the example is to allow us to compile a static lib with the same codebase as we compile the
 # normal dynamic libs (best workaround I could find to override crate-type on the command line)
 [[example]]
-name = "muslc"
+name = "staticlib"
 path = "src/lib.rs"
 crate-type = ["staticlib"]
 

Makefile

@@ -1,6 +1,6 @@
 .PHONY: all build build-rust build-go test
 
-BUILDERS_PREFIX := cosmwasm/go-ext-builder:0006
+BUILDERS_PREFIX := line/wasmvm-builder
 USER_ID := $(shell id -u)
 USER_GROUP = $(shell id -g)
 
@@ -59,25 +59,31 @@ test-safety:
 release-build-alpine:
 	rm -rf target/release
 	# build the muslc *.a file
-	docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX)-alpine
+	docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX):alpine
 	# try running go tests using this lib with muslc
-	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code -w /code $(BUILDERS_PREFIX)-alpine go build -tags muslc .
-	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code -w /code $(BUILDERS_PREFIX)-alpine go test -tags='muslc mocks' ./api ./types
+	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code -w /code $(BUILDERS_PREFIX):alpine go build -tags muslc .
+	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code -w /code $(BUILDERS_PREFIX):alpine go test -tags='muslc mocks' ./api ./types
+
+# Creates a release build in a containerized build environment of the static library for glibc Linux (.a)
+release-build-linux-static:
+	rm -rf target/release
+	docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX):static
 
 # Creates a release build in a containerized build environment of the shared library for glibc Linux (.so)
 release-build-linux:
 	rm -rf target/release
-	docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX)-centos7
+	docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX):centos7
 
 # Creates a release build in a containerized build environment of the shared library for macOS (.dylib)
 release-build-macos:
 	rm -rf target/release
-	docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX)-cross
+	docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX):cross
 
 release-build:
 	# Write like this because those must not run in parallal
 	make release-build-alpine
 	make release-build-linux
+	make release-build-linux-static
 	make release-build-macos
 
 test-alpine: release-build-alpine

api/link_muslc.go

@@ -1,4 +1,5 @@
-// +build linux,muslc
+//go:build linux && muslc && !static
+// +build linux,muslc,!static
 
 package api
 

api/link_static.go

@@ -0,0 +1,7 @@
+//go:build linux && !muslc && static
+// +build linux,!muslc,static
+
+package api
+
+// #cgo LDFLAGS: -Wl,-rpath,${SRCDIR} -L${SRCDIR} -lwasmvm_static -lm -ldl
+import "C"

api/link_std.go

@@ -1,4 +1,5 @@
-// +build linux,!muslc darwin
+//go:build (linux && !muslc && !static) || darwin
+// +build linux,!muslc,!static darwin
 
 package api
 

api/mocks.go

@@ -1,3 +1,4 @@
+//go:build mocks
 // +build mocks
 
 package api

builders/Dockerfile.alpine

@@ -1,3 +1,5 @@
+# > docker build -t line/wasmvm-builder:alpine -f Dockerfile.alpine .
+
 # we build with go and rust
 FROM golang:1.15-alpine3.12
 
@@ -15,7 +17,7 @@ RUN set -eux; \
 
 RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init"
 RUN chmod +x rustup-init
-RUN ./rustup-init -y --no-modify-path --default-toolchain 1.51.0; rm rustup-init
+RUN ./rustup-init -y --no-modify-path --default-toolchain 1.53.0; rm rustup-init
 RUN chmod -R a+w $RUSTUP_HOME $CARGO_HOME
 
 # needed for
@@ -39,4 +41,4 @@ RUN mkdir /.cargo
 RUN chmod +rx /.cargo
 COPY guest/cargo-config /.cargo/config
 
-CMD ["/opt/build_muslc.sh"]
+CMD ["/opt/build_linux_static.sh", "muslc"]

builders/Dockerfile.centos7

@@ -1,3 +1,5 @@
+# > docker build -t line/wasmvm-builder:centos7 -f Dockerfile.centos7 .
+
 FROM centos:centos7
 
 RUN yum -y update
@@ -12,7 +14,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN url="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"; \
     wget "$url"; \
     chmod +x rustup-init; \
-    ./rustup-init -y --no-modify-path --default-toolchain 1.51.0; \
+    ./rustup-init -y --no-modify-path --default-toolchain 1.53.0; \
     rm rustup-init; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     rustup --version; \

builders/Dockerfile.cross

@@ -1,4 +1,6 @@
-FROM rust:1.51.0-buster
+# > docker build -t line/wasmvm-builder:cross -f Dockerfile.cross .
+
+FROM rust:1.53.0-buster
 
 # Install build dependencies
 RUN apt-get update

builders/Dockerfile.static

@@ -0,0 +1,15 @@
+# > docker build -t line/wasmvm-builder:static -f Dockerfile.static .
+
+FROM rust:1.53
+
+COPY . /code
+WORKDIR /code
+
+COPY guest/*.sh /opt/
+RUN chmod +x /opt/*.sh
+
+RUN mkdir /.cargo
+RUN chmod +rx /.cargo
+COPY guest/cargo-config /.cargo/config
+
+ENTRYPOINT ["/opt/build_linux_static.sh"]

builders/guest/build_linux_static.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TARGET_NAME="${1:-static}"
+
+cargo build --release --example staticlib
+cp /code/target/release/examples/libstaticlib.a "/code/api/libwasmvm_$TARGET_NAME.a"

ibc_test.go

@@ -1,3 +1,4 @@
+//go:build mocks
 // +build mocks
 
 package cosmwasm

lib_test.go

@@ -1,3 +1,4 @@
+//go:build mocks
 // +build mocks
 
 package cosmwasm