Merge pull request #90 from Flouse/main

Bump POLYJUICE_VERSION to v0.8.6-rc

.github/workflows/ci.yml

@@ -9,11 +9,12 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
 
     - uses: actions/cache@v2
       with:
@@ -27,8 +28,9 @@ jobs:
       run: rustup component add rustfmt && rustup component add clippy
     - name: Install moleculec
       run: |
-        test "$(moleculec --version)" = "Moleculec 0.7.2" \
-        || CARGO_TARGET_DIR=target/ cargo install moleculec --version 0.7.2
+        export MOLC_VERSION=$(cat deps/godwoken-scripts/c/Makefile | egrep "MOLC_VERSION :=" | awk '{print $3}')
+        test "$(moleculec --version)" = "Moleculec $MOLC_VERSION" \
+        || CARGO_TARGET_DIR=target/ cargo install moleculec --version $MOLC_VERSION
     - name: Install ckb-cli
       run: which ckb-cli || CARGO_TARGET_DIR=target/ cargo install ckb-cli --version 0.43.0
 

.github/workflows/fuzz.yml

@@ -21,8 +21,9 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
     - name: Install moleculec
       run: |
-        test "$(moleculec --version)" = "Moleculec 0.7.2" \
-        || CARGO_TARGET_DIR=target/ cargo install moleculec --version 0.7.2 --force
+        export MOLC_VERSION=$(cat deps/godwoken-scripts/c/Makefile | egrep "MOLC_VERSION :=" | awk '{print $3}')
+        test "$(moleculec --version)" = "Moleculec $MOLC_VERSION" \
+        || CARGO_TARGET_DIR=target/ cargo install moleculec --version $MOLC_VERSION --force
     - name: Cache LLVM and Clang
       id: cache-llvm
       uses: actions/cache@v2

Makefile

@@ -1,3 +1,5 @@
+SHELL=/bin/bash
+
 # TARGET := riscv64-unknown-linux-gnu
 TARGET := riscv64-unknown-elf
 CC := $(TARGET)-gcc
@@ -23,10 +25,9 @@ LDFLAGS := -Wl,--gc-sections
 
 SECP256K1_SRC := $(SECP_DIR)/src/ecmult_static_pre_context.h
 
-# TODO: read PROTOCOL_VERSION from deps/godwoken-scripts/c/Makefile
 MOLC := moleculec
-MOLC_VERSION := 0.7.2
-PROTOCOL_VERSION := f6c8f8d8edf094bd45469a28d8493c54958c3321
+MOLC_VERSION := $(shell cat deps/godwoken-scripts/c/Makefile | egrep "MOLC_VERSION :=" | awk '{print $$3}')
+PROTOCOL_VERSION := $(shell cat deps/godwoken-scripts/c/Makefile | egrep "PROTOCOL_VERSION :=" | awk '{print $$3}')
 PROTOCOL_SCHEMA_URL := https://raw.githubusercontent.com/nervosnetwork/godwoken/${PROTOCOL_VERSION}/crates/types/schemas
 
 ALL_OBJS := build/execution_state.o build/baseline.o build/analysis.o build/instruction_metrics.o build/instruction_names.o build/execution.o build/instructions.o build/instructions_calls.o build/evmone.o \

c/polyjuice_globals.h

@@ -1,7 +1,7 @@
 #ifndef POLYJUICE_GLOBALS_H
 #define POLYJUICE_GLOBALS_H
 
-#define POLYJUICE_VERSION "v0.8.5"
+#define POLYJUICE_VERSION "v0.8.6-rc"
 #define POLYJUICE_SHORT_ADDR_LEN 20
 /* 32 + 4 + 20 */
 #define SCRIPT_ARGS_LEN 56

polyjuice-tests/Cargo.toml

@@ -14,15 +14,16 @@ gw-store = { path = "../integration-test/godwoken/crates/store" }
 gw-config = { path = "../integration-test/godwoken/crates/config" }
 gw-traits = { path = "../integration-test/godwoken/crates/traits" }
 gw-generator = { path = "../integration-test/godwoken/crates/generator" }
-gw-jsonrpc-types = { path = "../integration-test/godwoken/crates/jsonrpc-types" }
+# gw-jsonrpc-types = { path = "../integration-test/godwoken/crates/jsonrpc-types" }
+
 ckb-vm = { version = "=0.20.0-rc5", features = ["detect-asm"] }
-thiserror = "1.0"
-ethabi = "14.0.0"
+# ethabi = "14.0.0"
 lazy_static = "1.4"
 tiny-keccak = "1.4"
-blake2b-rs = "0.2"
-serde_json = "1.0"
 rlp = "0.5.0"
 hex = "0.4.2"
-rand = "0.7.3"
-env_logger = "0.8.3"
+env_logger = "0.8.3"
+
+# rand = "0.7.3"
+# blake2b-rs = "0.2"
+# serde_json = "1.0"