From 26ff0bf9aec43da9f8a5949f1020e0471d531bd6 Mon Sep 17 00:00:00 2001 From: simonjiao Date: Tue, 10 Dec 2024 17:57:48 +0800 Subject: [PATCH 1/7] Use full-length AccountAddress string * apply PR 4300 * update generated genesis * fix stc token string --- Cargo.lock | 75 +++++++++--------- Cargo.toml | 66 +++++++-------- genesis/generated/barnard/genesis | Bin 271465 -> 271496 bytes genesis/generated/halley/genesis | Bin 269177 -> 269208 bytes genesis/generated/main/genesis | Bin 271514 -> 271545 bytes genesis/generated/proxima/genesis | Bin 272863 -> 272894 bytes genesis/generated/vega/genesis | Bin 271514 -> 271545 bytes .../starcoin-framework/doc/stc_util.md | 2 +- .../sources/stc/stc_util.move | 2 +- 9 files changed, 75 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e59b9cbda0..75d617a633 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "abstract-domain-derive" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.36", @@ -5811,7 +5811,7 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "bcs 0.1.4", @@ -5828,7 +5828,7 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "arbitrary", @@ -5845,12 +5845,12 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "bcs 0.1.4", @@ -5865,7 +5865,7 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "move-binary-format", @@ -5877,7 +5877,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "fail", "move-binary-format", @@ -5891,7 +5891,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "clap 4.5.13", @@ -5906,7 +5906,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "clap 4.5.13", @@ -5936,7 +5936,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "difference", @@ -5953,7 +5953,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "bcs 0.1.4", @@ -5979,7 +5979,7 @@ dependencies = [ [[package]] name = "move-compiler-v2" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "abstract-domain-derive", "anyhow", @@ -6010,7 +6010,7 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "arbitrary", @@ -6037,7 +6037,7 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "bcs 0.1.4", @@ -6073,7 +6073,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "clap 4.5.13", @@ -6090,7 +6090,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "clap 4.5.13", @@ -6109,7 +6109,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "move-command-line-common", @@ -6121,7 +6121,7 @@ dependencies = [ [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "bcs 0.1.4", @@ -6137,7 +6137,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "codespan-reporting", @@ -6155,7 +6155,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "hex", @@ -6168,7 +6168,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "hex", "move-command-line-common", @@ -6181,7 +6181,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "codespan 0.11.1", @@ -6207,7 +6207,7 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "clap 4.5.13", @@ -6294,7 +6294,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "atty", @@ -6321,7 +6321,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "async-trait", @@ -6350,7 +6350,7 @@ dependencies = [ [[package]] name = "move-prover-bytecode-pipeline" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "abstract-domain-derive", "anyhow", @@ -6367,7 +6367,7 @@ dependencies = [ [[package]] name = "move-prover-test-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "move-command-line-common", @@ -6378,7 +6378,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "hex", @@ -6391,7 +6391,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "abstract-domain-derive", "codespan-reporting", @@ -6410,7 +6410,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "hex", @@ -6433,7 +6433,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "once_cell", "serde", @@ -6442,7 +6442,7 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "better_any", "bytes 1.6.1", @@ -6457,7 +6457,7 @@ dependencies = [ [[package]] name = "move-transactional-test-runner" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "clap 4.5.13", @@ -6489,7 +6489,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "better_any", @@ -6517,7 +6517,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "better_any", "bytes 1.6.1", @@ -6541,13 +6541,14 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "anyhow", "bytes 1.6.1", "move-binary-format", "move-bytecode-utils", "move-core-types", + "move-table-extension", "move-vm-types", "once_cell", "serde", @@ -6556,7 +6557,7 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=a14d2393e91b88465f1b3b351b20d34f0373e01f#a14d2393e91b88465f1b3b351b20d34f0373e01f" +source = "git+https://github.com/starcoinorg/move?rev=88e293a566e7aea1c4da1c302c1dbcf603930a22#88e293a566e7aea1c4da1c302c1dbcf603930a22" dependencies = [ "bcs 0.1.4", "derivative", diff --git a/Cargo.toml b/Cargo.toml index 25be379379..aeaee0c9eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -404,36 +404,40 @@ sha2_0_10_6 = { package = "sha2", version = "0.10.6" } siphasher = "0.3.10" merkletree = { version = "0.22.1" } mirai-annotations = "1.10.1" -move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-bytecode-utils = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-cli = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-compiler = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-compiler-v2 = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-core-types = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-coverage = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-docgen = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-model = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-package = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-prover = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-prover-boogie-backend = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-prover-bytecode-pipeline = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-stackless-bytecode = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } -move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f" } +move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-bytecode-utils = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-cli = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-compiler = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-compiler-v2 = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-core-types = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-coverage = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-docgen = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-model = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-package = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-prover = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-prover-boogie-backend = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-prover-bytecode-pipeline = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-stackless-bytecode = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22", features = [ + "table-extension", +] } +move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22" } +move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22", features = [ + "table-extension", +] } names = { version = "0.14.0", default-features = false } network-api = { path = "network/api", package = "network-api" } @@ -613,7 +617,7 @@ unsigned-varint = { version = "0.6.0", features = [ "futures", "asynchronous_codec", ] } -vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "a14d2393e91b88465f1b3b351b20d34f0373e01f", features = [ +vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "88e293a566e7aea1c4da1c302c1dbcf603930a22", features = [ "fuzzing", ] } vm-status-translator = { path = "vm/vm-status-translator" } diff --git a/genesis/generated/barnard/genesis b/genesis/generated/barnard/genesis index 1ef0f795e5aa5abadeb8cca2ac81d22f855f770c..c158f1980760c0885740738daa8ac667556db78f 100644 GIT binary patch delta 262 zcmaEPLZIWMzyv3S$xB{LJ>12ecTBQsb-H}tx5vR-UrlK^{j5{wuHl(Oxh)fuloZZx zNvL|XX^Cmm+WNiey|zL}*Z5ts-*RM+=xXVH&*=QR$p`1iOgzA=@S*YeQsIq~2O=N0 z8Z8!6tU7VqaQ*EMeR9=Jk#l)ohjcW)-TIbseG22I>2p&VRXF?wdYLCN^330UGLQ8I}dwNc|Y6!G0U9u*Vzx-alHj}~1y9dhI{rMOGCIfNB delta 231 zcmV$q?zt5RgJ3YZ7ppn#zkGjdIi2PJ0k32Mlb4-k0VD`85bgq!0Sth*$z=go0R$Kq zFnEVUX90&pX9BlFX9EPiL8p?1$xcjbaAf}blbT#g6JE?>`cO&KuMgj|9mTq8W&Ibf h*1d|HO3BxR5t}XtGgWV}q=f<&oy#t%5Wcyz0s!P9ZSDX7 diff --git a/genesis/generated/halley/genesis b/genesis/generated/halley/genesis index e028942bae968d27b90720e2242777de6f2cd01e..dbac59b397f8c5925875766e0eb714437ef904c8 100644 GIT binary patch delta 262 zcmeylO<=}$feB6u0zn%CLVj6)3}Mtytap>X;(Dj!k>9;Zn>PepyxjicSop*wB?ZPW z7AhX0=DoqrLTevI1W%lpmtB)vs#2ss1hS{4=J~&5a;sIWTmWGL+lEh?E=A|sZ ztpDTuR?BbKs!Y4DU6$@&rM}i;qVveWuC;yGk^QZRK{>d zWpguw3IqJ0T_v3nh?%ylq%(_bakLh&eUjBRw?J0ItMbO3|Ayf~XLeQB2;4AA-gV@$ q^qe~xqT0vezA?P{zIny+Vn%nr>3w-}KiPS9Px^ejp)wAfE=H-AG%lfj%Ek-!Zg29nkj>SJ0k32Mlb4-k0VD`85bgq!0Sth*$z=go0R$Kq zFnEVUX90&pX9BlFX9EyIJ&9@< hMEMXgtJm6j77unDn;}2-lRi#u3AYDMFi`bY0sy$0V2=O* diff --git a/genesis/generated/main/genesis b/genesis/generated/main/genesis index bdc9a4d6d721934bebd5158d2a6df3059895bb5f..9290ce43173c9fa866ca0da1f91d360a98a8a8a6 100644 GIT binary patch delta 262 zcmbPrQefvvfeB6uvqMX~zOgBV7}dloa?k zde2!|%zIOpHJ9ytZaQDF#h$AHGnW_Mk=b*(;BjKhpSjKHXK-`L>Oj?95gm#B*WTtt|KTfo%^lIv<6#i@Qo3fjJEV}(gc0Xykzyhs z2l2IS^rVQFdb(mTRz>FBZJdWzO-M7-5=qT!`yxJ8lfj%Ek-!Zg7&>1={vh_mb!kGP zQC?hf^LQJW3}qZxh*JzLp6w=bf$g>J0k32Mlb4-k0VD`85bgq!0Sth*$z=go0R$Kq zFnEVUX90&pX9BlFX9G38L0|6a5Ktq{CL;#SL2NUh5VXt?z@3ffP!Yc_0@ZU9N8rWGgfeB6u^Ex)pIs04BY{Glx#kJ0NW@t72u}e+(_u@u!|G62>BEl1sloTwF zoJ{n{vC2)D@q=~$!y~Ju|7(5qTKw})z=nqUZa&W?lMl|3nRtL#;q8%oE8LY>-iB%0 z_t4NpXUKC-tvhHZB$K44lCI^PPZG9(YEcJ1(9UB7xDMNA+ delta 231 zcmVskU~?d4>tljx@n&E<3PD7D^Jlfj%Ek-!Zg*tG+(4p|ZrS_z1m zva!9%WGbU=rwoiT3MR*$*x!`uf$g>J0k32Mlb4-k0VD`85bgq!0Sth*$z=go0R$Kq zFnEVUX90&pX9BlFX9Ie|L2Y4UM?JQLd=}yFm~h}JGY?Xar*Ql4!M@){&`#B+7)Es2 hbI-iD9`6fRuxw&Vc5ARcw?it1AX7jSDgQJA2>{l{XbAuS diff --git a/genesis/generated/vega/genesis b/genesis/generated/vega/genesis index b1db484c93a5d8fb46cb2387bc2676cd729f306f..ae68aceeb649d2a074c67c91548517faf8d1f107 100644 GIT binary patch delta 264 zcmbPrQefvvfeB6u*DkUB$T#^RCnEnQqSk#^S^0e_?O*1BP6gQ)^UPIMo=i+qlAn-w zaCaD|_lL|?3Fm)IV|(PevdO@2BkRJs>=i%Q&T~#aI7epkg*iM*@e08aiaJl;i5!bF zbaAW~+}U>2;Qy|cWP#jjv%1R+!Vf|l-)?=&xITq()AYHij4B-d0=>+W78^(AGE8aGXgQwc9nEy)4h)BW;f^EnI~c9bGN1Pq)TPv_7l;E(|&P%@R52{ rqH^;{=GW48W97)#0&Pq7>N7IDty}LhMX@_sIO{}Os?tsQFeU~7_P}ZX delta 231 zcmVJ0k32Mlb4-k0VD`85bgq!0Sth*$z=go0R$Kq zFnEVUX90&pX9BlFX9G38LEb!kEn)pPpgq_s_Tx3BU7(_QV=OUXL0}l diff --git a/vm/framework/starcoin-framework/doc/stc_util.md b/vm/framework/starcoin-framework/doc/stc_util.md index c44b2b7b34..5b5f027986 100644 --- a/vm/framework/starcoin-framework/doc/stc_util.md +++ b/vm/framework/starcoin-framework/doc/stc_util.md @@ -108,7 +108,7 @@
public fun is_stc<Coin>(): bool {
-    type_info::type_name<Coin>() == string::utf8(b"0x1::starcoin_coin::STC")
+    type_info::type_name<Coin>() == string::utf8(b"0x00000000000000000000000000000001::starcoin_coin::STC")
 }
 
diff --git a/vm/framework/starcoin-framework/sources/stc/stc_util.move b/vm/framework/starcoin-framework/sources/stc/stc_util.move index 92f3b1200c..6d38bfb668 100644 --- a/vm/framework/starcoin-framework/sources/stc/stc_util.move +++ b/vm/framework/starcoin-framework/sources/stc/stc_util.move @@ -14,7 +14,7 @@ module starcoin_framework::stc_util { #[view] public fun is_stc(): bool { - type_info::type_name() == string::utf8(b"0x1::starcoin_coin::STC") + type_info::type_name() == string::utf8(b"0x00000000000000000000000000000001::starcoin_coin::STC") } #[view] From 98e386d4efcde5abe3825d3452940605b6afd11d Mon Sep 17 00:00:00 2001 From: simonjiao Date: Tue, 10 Dec 2024 18:57:59 +0800 Subject: [PATCH 2/7] update statekey hash in tests --- vm/types/src/state_store/state_key/tests.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vm/types/src/state_store/state_key/tests.rs b/vm/types/src/state_store/state_key/tests.rs index eaa0f979d9..f66a2aebc5 100644 --- a/vm/types/src/state_store/state_key/tests.rs +++ b/vm/types/src/state_store/state_key/tests.rs @@ -16,7 +16,7 @@ fn assert_crypto_hash(key: &StateKey, expected_hash: &str) { fn test_resource_hash() { assert_crypto_hash( &StateKey::resource_typed::(&AccountAddress::TWO).unwrap(), - "8f9ab5d5e3c9f5b885fcceea388fecd16bdb490da08aac9d4f026ddc66733def", + "fdec56915926115cd094939bf5ef500157dd63a56e1a0e7521600adacdc50b90", ); } @@ -24,7 +24,7 @@ fn test_resource_hash() { fn test_resource_group_hash() { assert_crypto_hash( &StateKey::resource_group(&AccountAddress::TWO, &ObjectGroupResource::struct_tag()), - "87973d52189ac6a25ea543214305c4c8fb3bc2ceea8c34600361b03527578133", + "235dbcd87b398a707c229dbe02d3a42b118128a38ac266ff2d77c729c8c24d42", ); } @@ -32,7 +32,7 @@ fn test_resource_group_hash() { fn test_module_hash() { assert_crypto_hash( &StateKey::module(&AccountAddress::TWO, ident_str!("mymodule")), - "83d33b345c5e4b25d8f4dfe2b98b492024313b3b6e4febea6bfa844dbd850200", + "2b1fbcded1092bfbd49306ed6f39766c6235b3c52d412965668b600bc874e119", ); } From d13570d58d4479781de91dba404101d678b0efa3 Mon Sep 17 00:00:00 2001 From: simonjiao Date: Mon, 9 Dec 2024 21:21:39 +0800 Subject: [PATCH 3/7] fix block_cmd.move --- .../tests/cases/block_cmd.move | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/starcoin-transactional-test-harness/tests/cases/block_cmd.move b/vm/starcoin-transactional-test-harness/tests/cases/block_cmd.move index 99fb20234e..b977450694 100644 --- a/vm/starcoin-transactional-test-harness/tests/cases/block_cmd.move +++ b/vm/starcoin-transactional-test-harness/tests/cases/block_cmd.move @@ -2,5 +2,5 @@ //# block --author=0x2 -//# call 0x1::Block::get_current_block_number +//# call 0x1::stc_block::get_current_block_number From aaddc876f0f97421a7b21f130527c09c552f0d81 Mon Sep 17 00:00:00 2001 From: simonjiao Date: Wed, 11 Dec 2024 08:29:27 +0800 Subject: [PATCH 4/7] update coin.move --- vm/framework/starcoin-framework/sources/coin.move | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/framework/starcoin-framework/sources/coin.move b/vm/framework/starcoin-framework/sources/coin.move index a50352c14d..adb8fb3e44 100644 --- a/vm/framework/starcoin-framework/sources/coin.move +++ b/vm/framework/starcoin-framework/sources/coin.move @@ -305,7 +305,7 @@ module starcoin_framework::coin { } inline fun is_stc(): bool { - type_info::type_name() == string::utf8(b"0x1::starcoin_coin::STC") + type_info::type_name() == string::utf8(b"0x00000000000000000000000000000001::starcoin_coin::STC") } inline fun create_and_return_paired_metadata_if_not_exist(allow_stc_creation: bool): Object { From c960398f0afe9db846d5006c138a908aff660332 Mon Sep 17 00:00:00 2001 From: simonjiao Date: Wed, 11 Dec 2024 11:59:00 +0800 Subject: [PATCH 5/7] update auto-generated files --- genesis/generated/barnard/genesis | Bin 271496 -> 271527 bytes genesis/generated/halley/genesis | Bin 269208 -> 269239 bytes genesis/generated/main/genesis | Bin 271545 -> 271576 bytes genesis/generated/proxima/genesis | Bin 272894 -> 272925 bytes genesis/generated/vega/genesis | Bin 271545 -> 271576 bytes vm/framework/starcoin-framework/doc/coin.md | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/genesis/generated/barnard/genesis b/genesis/generated/barnard/genesis index c158f1980760c0885740738daa8ac667556db78f..ed58c8f07a165b988da0e0eeeb1ded604196eeac 100644 GIT binary patch delta 254 zcmV5RgJ3w5X9MQa5e(F2Q!EyMgqynVnVNt(#h!=c3LQpf1HXkzyhs zA)Jl#pF7bX%#wB+UqVBtTK0KwI_eC1C1`LJYs7tQlfj%Ek-!Zgp=2udFPlo_ZV;K` zEj67-{pX^eUj0OjpVai7SGoH}f$g>J0an!k`j8;uH= zqZT20$lEcm+whJadxBY=4C_>gf$g>J0an!k+m}Sv0W2Tn3lQ)(<`xRpPSgPls!$FL zxKN-Y4cK!a4)}8v4~(~u)&a^G1Q-`Ec!zxN0f&6=0=Inc1L`zEwMiE(%&`r&N{-tP|^uls=Kd7aOe%~PdR?)9({lfj%Ek-!ZghXT^Vh3`Gqoj<@2 z&$*RMdvp6RS^HV*1fKQHrcYW%f$g>J0an!k`j#vkzyhs z0rWT|NL4qDQ$rH1;#gCWk#1{zZFMHC(~-EW=~h2Alfj%Ek-!Zggn*IqVip`^o@A%f zFZj>3Iri5cbR2KrPj66~O35}tf$g>J0an!k+m}Sv0W2Tn3lQ)(<`xRpPSgPls!$FL zxKN-Y4cK!a4)}8v4~(~u)&a^G1Q-`Ec!zxN0f&6=0=Inc1NtjLI}knOYKon39Vkk9 z*xdgyS5nNndwdYsGGn^L;~SjZXca5QUiJX&_p_*{a{)(AmyT{8`3DTUlOl6%?YTp%G$kzyhs zfk`^6dCyoI(@Ms6qXgNJCTVvKD(?9WbunWZ+`;Lplfj%Ek-!Zgklkp5Yd$bii`|BO zndWtgG@>77GRqtyw|f;LeGO6qf$g>J0an!k`jWP5=M^ delta 254 zcmV285RgJ3n^km5_66lv0L(|E3F^{jGzEefa z{1#z}L@4{r+X+rE*`%vcCAwIMf$g>J0an!k+m}Sv0W2Tn3lQ)(<`xRpPSgPls!$FL zxKN-Y4cK!a4)}8v4~(~u)&a^G1Q-`Ec!zxN0f&6=0=Inc0~<9#yjCHmSwQsmW5&Cc zGALMbgZA|B-JJ5b-v0MAzOwV^iPCp?vkLrpu`Fa E0P5>@T>t<8 diff --git a/genesis/generated/proxima/genesis b/genesis/generated/proxima/genesis index 9389ef16c11b13aeb4188881aa20de8da87467cc..8e551a9a1c9479efefdb8d600989bfe296e5fa05 100644 GIT binary patch delta 254 zcmV}vx&Q`Cllfj%Ek-!Zg@n&6w=RDL8=FI%d zh+G|^TdW3Apy(W})p*}~X!lH^f$g>J0an!k`jJ0an!k+m}Sv0W2Tn3lQ)(<`xRpPSgPls!$FL zxKN-Y4cK!a4)}8v4~(~u)&a^G1Q-`Ec!zxN0f&6=0=Inc17JEqEkGyqb~f|9LfeR7 zDZ_l$Dl^Y+^YlB*OWTeM-;T4FkEIMBBpY=t(G&pGuEm8&-H@o0QB_8@?iw>1@x49< E00?(@T>t<8 diff --git a/genesis/generated/vega/genesis b/genesis/generated/vega/genesis index ae68aceeb649d2a074c67c91548517faf8d1f107..0b29a6420b21b65c71a0b242ecd26a4ae7102242 100644 GIT binary patch delta 254 zcmV};OR3_JB8|R5(_-FYa%Tp02GpODlfj%Ek-!ZgQZgXAYi<)EDv3aK zFl^RL!M9MaNc=9iC&U8U9@Qd+f$g>J0an!k`jP7i7s08H|jO3u285RgJ3*3t&}Z#4KG6d&wZeMh=>ci$Q-`ZrNRaBIkx*dy)OX(?S8LBlp%{_6Kcq2Wg^)h GRssNuI&jGV diff --git a/vm/framework/starcoin-framework/doc/coin.md b/vm/framework/starcoin-framework/doc/coin.md index 100b4c56ff..8945aec980 100644 --- a/vm/framework/starcoin-framework/doc/coin.md +++ b/vm/framework/starcoin-framework/doc/coin.md @@ -1415,7 +1415,7 @@ Create STC pairing by passing StarcoinCoin.
inline fun is_stc<CoinType>(): bool {
-    type_info::type_name<CoinType>() == string::utf8(b"0x1::starcoin_coin::STC")
+    type_info::type_name<CoinType>() == string::utf8(b"0x00000000000000000000000000000001::starcoin_coin::STC")
 }
 
From bf5db3aaa0a436677fac6c4c6fade251a86117fe Mon Sep 17 00:00:00 2001 From: simonjiao Date: Tue, 10 Dec 2024 19:01:50 +0800 Subject: [PATCH 6/7] update nextest.sh --- scripts/nextest.sh | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/scripts/nextest.sh b/scripts/nextest.sh index 151e4f47a1..026505352c 100755 --- a/scripts/nextest.sh +++ b/scripts/nextest.sh @@ -21,19 +21,11 @@ cargo nextest -V >/dev/null 2>&1 || cargo install cargo-nextest --version "0.9.5 # --failure-output immediate-final, make error log output immediate & at the end of the run # --retries 2, a correct test case usually takes no more than 3 tries to pass # --build-jobs 8, a little (~20s) faster than 5 or 10 build jobs -#cargo nextest run --workspace --retries 2 --build-jobs 8 --test-threads 12 --no-fail-fast --failure-output immediate-final -cargo nextest run \ --p starcoin-executor \ --p starcoin-vm-runtime \ --p starcoin-genesis \ --p starcoin-node \ --p starcoin-config \ --p starcoin-txpool \ --p starcoin-chain \ --p starcoin-network \ --p starcoin-storage \ --p starcoin-types \ --p starcoin-sync \ +cargo nextest run --workspace \ +--exclude starcoin-transactional-test-harness \ +--exclude starcoin-framework \ +--exclude contrib-contracts \ +--exclude starcoin-consensus \ --retries 2 --build-jobs 8 --test-threads 12 --no-fail-fast --failure-output immediate-final From 80244cd0c40c35b6262919884f8b3f8ce648c35f Mon Sep 17 00:00:00 2001 From: simonjiao Date: Wed, 11 Dec 2024 16:04:00 +0800 Subject: [PATCH 7/7] increase wait time when starting txpoolservice in tests --- test-helper/src/txpool.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-helper/src/txpool.rs b/test-helper/src/txpool.rs index 528f3798b5..26ea89d8f9 100644 --- a/test-helper/src/txpool.rs +++ b/test-helper/src/txpool.rs @@ -73,7 +73,7 @@ pub async fn start_txpool_with_miner( } //registry.register::().await.unwrap(); let pool_actor = registry.register::().await.unwrap(); - Delay::new(Duration::from_millis(200)).await; + Delay::new(Duration::from_millis(300)).await; let txpool_service = registry.get_shared::().await.unwrap(); (