diff --git a/.gitignore b/.gitignore index 7d8a35512..99d78843b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ proc-compose.temp.log methods/guest/Cargo.lock networks/movement/movement-client/src/move-modules/build/* +protocol-units/execution/maptos/framework/releases/post-l1-merge/src/tests/vote.data/enable_partial_governance_voting/build/* .idea/ target/ ledger_db/ diff --git a/Cargo.lock b/Cargo.lock index a58be7295..df9a8c551 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/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "proc-macro2", "quote", @@ -785,7 +785,7 @@ checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "aptos-abstract-gas-usage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-gas-algebra", @@ -809,7 +809,7 @@ dependencies = [ [[package]] name = "aptos-accumulator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-crypto", @@ -819,7 +819,7 @@ dependencies = [ [[package]] name = "aptos-admin-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -829,7 +829,7 @@ dependencies = [ "aptos-logger", "aptos-runtimes", "aptos-storage-interface", - "aptos-system-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-system-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "aptos-types", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "http 0.2.12", @@ -842,7 +842,7 @@ dependencies = [ [[package]] name = "aptos-aggregator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-logger", "aptos-types", @@ -856,7 +856,7 @@ dependencies = [ [[package]] name = "aptos-api" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api-types", @@ -898,7 +898,7 @@ dependencies = [ [[package]] name = "aptos-api-types" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -928,7 +928,7 @@ dependencies = [ [[package]] name = "aptos-backup-cli" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-backup-service", @@ -976,7 +976,7 @@ dependencies = [ [[package]] name = "aptos-backup-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-db", @@ -998,7 +998,7 @@ dependencies = [ [[package]] name = "aptos-bcs-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "hex", @@ -1007,7 +1007,7 @@ dependencies = [ [[package]] name = "aptos-bitvec" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "serde", "serde_bytes", @@ -1016,7 +1016,7 @@ dependencies = [ [[package]] name = "aptos-block-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-aggregator", @@ -1051,7 +1051,7 @@ dependencies = [ [[package]] name = "aptos-block-partitioner" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-logger", @@ -1072,7 +1072,7 @@ dependencies = [ [[package]] name = "aptos-bounded-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "futures", "rustversion", @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "aptos-build-info" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "shadow-rs", ] @@ -1090,7 +1090,7 @@ dependencies = [ [[package]] name = "aptos-cached-packages" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-framework", @@ -1104,7 +1104,7 @@ dependencies = [ [[package]] name = "aptos-channels" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-infallible", @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "aptos-cli-common" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anstyle", "clap 4.5.21", @@ -1125,12 +1125,12 @@ dependencies = [ [[package]] name = "aptos-collections" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" [[package]] name = "aptos-compression" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-logger", "aptos-metrics-core", @@ -1142,7 +1142,7 @@ dependencies = [ [[package]] name = "aptos-config" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-crypto", @@ -1173,7 +1173,7 @@ dependencies = [ [[package]] name = "aptos-consensus" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bitvec", @@ -1251,7 +1251,7 @@ dependencies = [ [[package]] name = "aptos-consensus-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-runtimes", @@ -1266,7 +1266,7 @@ dependencies = [ [[package]] name = "aptos-consensus-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bitvec", @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "aptos-crash-handler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-logger", "backtrace", @@ -1305,7 +1305,7 @@ dependencies = [ [[package]] name = "aptos-crypto" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aes-gcm", "anyhow", @@ -1358,7 +1358,7 @@ dependencies = [ [[package]] name = "aptos-crypto-derive" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "proc-macro2", "quote", @@ -1368,7 +1368,7 @@ dependencies = [ [[package]] name = "aptos-data-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-config", "aptos-crypto", @@ -1399,7 +1399,7 @@ dependencies = [ [[package]] name = "aptos-data-streaming-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-channels", "aptos-config", @@ -1425,7 +1425,7 @@ dependencies = [ [[package]] name = "aptos-db" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-accumulator", @@ -1473,7 +1473,7 @@ dependencies = [ [[package]] name = "aptos-db-indexer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -1493,7 +1493,7 @@ dependencies = [ [[package]] name = "aptos-db-indexer-schemas" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-schemadb", @@ -1507,7 +1507,7 @@ dependencies = [ [[package]] name = "aptos-dkg" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-crypto", @@ -1538,7 +1538,7 @@ dependencies = [ [[package]] name = "aptos-dkg-runtime" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bounded-executor", @@ -1576,7 +1576,7 @@ dependencies = [ [[package]] name = "aptos-drop-helper" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-infallible", "aptos-metrics-core", @@ -1587,7 +1587,7 @@ dependencies = [ [[package]] name = "aptos-enum-conversion-derive" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "quote", "syn 1.0.109", @@ -1596,7 +1596,7 @@ dependencies = [ [[package]] name = "aptos-event-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-channels", @@ -1612,7 +1612,7 @@ dependencies = [ [[package]] name = "aptos-executor" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-consensus-types", @@ -1644,7 +1644,7 @@ dependencies = [ [[package]] name = "aptos-executor-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-block-partitioner", "aptos-config", @@ -1674,7 +1674,7 @@ dependencies = [ [[package]] name = "aptos-executor-test-helpers" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-cached-packages", @@ -1696,7 +1696,7 @@ dependencies = [ [[package]] name = "aptos-executor-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-crypto", @@ -1716,7 +1716,7 @@ dependencies = [ [[package]] name = "aptos-experimental-runtimes" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-runtimes", "core_affinity", @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "aptos-fallible" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "thiserror 1.0.69", ] @@ -1737,7 +1737,7 @@ dependencies = [ [[package]] name = "aptos-faucet-core" version = "2.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -1771,7 +1771,7 @@ dependencies = [ [[package]] name = "aptos-faucet-metrics-server" version = "2.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-logger", @@ -1785,7 +1785,7 @@ dependencies = [ [[package]] name = "aptos-framework" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-aggregator", @@ -1951,6 +1951,36 @@ dependencies = [ "tokio", ] +[[package]] +name = "aptos-framework-post-l1-merge-release" +version = "0.3.4" +dependencies = [ + "anyhow", + "aptos-framework", + "aptos-framework-release-script-release", + "aptos-framework-set-feature-flags-release", + "aptos-framework-upgrade-gas-release", + "aptos-gas-schedule", + "aptos-release-builder", + "aptos-sdk", + "aptos-types", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", + "dot-movement", + "e2e-move-tests", + "hex", + "maptos-framework-release-util", + "move-command-line-common", + "move-model", + "movement-client", + "movement-config", + "once_cell", + "tempfile", + "tokio", + "tracing", + "tracing-subscriber 0.3.18", + "url", +] + [[package]] name = "aptos-framework-pre-l1-merge-release" version = "0.3.4" @@ -2021,6 +2051,7 @@ dependencies = [ "movement-client", "movement-config", "once_cell", + "sha2 0.10.8", "tempfile", "tokio", "toml 0.8.19", @@ -2056,7 +2087,7 @@ dependencies = [ [[package]] name = "aptos-gas-algebra" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "either", "move-core-types", @@ -2065,7 +2096,7 @@ dependencies = [ [[package]] name = "aptos-gas-meter" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-gas-algebra", "aptos-gas-schedule", @@ -2080,7 +2111,7 @@ dependencies = [ [[package]] name = "aptos-gas-profiling" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-gas-algebra", @@ -2100,7 +2131,7 @@ dependencies = [ [[package]] name = "aptos-gas-schedule" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-gas-algebra", "aptos-global-constants", @@ -2113,7 +2144,7 @@ dependencies = [ [[package]] name = "aptos-gas-schedule-updator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-gas-schedule", @@ -2128,7 +2159,7 @@ dependencies = [ [[package]] name = "aptos-genesis" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-cached-packages", @@ -2153,7 +2184,7 @@ dependencies = [ [[package]] name = "aptos-github-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-proxy", "serde", @@ -2165,17 +2196,17 @@ dependencies = [ [[package]] name = "aptos-global-constants" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" [[package]] name = "aptos-id-generator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" [[package]] name = "aptos-indexer" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api", @@ -2207,7 +2238,7 @@ dependencies = [ [[package]] name = "aptos-indexer-grpc-fullnode" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api", @@ -2219,7 +2250,7 @@ dependencies = [ "aptos-mempool", "aptos-metrics-core", "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc)", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "aptos-runtimes", "aptos-storage-interface", "aptos-types", @@ -2245,11 +2276,11 @@ dependencies = [ [[package]] name = "aptos-indexer-grpc-server-framework" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-metrics-core", - "aptos-system-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-system-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "async-trait", "backtrace", "clap 4.5.21", @@ -2267,7 +2298,7 @@ dependencies = [ [[package]] name = "aptos-indexer-grpc-table-info" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api", @@ -2298,11 +2329,11 @@ dependencies = [ [[package]] name = "aptos-indexer-grpc-utils" version = "1.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-metrics-core", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "async-trait", "backoff", "base64 0.13.1", @@ -2329,12 +2360,12 @@ dependencies = [ [[package]] name = "aptos-infallible" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" [[package]] name = "aptos-inspection-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-build-info", @@ -2360,7 +2391,7 @@ dependencies = [ [[package]] name = "aptos-jellyfish-merkle" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-crypto", @@ -2388,7 +2419,7 @@ dependencies = [ [[package]] name = "aptos-jwk-consensus" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bitvec", @@ -2424,7 +2455,7 @@ dependencies = [ [[package]] name = "aptos-jwk-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-types", @@ -2439,7 +2470,7 @@ dependencies = [ [[package]] name = "aptos-keygen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-types", @@ -2449,7 +2480,7 @@ dependencies = [ [[package]] name = "aptos-language-e2e-tests" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-abstract-gas-usage", @@ -2493,7 +2524,7 @@ dependencies = [ [[package]] name = "aptos-ledger" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-types", @@ -2506,7 +2537,7 @@ dependencies = [ [[package]] name = "aptos-log-derive" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "proc-macro2", "quote", @@ -2516,7 +2547,7 @@ dependencies = [ [[package]] name = "aptos-logger" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-infallible", "aptos-log-derive", @@ -2540,7 +2571,7 @@ dependencies = [ [[package]] name = "aptos-memory-usage-tracker" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-gas-algebra", "aptos-gas-meter", @@ -2553,7 +2584,7 @@ dependencies = [ [[package]] name = "aptos-mempool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bounded-executor", @@ -2593,7 +2624,7 @@ dependencies = [ [[package]] name = "aptos-mempool-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-types", "async-trait", @@ -2606,7 +2637,7 @@ dependencies = [ [[package]] name = "aptos-memsocket" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-infallible", "bytes 1.8.0", @@ -2617,7 +2648,7 @@ dependencies = [ [[package]] name = "aptos-metrics-core" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "prometheus", @@ -2626,7 +2657,7 @@ dependencies = [ [[package]] name = "aptos-move-debugger" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-block-executor", @@ -2652,7 +2683,7 @@ dependencies = [ [[package]] name = "aptos-move-stdlib" version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-gas-schedule", "aptos-native-interface", @@ -2683,7 +2714,7 @@ dependencies = [ [[package]] name = "aptos-mvhashmap" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-aggregator", @@ -2704,7 +2735,7 @@ dependencies = [ [[package]] name = "aptos-native-interface" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-gas-algebra", "aptos-gas-schedule", @@ -2721,7 +2752,7 @@ dependencies = [ [[package]] name = "aptos-netcore" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-memsocket", "aptos-proxy", @@ -2738,7 +2769,7 @@ dependencies = [ [[package]] name = "aptos-network" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bitvec", @@ -2783,7 +2814,7 @@ dependencies = [ [[package]] name = "aptos-network-benchmark" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-config", "aptos-logger", @@ -2803,7 +2834,7 @@ dependencies = [ [[package]] name = "aptos-network-builder" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-channels", "aptos-config", @@ -2826,7 +2857,7 @@ dependencies = [ [[package]] name = "aptos-network-checker" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -2843,7 +2874,7 @@ dependencies = [ [[package]] name = "aptos-network-discovery" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-channels", @@ -2868,7 +2899,7 @@ dependencies = [ [[package]] name = "aptos-node" version = "0.0.0-main" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-admin-service", @@ -2942,7 +2973,7 @@ dependencies = [ [[package]] name = "aptos-node-identity" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-types", @@ -2953,7 +2984,7 @@ dependencies = [ [[package]] name = "aptos-node-resource-metrics" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-build-info", "aptos-infallible", @@ -2969,7 +3000,7 @@ dependencies = [ [[package]] name = "aptos-num-variants" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "proc-macro2", "quote", @@ -2979,7 +3010,7 @@ dependencies = [ [[package]] name = "aptos-openapi" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "async-trait", "percent-encoding", @@ -2992,7 +3023,7 @@ dependencies = [ [[package]] name = "aptos-package-builder" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-framework", @@ -3005,7 +3036,7 @@ dependencies = [ [[package]] name = "aptos-peer-monitoring-service-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-channels", "aptos-config", @@ -3030,7 +3061,7 @@ dependencies = [ [[package]] name = "aptos-peer-monitoring-service-server" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-bounded-executor", "aptos-build-info", @@ -3056,7 +3087,7 @@ dependencies = [ [[package]] name = "aptos-peer-monitoring-service-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-config", "aptos-types", @@ -3068,7 +3099,7 @@ dependencies = [ [[package]] name = "aptos-profiler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" dependencies = [ "anyhow", "backtrace", @@ -3081,7 +3112,7 @@ dependencies = [ [[package]] name = "aptos-profiler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "backtrace", @@ -3094,7 +3125,7 @@ dependencies = [ [[package]] name = "aptos-proptest-helpers" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "crossbeam", "proptest", @@ -3104,7 +3135,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" dependencies = [ "futures-core", "pbjson", @@ -3116,7 +3147,7 @@ dependencies = [ [[package]] name = "aptos-protos" version = "1.3.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "futures-core", "pbjson", @@ -3128,7 +3159,7 @@ dependencies = [ [[package]] name = "aptos-proxy" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "ipnet", ] @@ -3136,7 +3167,7 @@ dependencies = [ [[package]] name = "aptos-push-metrics" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-logger", "aptos-metrics-core", @@ -3147,7 +3178,7 @@ dependencies = [ [[package]] name = "aptos-release-builder" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api-types", @@ -3186,7 +3217,7 @@ dependencies = [ [[package]] name = "aptos-reliable-broadcast" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bounded-executor", @@ -3208,7 +3239,7 @@ dependencies = [ [[package]] name = "aptos-resource-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-types", @@ -3222,7 +3253,7 @@ dependencies = [ [[package]] name = "aptos-rest-client" version = "0.0.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api-types", @@ -3245,7 +3276,7 @@ dependencies = [ [[package]] name = "aptos-rocksdb-options" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-config", "rocksdb", @@ -3254,7 +3285,7 @@ dependencies = [ [[package]] name = "aptos-runtimes" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "rayon", "tokio", @@ -3263,7 +3294,7 @@ dependencies = [ [[package]] name = "aptos-safety-rules" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -3287,7 +3318,7 @@ dependencies = [ [[package]] name = "aptos-schemadb" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-infallible", @@ -3304,7 +3335,7 @@ dependencies = [ [[package]] name = "aptos-scratchpad" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-drop-helper", @@ -3323,7 +3354,7 @@ dependencies = [ [[package]] name = "aptos-sdk" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-cached-packages", @@ -3345,7 +3376,7 @@ dependencies = [ [[package]] name = "aptos-sdk-builder" version = "0.2.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-types", @@ -3363,11 +3394,11 @@ dependencies = [ [[package]] name = "aptos-secure-net" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-logger", "aptos-metrics-core", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "crossbeam-channel", "once_cell", @@ -3381,7 +3412,7 @@ dependencies = [ [[package]] name = "aptos-secure-storage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-infallible", @@ -3402,7 +3433,7 @@ dependencies = [ [[package]] name = "aptos-short-hex-str" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "mirai-annotations", "serde", @@ -3413,7 +3444,7 @@ dependencies = [ [[package]] name = "aptos-speculative-state-helper" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-infallible", @@ -3424,7 +3455,7 @@ dependencies = [ [[package]] name = "aptos-state-sync-driver" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -3458,7 +3489,7 @@ dependencies = [ [[package]] name = "aptos-storage-interface" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-crypto", @@ -3486,7 +3517,7 @@ dependencies = [ [[package]] name = "aptos-storage-service-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-config", "aptos-network", @@ -3497,7 +3528,7 @@ dependencies = [ [[package]] name = "aptos-storage-service-notifications" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-channels", "async-trait", @@ -3509,7 +3540,7 @@ dependencies = [ [[package]] name = "aptos-storage-service-server" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-channels", @@ -3538,7 +3569,7 @@ dependencies = [ [[package]] name = "aptos-storage-service-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-compression", "aptos-config", @@ -3554,10 +3585,10 @@ dependencies = [ [[package]] name = "aptos-system-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" dependencies = [ "anyhow", - "aptos-profiler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-profiler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)", "async-mutex", "http 0.2.12", "hyper 0.14.31", @@ -3574,10 +3605,10 @@ dependencies = [ [[package]] name = "aptos-system-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", - "aptos-profiler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)", + "aptos-profiler 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "async-mutex", "http 0.2.12", "hyper 0.14.31", @@ -3594,7 +3625,7 @@ dependencies = [ [[package]] name = "aptos-table-natives" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-gas-schedule", "aptos-native-interface", @@ -3612,7 +3643,7 @@ dependencies = [ [[package]] name = "aptos-telemetry" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api", @@ -3651,7 +3682,7 @@ dependencies = [ [[package]] name = "aptos-telemetry-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-config", @@ -3691,7 +3722,7 @@ dependencies = [ [[package]] name = "aptos-temppath" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "hex", "rand 0.7.3", @@ -3700,7 +3731,7 @@ dependencies = [ [[package]] name = "aptos-time-service" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-infallible", "enum_dispatch", @@ -3713,7 +3744,7 @@ dependencies = [ [[package]] name = "aptos-types" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-bitvec", @@ -3770,12 +3801,12 @@ dependencies = [ [[package]] name = "aptos-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" [[package]] name = "aptos-validator-interface" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api-types", @@ -3796,7 +3827,7 @@ dependencies = [ [[package]] name = "aptos-validator-transaction-pool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-channels", "aptos-crypto", @@ -3809,7 +3840,7 @@ dependencies = [ [[package]] name = "aptos-vault-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "base64 0.13.1", @@ -3825,7 +3856,7 @@ dependencies = [ [[package]] name = "aptos-vm" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-aggregator", @@ -3876,7 +3907,7 @@ dependencies = [ [[package]] name = "aptos-vm-genesis" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-cached-packages", "aptos-crypto", @@ -3897,7 +3928,7 @@ dependencies = [ [[package]] name = "aptos-vm-logging" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "aptos-crypto", "aptos-logger", @@ -3912,7 +3943,7 @@ dependencies = [ [[package]] name = "aptos-vm-types" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-aggregator", @@ -3934,7 +3965,7 @@ dependencies = [ [[package]] name = "aptos-vm-validator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-logger", @@ -7124,6 +7155,42 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" +[[package]] +name = "e2e-move-tests" +version = "0.1.0" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" +dependencies = [ + "anyhow", + "aptos-cached-packages", + "aptos-crypto", + "aptos-framework", + "aptos-gas-algebra", + "aptos-gas-profiling", + "aptos-gas-schedule", + "aptos-language-e2e-tests", + "aptos-package-builder", + "aptos-types", + "aptos-vm", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", + "claims", + "ethabi", + "hex", + "move-binary-format", + "move-command-line-common", + "move-core-types", + "move-model", + "move-package", + "move-symbol-pool", + "once_cell", + "project-root", + "proptest", + "rand 0.7.3", + "rstest", + "serde", + "sha3 0.9.1", + "test-case", +] + [[package]] name = "ecdsa" version = "0.14.8" @@ -7352,6 +7419,50 @@ dependencies = [ "version_check", ] +[[package]] +name = "ethabi" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898" +dependencies = [ + "ethereum-types", + "hex", + "once_cell", + "regex", + "serde", + "serde_json", + "sha3 0.10.8", + "thiserror 1.0.69", + "uint", +] + +[[package]] +name = "ethbloom" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" +dependencies = [ + "crunchy", + "fixed-hash 0.8.0", + "impl-rlp", + "impl-serde 0.4.0", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" +dependencies = [ + "ethbloom", + "fixed-hash 0.8.0", + "impl-rlp", + "impl-serde 0.4.0", + "primitive-types 0.12.2", + "uint", +] + [[package]] name = "ethnum" version = "1.5.0" @@ -9032,6 +9143,15 @@ dependencies = [ "parity-scale-codec 3.7.0", ] +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + [[package]] name = "impl-serde" version = "0.3.2" @@ -9041,6 +9161,15 @@ dependencies = [ "serde", ] +[[package]] +name = "impl-serde" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" +dependencies = [ + "serde", +] + [[package]] name = "impl-trait-for-tuples" version = "0.2.2" @@ -9543,7 +9672,7 @@ dependencies = [ "aptos-language-e2e-tests", "aptos-logger", "aptos-mempool", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "aptos-sdk", "aptos-storage-interface", "aptos-temppath", @@ -10086,7 +10215,7 @@ dependencies = [ "aptos-language-e2e-tests", "aptos-logger", "aptos-mempool", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "aptos-sdk", "aptos-storage-interface", "aptos-temppath", @@ -10471,7 +10600,7 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", @@ -10488,7 +10617,7 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "backtrace", @@ -10503,12 +10632,12 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", @@ -10523,7 +10652,7 @@ dependencies = [ [[package]] name = "move-bytecode-spec" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "once_cell", "quote", @@ -10533,7 +10662,7 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "move-binary-format", @@ -10545,7 +10674,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "fail", "move-binary-format", @@ -10559,7 +10688,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "clap 4.5.21", @@ -10574,7 +10703,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "clap 4.5.21", @@ -10604,7 +10733,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "difference", @@ -10621,7 +10750,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", @@ -10647,7 +10776,7 @@ dependencies = [ [[package]] name = "move-compiler-v2" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "abstract-domain-derive", "anyhow", @@ -10678,7 +10807,7 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "arbitrary", @@ -10703,7 +10832,7 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", @@ -10722,7 +10851,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "clap 4.5.21", @@ -10739,7 +10868,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "clap 4.5.21", @@ -10758,7 +10887,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "move-command-line-common", @@ -10770,7 +10899,7 @@ dependencies = [ [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", @@ -10786,7 +10915,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "codespan-reporting", @@ -10804,7 +10933,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "hex", @@ -10817,7 +10946,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "hex", "move-command-line-common", @@ -10830,7 +10959,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "codespan", @@ -10856,7 +10985,7 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "clap 4.5.21", @@ -10890,7 +11019,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "atty", @@ -10917,7 +11046,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "async-trait", @@ -10946,7 +11075,7 @@ dependencies = [ [[package]] name = "move-prover-bytecode-pipeline" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "abstract-domain-derive", "anyhow", @@ -10963,7 +11092,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "hex", @@ -10990,7 +11119,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "abstract-domain-derive", "codespan-reporting", @@ -11009,7 +11138,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "hex", @@ -11032,7 +11161,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "once_cell", "serde", @@ -11041,7 +11170,7 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "better_any", "bytes 1.8.0", @@ -11056,7 +11185,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "better_any", @@ -11084,7 +11213,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "better_any", "bytes 1.8.0", @@ -11108,7 +11237,7 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "bytes 1.8.0", @@ -11124,7 +11253,7 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "derivative", @@ -11140,7 +11269,7 @@ dependencies = [ [[package]] name = "movement" version = "3.5.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67#1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" +source = "git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805#cbf9f5362d20c64d42c98bbb077f95076d73c805" dependencies = [ "anyhow", "aptos-api-types", @@ -11166,7 +11295,7 @@ dependencies = [ "aptos-move-debugger", "aptos-network-checker", "aptos-node", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "aptos-rest-client", "aptos-sdk", "aptos-storage-interface", @@ -11310,7 +11439,7 @@ dependencies = [ "anyhow", "aptos-crypto", "aptos-language-e2e-tests", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "aptos-sdk", "aptos-types", "async-trait", @@ -12590,7 +12719,7 @@ dependencies = [ "aptos-language-e2e-tests", "aptos-logger", "aptos-mempool", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=cbf9f5362d20c64d42c98bbb077f95076d73c805)", "aptos-sdk", "aptos-storage-interface", "aptos-temppath", @@ -13379,6 +13508,19 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "pre-l1-merge-to-post-l1-merge" +version = "0.3.4" +dependencies = [ + "aptos-framework-biarritz-rc1-release", + "aptos-framework-pre-l1-merge-release", + "aptos-sdk", + "dot-movement", + "maptos-framework-release-util", + "movement-config", + "thiserror 1.0.69", +] + [[package]] name = "pretty" version = "0.10.0" @@ -13416,7 +13558,7 @@ checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash 0.7.0", "impl-codec 0.5.1", - "impl-serde", + "impl-serde 0.3.2", "uint", ] @@ -13428,6 +13570,8 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash 0.8.0", "impl-codec 0.6.0", + "impl-rlp", + "impl-serde 0.4.0", "uint", ] @@ -13669,6 +13813,12 @@ dependencies = [ "hex", ] +[[package]] +name = "project-root" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" + [[package]] name = "prometheus" version = "0.13.4" @@ -14671,6 +14821,31 @@ dependencies = [ "serde", ] +[[package]] +name = "rstest" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9c9dc66cc29792b663ffb5269be669f1613664e69ad56441fdb895c2347b930" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros", + "rustc_version 0.4.1", +] + +[[package]] +name = "rstest_macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5015e68a0685a95ade3eee617ff7101ab6a3fc689203101ca16ebc16f2b89c66" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "rustc_version 0.4.1", + "syn 1.0.109", +] + [[package]] name = "ruint" version = "1.12.3" @@ -16360,6 +16535,39 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "test-case" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-core" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.87", +] + +[[package]] +name = "test-case-macros" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "test-case-core", +] + [[package]] name = "textwrap" version = "0.11.0" diff --git a/Cargo.toml b/Cargo.toml index a5242b82e..613ed7679 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,6 +83,7 @@ aptos-framework-head-release = { path = "protocol-units/execution/maptos/framewo aptos-framework-elsa-release = { path = "protocol-units/execution/maptos/framework/releases/elsa" } aptos-framework-biarritz-rc1-release = { path = "protocol-units/execution/maptos/framework/releases/biarritz-rc1" } aptos-framework-pre-l1-merge-release = { path = "protocol-units/execution/maptos/framework/releases/pre-l1-merge" } +aptos-framework-post-l1-merge-release = { path = "protocol-units/execution/maptos/framework/releases/post-l1-merge" } aptos-framework-upgrade-gas-release = { path = "protocol-units/execution/maptos/framework/releases/upgrade-gas" } aptos-framework-known-release = { path = "protocol-units/execution/maptos/framework/releases/known-release" } aptos-framework-set-feature-flags-release = { path = "protocol-units/execution/maptos/framework/releases/feature-flags" } @@ -149,46 +150,47 @@ borsh = { version = "0.10" } # todo: internalize jmt and bump ## Aptos dependencies -### We use a forked version so that we can override dependency versions. This is required -### to be avoid dependency conflicts with other Sovereign Labs crates. -aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67", features = [ +aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805", features = [ "cloneable-private-keys", ] } -aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-release-builder = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -aptos-gas-schedule = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -move-package = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } -movement = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" } +aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-release-builder = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +aptos-gas-schedule = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +move-model = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +move-command-line-common = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +move-package = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +e2e-move-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } +movement = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "cbf9f5362d20c64d42c98bbb077f95076d73c805" } # Indexer processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "ceaff42dfb4d1e5c84ee45e7568bb071de4b07f2" } diff --git a/process-compose/movement-full-node/README.md b/process-compose/movement-full-node/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/process-compose/movement-full-node/process-compose.test-migrate-post-l1-merge.yml b/process-compose/movement-full-node/process-compose.test-migrate-post-l1-merge.yml new file mode 100644 index 000000000..25b3ef29e --- /dev/null +++ b/process-compose/movement-full-node/process-compose.test-migrate-post-l1-merge.yml @@ -0,0 +1,18 @@ +version: "3" + +processes: + + setup: + environment: + - "KNOWN_FRAMEWORK_RELEASE=biarritz-rc1" + - APTOS_ACCOUNT_WHITELIST=$DOT_MOVEMENT_PATH/default_signer_address_whitelist + - MAPTOS_PRIVATE_KEY=random + + test-migrate-pre-to-post-l1-merge: + command: | + cargo run --bin aptos-framework-post-l1-merge-release-tool + depends_on: + movement-full-node: + condition: process_healthy + movement-faucet: + condition: process_healthy diff --git a/process-compose/movement-full-node/process-compose.test-upgrade-pre-l1-merge.yml b/process-compose/movement-full-node/process-compose.test-upgrade-pre-l1-merge.yml index 5c026cc79..dafb10e7f 100644 --- a/process-compose/movement-full-node/process-compose.test-upgrade-pre-l1-merge.yml +++ b/process-compose/movement-full-node/process-compose.test-upgrade-pre-l1-merge.yml @@ -2,6 +2,13 @@ version: "3" environment: + setup: + environment: + - "KNOWN_FRAMEWORK_RELEASE=biarritz-rc1" + - APTOS_ACCOUNT_WHITELIST=$DOT_MOVEMENT_PATH/default_signer_address_whitelist + - MAPTOS_PRIVATE_KEY=random + + processes: test-upgrade-pre-l1-merge: command: | diff --git a/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/Cargo.toml b/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/Cargo.toml new file mode 100644 index 000000000..813528fbe --- /dev/null +++ b/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "pre-l1-merge-to-post-l1-merge" +description = "post-l1-merge migration" +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +repository = { workspace = true } + +version = { workspace = true } + +[lib] +path = "src/lib.rs" + +[dependencies] +maptos-framework-release-util = { workspace = true } +aptos-sdk = { workspace = true } +aptos-framework-biarritz-rc1-release = { workspace = true } +aptos-framework-pre-l1-merge-release = { workspace = true } +thiserror = { workspace = true } +dot-movement = { workspace = true } +movement-config = { workspace = true } diff --git a/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/dot_movement.rs b/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/dot_movement.rs new file mode 100644 index 000000000..013c030d2 --- /dev/null +++ b/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/dot_movement.rs @@ -0,0 +1,48 @@ +use crate::{ + MigratePreL1MergeToPostL1Merge, PreL1MergeToPostL1Merge, PreL1MergeToPostL1MergeError, +}; +use dot_movement::DotMovement; +use maptos_framework_release_util::OverrideAccountAddressReleaseSigner; +use movement_config::{ + ops::aptos::{ + framework::releases::release_signer::ReleaseSignerOperations, + rest_client::RestClientOperations, + }, + Config, +}; + +impl MigratePreL1MergeToPostL1Merge for DotMovement { + async fn migrate_framework_from_biarritza_rc1_to_pre_l1_merge( + &self, + ) -> Result<(), PreL1MergeToPostL1MergeError> { + // get the movement config from dot movement + let config = self.try_get_config_from_json::().map_err(|e| { + PreL1MergeToPostL1MergeError::MigrationFailed( + format!("failed to get config: {}", e).into(), + ) + })?; + + // get the rest client from the movement config + let rest_client = config + .get_rest_client() + .await + .map_err(|e| PreL1MergeToPostL1MergeError::MigrationFailed(e.into()))?; + + // get the release signer from the movement config + let signer = config + .get_release_signer() + .await + .map_err(|e| PreL1MergeToPostL1MergeError::MigrationFailed(e.into()))?; + + // write the signer with a core resource account override + let signer = OverrideAccountAddressReleaseSigner::core_resource_account(signer); + + // migrate the framework from Elsa to Biarritz RC1 + let biarritza_rc1_to_pre_l1_merge = PreL1MergeToPostL1Merge::new(); + biarritza_rc1_to_pre_l1_merge + .migrate_framework_from_pre_l1_merge_to_post_l1_merge(&rest_client, &signer) + .await?; + + Ok(()) + } +} diff --git a/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/lib.rs b/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/lib.rs new file mode 100644 index 000000000..34942f8d6 --- /dev/null +++ b/protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/lib.rs @@ -0,0 +1,44 @@ +pub mod dot_movement; + +use aptos_framework_biarritz_rc1_release::cached::full::feature_upgrade::BiarritzRc1; +use maptos_framework_release_util::{Release, ReleaseSigner}; +use std::future::Future; + +pub struct PreL1MergeToPostL1Merge; + +impl PreL1MergeToPostL1Merge { + pub fn new() -> Self { + Self + } + + pub async fn migrate_framework_from_pre_l1_merge_to_post_l1_merge( + &self, + client: &aptos_sdk::rest_client::Client, + signer: &impl ReleaseSigner, + ) -> Result<(), PreL1MergeToPostL1MergeError> { + // todo: validate that the current release is Elsa + + // upgrade to PostL1Merge with the gas upgrade + let biarritz_rc1 = BiarritzRc1::new(); + biarritz_rc1 + .release(signer, 2_000_000, 100, 60_000, client) + .await + .map_err(|e| PreL1MergeToPostL1MergeError::MigrationFailed(e.into()))?; + + Ok(()) + } +} + +/// Errors thrown by PreL1MergeToPostL1Merge migrations. +#[derive(Debug, thiserror::Error)] +pub enum PreL1MergeToPostL1MergeError { + #[error("migration failed: {0}")] + MigrationFailed(#[source] Box), +} + +pub trait MigratePreL1MergeToPostL1Merge { + /// Migrate from PreL1Merge to PostL1Merge. + fn migrate_framework_from_biarritza_rc1_to_pre_l1_merge( + &self, + ) -> impl Future>; +} diff --git a/protocol-units/execution/maptos/framework/releases/feature-flags/Cargo.toml b/protocol-units/execution/maptos/framework/releases/feature-flags/Cargo.toml index 39511d26f..5a30459d3 100644 --- a/protocol-units/execution/maptos/framework/releases/feature-flags/Cargo.toml +++ b/protocol-units/execution/maptos/framework/releases/feature-flags/Cargo.toml @@ -13,22 +13,24 @@ version = { workspace = true } path = "src/lib.rs" [dependencies] -aptos-release-builder = { workspace = true } +anyhow = { workspace = true } +aptos-framework = { workspace = true } aptos-gas-schedule = { workspace = true } +aptos-release-builder = { workspace = true } +aptos-sdk = { workspace = true } +aptos-types = { workspace = true } +bcs = { workspace = true } +dot-movement = { workspace = true } maptos-framework-release-util = { workspace = true } -movement-config = { workspace = true } +move-package = { workspace = true } +movement = { workspace = true } movement-client = { workspace = true } +movement-config = { workspace = true } once_cell = { workspace = true } -aptos-framework = { workspace = true } -tokio = { workspace = true } -anyhow = { workspace = true} -url = { workspace = true } -dot-movement = { workspace = true } +sha2 = { workspace = true } tempfile = { workspace = true } -bcs = { workspace = true } -aptos-types = { workspace = true } -aptos-sdk = { workspace = true } -move-package = { workspace = true } -movement = { workspace = true } +tokio = { workspace = true } toml = { workspace = true } -tracing = { workspace = true } \ No newline at end of file +tracing = { workspace = true } +url = { workspace = true } + diff --git a/protocol-units/execution/maptos/framework/releases/feature-flags/src/lib.rs b/protocol-units/execution/maptos/framework/releases/feature-flags/src/lib.rs index 35bf6006a..423733c2c 100644 --- a/protocol-units/execution/maptos/framework/releases/feature-flags/src/lib.rs +++ b/protocol-units/execution/maptos/framework/releases/feature-flags/src/lib.rs @@ -7,6 +7,7 @@ use core::fmt::Debug; use maptos_framework_release_util::{ compiler::Compiler, Release, ReleaseBundleError, ReleaseSigner, }; +use sha2::{Digest, Sha256}; use std::fs; use tempfile::tempdir; use tracing::info; @@ -124,6 +125,14 @@ where Ok(vec![signed_transaction]) } + + pub fn execution_hash(&self) -> Result, ReleaseBundleError> { + let bytecode = self.set_feature_flags_proposal_bytecode()?; + let mut hasher = Sha256::new(); + hasher.update(&bytecode); + let hash = hasher.finalize(); + Ok(hash.to_vec()) + } } impl Release for SetFeatureFlags diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/Cargo.toml b/protocol-units/execution/maptos/framework/releases/post-l1-merge/Cargo.toml new file mode 100644 index 000000000..a8c72977b --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/Cargo.toml @@ -0,0 +1,57 @@ +[package] +name = "aptos-framework-post-l1-merge-release" +description = "Post L1 Merge Releaser Binary" +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +repository = { workspace = true } + +version = { workspace = true } + +[lib] +path = "src/lib.rs" + +[[bin]] +name = "aptos-framework-post-l1-merge-release-tool" +path = "src/bin/release.rs" + +[dependencies] +anyhow = { workspace = true } +aptos-framework = { workspace = true } +aptos-framework-release-script-release = { workspace = true } +aptos-framework-set-feature-flags-release = { workspace = true } +aptos-framework-upgrade-gas-release = { workspace = true } +aptos-gas-schedule = { workspace = true } +aptos-release-builder = { workspace = true } +aptos-sdk = { workspace = true } +aptos-types = { workspace = true } +bcs = { workspace = true } +dot-movement = { workspace = true } +e2e-move-tests = { workspace = true } +hex = { workspace = true } +maptos-framework-release-util = { workspace = true } +move-command-line-common = { workspace = true } +move-model = { workspace = true } +movement-client = { workspace = true } +movement-config = { workspace = true } +once_cell = { workspace = true } +tempfile = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } +url = { workspace = true } + +[build-dependencies] +maptos-framework-release-util = { workspace = true } +movement-config = { workspace = true } +movement-client = { workspace = true } +move-model = { workspace = true } +once_cell = { workspace = true } +aptos-framework = { workspace = true } +tokio = { workspace = true } +anyhow = { workspace = true } +url = { workspace = true } +dot-movement = { workspace = true } +tempfile = { workspace = true } +bcs = { workspace = true } diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/build.rs b/protocol-units/execution/maptos/framework/releases/post-l1-merge/build.rs new file mode 100644 index 000000000..f7f34afca --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/build.rs @@ -0,0 +1,10 @@ +use maptos_framework_release_util::commit_hash_with_script; + +commit_hash_with_script!( + PostL1Merge, // Struct name + "https://github.com/movementlabsxyz/aptos-core.git", // Repository URL + "867b1828618ad33bfb3b10c50665cb67113f60e2", // Commit hash + 6, // Bytecode version + "post-l1-merge.mrb", // MRB file name + "CACHE_POST_L1_MERGE_FRAMEWORK_RELEASE" // Cache environment variable for the post-l1-merge framework release +); diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/mrb_cache/867b1828618ad33bfb3b10c50665cb67113f60e2-post-l1-merge.mrb b/protocol-units/execution/maptos/framework/releases/post-l1-merge/mrb_cache/867b1828618ad33bfb3b10c50665cb67113f60e2-post-l1-merge.mrb new file mode 100644 index 000000000..8af2a8991 Binary files /dev/null and b/protocol-units/execution/maptos/framework/releases/post-l1-merge/mrb_cache/867b1828618ad33bfb3b10c50665cb67113f60e2-post-l1-merge.mrb differ diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/bin/release.rs b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/bin/release.rs new file mode 100644 index 000000000..01e5677d2 --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/bin/release.rs @@ -0,0 +1,74 @@ +use aptos_framework_post_l1_merge_release::{ + cached::script::script::PostL1Merge, vote::propose_post_l1_merge_with_full_governance, +}; +use movement_client::types::LocalAccount; +use once_cell::sync::Lazy; +use std::str::FromStr; +use url::Url; + +static MOVEMENT_CONFIG: Lazy = Lazy::new(|| { + let dot_movement = dot_movement::DotMovement::try_from_env().unwrap(); + let config = dot_movement.try_get_config_from_json::().unwrap(); + config +}); + +// :!:>section_1c +static NODE_URL: Lazy = Lazy::new(|| { + let node_connection_address = MOVEMENT_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_hostname + .clone(); + let node_connection_port = MOVEMENT_CONFIG + .execution_config + .maptos_config + .client + .maptos_rest_connection_port + .clone(); + + let node_connection_url = + format!("http://{}:{}", node_connection_address, node_connection_port); + + Url::from_str(node_connection_url.as_str()).unwrap() +}); + +#[tokio::main] +async fn main() -> Result<(), anyhow::Error> { + // setup the logger + use tracing_subscriber::EnvFilter; + + tracing_subscriber::fmt() + .with_env_filter( + EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info")), + ) + .init(); + + // get the root account + let raw_private_key = MOVEMENT_CONFIG + .execution_config + .maptos_config + .chain + .maptos_private_key_signer_identifier + .try_raw_private_key()?; + + let private_key_hex = hex::encode(raw_private_key); + let mut root_account = LocalAccount::from_private_key(private_key_hex.as_str(), 0)?; + + // form the local account release signer + // let local_account_release_signer = + // LocalAccountReleaseSigner::new(root_account, Some(aptos_test_root_address())); + + // form the rest client + let rest_client = movement_client::rest_client::Client::new(NODE_URL.clone()); + + let chain_id = rest_client.get_index().await?.inner().chain_id; + + propose_post_l1_merge_with_full_governance(&mut root_account, &rest_client, chain_id).await?; + + // post_l1_release + // .release(&local_account_release_signer, 2_000_000, 100, 60, &rest_client) + // .await?; + + Ok(()) +} diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/cached.rs b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/cached.rs new file mode 100644 index 000000000..d1d4c87bb --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/cached.rs @@ -0,0 +1,63 @@ +use aptos_framework_upgrade_gas_release::generate_gas_upgrade_module; +use maptos_framework_release_util::mrb_release; + +mrb_release!( + PostL1Merge, + BIARRTIZ_RC1, + "867b1828618ad33bfb3b10c50665cb67113f60e2-post-l1-merge.mrb" +); + +generate_gas_upgrade_module!(gas_upgrade, PostL1Merge, { + let mut gas_parameters = AptosGasParameters::initial(); + gas_parameters.vm.txn.max_transaction_size_in_bytes = GasQuantity::new(100_000_000); + gas_parameters.vm.txn.max_execution_gas = GasQuantity::new(10_000_000_000); + gas_parameters.vm.txn.gas_unit_scaling_factor = GasQuantity::new(50_000); + aptos_types::on_chain_config::GasScheduleV2 { + feature_version: aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION, + entries: gas_parameters + .to_on_chain_gas_schedule(aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION), + } +}); + +pub mod script { + use super::gas_upgrade::PostL1Merge; + use aptos_framework_release_script_release::generate_script_module; + + generate_script_module!(script, PostL1Merge, { + r#" +script { + use aptos_framework::aptos_governance; + use aptos_framework::gas_schedule; + use aptos_framework::governed_gas_pool; + use aptos_framework::aptos_coin; + use aptos_framework::signer; + use aptos_framework::version; + use aptos_framework::account; + + fun main(core_resources: &signer) { + + } +} +"# + .to_string() + }); +} + +pub mod full { + + use super::script::script::PostL1Merge; + use aptos_framework_set_feature_flags_release::generate_feature_upgrade_module; + + generate_feature_upgrade_module!(feature_upgrade, PostL1Merge, { + use aptos_release_builder::components::feature_flags::FeatureFlag; + use aptos_types::on_chain_config::FeatureFlag as AptosFeatureFlag; + + let mut aptos_feature_flags = AptosFeatureFlag::default_features(); + aptos_feature_flags.push(AptosFeatureFlag::DECOMMISSION_CORE_RESOURCES); + + Features { + enabled: aptos_feature_flags.into_iter().map(FeatureFlag::from).collect(), + disabled: vec![], + } + }); +} diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/lib.rs b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/lib.rs new file mode 100644 index 000000000..d41fdb8c6 --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/lib.rs @@ -0,0 +1,27 @@ +pub mod cached; +pub mod vote; + +use aptos_framework_upgrade_gas_release::generate_gas_upgrade_module; +use maptos_framework_release_util::commit_hash_with_script; + +// Example usage of the macro to generate a build script for PreL1Merge. +commit_hash_with_script!( + PostL1Merge, // Struct name + "https://github.com/movementlabsxyz/aptos-core.git", // Repository URL + "867b1828618ad33bfb3b10c50665cb67113f60e2", // Commit hash + 6, // Bytecode version + "post-l1-merge.mrb", // MRB file name + "CACHE_POST_L1_MERGE_FRAMEWORK_RELEASE" // Cache environment variable +); + +generate_gas_upgrade_module!(gas_upgrade, PostL1Merge, { + let mut gas_parameters = AptosGasParameters::initial(); + gas_parameters.vm.txn.max_transaction_size_in_bytes = GasQuantity::new(100_000_000); + gas_parameters.vm.txn.max_execution_gas = GasQuantity::new(10_000_000_000); + + aptos_types::on_chain_config::GasScheduleV2 { + feature_version: aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION, + entries: gas_parameters + .to_on_chain_gas_schedule(aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION), + } +}); diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/tests/vote.data/enable_partial_governance_voting/Move.toml b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/tests/vote.data/enable_partial_governance_voting/Move.toml new file mode 100644 index 000000000..954c1b20f --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/tests/vote.data/enable_partial_governance_voting/Move.toml @@ -0,0 +1,8 @@ +[package] +name = 'EnablePartialGovernanceVoting' +version = "0.0.0" + +[dependencies.AptosFramework] +git = "https://github.com/movementlabsxyz/aptos-core.git" +rev = "movement" +subdir = "aptos-move/framework/aptos-framework" diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/tests/vote.data/enable_partial_governance_voting/sources/main.move b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/tests/vote.data/enable_partial_governance_voting/sources/main.move new file mode 100644 index 000000000..588f914ea --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/tests/vote.data/enable_partial_governance_voting/sources/main.move @@ -0,0 +1,13 @@ +//Only used for partial voting tests (with core_resources signer enabled) +script { + use aptos_framework::aptos_governance; + use std::features; + + fun main(core_resources: &signer) { + let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @aptos_framework); + aptos_governance::initialize_partial_voting(&framework_signer); + let feature = features::get_partial_governance_voting(); + features::change_feature_flags_for_next_epoch(&framework_signer, vector[feature], vector[]); + aptos_governance::force_end_epoch(&framework_signer); + } +} diff --git a/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/vote.rs b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/vote.rs new file mode 100644 index 000000000..e9fb8c02b --- /dev/null +++ b/protocol-units/execution/maptos/framework/releases/post-l1-merge/src/vote.rs @@ -0,0 +1,332 @@ +use crate::cached::PostL1Merge; +use aptos_framework::{BuildOptions, BuiltPackage}; +use aptos_sdk::{ + move_types::{identifier::Identifier, language_storage::ModuleId}, + rest_client::Client, + transaction_builder::TransactionBuilder, + types::{account_address::AccountAddress, LocalAccount}, +}; +use aptos_types::{ + chain_id::ChainId, + transaction::{EntryFunction, TransactionPayload}, +}; +use move_command_line_common::env::get_move_compiler_v2_from_env; +use move_model::metadata::CompilerVersion; +use once_cell::sync::Lazy; +use std::collections::BTreeMap; +use std::path::PathBuf; +use std::time::{SystemTime, UNIX_EPOCH}; + +pub static PROPOSAL_SCRIPTS: Lazy>> = Lazy::new(build_scripts); + +pub fn build_package(package_path: PathBuf, options: BuildOptions) -> anyhow::Result { + let mut options = options; + if get_move_compiler_v2_from_env() { + options.compiler_version = Some(CompilerVersion::V2_0); + } + BuiltPackage::build(package_path.to_owned(), options) +} + +fn build_scripts() -> BTreeMap> { + let package_folder = "vote.data"; + let package_names = vec!["enable_partial_governance_voting"]; + process_scripts(package_folder, package_names) +} + +pub fn process_scripts( + package_folder: &str, + package_names: Vec<&str>, +) -> BTreeMap> { + let mut scripts = BTreeMap::new(); + for package_name in package_names { + let script = build_package( + test_dir_path(format!("{}/{}", package_folder, package_name).as_str()), + aptos_framework::BuildOptions::default(), + ) + .expect("building packages with scripts must succeed") + .extract_script_code()[0] + .clone(); + scripts.insert(package_name.to_string(), script); + } + scripts +} + +fn test_dir_path(s: &str) -> PathBuf { + PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("src").join("tests").join(s) +} + +/// Submits a governance proposal to enable specific feature flags (e.g., DECOMMISSION_CORE_RESOURCES) +/// using the full on-chain governance flow. +/// +/// This function: +/// - Builds a `SetFeatureFlags` release bundle with the desired feature flags. +/// - Computes the execution hash from the release bundle. +/// - Submits a `create_proposal_v2` transaction through the validator's stake pool account. +/// - Uses a real validator signer and Aptos REST client to broadcast the transaction to the chain. +/// +/// This is a production-grade governance interaction and **not a test**. +/// +/// # Arguments +/// - `validator_account`: The validator's `LocalAccount` representing the proposer and stake pool. +/// - `rest_client`: Aptos REST client used to submit and confirm the transaction. +/// - `chain_id`: The Chain ID of the network (e.g., testnet = 2, mainnet = 1). +/// +/// # Errors +/// Returns an `anyhow::Error` if any step in the proposal construction, signing, or submission fails. +/// +/// # Example +/// ```rust +/// propose_post_l1_merge_with_full_governance( +/// &mut validator_account, +/// &rest_client, +/// 4 // for devnet or testnet +/// ).await?; +/// ``` +pub async fn propose_post_l1_merge_with_full_governance( + validator_account: &mut LocalAccount, + rest_client: &Client, + chain_id: u8, +) -> Result<(), anyhow::Error> { + use aptos_framework_set_feature_flags_release::SetFeatureFlags; + use aptos_release_builder::components::feature_flags::{FeatureFlag, Features}; + use aptos_types::on_chain_config::FeatureFlag as AptosFeatureFlag; + + // === Build Release Bundle === + let post_l1_release = PostL1Merge::new(); + let mut aptos_feature_flags = AptosFeatureFlag::default_features(); + aptos_feature_flags.push(AptosFeatureFlag::DECOMMISSION_CORE_RESOURCES); + + let features = Features { + enabled: aptos_feature_flags.into_iter().map(FeatureFlag::from).collect(), + disabled: vec![], + }; + + let with_features = SetFeatureFlags::new(post_l1_release, features); + let execution_hash = with_features.execution_hash()?; + + // === Encode Arguments === + let stake_pool = validator_account.address(); + let metadata_location = Vec::::new(); + let metadata_hash = Vec::::new(); + let is_multi_step = false; + + let args = vec![ + bcs::to_bytes(&stake_pool)?, + bcs::to_bytes(&execution_hash)?, + bcs::to_bytes(&metadata_location)?, + bcs::to_bytes(&metadata_hash)?, + bcs::to_bytes(&is_multi_step)?, + ]; + + // === Construct Transaction === + let expiration_ts = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs() + 120; + + let entry_function = EntryFunction::new( + ModuleId::new( + AccountAddress::ONE, // Governance module lives at 0x1 + Identifier::new("aptos_governance")?, + ), + Identifier::new("create_proposal_v2")?, + vec![], // type args + args, + ); + + let transaction_builder = TransactionBuilder::new( + TransactionPayload::EntryFunction(entry_function), + expiration_ts, + ChainId::new(chain_id), + ) + .sender(validator_account.address()) + .sequence_number(validator_account.sequence_number()); + + let signed_txn = validator_account.sign_with_transaction_builder(transaction_builder); + + // === Submit Transaction === + let response = rest_client.submit_and_wait(&signed_txn).await?; + println!("Response {:?}", response); + + Ok(()) +} + +/// Partial Vote Assumes core_resources signer and is used for testing +mod tests { + use crate::vote::{AccountAddress, PROPOSAL_SCRIPTS}; + use e2e_move_tests::{ + aptos_governance::{create_proposal_v2, get_remaining_voting_power, partial_vote, vote}, + assert_abort, assert_success, increase_lockup, setup_staking, MoveHarness, + }; + + #[test] + pub fn test_partial_vote() { + // Genesis starts with one validator with index 0 + + let mut harness = MoveHarness::new(); + let validator_1 = + harness.new_account_at(AccountAddress::from_hex_literal("0x123").unwrap()); + let validator_2 = + harness.new_account_at(AccountAddress::from_hex_literal("0x234").unwrap()); + let validator_1_address = *validator_1.address(); + let validator_2_address = *validator_2.address(); + + let stake_amount_1 = 25_000_000; + assert_success!(setup_staking(&mut harness, &validator_1, stake_amount_1)); + assert_success!(increase_lockup(&mut harness, &validator_1)); + let stake_amount_2 = 25_000_000; + assert_success!(setup_staking(&mut harness, &validator_2, stake_amount_2)); + assert_success!(increase_lockup(&mut harness, &validator_2)); + + let mut proposal_id: u64 = 0; + assert_success!(create_proposal_v2( + &mut harness, + &validator_2, + validator_2_address, + vec![1], + vec![], + vec![], + true + )); + // Voters can vote on a partial voting proposal but argument voting_power will be ignored. + assert_success!(partial_vote( + &mut harness, + &validator_1, + validator_1_address, + proposal_id, + 100, + true + )); + // No remaining voting power. + assert_eq!(get_remaining_voting_power(&mut harness, validator_1_address, proposal_id), 0); + + // Enable partial governance voting. In production it requires governance. + let core_resources = + harness.new_account_at(AccountAddress::from_hex_literal("0xA550C18").unwrap()); + let script_code = PROPOSAL_SCRIPTS + .get("enable_partial_governance_voting") + .expect("proposal script should be built"); + let txn = harness.create_script(&core_resources, script_code.clone(), vec![], vec![]); + assert_success!(harness.run(txn)); + + // If a voter has already voted on a proposal before partial voting is enabled, the voter cannot vote on the proposal again. + assert_abort!( + partial_vote(&mut harness, &validator_1, validator_1_address, proposal_id, 100, true), + 0x10005 + ); + + assert_success!(create_proposal_v2( + &mut harness, + &validator_1, + validator_1_address, + vec![1], + vec![], + vec![], + true + )); + + // Cannot vote on a non-exist proposal. + let wrong_proposal_id: u64 = 2; + assert_abort!( + partial_vote( + &mut harness, + &validator_1, + validator_1_address, + wrong_proposal_id, + 100, + true + ), + 25863 + ); + + proposal_id = 1; + assert_eq!( + get_remaining_voting_power(&mut harness, validator_1_address, proposal_id), + stake_amount_1 + ); + assert_eq!( + get_remaining_voting_power(&mut harness, validator_2_address, proposal_id), + stake_amount_1 + ); + + // A voter can vote on a proposal multiple times with both Yes/No. + assert_success!(partial_vote( + &mut harness, + &validator_1, + validator_1_address, + proposal_id, + 100, + true + )); + assert_eq!( + get_remaining_voting_power(&mut harness, validator_1_address, proposal_id), + stake_amount_1 - 100 + ); + assert_success!(partial_vote( + &mut harness, + &validator_1, + validator_1_address, + proposal_id, + 1000, + false + )); + assert_eq!( + get_remaining_voting_power(&mut harness, validator_1_address, proposal_id), + stake_amount_1 - 1100 + ); + // A voter cannot use voting power more than it has. + assert_success!(partial_vote( + &mut harness, + &validator_1, + validator_1_address, + proposal_id, + stake_amount_1, + true + )); + assert_eq!(get_remaining_voting_power(&mut harness, validator_1_address, proposal_id), 0); + } + + #[test] + pub fn full_governance_vote() { + // Set up harness and two validators + let mut harness = MoveHarness::new(); + let validator_1 = + harness.new_account_at(AccountAddress::from_hex_literal("0x123").unwrap()); + let validator_2 = + harness.new_account_at(AccountAddress::from_hex_literal("0x234").unwrap()); + let validator_1_address = *validator_1.address(); + let validator_2_address = *validator_2.address(); + + // Stake and lock up for both validators + let stake_amount = 25_000_000; + assert_success!(setup_staking(&mut harness, &validator_1, stake_amount)); + assert_success!(increase_lockup(&mut harness, &validator_1)); + assert_success!(setup_staking(&mut harness, &validator_2, stake_amount)); + assert_success!(increase_lockup(&mut harness, &validator_2)); + + // Validator 1 creates a full governance proposal + let proposal_id = 0; + assert_success!(create_proposal_v2( + &mut harness, + &validator_1, + validator_1_address, + vec![1], // Dummy execution hash + vec![], + vec![], + false // Not a multi-step proposal + )); + + // Validator 2 votes YES on the proposal using full voting power + assert_success!(vote(&mut harness, &validator_2, validator_2_address, proposal_id, true)); + + // Trying to vote again with the same validator should fail (double voting not allowed) + assert_abort!( + vote(&mut harness, &validator_2, validator_2_address, proposal_id, true), + 0x10004 // EALREADY_VOTED or equivalent error code + ); + + // Validator 1 votes NO on the same proposal + assert_success!(vote(&mut harness, &validator_1, validator_1_address, proposal_id, false)); + + // Check remaining voting power: both should now be zero + assert_eq!(get_remaining_voting_power(&mut harness, validator_1_address, proposal_id), 0); + assert_eq!(get_remaining_voting_power(&mut harness, validator_2_address, proposal_id), 0); + } +} diff --git a/protocol-units/execution/maptos/opt-executor/src/background/transaction_pipe.rs b/protocol-units/execution/maptos/opt-executor/src/background/transaction_pipe.rs index 66438e2d5..b68e0cc16 100644 --- a/protocol-units/execution/maptos/opt-executor/src/background/transaction_pipe.rs +++ b/protocol-units/execution/maptos/opt-executor/src/background/transaction_pipe.rs @@ -103,6 +103,21 @@ impl TransactionPipe { } } + pub fn whitelist(&mut self, account: AccountAddress) -> Result<(), Error> { + match &mut self.whitelisted_accounts { + Some(set) => { + set.insert(account); + Ok(()) + } + None => { + let mut set = HashSet::new(); + set.insert(account); + self.whitelisted_accounts = Some(set); + Ok(()) + } + } + } + pub async fn run(mut self) -> Result<(), Error> { loop { self.tick().await?;