From 6b8bb6af5d0cf6aff1fac1d459b36fc381b94dba Mon Sep 17 00:00:00 2001 From: Xuejie Xiao Date: Thu, 31 Oct 2019 08:14:20 +0000 Subject: [PATCH 1/2] feat: Upgrade system script for modified multi-sign lock script --- Cargo.lock | 8 +++--- benches/Cargo.toml | 2 +- docs/hashes.toml | 54 ++++++++++++++++++------------------- resource/Cargo.toml | 4 +-- resource/specs/testnet.toml | 2 +- test/vendor | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a0655c8747..71abb1f5bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -343,7 +343,7 @@ dependencies = [ "ckb-jsonrpc-types 0.24.0-pre", "ckb-shared 0.24.0-pre", "ckb-store 0.24.0-pre", - "ckb-system-scripts 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ckb-system-scripts 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "ckb-test-chain-utils 0.24.0-pre", "ckb-tx-pool 0.24.0-pre", "ckb-types 0.24.0-pre", @@ -773,7 +773,7 @@ dependencies = [ name = "ckb-resource" version = "0.24.0-pre" dependencies = [ - "ckb-system-scripts 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ckb-system-scripts 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "ckb-types 0.24.0-pre", "includedir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "includedir_codegen 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -961,7 +961,7 @@ dependencies = [ [[package]] name = "ckb-system-scripts" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "blake2b-rs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3982,7 +3982,7 @@ dependencies = [ "checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" -"checksum ckb-system-scripts 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1572ed1974447f11c7609f34477085a3dceea9241065644298dd2dce65b7b791" +"checksum ckb-system-scripts 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "25f1b1c14eb05029f2e71ce70103d0b1013fbd0bdbd2c67a63df651a72e38ff3" "checksum ckb-vm 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "410eca836e677ea70f73358b53220c284836c3cbb3ecf9ee531606d926881f59" "checksum ckb-vm-definitions 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "201ab0ce4cf5644b3f0cacc9d772011f66c132d5e62ab35918413d9a6c29e6a7" "checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 01485f225c..6379425919 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -20,7 +20,7 @@ ckb-hash = {path = "../util/hash"} ckb-test-chain-utils = { path = "../util/test-chain-utils" } ckb-dao-utils = { path = "../util/dao/utils" } ckb-dao = { path = "../util/dao" } -ckb-system-scripts = { version = "= 0.4.0" } +ckb-system-scripts = { version = "= 0.5.0" } lazy_static = "1.3.0" ckb-crypto = { path = "../util/crypto" } faketime = "0.2.0" diff --git a/docs/hashes.toml b/docs/hashes.toml index 810727ca71..1d882ceb7a 100644 --- a/docs/hashes.toml +++ b/docs/hashes.toml @@ -2,128 +2,128 @@ # Spec: ckb_dev [ckb_dev] -genesis = "0x73f4ffa1d7898c2c044326363ba8d59fd123e173ff2d5c4d187d29baaae6214e" -cellbase = "0x637641b7785752c5272ef51508569b4b2ce27ad94ed425d46fa3c13d44bf7225" +genesis = "0xec599b3c2612a1ced3826bdc24894b2036e6fbfe648fe6624ce7707b0da52a58" +cellbase = "0xb5724acb4f5f82afb717c3ec3fe025d3b6e45ff48f4ffbb6162c950399cbcabe" [[ckb_dev.system_cells]] path = "Bundled(specs/cells/secp256k1_blake160_sighash_all)" -tx_hash = "0x637641b7785752c5272ef51508569b4b2ce27ad94ed425d46fa3c13d44bf7225" +tx_hash = "0xb5724acb4f5f82afb717c3ec3fe025d3b6e45ff48f4ffbb6162c950399cbcabe" index = 1 data_hash = "0x973bdb373cbb1d752b4ac006e2bb5bdcb63431ed2b6e394b22721c8906a2ad72" type_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8" [[ckb_dev.system_cells]] path = "Bundled(specs/cells/dao)" -tx_hash = "0x637641b7785752c5272ef51508569b4b2ce27ad94ed425d46fa3c13d44bf7225" +tx_hash = "0xb5724acb4f5f82afb717c3ec3fe025d3b6e45ff48f4ffbb6162c950399cbcabe" index = 2 data_hash = "0x516be0333273bbe12a723f3be583c524f0b6089326f89c49fc61e24d1f56be21" type_hash = "0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e" [[ckb_dev.system_cells]] path = "Bundled(specs/cells/secp256k1_data)" -tx_hash = "0x637641b7785752c5272ef51508569b4b2ce27ad94ed425d46fa3c13d44bf7225" +tx_hash = "0xb5724acb4f5f82afb717c3ec3fe025d3b6e45ff48f4ffbb6162c950399cbcabe" index = 3 data_hash = "0x9799bee251b975b82c45a02154ce28cec89c5853ecc14d12b7b8cccfc19e0af4" [[ckb_dev.system_cells]] path = "Bundled(specs/cells/secp256k1_blake160_multisig_all)" -tx_hash = "0x637641b7785752c5272ef51508569b4b2ce27ad94ed425d46fa3c13d44bf7225" +tx_hash = "0xb5724acb4f5f82afb717c3ec3fe025d3b6e45ff48f4ffbb6162c950399cbcabe" index = 4 -data_hash = "0x109805c7dc63086bdbbd81efb1c95a5ba2c81baf91a5f3e2564c7c23c5e77264" +data_hash = "0xc1fb0ae6915d3d4eded3498aedf5faddd8c5f6bd8921e0f8bfabd5ebcbf259bc" type_hash = "0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8" [[ckb_dev.dep_groups]] included_cells = ["Bundled(specs/cells/secp256k1_data)", "Bundled(specs/cells/secp256k1_blake160_sighash_all)"] -tx_hash = "0x62b47d45ee689fb852af9002c318dcea1aeb9a4632991429fc3ec38676e356e3" +tx_hash = "0xcb77d6dd01abde6dde8cd3fffaa9811399309ae47e18162096b7ae45e5e69f14" index = 0 [[ckb_dev.dep_groups]] included_cells = ["Bundled(specs/cells/secp256k1_data)", "Bundled(specs/cells/secp256k1_blake160_multisig_all)"] -tx_hash = "0x62b47d45ee689fb852af9002c318dcea1aeb9a4632991429fc3ec38676e356e3" +tx_hash = "0xcb77d6dd01abde6dde8cd3fffaa9811399309ae47e18162096b7ae45e5e69f14" index = 1 # Spec: ckb_testnet [ckb_testnet] -genesis = "0xee8e1738676791d4ba8d77dc927ae8a3d123aee6e693c613f739ea2ececf2cf1" -cellbase = "0xc640b8e88633d0982b23334771d24335710bcf4c04e59156cc1d497b80e523bf" +genesis = "0x880d668987cd15d6660c7161ba19d3523884c15c9d8ccd030b5c6cd04a4d29c2" +cellbase = "0x64b9232b579b2127f4464aecd5f10ba645c019eee39f5b7d82937c7809650450" [[ckb_testnet.system_cells]] path = "Bundled(specs/cells/secp256k1_blake160_sighash_all)" -tx_hash = "0xc640b8e88633d0982b23334771d24335710bcf4c04e59156cc1d497b80e523bf" +tx_hash = "0x64b9232b579b2127f4464aecd5f10ba645c019eee39f5b7d82937c7809650450" index = 1 data_hash = "0x973bdb373cbb1d752b4ac006e2bb5bdcb63431ed2b6e394b22721c8906a2ad72" type_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8" [[ckb_testnet.system_cells]] path = "Bundled(specs/cells/dao)" -tx_hash = "0xc640b8e88633d0982b23334771d24335710bcf4c04e59156cc1d497b80e523bf" +tx_hash = "0x64b9232b579b2127f4464aecd5f10ba645c019eee39f5b7d82937c7809650450" index = 2 data_hash = "0x516be0333273bbe12a723f3be583c524f0b6089326f89c49fc61e24d1f56be21" type_hash = "0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e" [[ckb_testnet.system_cells]] path = "Bundled(specs/cells/secp256k1_data)" -tx_hash = "0xc640b8e88633d0982b23334771d24335710bcf4c04e59156cc1d497b80e523bf" +tx_hash = "0x64b9232b579b2127f4464aecd5f10ba645c019eee39f5b7d82937c7809650450" index = 3 data_hash = "0x9799bee251b975b82c45a02154ce28cec89c5853ecc14d12b7b8cccfc19e0af4" [[ckb_testnet.system_cells]] path = "Bundled(specs/cells/secp256k1_blake160_multisig_all)" -tx_hash = "0xc640b8e88633d0982b23334771d24335710bcf4c04e59156cc1d497b80e523bf" +tx_hash = "0x64b9232b579b2127f4464aecd5f10ba645c019eee39f5b7d82937c7809650450" index = 4 -data_hash = "0x109805c7dc63086bdbbd81efb1c95a5ba2c81baf91a5f3e2564c7c23c5e77264" +data_hash = "0xc1fb0ae6915d3d4eded3498aedf5faddd8c5f6bd8921e0f8bfabd5ebcbf259bc" type_hash = "0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8" [[ckb_testnet.dep_groups]] included_cells = ["Bundled(specs/cells/secp256k1_data)", "Bundled(specs/cells/secp256k1_blake160_sighash_all)"] -tx_hash = "0xba700677f622b40041ef64cd124c165a7da75dda59140af2735838c36ab22982" +tx_hash = "0xf91c3f27dea88cb9f21ebb197165232bc6e0f6cb5ef8db3ac47a147164b28046" index = 0 [[ckb_testnet.dep_groups]] included_cells = ["Bundled(specs/cells/secp256k1_data)", "Bundled(specs/cells/secp256k1_blake160_multisig_all)"] -tx_hash = "0xba700677f622b40041ef64cd124c165a7da75dda59140af2735838c36ab22982" +tx_hash = "0xf91c3f27dea88cb9f21ebb197165232bc6e0f6cb5ef8db3ac47a147164b28046" index = 1 # Spec: ckb_staging [ckb_staging] -genesis = "0x5ccfb9c27fcb2a64f69ee7aaccdf3dca7d052ba378eba48af09901cd2b244f7f" -cellbase = "0x33473f6d905410f2c14ae733646380a9f5df42e4f2ebf14ba2d0eed0b1aebe67" +genesis = "0x9a078754d173736dd3c50636159d92e8741db02290549e3dc354b98507db700b" +cellbase = "0x1f89ab539d0da49e99ce740d0ed049aa8ba490327d2c4216b6ef532064a932ee" [[ckb_staging.system_cells]] path = "Bundled(specs/cells/secp256k1_blake160_sighash_all)" -tx_hash = "0x33473f6d905410f2c14ae733646380a9f5df42e4f2ebf14ba2d0eed0b1aebe67" +tx_hash = "0x1f89ab539d0da49e99ce740d0ed049aa8ba490327d2c4216b6ef532064a932ee" index = 1 data_hash = "0x973bdb373cbb1d752b4ac006e2bb5bdcb63431ed2b6e394b22721c8906a2ad72" type_hash = "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8" [[ckb_staging.system_cells]] path = "Bundled(specs/cells/dao)" -tx_hash = "0x33473f6d905410f2c14ae733646380a9f5df42e4f2ebf14ba2d0eed0b1aebe67" +tx_hash = "0x1f89ab539d0da49e99ce740d0ed049aa8ba490327d2c4216b6ef532064a932ee" index = 2 data_hash = "0x516be0333273bbe12a723f3be583c524f0b6089326f89c49fc61e24d1f56be21" type_hash = "0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e" [[ckb_staging.system_cells]] path = "Bundled(specs/cells/secp256k1_data)" -tx_hash = "0x33473f6d905410f2c14ae733646380a9f5df42e4f2ebf14ba2d0eed0b1aebe67" +tx_hash = "0x1f89ab539d0da49e99ce740d0ed049aa8ba490327d2c4216b6ef532064a932ee" index = 3 data_hash = "0x9799bee251b975b82c45a02154ce28cec89c5853ecc14d12b7b8cccfc19e0af4" [[ckb_staging.system_cells]] path = "Bundled(specs/cells/secp256k1_blake160_multisig_all)" -tx_hash = "0x33473f6d905410f2c14ae733646380a9f5df42e4f2ebf14ba2d0eed0b1aebe67" +tx_hash = "0x1f89ab539d0da49e99ce740d0ed049aa8ba490327d2c4216b6ef532064a932ee" index = 4 -data_hash = "0x109805c7dc63086bdbbd81efb1c95a5ba2c81baf91a5f3e2564c7c23c5e77264" +data_hash = "0xc1fb0ae6915d3d4eded3498aedf5faddd8c5f6bd8921e0f8bfabd5ebcbf259bc" type_hash = "0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8" [[ckb_staging.dep_groups]] included_cells = ["Bundled(specs/cells/secp256k1_data)", "Bundled(specs/cells/secp256k1_blake160_sighash_all)"] -tx_hash = "0xeae22bcf9bae23587ad64488d368c150a5506b43c98b50ee6fb20e37e5a14579" +tx_hash = "0xd8b8782eab9fa916ed6459a739449f3db355c390e2de0d94889ec73f2fdf5679" index = 0 [[ckb_staging.dep_groups]] included_cells = ["Bundled(specs/cells/secp256k1_data)", "Bundled(specs/cells/secp256k1_blake160_multisig_all)"] -tx_hash = "0xeae22bcf9bae23587ad64488d368c150a5506b43c98b50ee6fb20e37e5a14579" +tx_hash = "0xd8b8782eab9fa916ed6459a739449f3db355c390e2de0d94889ec73f2fdf5679" index = 1 diff --git a/resource/Cargo.toml b/resource/Cargo.toml index 4e7e511593..bb3d4998cd 100644 --- a/resource/Cargo.toml +++ b/resource/Cargo.toml @@ -13,10 +13,10 @@ tempfile = "3.0" serde = "1.0" serde_derive = "1.0" ckb-types = { path = "../util/types" } -ckb-system-scripts = { version = "= 0.4.0" } +ckb-system-scripts = { version = "= 0.5.0" } [build-dependencies] includedir_codegen = "0.5.0" walkdir = "2.1.4" ckb-types = { path = "../util/types" } -ckb-system-scripts = { version = "= 0.4.0" } +ckb-system-scripts = { version = "= 0.5.0" } diff --git a/resource/specs/testnet.toml b/resource/specs/testnet.toml index 82054e0738..6c7f8cef52 100644 --- a/resource/specs/testnet.toml +++ b/resource/specs/testnet.toml @@ -8,7 +8,7 @@ compact_target = 0x1c00e904 uncles_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" nonce = "0x0" # run `cargo run cli hashes -b` to get the genesis hash -hash = "0xee8e1738676791d4ba8d77dc927ae8a3d123aee6e693c613f739ea2ececf2cf1" +hash = "0x880d668987cd15d6660c7161ba19d3523884c15c9d8ccd030b5c6cd04a4d29c2" [genesis.genesis_cell] message = "rylai-v11 9d812af5 chore: update system script " diff --git a/test/vendor b/test/vendor index 46f5ac7fc0..93e948c93c 160000 --- a/test/vendor +++ b/test/vendor @@ -1 +1 @@ -Subproject commit 46f5ac7fc0a5eb60cbe72d98177d87ff2377e58f +Subproject commit 93e948c93c7654f415c9dbcae163adeeb32c08d8 From a4bd424c1bb8bb8834bd8701d7608757665d8c2c Mon Sep 17 00:00:00 2001 From: Xuejie Xiao Date: Thu, 31 Oct 2019 08:21:32 +0000 Subject: [PATCH 2/2] fix: integration test --- test/src/specs/tx_pool/send_multisig_secp_tx.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/specs/tx_pool/send_multisig_secp_tx.rs b/test/src/specs/tx_pool/send_multisig_secp_tx.rs index 14a9d31e61..7c593f9c5a 100644 --- a/test/src/specs/tx_pool/send_multisig_secp_tx.rs +++ b/test/src/specs/tx_pool/send_multisig_secp_tx.rs @@ -139,7 +139,7 @@ fn gen_multi_sign_script(keys: &[Privkey], threshold: u8, require_first_n: u8) - .collect::>(); let mut script = vec![0u8, require_first_n, threshold, pubkeys.len() as u8]; pubkeys.iter().for_each(|pubkey| { - script.extend_from_slice(&pubkey.serialize()); + script.extend_from_slice(&blake160(&pubkey.serialize()).as_bytes()); }); script.into() }