Cosmwasm 0.9

.dockerignore

@@ -12,8 +12,6 @@ third_party/vendor
 
 cosmwasm-js
 
-cosmwasm/lib/incubator-teaclave-sgx-sdk
-
 README.md
 .gitignore
 

.github/workflows/ci.yaml

@@ -3,7 +3,7 @@ name: Tests
 on: [push]
 
 jobs:
-  test:
+  Tests:
     runs-on: ubuntu-latest
 
     steps:
@@ -42,36 +42,37 @@ jobs:
         run: |
           source "$HOME/.sgxsdk/sgxsdk/environment"
           make vendor
-          cd cosmwasm/lib/wasmi-runtime/
+          cd cosmwasm/packages/wasmi-runtime/
           SGX_MODE=SW make clippy
           SGX_MODE=HW make clippy
       - name: Build
         run: |
           source "$HOME/.sgxsdk/sgxsdk/environment"
           make vendor
-          SGX_MODE=SW RUSTC_WRAPPER="$HOME/sccache" make build_linux
+          SGX_MODE=SW BUILD_PROFILE="minimal" RUSTC_WRAPPER="$HOME/sccache" make build-linux
       - name: Old bash+js sanity tests
         run: |
           source "$HOME/.sgxsdk/sgxsdk/environment"
           export SGX_MODE=SW
           mkdir -p ./.sgx_secrets
-          cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
-          ./cosmwasm/lib/sanity-test.sh
+          cp ./cosmwasm/packages/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
+          ./cosmwasm/testing/sanity-test.sh
       - name: Old bash+js sanity callbacks tests
         run: |
           source "$HOME/.sgxsdk/sgxsdk/environment"
           export SGX_MODE=SW
           mkdir -p ./.sgx_secrets
-          cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
-          ./cosmwasm/lib/callback-test.sh
-      - name: Test Registration Module
+          cp ./cosmwasm/packages/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
+          ./cosmwasm/testing/callback-test.sh
+      - name: Test x/registration
         run: |
           source "$HOME/.sgxsdk/sgxsdk/environment"
           go test -v ./x/registration/internal/...
-      - name: System Tests
+      - name: Test x/compute
         run: |
           source "$HOME/.sgxsdk/sgxsdk/environment"
           export SGX_MODE=SW
-          cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
+          cp ./cosmwasm/packages/wasmi-runtime/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
           mkdir -p ./x/compute/internal/keeper/.sgx_secrets
+          go test -v ./x/compute/client/...
           go test -p 1 -v ./x/compute/internal/...

.gitignore

@@ -7,6 +7,8 @@ Enclave_u.h
 Enclave_u.o
 /secretcli*
 /secretd*
+/enigmacli*
+/enigmad*
 incubator-teaclave-sgx-sdk
 libenclave.a
 libEnclave_u.a
@@ -22,4 +24,6 @@ SHA256SUMS*
 spid.txt
 api_key.txt
 __debug_bin
-id_tx_io.json
+id_tx_io.json
+.idea
+x/compute/internal/keeper/debug.test

Dockerfile

@@ -30,7 +30,7 @@ WORKDIR /go/src/github.com/enigmampc/SecretNetwork/
 
 COPY Makefile Makefile
 
-RUN make clean
+# RUN make clean
 RUN make vendor
 
 WORKDIR /go/src/github.com/enigmampc/SecretNetwork/go-cosmwasm
@@ -91,6 +91,8 @@ COPY --from=build-env-rust-go /go/src/github.com/enigmampc/SecretNetwork/go-cosm
 COPY --from=build-env-rust-go /go/src/github.com/enigmampc/SecretNetwork/secretd /usr/bin/secretd
 COPY --from=build-env-rust-go /go/src/github.com/enigmampc/SecretNetwork/secretcli /usr/bin/secretcli
 
+COPY ./x/compute/internal/keeper/testdata/erc20.wasm erc20.wasm
+
 # COPY ./packaging_docker/devnet_init.sh .
 COPY packaging_docker/ci/wasmi-sgx-test.sh .
 COPY packaging_docker/ci/bootstrap_init.sh .
@@ -117,4 +119,4 @@ COPY spid.txt /root/
 #ENV LD_LIBRARY_PATH=/opt/sgxsdk/libsgx-enclave-common/:/opt/sgxsdk/lib64/
 
 # Run secretd by default, omit entrypoint to ease using container with secretcli
