From 80cc8dc34dd3423e30e19805f8b7eef8b52c7a7e Mon Sep 17 00:00:00 2001 From: jjy Date: Tue, 22 Jun 2021 20:02:05 +0800 Subject: [PATCH] upgrade godwoken dependencies to 888f0e9fc02adf0a52592dda1ddf283a596a7459 --- Cargo.lock | 28 ++++++++++++++-------------- c/Makefile | 2 +- contracts/Cargo.lock | 6 +++--- contracts/validator-utils/Cargo.toml | 4 ++-- tests/Cargo.toml | 20 ++++++++++---------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da7083c8..70240d63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1723,7 +1723,7 @@ dependencies = [ [[package]] name = "gw-block-producer" version = "0.2.0-rc1" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "async-channel", @@ -1763,7 +1763,7 @@ dependencies = [ [[package]] name = "gw-chain" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "ckb-fixed-hash 0.38.0", @@ -1785,7 +1785,7 @@ dependencies = [ [[package]] name = "gw-common" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "cfg-if 0.1.10", "gw-hash", @@ -1796,7 +1796,7 @@ dependencies = [ [[package]] name = "gw-config" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "ckb-fixed-hash 0.38.0", "gw-jsonrpc-types", @@ -1806,7 +1806,7 @@ dependencies = [ [[package]] name = "gw-db" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "ckb-rocksdb", "libc", @@ -1818,7 +1818,7 @@ dependencies = [ [[package]] name = "gw-generator" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "blake2b-rs 0.2.0", @@ -1839,7 +1839,7 @@ dependencies = [ [[package]] name = "gw-hash" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "blake2b-ref", ] @@ -1847,7 +1847,7 @@ dependencies = [ [[package]] name = "gw-jsonrpc-types" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "ckb-fixed-hash 0.38.0", @@ -1861,7 +1861,7 @@ dependencies = [ [[package]] name = "gw-mem-pool" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "gw-common", @@ -1875,7 +1875,7 @@ dependencies = [ [[package]] name = "gw-rpc-server" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "async-channel", @@ -1914,7 +1914,7 @@ dependencies = [ [[package]] name = "gw-store" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "gw-common", @@ -1967,7 +1967,7 @@ dependencies = [ [[package]] name = "gw-traits" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "gw-common", "gw-db", @@ -1977,7 +1977,7 @@ dependencies = [ [[package]] name = "gw-types" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "cfg-if 0.1.10", "ckb-fixed-hash 0.38.0", @@ -1989,7 +1989,7 @@ dependencies = [ [[package]] name = "gw-web3-indexer" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "anyhow", "ckb-hash 0.38.0", diff --git a/c/Makefile b/c/Makefile index 604dad7b..d0cdec8d 100644 --- a/c/Makefile +++ b/c/Makefile @@ -8,7 +8,7 @@ CFLAGS := $(CINCLUDES) $(SECP256K1_INCLUDES) -DCKB_C_STDLIB_PRINTF -fPIC -O3 -no LDFLAGS := -Wl,-static -fdata-sections -ffunction-sections -Wl,--gc-sections MOLC := moleculec MOLC_VERSION := 0.6.1 -PROTOCOL_VERSION := c3165a6a2663c89cc81d821024fd71fe9cd0c49c +PROTOCOL_VERSION := 888f0e9fc02adf0a52592dda1ddf283a596a7459 PROTOCOL_SCHEMA_URL := https://raw.githubusercontent.com/nervosnetwork/godwoken/${PROTOCOL_VERSION}/crates/types/schemas # docker pull nervos/ckb-riscv-gnu-toolchain:gnu-bionic-20191012 diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index ca64c446..3f4eedd5 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -130,7 +130,7 @@ dependencies = [ [[package]] name = "gw-common" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "cfg-if", "gw-hash", @@ -140,7 +140,7 @@ dependencies = [ [[package]] name = "gw-hash" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "blake2b-ref", ] @@ -148,7 +148,7 @@ dependencies = [ [[package]] name = "gw-types" version = "0.1.0" -source = "git+https://github.com/nervosnetwork/godwoken.git?rev=c3165a6a2663c89cc81d821024fd71fe9cd0c49c#c3165a6a2663c89cc81d821024fd71fe9cd0c49c" +source = "git+https://github.com/nervosnetwork/godwoken.git?rev=888f0e9fc02adf0a52592dda1ddf283a596a7459#888f0e9fc02adf0a52592dda1ddf283a596a7459" dependencies = [ "cfg-if", "gw-hash", diff --git a/contracts/validator-utils/Cargo.toml b/contracts/validator-utils/Cargo.toml index 467cdde1..447a11f7 100644 --- a/contracts/validator-utils/Cargo.toml +++ b/contracts/validator-utils/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" [dependencies] ckb-std = "0.7.4" -gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c", default-features = false } -gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c", default-features = false } +gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459", default-features = false } +gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459", default-features = false } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index d5f2229b..9cb56c75 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -7,16 +7,16 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-config = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-db = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-store = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-traits = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-generator = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-chain = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-mem-pool = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } -gw-block-producer = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "c3165a6a2663c89cc81d821024fd71fe9cd0c49c" } +gw-types = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-common = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-config = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-db = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-store = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-traits = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-generator = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-chain = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-mem-pool = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } +gw-block-producer = { git = "https://github.com/nervosnetwork/godwoken.git", rev = "888f0e9fc02adf0a52592dda1ddf283a596a7459" } parking_lot = "0.11" anyhow = "1.0" blake2b-rs = "0.2"