revert(lib/runtime): rollback wasmer update PR#3168 (#3264)

ChainSafe · May 19, 2023 · e7ff0cf · e7ff0cf
1 parent 1f4e786
commit e7ff0cf
Show file tree

Hide file tree

Showing 19 changed files with 1,495 additions and 1,764 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,6 +23,9 @@ WORKDIR /go/src/github.com/ChainSafe/gossamer
 COPY go.mod go.sum ./
 RUN go mod download
 
+# Prepare libwasmer.so for COPY
+RUN cp /go/pkg/mod/github.com/wasmerio/go-ext-wasm@*/wasmer/libwasmer.so libwasmer.so
+
 # Copy gossamer sources
 COPY . .
 

diff --git a/README.md b/README.md
@@ -81,15 +81,22 @@ make install
 
 To install Gossamer
 
-**Note**: Apple Silicon users running aarch64 might run into issues 
-with our wasm interpreter since wasmer is still working on supporting this architecture.
-See their [README](https://github.com/wasmerio/wasmer-go) for me info on supported platforms.
-Currently, there are no known issues regarding this within the Gossamer repo, but if you run into one please open an issue
-on our GitHub.
-
-If you are an Apple Silicon user make sure the `GOARCH` env variable is 
-set to `arm64` by executing `go env`, if the variable contains another value you can change
-by executing `go env -w GOARCH=arm64`
+#### Troubleshooting for Apple Silicon users
+
+Apple Silicon users may encounter these errors:
+
+```sh
+undefined: cWasmerImportObjectT
+undefined: cWasmerImportFuncT
+undefined: cWasmerValueTag
+```
+
+If so, set the following
+[Golang environment variables](https://pkg.go.dev/cmd/go#hdr-Environment_variables):
+
+```sh
+GOARCH="amd64"
+```
 
 ## Use Gossamer
 

diff --git a/dot/core/service_test.go b/dot/core/service_test.go
@@ -252,7 +252,7 @@ func Test_Service_handleCodeSubstitution(t *testing.T) {
 			},
 			blockHash:  common.Hash{0x01},
 			errWrapped: wasmer.ErrWASMDecompress,
-			errMessage: "creating new runtime instance: " +
+			errMessage: "creating new runtime instance: setting up VM: " +
 				"wasm decompression failed: unexpected EOF",
 		},
 		"store_code_substitution_block_hash_error": {

diff --git a/dot/state/block.go b/dot/state/block.go
@@ -888,8 +888,6 @@ func (bs *BlockState) HandleRuntimeChanges(newState *rtstorage.TrieState,
 		return err
 	}
 
-	logger.Info("instantiated runtime!!!")
-
 	bs.StoreRuntime(bHash, instance)
 
 	err = bs.baseState.StoreCodeSubstitutedBlockHash(common.Hash{})

diff --git a/go.mod b/go.mod
@@ -35,6 +35,7 @@ require (
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.8.2
+	github.com/wasmerio/go-ext-wasm v0.3.2-0.20200326095750-0a32be6068ec
 	github.com/wasmerio/wasmer-go v1.0.4
 	github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9
 	golang.org/x/crypto v0.9.0
@@ -164,6 +165,7 @@ require (
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.5 // indirect
 	github.com/tklauser/numcpus v0.2.2 // indirect

diff --git a/go.sum b/go.sum
@@ -718,6 +718,7 @@ github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -748,12 +749,15 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/vedhavyas/go-subkey v1.0.3 h1:iKR33BB/akKmcR2PMlXPBeeODjWLM90EL98OrOGs8CA=
 github.com/vedhavyas/go-subkey v1.0.3/go.mod h1:CloUaFQSSTdWnINfBRFjVMkWXZANW+nd8+TI5jYcl6Y=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
 github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ=
 github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
+github.com/wasmerio/go-ext-wasm v0.3.2-0.20200326095750-0a32be6068ec h1:VElCeVyfCWNmCv6UisKQrr+P2/JRG0uf4/FIdCB4pL0=
+github.com/wasmerio/go-ext-wasm v0.3.2-0.20200326095750-0a32be6068ec/go.mod h1:VGyarTzasuS7k5KhSIGpM3tciSZlkP31Mp9VJTHMMeI=
 github.com/wasmerio/wasmer-go v1.0.4 h1:MnqHoOGfiQ8MMq2RF6wyCeebKOe84G88h5yv+vmxJgs=
 github.com/wasmerio/wasmer-go v1.0.4/go.mod h1:0gzVdSfg6pysA6QVp6iVRPTagC6Wq9pOE8J86WKb2Fk=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=