-ENTRYPOINT ["/bin/bash", "startup.sh"]
+ENTRYPOINT ["/bin/bash", "startup.sh"]

Makefile

@@ -3,6 +3,20 @@ VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true
 BINDIR ?= $(GOPATH)/bin
+BUILD_PROFILE ?= release
+
+SGX_MODE ?= HW
+BRANCH ?= develop
+DEBUG ?= 0
+DOCKER_TAG ?= latest
+
+ifeq ($(SGX_MODE), HW)
+	ext := hw
+else ifeq ($(SGX_MODE), SW)
+	ext := sw
+else
+$(error SGX_MODE must be either HW or SW)
+endif
 
 SGX_MODE ?= HW
 BRANCH ?= develop
@@ -89,18 +103,13 @@ build_local_no_rust:
 	go build -mod=readonly $(BUILD_FLAGS) ./cmd/secretd
 	go build -mod=readonly $(BUILD_FLAGS) ./cmd/secretcli
 
-build_linux: vendor
-	$(MAKE) -C go-cosmwasm build-rust
-	cp go-cosmwasm/target/release/libgo_cosmwasm.so go-cosmwasm/api
+build-linux: vendor
+	BUILD_PROFILE=$(BUILD_PROFILE) $(MAKE) -C go-cosmwasm build-rust
+	cp go-cosmwasm/target/$(BUILD_PROFILE)/libgo_cosmwasm.so go-cosmwasm/api
 #   this pulls out ELF symbols, 80% size reduction!
 	go build -mod=readonly $(BUILD_FLAGS) ./cmd/secretd
 	go build -mod=readonly $(BUILD_FLAGS) ./cmd/secretcli
 
-#build_local_no_rust:
-#   this pulls out ELF symbols, 80% size reduction!
-#	go build -mod=readonly $(BUILD_FLAGS) ./cmd/secretd
-#	go build -mod=readonly $(BUILD_FLAGS) ./cmd/secretcli
-
 build_windows:
 	# CLI only 
 	$(MAKE) xgo_build_secretcli XGO_TARGET=windows/amd64
@@ -113,9 +122,9 @@ build_arm_linux:
 	# CLI only 
 	$(MAKE) xgo_build_secretcli XGO_TARGET=linux/arm64
 
-build_all: build_linux build_windows build_macos build_arm_linux
+build_all: build-linux build_windows build_macos build_arm_linux
 
-deb: build_linux
+deb: build-linux
     ifneq ($(UNAME_S),Linux)
 		exit 1
     endif
