From c5b85a3babcefde2daeab16b2edf3d60dd0b825c Mon Sep 17 00:00:00 2001 From: Bob Ong Date: Wed, 24 Apr 2024 17:41:34 +0800 Subject: [PATCH] Frozen config errmsg fix (#4033) * [frozen config] Add compiled v12 binary files * [frozen config] Add stdlib building script for building new stdlib binary files * [force-upgrade] commit fixed codes * [force-upgrade] Add stdlib building script for building new stdlib binary files * [force-upgrade] Fix error code of framework * [force-upgrade] commit binary files * [force-upgrade] fixed by the merged starcoin-move branch starcoin-main-v6 * [force-upgrade] fixed by the merged starcoin-framework branch 'v11_branch' --- Cargo.lock | 80 +++++++++--------- Cargo.toml | 54 ++++++------ scripts/build_stdlib.sh | 36 ++++++++ vm/stdlib/compiled/12/11-12/stdlib.blob | Bin 88272 -> 88437 bytes .../11-12/stdlib/064_StdlibUpgradeScripts.mv | Bin 2143 -> 2328 bytes .../12/11-12/stdlib/078_TransactionManager.mv | Bin 1426 -> 1406 bytes .../12/stdlib/064_StdlibUpgradeScripts.mv | Bin 2143 -> 2328 bytes .../12/stdlib/078_TransactionManager.mv | Bin 1426 -> 1406 bytes .../error_descriptions.errmap | Bin 8855 -> 8963 bytes .../latest/stdlib/064_StdlibUpgradeScripts.mv | Bin 2143 -> 2328 bytes .../latest/stdlib/078_TransactionManager.mv | Bin 1426 -> 1406 bytes vm/vm-runtime/src/errors.rs | 9 ++ 12 files changed, 112 insertions(+), 67 deletions(-) create mode 100755 scripts/build_stdlib.sh diff --git a/Cargo.lock b/Cargo.lock index 305926dac3..9251d3fb1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -978,7 +978,7 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytecode-interpreter-crypto" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "curve25519-dalek-fiat", @@ -5020,7 +5020,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5037,7 +5037,7 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "arbitrary", @@ -5053,12 +5053,12 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5073,7 +5073,7 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "move-binary-format", @@ -5085,7 +5085,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "fail", @@ -5098,7 +5098,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "clap 3.2.23", @@ -5115,7 +5115,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5161,7 +5161,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "difference", @@ -5178,7 +5178,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5207,7 +5207,7 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "arbitrary", @@ -5231,7 +5231,7 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5268,7 +5268,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "clap 3.2.23", @@ -5286,7 +5286,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "codespan 0.11.1", @@ -5304,7 +5304,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5318,7 +5318,7 @@ dependencies = [ [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5337,7 +5337,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "codespan-reporting", @@ -5356,7 +5356,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "hex", @@ -5369,7 +5369,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "hex", @@ -5383,7 +5383,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "codespan 0.11.1", @@ -5409,7 +5409,7 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5493,7 +5493,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "async-trait", @@ -5530,7 +5530,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "async-trait", @@ -5558,7 +5558,7 @@ dependencies = [ [[package]] name = "move-prover-test-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "move-command-line-common", @@ -5569,7 +5569,7 @@ dependencies = [ [[package]] name = "move-read-write-set-types" version = "0.0.3" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "move-binary-format", @@ -5580,7 +5580,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5595,7 +5595,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "codespan 0.11.1", "codespan-reporting", @@ -5622,7 +5622,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode-interpreter" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bytecode-interpreter-crypto", @@ -5640,7 +5640,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "hex", @@ -5663,7 +5663,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "once_cell", "serde 1.0.152", @@ -5672,7 +5672,7 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "bcs", @@ -5689,7 +5689,7 @@ dependencies = [ [[package]] name = "move-transactional-test-runner" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "clap 3.2.23", @@ -5724,7 +5724,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "better_any", @@ -5755,7 +5755,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "better_any", "fail", @@ -5772,7 +5772,7 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "move-binary-format", @@ -5786,7 +5786,7 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "bcs", "move-binary-format", @@ -7816,7 +7816,7 @@ dependencies = [ [[package]] name = "read-write-set" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "move-binary-format", @@ -7831,7 +7831,7 @@ dependencies = [ [[package]] name = "read-write-set-dynamic" version = "0.1.0" -source = "git+https://github.com/starcoinorg/move?rev=823912c39b4b58fe1ee3f24af81dbf56849ff82a#823912c39b4b58fe1ee3f24af81dbf56849ff82a" +source = "git+https://github.com/starcoinorg/move?rev=7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc#7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" dependencies = [ "anyhow", "move-binary-format", @@ -9706,7 +9706,7 @@ dependencies = [ [[package]] name = "starcoin-framework" version = "11.0.0" -source = "git+https://github.com/starcoinorg/starcoin-framework?rev=1df759371941ab59cb2295542f7eafa85c4ef6fe#1df759371941ab59cb2295542f7eafa85c4ef6fe" +source = "git+https://github.com/starcoinorg/starcoin-framework?rev=3e879a168036dceaa60c57c8e2b9228283476f81#3e879a168036dceaa60c57c8e2b9228283476f81" dependencies = [ "anyhow", "include_dir", diff --git a/Cargo.toml b/Cargo.toml index dabb326153..f2e7051406 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -335,31 +335,31 @@ log4rs = { version = "1.2.0", features = ["background_rotation", "gzip"] } lru = "0.7.8" merkletree = { version = "0.22.1" } mirai-annotations = "1.10.1" -move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-cli = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-compiler = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-core-types = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-coverage = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-docgen = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-model = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-package = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-prover = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a", features = ["table-extension"] } -move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a" } -move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a", features = ["table-extension"] } +move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-bytecode-verifier = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-cli = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-compiler = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-core-types = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-coverage = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-disassembler = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-docgen = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-ir-compiler = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-ir-types = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-model = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-package = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-prover = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc", features = ["table-extension"] } +move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc" } +move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc", features = ["table-extension"] } names = { version = "0.14.0", default-features = false } network-api = { path = "network/api", package = "network-api" } @@ -444,7 +444,7 @@ starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev starcoin-decrypt = { path = "commons/decrypt" } starcoin-dev = { path = "vm/dev" } starcoin-executor = { path = "executor" } -starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "1df759371941ab59cb2295542f7eafa85c4ef6fe" } +starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "3e879a168036dceaa60c57c8e2b9228283476f81" } starcoin-genesis = { path = "genesis" } starcoin-logger = { path = "commons/logger" } starcoin-metrics = { path = "commons/metrics" } @@ -525,7 +525,7 @@ unsigned-varint = { version = "0.6.0", features = [ "futures", "asynchronous_codec", ] } -vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "823912c39b4b58fe1ee3f24af81dbf56849ff82a", features = [ +vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "7b6ac7bb04515ee4ced5b1c1cdafb6ea6cb4eadc", features = [ "fuzzing", ] } vm-status-translator = { path = "vm/vm-status-translator" } diff --git a/scripts/build_stdlib.sh b/scripts/build_stdlib.sh new file mode 100755 index 0000000000..c7fa5b4976 --- /dev/null +++ b/scripts/build_stdlib.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +SOURCE_VERSION=$1 +TARGET_VERSION=$2 + +if [ $# -lt 2 ]; then + echo "Usage: $0 SOURCE_VERSION TARGET_VERSION [ARGS...]" + exit 1 +fi + +SOURCE_VERSION=$1 +TARGET_VERSION=$2 + +# check SOURCE_VERSION and TARGET_VERSION has defined +if [ -z "$SOURCE_VERSION" ] || [ -z "$TARGET_VERSION" ]; then + echo "SOURCE_VERSION and TARGET_VERSION must be specified." + exit 1 +fi + +# Check SOURCE_VERSION and TARGET_VERSION is number +if ! [[ "$SOURCE_VERSION" =~ ^[0-9]+$ ]] || ! [[ "$TARGET_VERSION" =~ ^[0-9]+$ ]]; then + echo "SOURCE_VERSION and TARGET_VERSION must be integers." + exit 1 +fi + +cargo run --bin stdlib + +cmd="cargo run --bin stdlib -- -v ${TARGET_VERSION} -m StdlibUpgradeScripts -f upgrade_from_v${SOURCE_VERSION}_to_v${TARGET_VERSION}" + +args=("${@:3}") + +for arg in "${args[@]}"; do + cmd+=" --arg ${arg}" +done + +eval $cmd \ No newline at end of file diff --git a/vm/stdlib/compiled/12/11-12/stdlib.blob b/vm/stdlib/compiled/12/11-12/stdlib.blob index 3b94cae1b1322ac4d0daaa2ef550856ebe13ba95..afcfdca18b4066f480eb4ff9f19ca1d98d9d8c9a 100644 GIT binary patch delta 1406 zcmY*Z&1+m$6hG&FzjyDvd3Q3CNivhkd?cBqolatE(pQbfHf^aJCHq2*q@=+Zp;m$$ zr%MrB$be69(+F;KA(l#3qJoRM&nn9^BtM_x#Q|_nvdlz2AN; zf4?hl-@`X>{++^p^%tuEAVBD{ZkJ!X&BPC^CjVgHq5fL@X3S@~SRLkGb@!uv-jDaj z)AJ$vUL0#E76k$#YOq!VTM$rMbfhVs&rk?JfYNd%LphU27{O=;V;NL9K{b=cDGt;! zn8@tvnbgRjNx)kup)ko5=qXLhOa~!~Ufi|_YKFYcEam`DMR{PSW1{jMQu;FlE|Y?e zN3dO8068~AdyVE9GOdG0h|8a4B?vpiWSU9r(Gta6LIt^VBcmuv$rw@^k1>*qk5|W0 z#7_hhpq@n41F@p&L_XDMA`~yQh!hv=WInV?^(bAMoI)`?KTV3<$!K!^t54X26h64KVE{r1&dtEe>LY>_Tv#(OIYK>fCO!a; ziUO$gbB>qN^&F1%x0XxkCugyg9_Fx>UK6<5zjL*mek5?JP0e0b-__ujqw+~&hCdTHL^dXGvMdnarJKBuuEjHGV#Q9A;Q3HX>Hb&{J1 z!FykDEMk7h(HS3qj)y$L3#uimG9N;OA-|}K3n%o+KS3W`t|-#r8+Kd<7LYOQ0brB` zr%|FYOrvZ;GqrWRh~|ET&W-GZ1;vg-c)_w3#~`GA`q6}ikZ=pW$|R{vA%z)tI3R1J zp73?1P(V3Pc{UQ^aFCyjdXT6@Q`1me6OWvDWQN4rEQvld^V2Ty?Zh}9@qaQ;f+Tdx zX(ybqJh8sxWG=AAin3LfidZfuj_L(ANOFYCxBvBxSa7^p!!t(Lj*^T1mz+J>j6C=$ zz=!SbU*Ufqn3BIKuO9<=G!=4VLK0gGKcbnwjrzRuFkMchwEm#}EV<2qA!r;|(gb5DBJrl+e= z7d6??f@TqfXqn|!SV^^4z9>3!POHq&Xx$K(!_eoOVuk7$`I1@N9u=;x9K3lBR~vr=W2KVx delta 1231 zcmYjQJBVaO6ur0pzkdCy|2@+^)8FZy-PxUSR>!BVEDEN|p!f+ESy5y_40JUyXvIVf zL>%xXf{cM+BrZZHf{_Tq;wp+}VqzkgnHZ?I=A&Csr%v5-@2&Uh-um-~y!DxU{d0U9 zw|~ixdcS)G02X1+<`?D$5_kZG+qNvoWPI+#g=ToYqk zb;^7ZE%@zL8%1rWgDChe5RaEuR#9Yk_18e|kq5uqu9H>_h6wSV5ovsJ?>f2X_hA)k zm&X$n_4$+x{{9WZ%r)~?t>0X8>)nAHcPHJc+vv{SraRX}6@aP0F|Z)GlLj~%Ktyv6t5; z0vWjQ<|K|XBv#(y_++^wa8N!W@U_GKW8K3)KI|=r5~p~W|IjJlRk$O>Gq1d~{8HgJ z6i~yf3%Xk>k%Q=C2rOf<5~x(CBXGwve87%HPgWgd==g)Sv3n+;tp&uY=ZZ2Nk5=H) zda50g1+$c!W==EGta;F&oLj{;Q0z2C=isCmEO~+S?@RGgwfDVX$#j=)g1n z-=7zzut5bKL@=HgF3y6iSZ};&d*!9q?RMemzQEfe5VAP>KeocC>?fxovx(A|-2QLw zOcu+J9R4%A@SeZz5s%o&@vS#ee2PXc@qN@c*$U%mFi!Lv`leEr(>=SsVWM^u=T z!Hq4C_OM@mzlXmb@K~EUD$GEv$)RSn%fL}Pd+vpo1@|g8#g^RGDyo??S`WoT&c*6T qT%l{tVoO|>SF|88)xkS&V_WWfqs>t4AA5Af!*XBCWv{@ehW`TCdvD|b diff --git a/vm/stdlib/compiled/12/11-12/stdlib/064_StdlibUpgradeScripts.mv b/vm/stdlib/compiled/12/11-12/stdlib/064_StdlibUpgradeScripts.mv index 3e9fcaba3bda416d9d9f559f1ef94a303556c5ed..3b340b742e46e65c5b31263de25c522cbf3e1267 100644 GIT binary patch delta 1152 zcmY*Y&u?2r5T2Rcx4ZA{`uVN%?3ct&;>1auw5eMHg~!j*mP&;yS0od#Ni5PtIIRj2 zl9BieDjz`NLb-D6jSJ!i2gHFZh(CZEM-ITOIW?8%=GC?z03{iR?-5$r``SPHNlpeYzy!CGM*SPifi;@ZJl53s=?Iv7E1lN9JJ ztzkmjae^}IS_HMj*=83jfS1xL(B+Jo>K;4&6$Tfqc+Vr)o~}W3b%EcSULz!}?@bW7Xtlxz@}#ijLWAZke6tZu644+`M9X=4wHX zo248nC(v<6BNS+Wj}k3n3;_*@Br-H%hEVZNBB5L)rE&?0gwP01h=B|kj*)yYoF1JE zMXbUeJ_a?#&VVsUDTOezD67v2b_i+BEaV*ZESdQj#I#3m7=8QbV07~OVEQ4omAW$? zpN^-W(Z^c7IXXNUj;9OadQp4l!T6*SUh{2ID50ow zo$IA^IIAy8Cs3+V^Ca=CGmnCKB*W(FE}K4t`E3{bZfTrI#lMx8ahW*fw3E(QQCh#} uqDpLym4#K7n^+X3<9>mS%L*g;?ti%{#q-NLo`}CiE-w9FarWXd5y3x95O7BT delta 924 zcmYjPxo#9e5Ur~2>3e3k_wah`wRgRTy*99bjbXR~EQCm$A`*l|LXJd4u-|}2NCYHE zB&0YcC4qir*JR4$$!$*`D}rxp(r%OC=t+F4YVVnbtdpCo=+$QAVBLv;?POFn_wwH zj~JE{D+R+!f>kaA{lwN1tTSW-4pBo?fE(HXjeI~^jB|uVK4GabWpIhZ~ zk@ps6fTXqFW-UJjZ7`D#hbBg++gy2$7W~+D{l91_T;F#pW{1(4bHuljw;XCp0Kka3mZdM+(lhK!zC_dB`inu_=vd z#wk4UGNmeZCbS@>6vF(D^7@a!4k104NqJl$vHB+6tzXfw{y}nKqz-|qZ z(w@zr+z%cP>ImgwAdXd9N~`!8!JHq7J9uI($`e`<;tONZ_Px# diff --git a/vm/stdlib/compiled/12/stdlib/064_StdlibUpgradeScripts.mv b/vm/stdlib/compiled/12/stdlib/064_StdlibUpgradeScripts.mv index 3e9fcaba3bda416d9d9f559f1ef94a303556c5ed..3b340b742e46e65c5b31263de25c522cbf3e1267 100644 GIT binary patch delta 1152 zcmY*Y&u?2r5T2Rcx4ZA{`uVN%?3ct&;>1auw5eMHg~!j*mP&;yS0od#Ni5PtIIRj2 zl9BieDjz`NLb-D6jSJ!i2gHFZh(CZEM-ITOIW?8%=GC?z03{iR?-5$r``SPHNlpeYzy!CGM*SPifi;@ZJl53s=?Iv7E1lN9JJ ztzkmjae^}IS_HMj*=83jfS1xL(B+Jo>K;4&6$Tfqc+Vr)o~}W3b%EcSULz!}?@bW7Xtlxz@}#ijLWAZke6tZu644+`M9X=4wHX zo248nC(v<6BNS+Wj}k3n3;_*@Br-H%hEVZNBB5L)rE&?0gwP01h=B|kj*)yYoF1JE zMXbUeJ_a?#&VVsUDTOezD67v2b_i+BEaV*ZESdQj#I#3m7=8QbV07~OVEQ4omAW$? zpN^-W(Z^c7IXXNUj;9OadQp4l!T6*SUh{2ID50ow zo$IA^IIAy8Cs3+V^Ca=CGmnCKB*W(FE}K4t`E3{bZfTrI#lMx8ahW*fw3E(QQCh#} uqDpLym4#K7n^+X3<9>mS%L*g;?ti%{#q-NLo`}CiE-w9FarWXd5y3x95O7BT delta 924 zcmYjPxo#9e5Ur~2>3e3k_wah`wRgRTy*99bjbXR~EQCm$A`*l|LXJd4u-|}2NCYHE zB&0YcC4qir*JR4$$!$*`D}rxp(r%OC=t+F4YVVnbtdpCo=+$QAVBLv;?POFn_wwH zj~JE{D+R+!f>kaA{lwN1tTSW-4pBo?fE(HXjeI~^jB|uVK4GabWpIhZ~ zk@ps6fTXqFW-UJjZ7`D#hbBg++gy2$7W~+D{l91_T;F#pW{1(4bHuljw;XCp0Kka3mZdM+(lhK!zC_dB`inu_=vd z#wk4UGNmeZCbS@>6vF(D^7@a!4k104NqJl$vHB+6tzXfw{y}nKqz-|qZ z(w@zr+z%cP>ImgwAdXd9N~`!8!JHq7J9uI($`e`<;tONZ_Px# diff --git a/vm/stdlib/compiled/latest/error_descriptions/error_descriptions.errmap b/vm/stdlib/compiled/latest/error_descriptions/error_descriptions.errmap index a3f23c9a7373f15eb1dd7ef279c435b066bee325..687ca02f7366ff967db417600b5c22505ff12b3a 100644 GIT binary patch delta 184 zcmbR4+U&-}V6c&?MK+9!0Rj|U1A_d0{M|!cX_&YiJKow6uBm2TfB)B9cCo?IuAiXFtB{ev?D6^oXm@ySUWxUTTU$Ql&y^acYr5VsdhRXG3 A`~Uy| delta 87 zcmZp6o9@cQpudr+Mb?g!0Rp651A_d0{M|!c9DU+LBK#P*po%2W T6-~|;mz?}o_WEW8`NzxvZJrij diff --git a/vm/stdlib/compiled/latest/stdlib/064_StdlibUpgradeScripts.mv b/vm/stdlib/compiled/latest/stdlib/064_StdlibUpgradeScripts.mv index 3e9fcaba3bda416d9d9f559f1ef94a303556c5ed..3b340b742e46e65c5b31263de25c522cbf3e1267 100644 GIT binary patch delta 1152 zcmY*Y&u?2r5T2Rcx4ZA{`uVN%?3ct&;>1auw5eMHg~!j*mP&;yS0od#Ni5PtIIRj2 zl9BieDjz`NLb-D6jSJ!i2gHFZh(CZEM-ITOIW?8%=GC?z03{iR?-5$r``SPHNlpeYzy!CGM*SPifi;@ZJl53s=?Iv7E1lN9JJ ztzkmjae^}IS_HMj*=83jfS1xL(B+Jo>K;4&6$Tfqc+Vr)o~}W3b%EcSULz!}?@bW7Xtlxz@}#ijLWAZke6tZu644+`M9X=4wHX zo248nC(v<6BNS+Wj}k3n3;_*@Br-H%hEVZNBB5L)rE&?0gwP01h=B|kj*)yYoF1JE zMXbUeJ_a?#&VVsUDTOezD67v2b_i+BEaV*ZESdQj#I#3m7=8QbV07~OVEQ4omAW$? zpN^-W(Z^c7IXXNUj;9OadQp4l!T6*SUh{2ID50ow zo$IA^IIAy8Cs3+V^Ca=CGmnCKB*W(FE}K4t`E3{bZfTrI#lMx8ahW*fw3E(QQCh#} uqDpLym4#K7n^+X3<9>mS%L*g;?ti%{#q-NLo`}CiE-w9FarWXd5y3x95O7BT delta 924 zcmYjPxo#9e5Ur~2>3e3k_wah`wRgRTy*99bjbXR~EQCm$A`*l|LXJd4u-|}2NCYHE zB&0YcC4qir*JR4$$!$*`D}rxp(r%OC=t+F4YVVnbtdpCo=+$QAVBLv;?POFn_wwH zj~JE{D+R+!f>kaA{lwN1tTSW-4pBo?fE(HXjeI~^jB|uVK4GabWpIhZ~ zk@ps6fTXqFW-UJjZ7`D#hbBg++gy2$7W~+D{l91_T;F#pW{1(4bHuljw;XCp0Kka3mZdM+(lhK!zC_dB`inu_=vd z#wk4UGNmeZCbS@>6vF(D^7@a!4k104NqJl$vHB+6tzXfw{y}nKqz-|qZ z(w@zr+z%cP>ImgwAdXd9N~`!8!JHq7J9uI($`e`<;tONZ_Px# diff --git a/vm/vm-runtime/src/errors.rs b/vm/vm-runtime/src/errors.rs index 71d6b2ea89..44273062db 100644 --- a/vm/vm-runtime/src/errors.rs +++ b/vm/vm-runtime/src/errors.rs @@ -17,6 +17,8 @@ const PROLOGUE_BAD_CHAIN_ID: u64 = 6; const PROLOGUE_MODULE_NOT_ALLOWED: u64 = 7; const PROLOGUE_SCRIPT_NOT_ALLOWED: u64 = 8; const PROLOGUE_SEQUENCE_NUMBER_TOO_BIG: u64 = 9; +const EPROLOGUE_SENDING_ACCOUNT_FROZEN: u64 = 10; +const EPROLOGUE_SENDING_TXN_GLOBAL_FROZEN: u64 = 11; const EPROLOGUE_SIGNER_ALREADY_DELEGATED: u64 = 200; const EINSUFFICIENT_BALANCE: u64 = 10; @@ -86,6 +88,13 @@ pub fn convert_prologue_runtime_error(error: VMError) -> Result<(), VMStatus> { (INVALID_ARGUMENT, EBAD_TRANSACTION_FEE_TOKEN) => { StatusCode::BAD_TRANSACTION_FEE_CURRENCY } + (INVALID_ARGUMENT, EPROLOGUE_SENDING_ACCOUNT_FROZEN) => { + StatusCode::SENDING_ACCOUNT_FROZEN + } + (INVALID_ARGUMENT, EPROLOGUE_SENDING_TXN_GLOBAL_FROZEN) => { + StatusCode::SEND_TXN_GLOBAL_FROZEN + } + (category, reason) => { warn!( "prologue runtime unknown: category({}), reason:({}), location:({})",