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

chore: update godwoken and godwoken-scripts dependencies #41

Merged
merged 1 commit into from
Jun 23, 2021
Merged

chore: update godwoken and godwoken-scripts dependencies #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ SECP256K1_SRC := $(SECP_DIR)/src/ecmult_static_pre_context.h

MOLC := moleculec
MOLC_VERSION := 0.6.1
PROTOCOL_VERSION := c3165a6a2663c89cc81d821024fd71fe9cd0c49c
PROTOCOL_SCHEMA_URL := https://raw.githubusercontent.com/thewawar/godwoken/${PROTOCOL_VERSION}/crates/types/schemas
PROTOCOL_VERSION := 888f0e9fc02adf0a52592dda1ddf283a596a7459
PROTOCOL_SCHEMA_URL := https://raw.githubusercontent.com/nervosnetwork/godwoken/${PROTOCOL_VERSION}/crates/types/schemas

ALL_OBJS := build/evmone.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/keccak.o build/keccakf800.o \
Expand Down
2 changes: 1 addition & 1 deletion deps/godwoken-scripts
Open in desktop
Submodule godwoken-scripts updated from c57290 to c015a5
4 changes: 2 additions & 2 deletions devtools/ci/integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ if [ -d "$GODWOKEN_DIR" ]
then
echo "godwoken project already exists"
else
git clone https://github.com/thewawar/godwoken.git $GODWOKEN_DIR
git clone https://github.com/nervosnetwork/godwoken.git $GODWOKEN_DIR
fi
cd $GODWOKEN_DIR
git checkout c3165a6a2663c89cc81d821024fd71fe9cd0c49c
git checkout v0.4.0-rc1
git submodule update --init --recursive
cd godwoken-scripts/c
make all-via-docker
Expand Down
4 changes: 2 additions & 2 deletions polyjuice-tests/src/helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ pub fn eth_address_to_account_id(state: &DummyState, data: &[u8]) -> Result<u32,
return Ok(0);
}
let account_script_hash = state
.get_script_hash_by_prefix(data)
.ok_or_else(|| format!("can not get script hash by prefix: {:?}", data))?;
.get_script_hash_by_short_address(data)
.ok_or_else(|| format!("can not get script hash by short address: {:?}", data))?;
state
.get_account_id_by_script_hash(&account_script_hash)
.map_err(|err| err.to_string())?
Expand Down