replacing the wasmer runtime with a wasmi runtime running inside an SGX enclave

.github/workflows/wasmi-in-sgx.yml

@@ -0,0 +1,55 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Intel's SGX SDK
+        run: |
+          mkdir -p "$HOME/.sgxsdk"
+          cd "$HOME/.sgxsdk"
+          SDK_BIN=sgx_linux_x64_sdk_2.9.101.2.bin
+
+          wget https://download.01.org/intel-sgx/sgx-linux/2.9.1/distro/ubuntu18.04-server/"$SDK_BIN"
+
+          chmod +x "$SDK_BIN"
+          echo yes | ./"$SDK_BIN"
+      - run: git submodule update --init --recursive
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache build artifacts
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/sccache
+          key: ${{ runner.os }}-sccache
+      - run: rustup component add rust-src
+      - name: Install xargo
+        run: |
+          cargo +stable install xargo
+          xargo --version
+      - name: Download sccache
+        run: |
+          wget https://github.com/mozilla/sccache/releases/download/0.2.13/sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz
+          tar xf ./sccache-*.tar.gz
+          mv ./sccache*/sccache "$HOME/sccache"
+      - name: Build
+        run: |
+          source "$HOME/.sgxsdk/sgxsdk/environment"
+          SGX_MODE=SW RUSTC_WRAPPER="$HOME/sccache" make build_linux
+      - name: Test SGX Sanity
+        run: |
+          source "$HOME/.sgxsdk/sgxsdk/environment"
+          cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
+          ./cosmwasm/lib/wasmi-sgx-test.sh
+      - name: Test Compute Module
+        run: |
+          source "$HOME/.sgxsdk/sgxsdk/environment"
+          cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
+          go test -v ./x/compute/internal/...

.gitignore

@@ -1,13 +1,17 @@
+*.a
 *.deb
-/enigmacli*
-/enigmad*
-SHA256SUMS*
-/release
-Enclave_u.c
-Enclave_u.h
-.vscode/
 Enclave_t.c
 Enclave_t.h
-*.a
+Enclave_u.c
+Enclave_u.h
+Enclave_u.o
+/enigmacli*
+/enigmad*
+libenclave.a
+libEnclave_u.a
+librust_cosmwasm_enclave.signed.so
 *.o
+/release
+SHA256SUMS*
 *.so
+.vscode/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "cosmwasm/lib/incubator-teaclave-sgx-sdk"]
+	path = cosmwasm/lib/incubator-teaclave-sgx-sdk
+	url = https://github.com/apache/incubator-teaclave-sgx-sdk.git
+	branch = v1.1.1

Makefile

@@ -4,23 +4,23 @@ COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true
 BINDIR ?= $(GOPATH)/bin
 
-build_tags = 
+build_tags =
 ifeq ($(LEDGER_ENABLED),true)
   ifeq ($(OS),Windows_NT)
     GCCEXE = $(shell where gcc.exe 2> NUL)
     ifeq ($(GCCEXE),)
-      $(error gcc.exe not installed for ledger support, please install or set LEDGER_ENABLED=false)
+      $(error "gcc.exe not installed for ledger support, please install or set LEDGER_ENABLED=false")
     else
       build_tags += ledger
     endif
   else
     UNAME_S = $(shell uname -s)
     ifeq ($(UNAME_S),OpenBSD)
-      $(warning OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988))
+      $(warning "OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988)")
     else
       GCC = $(shell command -v gcc 2> /dev/null)
       ifeq ($(GCC),)
-        $(error gcc not installed for ledger support, please install or set LEDGER_ENABLED=false)
+        $(error "gcc not installed for ledger support, please install or set LEDGER_ENABLED=false")
       else
         build_tags += ledger
       endif
@@ -49,6 +49,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=EnigmaBlockchain \
 ifeq ($(WITH_CLEVELDB),yes)
   ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb
 endif
+ldflags += -s -w
 ldflags += $(LDFLAGS)
 ldflags := $(strip $(ldflags))
 
@@ -66,44 +67,41 @@ xgo_build_enigmad: go.sum
 xgo_build_enigmacli: go.sum
 	xgo --go latest --targets $(XGO_TARGET) $(BUILD_FLAGS) github.com/enigmampc/EnigmaBlockchain/cmd/enigmacli
 
-build_local_no_rust:
-	@ #this pulls out ELF symbols, 80% size reduction!
+build_linux:
+	$(MAKE) -C go-cosmwasm build-rust
+	cp go-cosmwasm/target/release/libgo_cosmwasm.so go-cosmwasm/api
+#   this pulls out ELF symbols, 80% size reduction!
 	go build -mod=readonly $(BUILD_FLAGS) ./cmd/enigmad
 	go build -mod=readonly $(BUILD_FLAGS) ./cmd/enigmacli
 
