From bddba6f2db8fe7627a757c17eff2359aa6f25c35 Mon Sep 17 00:00:00 2001
From: Linfeng Qian <thewawar@gmail.com>
Date: Wed, 23 Jun 2021 23:43:14 +0800
Subject: [PATCH] chore: update godwoken and godwoken-scripts

---
 Makefile                        | 4 ++--
 deps/godwoken-scripts           | 2 +-
 devtools/ci/integration-test.sh | 4 ++--
 polyjuice-tests/src/helper.rs   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1624c31d..f84855c5 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
diff --git a/deps/godwoken-scripts b/deps/godwoken-scripts
index c5729052..c015a5c3 160000
--- a/deps/godwoken-scripts
+++ b/deps/godwoken-scripts
@@ -1 +1 @@
-Subproject commit c5729052157c4af46d13617e9747695aabd1e52e
+Subproject commit c015a5c3b6da2fd6ce17b2e8a7a0f1e9f2e7b28c
diff --git a/devtools/ci/integration-test.sh b/devtools/ci/integration-test.sh
index ebc08ad1..b59a8a72 100644
--- a/devtools/ci/integration-test.sh
+++ b/devtools/ci/integration-test.sh
@@ -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
diff --git a/polyjuice-tests/src/helper.rs b/polyjuice-tests/src/helper.rs
index 54a79e5a..291e86ee 100644
--- a/polyjuice-tests/src/helper.rs
+++ b/polyjuice-tests/src/helper.rs
@@ -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())?