Skip to content
This repository has been archived by the owner on Nov 18, 2022. It is now read-only.

Commit

Permalink
Merge pull request #89 from Flouse/update-gwScripts-and-moleculec
Browse files Browse the repository at this point in the history
Update godwoken-scripts and moleculec(0.7.2)
  • Loading branch information
jjyr authored Sep 27, 2021
2 parents 06d22e4 + b3b3db4 commit 9b4c999
Show file tree
Hide file tree
Showing 33 changed files with 677 additions and 436 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
run: rustup component add rustfmt && rustup component add clippy
- name: Install moleculec
run: |
test "$(moleculec --version)" = "Moleculec 0.6.1" \
|| CARGO_TARGET_DIR=target/ cargo install moleculec --version 0.6.1
test "$(moleculec --version)" = "Moleculec 0.7.2" \
|| CARGO_TARGET_DIR=target/ cargo install moleculec --version 0.7.2
- name: Install ckb-cli
run: which ckb-cli || CARGO_TARGET_DIR=target/ cargo install ckb-cli --version 0.43.0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
- name: Install moleculec
run: |
test "$(moleculec --version)" = "Moleculec 0.6.1" \
|| CARGO_TARGET_DIR=target/ cargo install moleculec --version 0.6.1
test "$(moleculec --version)" = "Moleculec 0.7.2" \
|| CARGO_TARGET_DIR=target/ cargo install moleculec --version 0.7.2 --force
- name: Cache LLVM and Clang
id: cache-llvm
uses: actions/cache@v2
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ 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.6.1
PROTOCOL_VERSION := 2221efdfcf06351fa1884ea0f2df1604790c3378
MOLC_VERSION := 0.7.2
PROTOCOL_VERSION := f6c8f8d8edf094bd45469a28d8493c54958c3321
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 \
Expand Down
2 changes: 1 addition & 1 deletion deps/godwoken-scripts
2 changes: 1 addition & 1 deletion devtools/ci/integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ else
git clone -b master https://github.com/nervosnetwork/godwoken.git $GODWOKEN_DIR
fi
cd $GODWOKEN_DIR
git checkout 4e65efde86bb16aafc6d29aee1bf6f586077eaf6
git checkout 5a59b6d3ac83c0b9378b199148db8e934c4ea658
git submodule update --init --recursive

cd tests-deps/godwoken-scripts/c
Expand Down
Loading

0 comments on commit 9b4c999

Please sign in to comment.