-build_local:
-	# cd go-cosmwasm && rustup run nightly cargo build --release --features backtraces
-	# cp go-cosmwasm/target/release/libgo_cosmwasm.so go-cosmwasm/api
-	@ #this pulls out ELF symbols, 80% size reduction!
-	go build -mod=readonly $(BUILD_FLAGS) ./cmd/enigmad
-	go build -mod=readonly $(BUILD_FLAGS) ./cmd/enigmacli
-
-build_linux: build_local
-
 build_windows:
-	$(MAKE) xgo_build_enigmad XGO_TARGET=windows/amd64
+	# CLI only 
 	$(MAKE) xgo_build_enigmacli XGO_TARGET=windows/amd64
 
 build_macos:
-	$(MAKE) xgo_build_enigmad XGO_TARGET=darwin/amd64
+	# CLI only 
 	$(MAKE) xgo_build_enigmacli XGO_TARGET=darwin/amd64
 
-build_all: build_linux build_windows build_macos
+build_arm_linux:
+	# CLI only 
+	$(MAKE) xgo_build_enigmacli XGO_TARGET=linux/arm64
 
-deb: build_local
+build_all: build_linux build_windows build_macos build_arm_linux
+
+deb: build_linux
     ifneq ($(UNAME_S),Linux)
 		exit 1
     endif
 	rm -rf /tmp/EnigmaBlockchain
-	
+
 	mkdir -p /tmp/EnigmaBlockchain/deb/bin
 	mv -f ./enigmacli /tmp/EnigmaBlockchain/deb/bin/enigmacli
 	mv -f ./enigmad /tmp/EnigmaBlockchain/deb/bin/enigmad
 	chmod +x /tmp/EnigmaBlockchain/deb/bin/enigmad /tmp/EnigmaBlockchain/deb/bin/enigmacli
-	
-	# mkdir -p /tmp/EnigmaBlockchain/deb/usr/lib
-	# mv -f ./go-cosmwasm/api/libgo_cosmwasm.so /tmp/EnigmaBlockchain/deb/usr/lib/libgo_cosmwasm.so
-	# chmod +x /tmp/EnigmaBlockchain/deb/usr/lib/libgo_cosmwasm.so
+
+	mkdir -p /tmp/EnigmaBlockchain/deb/usr/lib
+	cp -f ./go-cosmwasm/api/libgo_cosmwasm.so ./go-cosmwasm/librust_cosmwasm_enclave.signed.so /tmp/EnigmaBlockchain/deb/usr/lib/
+	chmod +x /tmp/EnigmaBlockchain/deb/usr/lib/lib*.so
 
 	mkdir -p /tmp/EnigmaBlockchain/deb/DEBIAN
 	cp ./packaging_ubuntu/control /tmp/EnigmaBlockchain/deb/DEBIAN/control
@@ -126,18 +124,22 @@ sign_for_release: rename_for_release
 	-sha256sum enigmad-* enigmacli-* >> SHA256SUMS
 	gpg -u 91831DE812C6415123AFAA7B420BF1CB005FBCE6 --digest-algo sha256 --clearsign --yes SHA256SUMS
 	rm -f SHA256SUMS
-	
+
 release: sign_for_release
 	rm -rf ./release/
 	mkdir -p ./release/
-	cp enigma-blockchain_*.deb ./release/ 
-	cp enigmacli-* ./release/ 
+	cp enigma-blockchain_*.deb ./release/
+	cp enigmacli-* ./release/
 	cp enigmad-* ./release/
 	cp SHA256SUMS.asc ./release/
 
 clean:
 	-rm -rf /tmp/EnigmaBlockchain
-	-rm -f ./enigmacli-*
-	-rm -f ./enigmad-*
+	-rm -f ./enigmacli*
+	-rm -f ./enigmad*
+	-rm -f ./librust_cosmwasm_enclave.signed.so 
+	-rm -f ./x/compute/internal/keeper/librust_cosmwasm_enclave.signed.so 
 	-rm -f ./enigma-blockchain*.deb
 	-rm -f ./SHA256SUMS*
+	$(MAKE) -C go-cosmwasm clean-all
+	$(MAKE) -C cosmwasm/lib/wasmi-runtime clean

app.go