@@ -175,7 +184,8 @@ clean:
 	-rm -rf ./x/compute/internal/keeper/*.der
 	-rm -rf ./x/compute/internal/keeper/*.so
 	$(MAKE) -C go-cosmwasm clean-all
-	$(MAKE) -C cosmwasm/lib/wasmi-runtime clean
+	$(MAKE) -C cosmwasm/packages/wasmi-runtime clean
+	$(MAKE) -C ./x/compute/internal/keeper/testdata/test-contract clean
 # docker build --build-arg SGX_MODE=HW --build-arg SECRET_NODE_TYPE=NODE -f Dockerfile.testnet -t cashmaney/secret-network-node:azuretestnet .
 build-azure:
 	docker build -f Dockerfile.azure -t cashmaney/secret-network-node:azuretestnet .
@@ -188,34 +198,65 @@ docker_bootstrap:
 	docker build --build-arg SGX_MODE=${SGX_MODE} --build-arg SECRET_NODE_TYPE=BOOTSTRAP -t cashmaney/secret-network-bootstrap-${ext}:${DOCKER_TAG} .
 
 docker_node:
+	docker build --build-arg SECRET_NODE_TYPE=NODE -t enigmampc/secret_node .
+
 	docker build --build-arg SGX_MODE=${SGX_MODE} --build-arg SECRET_NODE_TYPE=NODE -t cashmaney/secret-network-node-${ext}:${DOCKER_TAG} .
 # while developing:
 build-enclave:
-	$(MAKE) -C cosmwasm/lib/wasmi-runtime 
+	$(MAKE) -C cosmwasm/packages/wasmi-runtime
+
+# while developing:
+check-enclave:
+	$(MAKE) -C cosmwasm/packages/wasmi-runtime check
 
 # while developing:
 clean-enclave:
-	$(MAKE) -C cosmwasm/lib/wasmi-runtime clean 
+	$(MAKE) -C cosmwasm/packages/wasmi-runtime clean
 
 sanity-test:
-	SGX_MODE=SW $(MAKE) build_linux
-	cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
-	SGX_MODE=SW ./cosmwasm/lib/sanity-test.sh
-	
+	SGX_MODE=SW $(MAKE) build-linux
+	cp ./cosmwasm/packages/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
+	SGX_MODE=SW ./cosmwasm/testing/sanity-test.sh
+
 sanity-test-hw:
-	$(MAKE) build_linux
-	cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
-	./cosmwasm/lib/sanity-test.sh
+	$(MAKE) build-linux
+	cp ./cosmwasm/packages/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
+	./cosmwasm/testing/sanity-test.sh
 
 callback-sanity-test:
-	SGX_MODE=SW $(MAKE) build_linux
-	cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
-	SGX_MODE=SW ./cosmwasm/lib/callback-test.sh
+	SGX_MODE=SW $(MAKE) build-linux
+	cp ./cosmwasm/packages/wasmi-runtime/librust_cosmwasm_enclave.signed.so .
+	SGX_MODE=SW ./cosmwasm/testing/callback-test.sh
 
 build-test-contract:
+	# echo "" | sudo add-apt-repository ppa:hnakamur/binaryen
+	# sudo apt update
+	# sudo apt install -y binaryen
 	$(MAKE) -C ./x/compute/internal/keeper/testdata/test-contract
 
 go-tests: build-test-contract
-	SGX_MODE=SW $(MAKE) build_linux
-	cp ./cosmwasm/lib/wasmi-runtime/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
-	SGX_MODE=SW go test -p 1 -v ./x/compute/internal/...
+	# empty BUILD_PROFILE means debug mode which compiles faster
+	SGX_MODE=SW $(MAKE) build-linux
+	cp ./cosmwasm/packages/wasmi-runtime/librust_cosmwasm_enclave.signed.so ./x/compute/internal/keeper
+	mkdir -p ./x/compute/internal/keeper/.sgx_secrets
+	SGX_MODE=SW go test -p 1 -v ./x/compute/internal/...
+
+build-cosmwasm-test-contracts:
+	# echo "" | sudo add-apt-repository ppa:hnakamur/binaryen
+	# sudo apt update
+	# sudo apt install -y binaryen
+	cd ./cosmwasm/contracts/staking && RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --locked
+	wasm-opt -Os ./cosmwasm/contracts/staking/target/wasm32-unknown-unknown/release/staking.wasm -o ./x/compute/internal/keeper/testdata/staking.wasm
+
+	cd ./cosmwasm/contracts/reflect && RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --locked
+	wasm-opt -Os ./cosmwasm/contracts/reflect/target/wasm32-unknown-unknown/release/reflect.wasm -o ./x/compute/internal/keeper/testdata/reflect.wasm
+
+	cd ./cosmwasm/contracts/burner && RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --locked
+	wasm-opt -Os ./cosmwasm/contracts/burner/target/wasm32-unknown-unknown/release/burner.wasm -o ./x/compute/internal/keeper/testdata/burner.wasm
+
+	cd ./cosmwasm/contracts/erc20 && RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --locked
+	wasm-opt -Os ./cosmwasm/contracts/erc20/target/wasm32-unknown-unknown/release/erc20.wasm -o ./x/compute/internal/keeper/testdata/erc20.wasm
+
+	cd ./cosmwasm/contracts/hackatom && RUSTFLAGS='-C link-arg=-s' cargo build --release --target wasm32-unknown-unknown --locked
+	wasm-opt -Os ./cosmwasm/contracts/hackatom/target/wasm32-unknown-unknown/release/hackatom.wasm -o ./x/compute/internal/keeper/testdata/contract.wasm
+	cat ./x/compute/internal/keeper/testdata/contract.wasm | gzip > ./x/compute/internal/keeper/testdata/contract.wasm.gzip

app.go

@@ -284,9 +284,14 @@ func NewSecretNetworkApp(
 	}
 	wasmConfig := wasmWrap.Wasm
 
+	supportedFeatures := ""
 	// replace with bootstrap flag when we figure out how to test properly and everything works
 	app.regKeeper = reg.NewKeeper(app.cdc, keys[reg.StoreKey], regRouter, reg.EnclaveApi{}, homeDir, app.bootstrap)
-	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, app.stakingKeeper, computeRouter, computeDir, wasmConfig, supportedFeatures, nil, nil)
 	// register the proposal types
 	govRouter := gov.NewRouter()
 	govRouter.AddRoute(gov.RouterKey, gov.ProposalHandler).

cmd/secretd/attestation.go

@@ -206,7 +206,7 @@ func ConfigureSecret(_ *server.Context, _ *codec.Codec) *cobra.Command {
 			if os.IsNotExist(err) {
 				var file, err = os.Create(path)
 				if err != nil {
-					return fmt.Errorf("failed to open config file: %s", path)
+					return fmt.Errorf("failed to open config file '%s': %w", path, err)
 				}
 				_ = file.Close()
 			}

cosmwasm-js/packages/sdk/package.json

@@ -1,8 +1,11 @@
 {
-  "name": "@cosmwasm/sdk",
-  "version": "0.8.0-alpha.0",
-  "description": "CosmWasm SDK",
+  "name": "secretjs",
+  "version": "0.9.0",
+  "description": "CosmWasm SDK + Encryption for the Secret Network",
   "author": "Ethan Frey <[email protected]>",
+  "contributors": [
+    "Enigma <[email protected]> (https://enigma.co)"
+  ],
   "license": "Apache-2.0",
   "main": "build/index.js",
   "types": "types/index.d.ts",
@@ -15,7 +18,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/confio/cosmwasm-js/tree/master/packages/sdk"
+    "url": "https://github.com/enigmampc/SecretNetwork/blob/master/cosmwasm-js/packages/sdk"
   },
   "publishConfig": {
     "access": "public"

cosmwasm-js/packages/sdk/src/cosmwasmclient.ts

@@ -315,7 +315,7 @@ export class CosmWasmClient {
       logs: result.logs ? parseLogs(result.logs) : [],
       rawLog: result.raw_log || "",
       transactionHash: result.txhash,
-      data: result.data,
+      data: result.data || "",
     };
   }
 

cosmwasm-js/packages/sdk/src/enigmautils.ts

@@ -134,6 +134,10 @@ export default class EnigmaUtils {
   }
 
   public async decrypt(ciphertext: Uint8Array, nonce: Uint8Array): Promise<Uint8Array> {
+    if (ciphertext.length === 0) {
+      return new Uint8Array();
+    }
+
     const { privkey: txSenderPrivKey } = this.getTxSenderKeyPair();
     const txEncryptionKey = await this.getTxEncryptionKey(txSenderPrivKey, nonce);
 

cosmwasm-js/packages/sdk/src/index.ts

@@ -25,7 +25,7 @@ export {
   SearchTxQuery,
   SearchTxFilter,
 } from "./cosmwasmclient";
-export { makeCosmoshubPath, Pen, PrehashType, Secp256k1Pen } from "./pen";
+export { makeSecretNetworkPath as makeCosmoshubPath, Pen, PrehashType, Secp256k1Pen } from "./pen";
 export { decodeBech32Pubkey, encodeBech32Pubkey, encodeSecp256k1Pubkey } from "./pubkey";
 export { findSequenceForSignedTx } from "./sequence";
 export { encodeSecp256k1Signature, decodeSignature } from "./signature";

cosmwasm-js/packages/sdk/src/pen.ts

@@ -46,10 +46,10 @@ function prehash(bytes: Uint8Array, type: PrehashType): Uint8Array {
  * The Cosmoshub derivation path in the form `m/44'/118'/0'/0/a`
  * with 0-based account index `a`.
  */
-export function makeCosmoshubPath(a: number): readonly Slip10RawIndex[] {
+export function makeSecretNetworkPath(a: number): readonly Slip10RawIndex[] {
   return [
     Slip10RawIndex.hardened(44),
-    Slip10RawIndex.hardened(118),
+    Slip10RawIndex.hardened(529),
     Slip10RawIndex.hardened(0),
     Slip10RawIndex.normal(0),
     Slip10RawIndex.normal(a),
@@ -59,7 +59,7 @@ export function makeCosmoshubPath(a: number): readonly Slip10RawIndex[] {
 export class Secp256k1Pen implements Pen {
   public static async fromMnemonic(
     mnemonic: string,
-    hdPath: readonly Slip10RawIndex[] = makeCosmoshubPath(0),
+    hdPath: readonly Slip10RawIndex[] = makeSecretNetworkPath(0),
   ): Promise<Secp256k1Pen> {
     const seed = await Bip39.mnemonicToSeed(new EnglishMnemonic(mnemonic));
     const { privkey } = Slip10.derivePath(Slip10Curve.Secp256k1, seed, hdPath);