diff --git a/Cargo.lock b/Cargo.lock index adf5400..f4a91bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1024,7 +1024,6 @@ dependencies = [ [[package]] name = "bin-version" version = "1.60.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "const-str 0.5.7", "git-version", @@ -1682,7 +1681,6 @@ checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" [[package]] name = "consensus-config" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "fastcrypto", "mysten-network", @@ -1694,7 +1692,6 @@ dependencies = [ [[package]] name = "consensus-types" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "base64 0.21.7", "consensus-config", @@ -2673,7 +2670,6 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "enum-compat-util" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "serde_yaml", ] @@ -4197,7 +4193,6 @@ dependencies = [ [[package]] name = "jsonrpc" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "serde", "serde_json", @@ -5001,12 +4996,10 @@ dependencies = [ [[package]] name = "move-abstract-interpreter" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" [[package]] name = "move-abstract-interpreter-v2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-binary-format", ] @@ -5014,12 +5007,10 @@ dependencies = [ [[package]] name = "move-abstract-stack" version = "0.0.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "enum-compat-util", @@ -5035,12 +5026,10 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -5056,7 +5045,6 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "indexmap 2.12.1", @@ -5069,7 +5057,6 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-interpreter", "move-abstract-stack", @@ -5085,7 +5072,6 @@ dependencies = [ [[package]] name = "move-bytecode-verifier-meter" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-binary-format", "move-core-types", @@ -5095,7 +5081,6 @@ dependencies = [ [[package]] name = "move-bytecode-verifier-v0" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-interpreter-v2", "move-abstract-stack", @@ -5110,7 +5095,6 @@ dependencies = [ [[package]] name = "move-bytecode-verifier-v1" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-interpreter-v2", "move-abstract-stack", @@ -5125,7 +5109,6 @@ dependencies = [ [[package]] name = "move-bytecode-verifier-v2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-interpreter-v2", "move-abstract-stack", @@ -5140,7 +5123,6 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -5161,7 +5143,6 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -5197,7 +5178,6 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -5222,7 +5202,6 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -5247,7 +5226,6 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -5268,7 +5246,6 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "clap", @@ -5291,7 +5268,6 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "codespan-reporting", @@ -5309,7 +5285,6 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "hex", @@ -5322,7 +5297,6 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "hex", "move-command-line-common", @@ -5335,7 +5309,6 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "codespan", @@ -5359,7 +5332,6 @@ dependencies = [ [[package]] name = "move-model-2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -5383,7 +5355,6 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "clap", @@ -5419,7 +5390,6 @@ dependencies = [ [[package]] name = "move-proc-macros" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "enum-compat-util", "quote", @@ -5429,7 +5399,6 @@ dependencies = [ [[package]] name = "move-regex-borrow-graph" version = "0.0.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "itertools 0.10.5", "move-binary-format", @@ -5440,7 +5409,6 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "codespan", "codespan-reporting", @@ -5461,7 +5429,6 @@ dependencies = [ [[package]] name = "move-stdlib-natives" version = "0.1.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "hex", "move-binary-format", @@ -5476,7 +5443,6 @@ dependencies = [ [[package]] name = "move-stdlib-natives-v0" version = "0.1.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "hex", "move-binary-format", @@ -5491,7 +5457,6 @@ dependencies = [ [[package]] name = "move-stdlib-natives-v1" version = "0.1.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "hex", "move-binary-format", @@ -5506,7 +5471,6 @@ dependencies = [ [[package]] name = "move-stdlib-natives-v2" version = "0.1.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "hex", "move-binary-format", @@ -5521,7 +5485,6 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "once_cell", "phf", @@ -5531,7 +5494,6 @@ dependencies = [ [[package]] name = "move-trace-format" version = "0.0.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-binary-format", "move-core-types", @@ -5544,7 +5506,6 @@ dependencies = [ [[package]] name = "move-vm-config" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-binary-format", "once_cell", @@ -5553,7 +5514,6 @@ dependencies = [ [[package]] name = "move-vm-profiler" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-vm-config", "once_cell", @@ -5565,7 +5525,6 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "better_any", "fail", @@ -5585,7 +5544,6 @@ dependencies = [ [[package]] name = "move-vm-runtime-v0" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "better_any", "fail", @@ -5603,7 +5561,6 @@ dependencies = [ [[package]] name = "move-vm-runtime-v1" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "better_any", "fail", @@ -5621,7 +5578,6 @@ dependencies = [ [[package]] name = "move-vm-runtime-v2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "better_any", "fail", @@ -5639,7 +5595,6 @@ dependencies = [ [[package]] name = "move-vm-stack" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-bytecode-verifier", "move-vm-types", @@ -5648,7 +5603,6 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "move-binary-format", @@ -5662,7 +5616,6 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "move-binary-format", @@ -5675,7 +5628,6 @@ dependencies = [ [[package]] name = "move-vm-types-v0" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "move-binary-format", @@ -5687,7 +5639,6 @@ dependencies = [ [[package]] name = "move-vm-types-v1" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "move-binary-format", @@ -5699,7 +5650,6 @@ dependencies = [ [[package]] name = "move-vm-types-v2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "move-binary-format", @@ -5990,7 +5940,6 @@ dependencies = [ [[package]] name = "mysten-common" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "antithesis_sdk", "anyhow", @@ -6013,7 +5962,6 @@ dependencies = [ [[package]] name = "mysten-metrics" version = "0.7.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "async-trait", "axum", @@ -6034,7 +5982,6 @@ dependencies = [ [[package]] name = "mysten-network" version = "0.2.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anemo", "anemo-tower", @@ -7265,7 +7212,6 @@ dependencies = [ [[package]] name = "prometheus-closure-metric" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "prometheus", @@ -8720,7 +8666,6 @@ dependencies = [ [[package]] name = "shared-crypto" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "eyre", @@ -9129,7 +9074,6 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "sui-adapter-latest" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -9162,7 +9106,6 @@ dependencies = [ [[package]] name = "sui-adapter-v0" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -9190,7 +9133,6 @@ dependencies = [ [[package]] name = "sui-adapter-v1" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -9217,7 +9159,6 @@ dependencies = [ [[package]] name = "sui-adapter-v2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -9244,7 +9185,6 @@ dependencies = [ [[package]] name = "sui-config" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anemo", "anyhow", @@ -9277,7 +9217,6 @@ dependencies = [ [[package]] name = "sui-enum-compat-util" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "serde_yaml", ] @@ -9285,7 +9224,6 @@ dependencies = [ [[package]] name = "sui-execution" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-interpreter", "move-abstract-interpreter-v2", @@ -9324,7 +9262,6 @@ dependencies = [ [[package]] name = "sui-framework" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "move-binary-format", @@ -9338,7 +9275,6 @@ dependencies = [ [[package]] name = "sui-framework-snapshot" version = "1.60.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -9353,7 +9289,6 @@ dependencies = [ [[package]] name = "sui-http" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bytes", "http", @@ -9373,7 +9308,6 @@ dependencies = [ [[package]] name = "sui-json" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -9390,7 +9324,6 @@ dependencies = [ [[package]] name = "sui-json-rpc-api" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "fastcrypto", @@ -9410,7 +9343,6 @@ dependencies = [ [[package]] name = "sui-json-rpc-types" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "bcs", @@ -9443,7 +9375,6 @@ dependencies = [ [[package]] name = "sui-keys" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "async-trait", @@ -9469,7 +9400,6 @@ dependencies = [ [[package]] name = "sui-macros" version = "0.7.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "futures", "once_cell", @@ -9480,7 +9410,6 @@ dependencies = [ [[package]] name = "sui-move-build" version = "1.60.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "fastcrypto", @@ -9505,7 +9434,6 @@ dependencies = [ [[package]] name = "sui-move-natives-latest" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "better_any", @@ -9528,7 +9456,6 @@ dependencies = [ [[package]] name = "sui-move-natives-v0" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "better_any", @@ -9549,7 +9476,6 @@ dependencies = [ [[package]] name = "sui-move-natives-v1" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "better_any", @@ -9570,7 +9496,6 @@ dependencies = [ [[package]] name = "sui-move-natives-v2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "better_any", @@ -9591,7 +9516,6 @@ dependencies = [ [[package]] name = "sui-open-rpc" version = "1.60.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "bcs", "schemars 0.8.22", @@ -9603,7 +9527,6 @@ dependencies = [ [[package]] name = "sui-open-rpc-macros" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "derive-syn-parse", "itertools 0.13.0", @@ -9616,7 +9539,6 @@ dependencies = [ [[package]] name = "sui-package-management" version = "1.60.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "move-core-types", @@ -9634,7 +9556,6 @@ dependencies = [ [[package]] name = "sui-package-resolver" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "async-trait", "bcs", @@ -9652,7 +9573,6 @@ dependencies = [ [[package]] name = "sui-proc-macros" version = "0.7.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "msim-macros", "proc-macro2", @@ -9664,7 +9584,6 @@ dependencies = [ [[package]] name = "sui-protocol-config" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "clap", "fastcrypto", @@ -9682,7 +9601,6 @@ dependencies = [ [[package]] name = "sui-protocol-config-macros" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "proc-macro2", "quote", @@ -9713,7 +9631,6 @@ dependencies = [ [[package]] name = "sui-sdk" version = "1.60.1" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "async-trait", @@ -9767,7 +9684,6 @@ dependencies = [ [[package]] name = "sui-transaction-builder" version = "0.0.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anyhow", "async-trait", @@ -9784,7 +9700,6 @@ dependencies = [ [[package]] name = "sui-types" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "anemo", "anyhow", @@ -9860,7 +9775,6 @@ dependencies = [ [[package]] name = "sui-verifier-latest" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-stack", "move-binary-format", @@ -9876,7 +9790,6 @@ dependencies = [ [[package]] name = "sui-verifier-v0" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-stack", "move-binary-format", @@ -9892,7 +9805,6 @@ dependencies = [ [[package]] name = "sui-verifier-v1" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-stack", "move-binary-format", @@ -9907,7 +9819,6 @@ dependencies = [ [[package]] name = "sui-verifier-v2" version = "0.1.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "move-abstract-stack", "move-binary-format", @@ -10769,7 +10680,6 @@ dependencies = [ [[package]] name = "typed-store-error" version = "0.4.0" -source = "git+https://github.com/wtdcode/sui?branch=v1.60.1-fuzz#bed1a2317f3f2fe2595d6f80767865a17363bf95" dependencies = [ "serde", "thiserror 1.0.69", diff --git a/Cargo.toml b/Cargo.toml index 5b39c9b..5c94de1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,59 +61,59 @@ tonic = "0.14" url = "2.5.7" # Sui dependencies -move-binary-format = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-trace-format = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-package = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-compiler = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-disassembler = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-ir-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-core-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-vm-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-vm-stack = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-vm-runtime = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz", features = ["tracing", "testing"]} -move-model = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -move-stackless-bytecode = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-move-build = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-json-rpc-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-package-management = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-sdk = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-config = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-storage = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-snapshot = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-core = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -sui-execution = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz", features = ["testing"]} -shared-crypto = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} -# sui-adapter-v2 = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-binary-format = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-trace-format = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-package = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-compiler = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-disassembler = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-ir-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-core-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-vm-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-vm-stack = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-vm-runtime = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz", features = ["tracing", "testing"]} +# move-model = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# move-stackless-bytecode = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-move-build = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-json-rpc-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-types = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-package-management = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-sdk = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-config = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-storage = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-snapshot = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-core = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# sui-execution = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz", features = ["testing"]} +# shared-crypto = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} +# # sui-adapter-v2 = {git = "https://github.com/wtdcode/sui", branch = "v1.60.1-fuzz"} sui-rpc = { git = "https://github.com/MystenLabs/sui-rust-sdk.git", rev = "fb62af78b30f5dc64eeaec0094ab95b5ce5b7ce2" } sui-sdk-types = { git = "https://github.com/MystenLabs/sui-rust-sdk.git", rev = "fb62af78b30f5dc64eeaec0094ab95b5ce5b7ce2" } fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "09f86974195ec85d8aae386b1909d341d3ccfe52"} # sui use git dependency =/ -# move-stackless-bytecode = {path = "../sui/external-crates/move/crates/move-stackless-bytecode"} -# move-model = {path = "../sui/external-crates/move/crates/move-model"} -# move-binary-format = {path = "../sui/external-crates/move/crates/move-binary-format"} -# move-trace-format = {path = "../sui/external-crates/move/crates/move-trace-format"} -# move-package = {path = "../sui/external-crates/move/crates/move-package"} -# move-compiler = {path = "../sui/external-crates/move/crates/move-compiler"} -# move-disassembler = {path = "../sui/external-crates/move/crates/move-disassembler"} -# move-ir-types = {path = "../sui/external-crates/move/crates/move-ir-types"} -# move-core-types = {path = "../sui/external-crates/move/crates/move-core-types"} -# move-vm-types = {path = "../sui/external-crates/move/crates/move-vm-types"} -# move-vm-stack = {path = "../sui/external-crates/move/crates/move-vm-stack"} -# move-vm-runtime = {path = "../sui/external-crates/move/crates/move-vm-runtime", features = ["tracing", "testing"]} -# sui-move-build = {path = "../sui/crates/sui-move-build"} -# sui-json-rpc-types = {path = "../sui/crates/sui-json-rpc-types"} -# sui-types = {path = "../sui/crates/sui-types"} -# sui-package-management = {path = "../sui/crates/sui-package-management"} -# sui-sdk = {path = "../sui/crates/sui-sdk"} -# sui-config = {path = "../sui/crates/sui-config"} -# sui-storage = {path = "../sui/crates/sui-storage"} -# sui-snapshot = {path = "../sui/crates/sui-snapshot"} -# sui-core = {path = "../sui/crates/sui-core"} -# sui-execution = {path = "../sui/sui-execution", features = ["testing"]} -# # sui-adapter-v2 = {path = "../sui/sui-execution/v2/sui-adapter/"} -# shared-crypto = {path = "../sui/crates/shared-crypto"} +move-stackless-bytecode = {path = "../sui/external-crates/move/crates/move-stackless-bytecode"} +move-model = {path = "../sui/external-crates/move/crates/move-model"} +move-binary-format = {path = "../sui/external-crates/move/crates/move-binary-format"} +move-trace-format = {path = "../sui/external-crates/move/crates/move-trace-format"} +move-package = {path = "../sui/external-crates/move/crates/move-package"} +move-compiler = {path = "../sui/external-crates/move/crates/move-compiler"} +move-disassembler = {path = "../sui/external-crates/move/crates/move-disassembler"} +move-ir-types = {path = "../sui/external-crates/move/crates/move-ir-types"} +move-core-types = {path = "../sui/external-crates/move/crates/move-core-types"} +move-vm-types = {path = "../sui/external-crates/move/crates/move-vm-types"} +move-vm-stack = {path = "../sui/external-crates/move/crates/move-vm-stack"} +move-vm-runtime = {path = "../sui/external-crates/move/crates/move-vm-runtime", features = ["tracing", "testing"]} +sui-move-build = {path = "../sui/crates/sui-move-build"} +sui-json-rpc-types = {path = "../sui/crates/sui-json-rpc-types"} +sui-types = {path = "../sui/crates/sui-types"} +sui-package-management = {path = "../sui/crates/sui-package-management"} +sui-sdk = {path = "../sui/crates/sui-sdk"} +sui-config = {path = "../sui/crates/sui-config"} +sui-storage = {path = "../sui/crates/sui-storage"} +sui-snapshot = {path = "../sui/crates/sui-snapshot"} +sui-core = {path = "../sui/crates/sui-core"} +sui-execution = {path = "../sui/sui-execution", features = ["testing"]} +# sui-adapter-v2 = {path = "../sui/sui-execution/v2/sui-adapter/"} +shared-crypto = {path = "../sui/crates/shared-crypto"} # Aptos dependencies diff --git a/crates/movy-replay/src/env.rs b/crates/movy-replay/src/env.rs index 6bf5e1c..b60f9a4 100644 --- a/crates/movy-replay/src/env.rs +++ b/crates/movy-replay/src/env.rs @@ -82,10 +82,15 @@ impl< .map(|v| v.self_id().name().to_string()) .join(",") ); + let std_onchain_version = self + .db + .get_object(&out.package_id.into()) + .ok_or_else(|| eyre!("{} not onchain?!", out.package_id))? + .version(); let (modules, dependencies) = out.into_deployment(); let move_package = Object::new_system_package( &modules, - SequenceNumber::new(), + std_onchain_version, dependencies, TransactionDigest::genesis_marker(), ); diff --git a/crates/movy-sui/src/compile.rs b/crates/movy-sui/src/compile.rs index 8dd7046..7e59d3d 100644 --- a/crates/movy-sui/src/compile.rs +++ b/crates/movy-sui/src/compile.rs @@ -125,12 +125,12 @@ impl SuiCompiledPackage { self.published_dependencies.clone().into_iter().collect(); for md in self.modules.iter() { let md = Self::mock_module(md); - deps.extend( - md.immediate_dependencies() - .into_iter() - .map(|v| ObjectID::from(*v.address())) - .filter(|v| v != &self.package_id), - ); + // deps.extend( + // md.immediate_dependencies() + // .into_iter() + // .map(|v| ObjectID::from(*v.address())) + // .filter(|v| v != &self.package_id), + // ); new_package.modules.push(md); } new_package.dependencies = deps.into_iter().collect(); @@ -155,6 +155,7 @@ impl SuiCompiledPackage { Err(PublishedAtError::NotPresent) => ObjectID::ZERO, _ => return Err(eyre!("Invalid published-at: {:?}", &artifacts.published_at).into()), }; + debug!("Root address is {}", root_address); let package_name = artifacts .package .compiled_package_info @@ -172,20 +173,37 @@ impl SuiCompiledPackage { let modules = artifacts .package .all_compiled_units() - .filter(|m| root_address == m.address.into_inner().into()) + .filter(|m| { + debug!("Compiled module address: {}", m.address.into_inner()); + root_address == m.address.into_inner().into() + }) .map(|m| m.module.clone()) .collect::>(); + if modules.len() == 0 { + return Err(eyre!( + "Compiling {} yields 0 modules for root {}", + folder.display(), + root_address + ) + .into()); + } debug!("Package {} has {} modules", root_address, modules.len()); - let deps = modules + // let deps = modules + // .iter() + // .flat_map(|m| { + // m.immediate_dependencies() + // .iter() + // .map(|m| m.address().to_owned().into()) + // .filter(|a| a != &root_address) + // .collect::>() + // }) + // .chain(artifacts.dependency_ids.published.values().cloned()) + // .collect::>(); + let deps = artifacts + .dependency_ids + .published .iter() - .flat_map(|m| { - m.immediate_dependencies() - .iter() - .map(|m| m.address().to_owned().into()) - .filter(|a| a != &root_address) - .collect::>() - }) - .chain(artifacts.dependency_ids.published.values().cloned()) + .map(|v| *v.1) .collect::>(); debug!( diff --git a/crates/movy/src/main.rs b/crates/movy/src/main.rs index 08b3130..22aa421 100644 --- a/crates/movy/src/main.rs +++ b/crates/movy/src/main.rs @@ -34,7 +34,10 @@ fn main() { // Allows failure let _ = dotenvy::dotenv(); } - env_logger::init(); + env_logger::builder() + .filter_level(log::LevelFilter::Info) + .parse_default_env() + .init(); tokio::runtime::Builder::new_multi_thread() .enable_all()