@@ -4,8 +4,12 @@ import (
 	"encoding/json"
 	"io"
 	"os"
+	"path/filepath"
 
+	"github.com/enigmampc/EnigmaBlockchain/x/compute"
+	"github.com/spf13/viper"
 	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/cli"
 	"github.com/tendermint/tendermint/libs/log"
 	tmos "github.com/tendermint/tendermint/libs/os"
 	tmtypes "github.com/tendermint/tendermint/types"
@@ -56,7 +60,7 @@ var (
 		distr.AppModuleBasic{},
 		gov.NewAppModuleBasic(paramsclient.ProposalHandler, distr.ProposalHandler, upgradeclient.ProposalHandler),
 		params.AppModuleBasic{},
-		// compute.AppModuleBasic{},
+		compute.AppModuleBasic{},
 		crisis.AppModuleBasic{},
 		slashing.AppModuleBasic{},
 		supply.AppModuleBasic{},
@@ -116,7 +120,7 @@ type EnigmaChainApp struct {
 	paramsKeeper   params.Keeper
 	upgradeKeeper  upgrade.Keeper
 	evidenceKeeper evidence.Keeper
-	// computeKeeper  compute.Keeper
+	computeKeeper  compute.Keeper
 
 	// the module manager
 	mm *module.Manager
@@ -127,9 +131,9 @@ type EnigmaChainApp struct {
 
 // WasmWrapper allows us to use namespacing in the config file
 // This is only used for parsing in the app, x/compute expects WasmConfig
-// type WasmWrapper struct {
-// 	Wasm compute.WasmConfig `mapstructure:"wasm"`
-// }
+type WasmWrapper struct {
+	Wasm compute.WasmConfig `mapstructure:"wasm"`
+}
 
 // NewEnigmaChainApp is a constructor function for enigmaChainApp
 func NewEnigmaChainApp(
@@ -161,7 +165,7 @@ func NewEnigmaChainApp(
 		params.StoreKey,
 		upgrade.StoreKey,
 		evidence.StoreKey,
-		// compute.StoreKey,
+		compute.StoreKey,
 	)
 
 	tKeys := sdk.NewTransientStoreKeys(staking.TStoreKey, params.TStoreKey)
@@ -256,20 +260,20 @@ func NewEnigmaChainApp(
 
 	app.evidenceKeeper = *evidenceKeeper
 
-	// // just re-use the full router - do we want to limit this more?
-	// var computeRouter = bApp.Router()
-	// // better way to get this dir???
-	// homeDir := viper.GetString(cli.HomeFlag)
-	// computeDir := filepath.Join(homeDir, ".compute")
+	// just re-use the full router - do we want to limit this more?
+	var computeRouter = bApp.Router()
+	// better way to get this dir???
+	homeDir := viper.GetString(cli.HomeFlag)
+	computeDir := filepath.Join(homeDir, ".compute")
 
-	// wasmWrap := WasmWrapper{Wasm: compute.DefaultWasmConfig()}
-	// err := viper.Unmarshal(&wasmWrap)
-	// if err != nil {
-	// 	panic("error while reading wasm config: " + err.Error())
-	// }
-	// wasmConfig := wasmWrap.Wasm
+	wasmWrap := WasmWrapper{Wasm: compute.DefaultWasmConfig()}
+	err := viper.Unmarshal(&wasmWrap)
+	if err != nil {
+		panic("error while reading wasm config: " + err.Error())
+	}
+	wasmConfig := wasmWrap.Wasm
 
-	// app.computeKeeper = compute.NewKeeper(app.cdc, keys[compute.StoreKey], app.accountKeeper, app.bankKeeper, computeRouter, computeDir, wasmConfig)
+	app.computeKeeper = compute.NewKeeper(app.cdc, keys[compute.StoreKey], app.accountKeeper, app.bankKeeper, computeRouter, computeDir, wasmConfig)
 
 	// register the proposal types
 	govRouter := gov.NewRouter()
@@ -305,7 +309,7 @@ func NewEnigmaChainApp(
 		staking.NewAppModule(app.stakingKeeper, app.accountKeeper, app.supplyKeeper),
 		upgrade.NewAppModule(app.upgradeKeeper),
 		evidence.NewAppModule(app.evidenceKeeper),
-		// compute.NewAppModule(app.computeKeeper),
+		compute.NewAppModule(app.computeKeeper),
 	)
 	// During begin block slashing happens after distr.BeginBlocker so that
 	// there is nothing left over in the validator fee pool, so as to keep the
@@ -329,7 +333,7 @@ func NewEnigmaChainApp(
 		crisis.ModuleName,
 		genutil.ModuleName,
 		evidence.ModuleName,
-		// compute.ModuleName,
+		compute.ModuleName,
 	)
 
 	// register all module routes and module queriers