diff --git a/.dockerignore b/.dockerignore index f10ff7d286..314178e8c4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -25,7 +25,7 @@ !lumio-move/lumio-release-builder/data/proposals/* !lumio-move/framework/ !lumio-move/move-examples/hello_blockchain/ -!crates/aptos/src/move_tool/*.bpl +!crates/lumio/src/move_tool/*.bpl !crates/lumio-localnet/src/hasura_metadata.json !crates/lumio-faucet/doc/ !crates/transaction-emitter-lib/src/emitter/test_proofs_for_localnet_txn_emitter.txt diff --git a/.github/workflows/indexer-protos-sdk-update.yaml b/.github/workflows/indexer-protos-sdk-update.yaml index 35fafc0b17..d0d7babe0b 100644 --- a/.github/workflows/indexer-protos-sdk-update.yaml +++ b/.github/workflows/indexer-protos-sdk-update.yaml @@ -99,7 +99,7 @@ jobs: uses: peter-evans/repository-dispatch@v3.0.0 with: token: ${{ steps.secrets.outputs.token }} - repository: 'aptos-labs/aptos-indexer-processor-sdk' + repository: 'aptos-labs/lumio-indexer-processor-sdk' event-type: 'proto-dependency-update' client-payload: '{"commit_hash": "${{ github.sha }}", "branch_name": "${{ steps.commit_hash.outputs.branch_name }}"}' - name: Poll for Workflow Run and Wait for Job Completion diff --git a/.gitignore b/.gitignore index 1405150766..da7cee0dab 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,5 @@ gha-creds-*.json # Ignore cache for move-package-resolver tests third_party/move/tools/move-package-resolver/cache + +.local_node \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 85ff818a8b..5117e76dbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -302,158 +302,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "aptos-indexer-processor-sdk" -version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?tag=aptos-indexer-processor-sdk-v2.1.2#188ba1a37597739a2e503165dec0c3fcc63c89ec" -dependencies = [ - "ahash 0.8.11", - "anyhow", - "aptos-indexer-transaction-stream", - "aptos-protos", - "aptos-system-utils", - "async-trait", - "autometrics", - "axum 0.7.5", - "backtrace", - "bcs 0.1.4", - "bigdecimal", - "chrono", - "clap 4.5.21", - "derive_builder", - "diesel", - "diesel-async", - "diesel_migrations", - "field_count", - "futures", - "futures-util", - "hex", - "indexmap 2.7.0", - "instrumented-channel", - "kanal", - "mockall 0.12.1", - "native-tls", - "num_cpus", - "once_cell", - "petgraph 0.6.5", - "postgres-native-tls", - "prometheus", - "prometheus-client", - "serde", - "serde_json", - "serde_yaml 0.8.26", - "sha2 0.9.9", - "tempfile", - "thiserror", - "tiny-keccak", - "tokio", - "tokio-postgres", - "toml 0.7.8", - "tracing", - "tracing-subscriber 0.3.18", - "url", -] - -[[package]] -name = "aptos-indexer-transaction-stream" -version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?tag=aptos-indexer-processor-sdk-v2.1.2#188ba1a37597739a2e503165dec0c3fcc63c89ec" -dependencies = [ - "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?tag=aptos-indexer-processor-sdk-v2.1.2)", - "aptos-protos", - "aptos-transaction-filter", - "chrono", - "futures-util", - "once_cell", - "prometheus", - "prost 0.13.4", - "sample", - "serde", - "tokio", - "tonic 0.12.3", - "tracing", - "url", -] - -[[package]] -name = "aptos-moving-average" -version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?tag=aptos-indexer-processor-sdk-v2.1.2#188ba1a37597739a2e503165dec0c3fcc63c89ec" -dependencies = [ - "chrono", -] - -[[package]] -name = "aptos-moving-average" -version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=62beedc881d1b76632318ceb186ee9065236468e#62beedc881d1b76632318ceb186ee9065236468e" -dependencies = [ - "chrono", -] - -[[package]] -name = "aptos-profiler" -version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686#2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686" -dependencies = [ - "anyhow", - "backtrace", - "jemalloc-sys", - "jemallocator", - "pprof", - "regex", -] - -[[package]] -name = "aptos-protos" -version = "1.3.1" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686#2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686" -dependencies = [ - "pbjson", - "prost 0.13.4", - "serde", - "tonic 0.12.3", -] - -[[package]] -name = "aptos-system-utils" -version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686#2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686" -dependencies = [ - "anyhow", - "aptos-profiler", - "async-mutex", - "http 0.2.11", - "hyper 0.14.28", - "lazy_static", - "mime", - "pprof", - "regex", - "rstack-self", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "aptos-transaction-filter" -version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-core.git?rev=2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686#2dd9c73b27fdcbe78c7391fd43c9a5d00b93e686" -dependencies = [ - "anyhow", - "aptos-protos", - "derivative", - "derive_builder", - "memchr", - "once_cell", - "prost 0.13.4", - "serde", - "serde_json", - "serde_yaml 0.8.26", - "thiserror", -] - [[package]] name = "arbitrary" version = "1.4.1" @@ -6621,7 +6469,7 @@ dependencies = [ [[package]] name = "instrumented-channel" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?tag=aptos-indexer-processor-sdk-v2.1.2#188ba1a37597739a2e503165dec0c3fcc63c89ec" +source = "git+https://github.com/vladimirovmm/lumio-indexer-processor-sdk.git#bbc4a4e6a41d068e126c50f8d4adae2bbe437ab9" dependencies = [ "delegate", "derive_builder", @@ -7477,7 +7325,6 @@ name = "lumio" version = "7.8.0" dependencies = [ "anyhow", - "aptos-indexer-processor-sdk", "async-trait", "backoff", "base64 0.13.1", @@ -7512,6 +7359,7 @@ dependencies = [ "lumio-github-client", "lumio-global-constants", "lumio-indexer-grpc-server-framework", + "lumio-indexer-processor-sdk", "lumio-keygen", "lumio-ledger", "lumio-localnet", @@ -7615,7 +7463,7 @@ dependencies = [ "lumio-mempool", "lumio-runtimes", "lumio-storage-interface", - "lumio-system-utils", + "lumio-system-utils 0.1.0", "lumio-types", "sha256", "tikv-jemalloc-ctl", @@ -8719,7 +8567,7 @@ dependencies = [ "lumio-metrics-core", "lumio-mvhashmap", "lumio-node-resource-metrics", - "lumio-profiler", + "lumio-profiler 0.1.0", "lumio-push-metrics", "lumio-sdk", "lumio-storage-interface", @@ -9341,7 +9189,6 @@ name = "lumio-indexer-grpc-cache-worker" version = "1.0.0" dependencies = [ "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=62beedc881d1b76632318ceb186ee9065236468e)", "async-trait", "clap 4.5.21", "futures", @@ -9350,7 +9197,8 @@ dependencies = [ "lumio-indexer-grpc-server-framework", "lumio-indexer-grpc-utils", "lumio-metrics-core", - "lumio-protos", + "lumio-moving-average 0.1.0 (git+https://github.com/vladimirovmm/lumio-indexer-processors.git)", + "lumio-protos 1.3.1", "once_cell", "prost 0.13.4", "redis", @@ -9369,15 +9217,15 @@ name = "lumio-indexer-grpc-data-service" version = "1.0.0" dependencies = [ "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=62beedc881d1b76632318ceb186ee9065236468e)", "async-trait", "clap 4.5.21", "futures", "lumio-indexer-grpc-server-framework", "lumio-indexer-grpc-utils", "lumio-metrics-core", - "lumio-protos", - "lumio-transaction-filter", + "lumio-moving-average 0.1.0 (git+https://github.com/vladimirovmm/lumio-indexer-processors.git)", + "lumio-protos 1.3.1", + "lumio-transaction-filter 0.1.0", "once_cell", "prost 0.13.4", "redis", @@ -9406,8 +9254,8 @@ dependencies = [ "lumio-indexer-grpc-server-framework", "lumio-indexer-grpc-utils", "lumio-metrics-core", - "lumio-protos", - "lumio-transaction-filter", + "lumio-protos 1.3.1", + "lumio-transaction-filter 0.1.0", "once_cell", "prost 0.13.4", "rand 0.7.3", @@ -9447,13 +9295,13 @@ name = "lumio-indexer-grpc-file-store" version = "1.0.0" dependencies = [ "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=62beedc881d1b76632318ceb186ee9065236468e)", "async-trait", "clap 4.5.21", "futures", "lumio-indexer-grpc-server-framework", "lumio-indexer-grpc-utils", "lumio-metrics-core", + "lumio-moving-average 0.1.0 (git+https://github.com/vladimirovmm/lumio-indexer-processors.git)", "once_cell", "redis", "serde", @@ -9472,7 +9320,7 @@ dependencies = [ "futures", "lumio-indexer-grpc-server-framework", "lumio-indexer-grpc-utils", - "lumio-protos", + "lumio-protos 1.3.1", "serde", "serde_json", "tikv-jemallocator", @@ -9487,7 +9335,6 @@ name = "lumio-indexer-grpc-fullnode" version = "1.0.0" dependencies = [ "anyhow", - "aptos-moving-average 0.1.0 (git+https://github.com/aptos-labs/aptos-indexer-processors.git?rev=62beedc881d1b76632318ceb186ee9065236468e)", "bcs 0.1.4", "bytes", "chrono", @@ -9513,8 +9360,9 @@ dependencies = [ "lumio-mempool", "lumio-mempool-notifications", "lumio-metrics-core", + "lumio-moving-average 0.1.0 (git+https://github.com/vladimirovmm/lumio-indexer-processors.git)", "lumio-proptest-helpers", - "lumio-protos", + "lumio-protos 1.3.1", "lumio-runtimes", "lumio-sdk", "lumio-secure-storage", @@ -9543,7 +9391,7 @@ dependencies = [ "futures", "lazy_static", "lumio-indexer-grpc-utils", - "lumio-protos", + "lumio-protos 1.3.1", "once_cell", "redis", "redis-test", @@ -9565,7 +9413,7 @@ dependencies = [ "lumio-indexer-grpc-server-framework", "lumio-indexer-grpc-utils", "lumio-metrics-core", - "lumio-protos", + "lumio-protos 1.3.1", "once_cell", "prost 0.13.4", "rand 0.7.3", @@ -9589,7 +9437,7 @@ dependencies = [ "clap 4.5.21", "figment", "lumio-metrics-core", - "lumio-system-utils", + "lumio-system-utils 0.1.0", "prometheus", "serde", "tempfile", @@ -9651,8 +9499,8 @@ dependencies = [ "futures", "itertools 0.13.0", "lumio-metrics-core", - "lumio-protos", - "lumio-transaction-filter", + "lumio-protos 1.3.1", + "lumio-transaction-filter 0.1.0", "lz4", "once_cell", "prometheus", @@ -9680,7 +9528,7 @@ dependencies = [ "futures", "lumio-indexer-grpc-server-framework", "lumio-indexer-grpc-utils", - "lumio-protos", + "lumio-protos 1.3.1", "serde", "serde_json", "tikv-jemallocator", @@ -9691,11 +9539,63 @@ dependencies = [ "url", ] +[[package]] +name = "lumio-indexer-processor-sdk" +version = "0.1.0" +source = "git+https://github.com/vladimirovmm/lumio-indexer-processor-sdk.git#bbc4a4e6a41d068e126c50f8d4adae2bbe437ab9" +dependencies = [ + "ahash 0.8.11", + "anyhow", + "async-trait", + "autometrics", + "axum 0.7.5", + "backtrace", + "bcs 0.1.4", + "bigdecimal", + "chrono", + "clap 4.5.21", + "derive_builder", + "diesel", + "diesel-async", + "diesel_migrations", + "field_count", + "futures", + "futures-util", + "hex", + "indexmap 2.7.0", + "instrumented-channel", + "kanal", + "lumio-indexer-transaction-stream", + "lumio-protos 1.3.1 (git+ssh://git@github.com/pontem-network/lumio-node.git)", + "lumio-system-utils 0.1.0 (git+ssh://git@github.com/pontem-network/lumio-node.git)", + "mockall 0.12.1", + "native-tls", + "num_cpus", + "once_cell", + "petgraph 0.6.5", + "postgres-native-tls", + "prometheus", + "prometheus-client", + "serde", + "serde_json", + "serde_yaml 0.8.26", + "sha2 0.9.9", + "tempfile", + "thiserror", + "tiny-keccak", + "tokio", + "tokio-postgres", + "toml 0.7.8", + "tracing", + "tracing-subscriber 0.3.18", + "url", +] + [[package]] name = "lumio-indexer-test-transactions" version = "1.0.0" dependencies = [ - "lumio-protos", + "lumio-protos 1.3.1", "serde_json", ] @@ -9711,7 +9611,7 @@ dependencies = [ "lumio-config", "lumio-faucet-core", "lumio-indexer-grpc-utils", - "lumio-protos", + "lumio-protos 1.3.1", "rand 0.7.3", "serde", "serde_json", @@ -9724,6 +9624,28 @@ dependencies = [ "url", ] +[[package]] +name = "lumio-indexer-transaction-stream" +version = "0.1.0" +source = "git+https://github.com/vladimirovmm/lumio-indexer-processor-sdk.git#bbc4a4e6a41d068e126c50f8d4adae2bbe437ab9" +dependencies = [ + "anyhow", + "chrono", + "futures-util", + "lumio-moving-average 0.1.0 (git+https://github.com/vladimirovmm/lumio-indexer-processor-sdk.git)", + "lumio-protos 1.3.1 (git+ssh://git@github.com/pontem-network/lumio-node.git)", + "lumio-transaction-filter 0.1.0 (git+ssh://git@github.com/pontem-network/lumio-node.git)", + "once_cell", + "prometheus", + "prost 0.13.4", + "sample", + "serde", + "tokio", + "tonic 0.12.3", + "tracing", + "url", +] + [[package]] name = "lumio-infallible" version = "0.1.0" @@ -10001,7 +9923,7 @@ dependencies = [ "dirs 5.0.1", "futures", "lumio-indexer-grpc-utils", - "lumio-protos", + "lumio-protos 1.3.1", "lumio-rest-client", "processor", "reqwest 0.11.23", @@ -10218,6 +10140,22 @@ dependencies = [ "tempfile", ] +[[package]] +name = "lumio-moving-average" +version = "0.1.0" +source = "git+https://github.com/vladimirovmm/lumio-indexer-processor-sdk.git#bbc4a4e6a41d068e126c50f8d4adae2bbe437ab9" +dependencies = [ + "chrono", +] + +[[package]] +name = "lumio-moving-average" +version = "0.1.0" +source = "git+https://github.com/vladimirovmm/lumio-indexer-processors.git#d3544ad1b00492cfec9a972f1fa8d9306ae55c16" +dependencies = [ + "chrono", +] + [[package]] name = "lumio-mvhashmap" version = "0.1.0" @@ -10699,6 +10637,17 @@ dependencies = [ "tikv-jemalloc-sys", ] +[[package]] +name = "lumio-profiler" +version = "0.1.0" +source = "git+ssh://git@github.com/pontem-network/lumio-node.git#2805dfcbaee46b8d9f328c787693aeed1b0ddf80" +dependencies = [ + "anyhow", + "pprof", + "regex", + "tikv-jemalloc-sys", +] + [[package]] name = "lumio-proptest-helpers" version = "0.1.0" @@ -10718,6 +10667,17 @@ dependencies = [ "tonic 0.12.3", ] +[[package]] +name = "lumio-protos" +version = "1.3.1" +source = "git+ssh://git@github.com/pontem-network/lumio-node.git#2805dfcbaee46b8d9f328c787693aeed1b0ddf80" +dependencies = [ + "pbjson", + "prost 0.13.4", + "serde", + "tonic 0.12.3", +] + [[package]] name = "lumio-proxy" version = "0.1.0" @@ -11082,7 +11042,7 @@ dependencies = [ "lumio-config", "lumio-logger", "lumio-metrics-core", - "lumio-protos", + "lumio-protos 1.3.1", "once_cell", "serde", "thiserror", @@ -11302,7 +11262,27 @@ dependencies = [ "http 0.2.11", "hyper 0.14.28", "lazy_static", - "lumio-profiler", + "lumio-profiler 0.1.0", + "mime", + "pprof", + "regex", + "rstack-self", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "lumio-system-utils" +version = "0.1.0" +source = "git+ssh://git@github.com/pontem-network/lumio-node.git#2805dfcbaee46b8d9f328c787693aeed1b0ddf80" +dependencies = [ + "anyhow", + "async-mutex", + "http 0.2.11", + "hyper 0.14.28", + "lazy_static", + "lumio-profiler 0.1.0 (git+ssh://git@github.com/pontem-network/lumio-node.git)", "mime", "pprof", "regex", @@ -11538,7 +11518,7 @@ dependencies = [ "anyhow", "derivative", "derive_builder", - "lumio-protos", + "lumio-protos 1.3.1", "lz4", "memchr", "once_cell", @@ -11549,6 +11529,24 @@ dependencies = [ "thiserror", ] +[[package]] +name = "lumio-transaction-filter" +version = "0.1.0" +source = "git+ssh://git@github.com/pontem-network/lumio-node.git#2805dfcbaee46b8d9f328c787693aeed1b0ddf80" +dependencies = [ + "anyhow", + "derivative", + "derive_builder", + "lumio-protos 1.3.1 (git+ssh://git@github.com/pontem-network/lumio-node.git)", + "memchr", + "once_cell", + "prost 0.13.4", + "serde", + "serde_json", + "serde_yaml 0.8.26", + "thiserror", +] + [[package]] name = "lumio-transaction-filters" version = "0.1.0" @@ -12040,7 +12038,6 @@ name = "lumio-workspace-server" version = "0.1.0" dependencies = [ "anyhow", - "aptos-indexer-processor-sdk", "bollard", "clap 4.5.21", "diesel", @@ -12049,6 +12046,7 @@ dependencies = [ "lumio-cached-packages", "lumio-config", "lumio-faucet-core", + "lumio-indexer-processor-sdk", "lumio-localnet", "lumio-node", "lumio-types", @@ -15312,13 +15310,12 @@ dependencies = [ [[package]] name = "processor" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processors-v2.git?tag=aptos-indexer-processors-v2.1.5#a1a0cfeff7febc81dbe5a238ed5318f319aaef6c" +source = "git+https://github.com/vladimirovmm/lumio-indexer-processors-v2.git#d0afb634a00609dd45f17f7c613255a78b2258b4" dependencies = [ "ahash 0.8.11", "allocative", "allocative_derive", "anyhow", - "aptos-indexer-processor-sdk", "async-trait", "bcs 0.1.4", "bigdecimal", @@ -15343,6 +15340,7 @@ dependencies = [ "jemallocator", "lazy_static", "log", + "lumio-indexer-processor-sdk", "native-tls", "num_cpus", "once_cell", @@ -16818,7 +16816,7 @@ dependencies = [ [[package]] name = "sample" version = "0.1.0" -source = "git+https://github.com/aptos-labs/aptos-indexer-processor-sdk.git?tag=aptos-indexer-processor-sdk-v2.1.2#188ba1a37597739a2e503165dec0c3fcc63c89ec" +source = "git+https://github.com/vladimirovmm/lumio-indexer-processor-sdk.git#bbc4a4e6a41d068e126c50f8d4adae2bbe437ab9" dependencies = [ "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index 33a9f92f42..f594a01ac8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -503,10 +503,10 @@ ark-groth16 = "0.4.0" ark-relations = "0.4.0" ark-serialize = "0.4.0" ark-std = { version = "0.4.0", features = ["getrandom"] } -aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", tag = "aptos-indexer-processor-sdk-v2.1.2", features = [ +lumio-indexer-processor-sdk = { git = "https://github.com/vladimirovmm/lumio-indexer-processor-sdk.git", features = [ "postgres_partial", ] } -aptos-moving-average = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "62beedc881d1b76632318ceb186ee9065236468e" } +lumio-moving-average = { git = "https://github.com/vladimirovmm/lumio-indexer-processors.git" } assert_approx_eq = "1.1.0" async-channel = "1.7.1" async-mutex = "1.4.0" @@ -710,7 +710,7 @@ pretty = "0.10.0" pretty_assertions = "1.2.1" # We set default-features to false so we don't onboard the libpq dep. See more here: # https://github.com/aptos-labs/aptos-core/pull/12568 -processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors-v2.git", tag = "aptos-indexer-processors-v2.1.5", default-features = false } +processor = { git = "https://github.com/vladimirovmm/lumio-indexer-processors-v2.git", default-features = false } procfs = "0.14.1" proc-macro2 = "1.0.38" project-root = "0.2.2" @@ -941,7 +941,7 @@ futures-io = { git = "https://github.com/aptos-labs/futures-rs", branch = "backp futures-task = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" } futures-macro = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" } -# There is a circular dependency between lumio-core, aptos-indexer-processor-sdk, and lumio-indexer-processors-v2, +# There is a circular dependency between lumio-core, lumio-indexer-processor-sdk, and lumio-indexer-processors-v2, # so we cannot simply change the version and package for `jemalloc-sys` in one repo without running into conflicts. # We have to keep this shim until everything uses the same jemalloc dependency. jemalloc-sys = { git = "https://github.com/aptos-labs/jemalloc-sys-shim", rev = "e0920246dd74303fab9a14b990768c6ac990a59b" } diff --git a/complete_rebrand.sh b/complete_rebrand.sh index 7bb4cdb8fe..0be06dbb3b 100644 --- a/complete_rebrand.sh +++ b/complete_rebrand.sh @@ -14,11 +14,11 @@ replace_in_file() { # Process the file line by line awk ' - /Copyright.*Aptos|©.*Aptos|SPDX-License-Identifier|aptos-labs\/aptos|aptos_moving_average|aptos_indexer_processor_sdk/ { + /Copyright.*Aptos|©.*Aptos|SPDX-License-Identifier|aptos-labs\/aptos|lumio_moving_average|lumio_indexer_processor_sdk/ { # Keep these lines unchanged print $0 } - !/Copyright.*Aptos|©.*Aptos|SPDX-License-Identifier|aptos-labs\/aptos|aptos_moving_average|aptos_indexer_processor_sdk/ { + !/Copyright.*Aptos|©.*Aptos|SPDX-License-Identifier|aptos-labs\/aptos|lumio_moving_average|lumio_indexer_processor_sdk/ { # Replace in all other lines gsub(/Lumio/, "Lumio") gsub(/LUMIO/, "LUMIO") diff --git a/crates/lumio-faucet/ts-client/src/AptosFaucetClient.ts b/crates/lumio-faucet/ts-client/src/LumioFaucetClient.ts similarity index 97% rename from crates/lumio-faucet/ts-client/src/AptosFaucetClient.ts rename to crates/lumio-faucet/ts-client/src/LumioFaucetClient.ts index 001267c718..28da62b0b7 100644 --- a/crates/lumio-faucet/ts-client/src/AptosFaucetClient.ts +++ b/crates/lumio-faucet/ts-client/src/LumioFaucetClient.ts @@ -11,7 +11,7 @@ import { GeneralService } from './services/GeneralService'; type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest; -export class AptosFaucetClient { +export class LumioFaucetClient { public readonly captcha: CaptchaService; public readonly fund: FundService; diff --git a/crates/lumio-faucet/ts-client/src/index.test.ts b/crates/lumio-faucet/ts-client/src/index.test.ts index 2ee03ce77b..2789954e9b 100644 --- a/crates/lumio-faucet/ts-client/src/index.test.ts +++ b/crates/lumio-faucet/ts-client/src/index.test.ts @@ -1,7 +1,7 @@ -import { AptosFaucetClient } from "./AptosFaucetClient"; +import { LumioFaucetClient } from "./LumioFaucetClient"; test("node url empty", async () => { - const client = new AptosFaucetClient({BASE: "http://127.0.0.1:8081"}); + const client = new LumioFaucetClient({ BASE: "http://127.0.0.1:8081" }); const response = await client.general.root(); expect(response).toBe("tap:ok"); }); diff --git a/crates/lumio-faucet/ts-client/src/index.ts b/crates/lumio-faucet/ts-client/src/index.ts index dea734e6dd..4977ed6fba 100644 --- a/crates/lumio-faucet/ts-client/src/index.ts +++ b/crates/lumio-faucet/ts-client/src/index.ts @@ -1,7 +1,7 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -export { AptosFaucetClient } from './AptosFaucetClient'; +export { LumioFaucetClient } from './LumioFaucetClient'; export { ApiError } from './core/ApiError'; export { BaseHttpRequest } from './core/BaseHttpRequest'; diff --git a/crates/lumio/Cargo.toml b/crates/lumio/Cargo.toml index b362082d5a..43de9edae5 100644 --- a/crates/lumio/Cargo.toml +++ b/crates/lumio/Cargo.toml @@ -30,7 +30,7 @@ lumio-genesis = { workspace = true } lumio-github-client = { workspace = true } lumio-global-constants = { workspace = true } lumio-indexer-grpc-server-framework = { workspace = true } -aptos-indexer-processor-sdk = { workspace = true } +lumio-indexer-processor-sdk = { workspace = true } lumio-keygen = { workspace = true } lumio-ledger = { workspace = true } lumio-localnet = { workspace = true } diff --git a/crates/lumio/e2e/poetry.lock b/crates/lumio/e2e/poetry.lock index c4dc86ca70..b3d145a995 100644 --- a/crates/lumio/e2e/poetry.lock +++ b/crates/lumio/e2e/poetry.lock @@ -164,7 +164,7 @@ test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypo trio = ["trio (>=0.26.1)"] [[package]] -name = "aptos-sdk" +name = "lumio-sdk" version = "0.10.0" description = "Aptos SDK" optional = false diff --git a/crates/lumio/src/node/local_testnet/health_checker.rs b/crates/lumio/src/node/local_testnet/health_checker.rs index 923c7c4dbe..a3a817ed15 100644 --- a/crates/lumio/src/node/local_testnet/health_checker.rs +++ b/crates/lumio/src/node/local_testnet/health_checker.rs @@ -3,12 +3,12 @@ use super::indexer_api::confirm_metadata_applied; use anyhow::{anyhow, Context, Result}; -use aptos_indexer_processor_sdk::{ - aptos_indexer_transaction_stream::{transaction_stream::get_chain_id, TransactionStreamConfig}, - postgres::processor_metadata_schema::processor_metadata::processor_status, -}; use diesel::{ExpressionMethods, OptionalExtension, QueryDsl}; use diesel_async::{pg::AsyncPgConnection, AsyncConnection, RunQueryDsl}; +use lumio_indexer_processor_sdk::{ + lumio_indexer_transaction_stream::{transaction_stream::get_chain_id, TransactionStreamConfig}, + postgres::processor_metadata_schema::processor_metadata::processor_status, +}; use reqwest::Url; use serde::Serialize; use std::time::Duration; diff --git a/crates/lumio/src/node/local_testnet/processors.rs b/crates/lumio/src/node/local_testnet/processors.rs index bab9846a5a..917b80aea6 100644 --- a/crates/lumio/src/node/local_testnet/processors.rs +++ b/crates/lumio/src/node/local_testnet/processors.rs @@ -3,15 +3,15 @@ use super::{health_checker::HealthChecker, traits::ServiceManager, RunLocalnet}; use anyhow::{bail, Context, Result}; -use aptos_indexer_processor_sdk::{ - aptos_indexer_transaction_stream::TransactionStreamConfig, - postgres::utils::database::run_pending_migrations, server_framework::RunnableConfig, -}; -pub use lumio_localnet::processors::get_processor_config; use async_trait::async_trait; use clap::Parser; use diesel::Connection; use diesel_async::{async_connection_wrapper::AsyncConnectionWrapper, pg::AsyncPgConnection}; +use lumio_indexer_processor_sdk::{ + lumio_indexer_transaction_stream::TransactionStreamConfig, + postgres::utils::database::run_pending_migrations, server_framework::RunnableConfig, +}; +pub use lumio_localnet::processors::get_processor_config; use maplit::hashset; use processor::{ config::{ diff --git a/devtools/lumio-cargo-cli/src/common.rs b/devtools/lumio-cargo-cli/src/common.rs index d661390812..96e90bbbad 100644 --- a/devtools/lumio-cargo-cli/src/common.rs +++ b/devtools/lumio-cargo-cli/src/common.rs @@ -422,7 +422,7 @@ fn recompute_merge_base_metadata( .arg("clone") .arg("--depth") .arg("500") // Clone the last 500 commits to ensure the merge base is included - .arg("https://github.com/aptos-labs/aptos-core.git") + .arg("ssh://git@github.com/pontem-network/lumio-node.git") .arg(clone_directory.clone()) .output() .expect("failed to execute git clone"); diff --git a/docker/builder/forge.Dockerfile b/docker/builder/forge.Dockerfile index d3becacab3..aafad0033c 100644 --- a/docker/builder/forge.Dockerfile +++ b/docker/builder/forge.Dockerfile @@ -15,19 +15,19 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ WORKDIR /aptos # copy helm charts from source -COPY --link --from=tools-builder /aptos/terraform/helm /aptos/terraform/helm -COPY --link --from=tools-builder /aptos/testsuite/forge/src/backend/k8s/helm-values/lumio-node-default-values.yaml /aptos/terraform/lumio-node-default-values.yaml +COPY --link --from=tools-builder /lumio/terraform/helm /lumio/terraform/helm +COPY --link --from=tools-builder /lumio/testsuite/forge/src/backend/k8s/helm-values/lumio-node-default-values.yaml /lumio/terraform/lumio-node-default-values.yaml RUN cd /usr/local/bin && wget "https://storage.googleapis.com/kubernetes-release/release/v1.18.6/bin/linux/amd64/kubectl" -O kubectl && chmod +x kubectl RUN cd /usr/local/bin && wget "https://get.helm.sh/helm-v3.8.0-linux-amd64.tar.gz" -O- | busybox tar -zxvf - && mv linux-amd64/helm . && chmod +x helm ENV PATH "$PATH:/root/bin" WORKDIR /aptos -COPY --link --from=node-builder /aptos/dist/forge /usr/local/bin/forge +COPY --link --from=node-builder /lumio/dist/forge /usr/local/bin/forge ### Get Aptos Framework Release for forge framework upgrade testing -COPY --link --from=tools-builder /aptos/aptos-move/framework/ /aptos/aptos-move/framework/ -COPY --link --from=tools-builder /aptos/aptos-move/aptos-release-builder/ /aptos/aptos-move/aptos-release-builder/ +COPY --link --from=tools-builder /lumio/aptos-move/framework/ /lumio/aptos-move/framework/ +COPY --link --from=tools-builder /lumio/aptos-move/aptos-release-builder/ /lumio/aptos-move/aptos-release-builder/ ENV RUST_LOG_FORMAT=json diff --git a/docker/builder/keyless-pepper-service.Dockerfile b/docker/builder/keyless-pepper-service.Dockerfile index 1ecadbce7b..5d149b1d82 100644 --- a/docker/builder/keyless-pepper-service.Dockerfile +++ b/docker/builder/keyless-pepper-service.Dockerfile @@ -1,6 +1,6 @@ FROM debian-base AS keyless-pepper-service -COPY --link --from=tools-builder /aptos/dist/aptos-keyless-pepper-service /usr/local/bin/aptos-keyless-pepper-service +COPY --link --from=tools-builder /lumio/dist/aptos-keyless-pepper-service /usr/local/bin/aptos-keyless-pepper-service EXPOSE 8000 ENV RUST_LOG_FORMAT=json diff --git a/docker/builder/nft-metadata-crawler.Dockerfile b/docker/builder/nft-metadata-crawler.Dockerfile index ddb5a17221..27d775caef 100644 --- a/docker/builder/nft-metadata-crawler.Dockerfile +++ b/docker/builder/nft-metadata-crawler.Dockerfile @@ -4,7 +4,7 @@ FROM indexer-builder FROM debian-base AS nft-metadata-crawler -COPY --link --from=indexer-builder /aptos/dist/aptos-nft-metadata-crawler /usr/local/bin/aptos-nft-metadata-crawler +COPY --link --from=indexer-builder /lumio/dist/aptos-nft-metadata-crawler /usr/local/bin/aptos-nft-metadata-crawler # The health check port EXPOSE 8080 diff --git a/docker/builder/node-checker.Dockerfile b/docker/builder/node-checker.Dockerfile index 5388ce902e..f773ff8c3c 100644 --- a/docker/builder/node-checker.Dockerfile +++ b/docker/builder/node-checker.Dockerfile @@ -2,7 +2,7 @@ FROM debian-base AS node-checker -COPY --link --from=tools-builder /aptos/dist/lumio-node-checker /usr/local/bin/lumio-node-checker +COPY --link --from=tools-builder /lumio/dist/lumio-node-checker /usr/local/bin/lumio-node-checker ENV RUST_LOG_FORMAT=json diff --git a/docker/builder/telemetry-service.Dockerfile b/docker/builder/telemetry-service.Dockerfile index 8de9deffa1..f1cda5b377 100644 --- a/docker/builder/telemetry-service.Dockerfile +++ b/docker/builder/telemetry-service.Dockerfile @@ -1,6 +1,6 @@ FROM debian-base AS telemetry-service -COPY --link --from=tools-builder /aptos/dist/aptos-telemetry-service /usr/local/bin/aptos-telemetry-service +COPY --link --from=tools-builder /lumio/dist/aptos-telemetry-service /usr/local/bin/aptos-telemetry-service EXPOSE 8000 ENV RUST_LOG_FORMAT=json diff --git a/docker/builder/tools.Dockerfile b/docker/builder/tools.Dockerfile index 16f2c1a3f7..e89826a233 100644 --- a/docker/builder/tools.Dockerfile +++ b/docker/builder/tools.Dockerfile @@ -27,22 +27,22 @@ COPY --link docker/tools/boto.cfg /etc/boto.cfg RUN wget https://storage.googleapis.com/pub/gsutil.tar.gz -O- | tar --gzip --directory /opt --extract && ln -s /opt/gsutil/gsutil /usr/local/bin RUN cd /usr/local/bin && wget "https://storage.googleapis.com/kubernetes-release/release/v1.18.6/bin/linux/amd64/kubectl" -O kubectl && chmod +x kubectl -COPY --link --from=tools-builder /aptos/dist/aptos-debugger /usr/local/bin/aptos-debugger -COPY --link --from=tools-builder /aptos/dist/aptos /usr/local/bin/aptos -COPY --link --from=tools-builder /aptos/dist/aptos-openapi-spec-generator /usr/local/bin/aptos-openapi-spec-generator -COPY --link --from=tools-builder /aptos/dist/aptos-fn-check-client /usr/local/bin/aptos-fn-check-client -COPY --link --from=tools-builder /aptos/dist/aptos-transaction-emitter /usr/local/bin/aptos-transaction-emitter -COPY --link --from=tools-builder /aptos/dist/aptos-api-tester /usr/local/bin/aptos-api-tester +COPY --link --from=tools-builder /lumio/dist/aptos-debugger /usr/local/bin/aptos-debugger +COPY --link --from=tools-builder /lumio/dist/aptos /usr/local/bin/aptos +COPY --link --from=tools-builder /lumio/dist/aptos-openapi-spec-generator /usr/local/bin/aptos-openapi-spec-generator +COPY --link --from=tools-builder /lumio/dist/aptos-fn-check-client /usr/local/bin/aptos-fn-check-client +COPY --link --from=tools-builder /lumio/dist/aptos-transaction-emitter /usr/local/bin/aptos-transaction-emitter +COPY --link --from=tools-builder /lumio/dist/aptos-api-tester /usr/local/bin/aptos-api-tester # Copy the example module to publish for api-tester -COPY --link --from=tools-builder /aptos/aptos-move/framework/aptos-framework /aptos-move/framework/aptos-framework -COPY --link --from=tools-builder /aptos/aptos-move/framework/aptos-stdlib /aptos-move/framework/aptos-stdlib -COPY --link --from=tools-builder /aptos/aptos-move/framework/move-stdlib /aptos-move/framework/move-stdlib -COPY --link --from=tools-builder /aptos/aptos-move/move-examples/hello_blockchain /aptos-move/move-examples/hello_blockchain +COPY --link --from=tools-builder /lumio/lumio-move/framework/lumio-framework /lumio-move/framework/lumio-framework +COPY --link --from=tools-builder /lumio/aptos-move/framework/lumio-stdlib /aptos-move/framework/lumio-stdlib +COPY --link --from=tools-builder /lumio/aptos-move/framework/move-stdlib /aptos-move/framework/move-stdlib +COPY --link --from=tools-builder /lumio/aptos-move/move-examples/hello_blockchain /aptos-move/move-examples/hello_blockchain ### Get Aptos Move releases for genesis ceremony -RUN mkdir -p /aptos-framework/move -COPY --link --from=tools-builder /aptos/dist/head.mrb /aptos-framework/move/head.mrb +RUN mkdir -p /lumio-framework/move +COPY --link --from=tools-builder /lumio/dist/head.mrb /lumio-framework/move/head.mrb # add build info ARG BUILD_DATE diff --git a/docker/builder/validator-testing.Dockerfile b/docker/builder/validator-testing.Dockerfile index 401e657104..e2e469efcc 100644 --- a/docker/builder/validator-testing.Dockerfile +++ b/docker/builder/validator-testing.Dockerfile @@ -35,9 +35,9 @@ FROM validator-testing-base AS validator-testing RUN addgroup --system --gid 6180 aptos && adduser --system --ingroup aptos --no-create-home --uid 6180 aptos -RUN mkdir -p /opt/aptos/etc -COPY --link --from=node-builder /aptos/dist/lumio-node /usr/local/bin/ -COPY --link --from=tools-builder /aptos/dist/aptos-debugger /usr/local/bin/ +RUN mkdir -p /opt/lumio/etc +COPY --link --from=node-builder /lumio/dist/lumio-node /usr/local/bin/ +COPY --link --from=tools-builder /lumio/dist/aptos-debugger /usr/local/bin/ # Admission control EXPOSE 8000 diff --git a/docker/rosetta/rosetta.Dockerfile b/docker/rosetta/rosetta.Dockerfile index aba80cab73..a2e3e17c83 100644 --- a/docker/rosetta/rosetta.Dockerfile +++ b/docker/rosetta/rosetta.Dockerfile @@ -11,11 +11,11 @@ RUN apt-get update && apt-get install -y cmake curl clang git pkg-config libssl- ### Build Rust code ### FROM rust-base as builder -ARG GIT_REPO=https://github.com/aptos-labs/aptos-core.git +ARG GIT_REPO=ssh://git@github.com/pontem-network/lumio-node.git ARG GIT_REF RUN git clone $GIT_REPO ./ && git reset $GIT_REF --hard -RUN --mount=type=cache,target=/aptos/target --mount=type=cache,target=$CARGO_HOME/registry \ +RUN --mount=type=cache,target=/lumio/target --mount=type=cache,target=$CARGO_HOME/registry \ cargo build --release \ -p aptos-rosetta \ && mkdir dist \ @@ -26,7 +26,7 @@ FROM ubuntu-base AS rosetta RUN apt-get update && apt-get install -y libssl-dev ca-certificates && apt-get clean && rm -r /var/lib/apt/lists/* -COPY --from=builder /aptos/dist/aptos-rosetta /usr/local/bin/aptos-rosetta +COPY --from=builder /lumio/dist/aptos-rosetta /usr/local/bin/aptos-rosetta # Rosetta API EXPOSE 8082 @@ -34,7 +34,7 @@ EXPOSE 8082 # Capture backtrace on error ENV RUST_BACKTRACE 1 -WORKDIR /opt/aptos/data +WORKDIR /opt/lumio/data ENTRYPOINT ["/usr/local/bin/aptos-rosetta"] -CMD ["online", "--config /opt/aptos/fullnode.yaml"] +CMD ["online", "--config /opt/lumio/fullnode.yaml"] diff --git a/ecosystem/indexer-grpc/indexer-grpc-cache-worker/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-cache-worker/Cargo.toml index 50625a2d98..1f45170cf0 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-cache-worker/Cargo.toml +++ b/ecosystem/indexer-grpc/indexer-grpc-cache-worker/Cargo.toml @@ -17,7 +17,7 @@ anyhow = { workspace = true } lumio-indexer-grpc-server-framework = { workspace = true } lumio-indexer-grpc-utils = { workspace = true } lumio-metrics-core = { workspace = true } -aptos-moving-average = { workspace = true } +lumio-moving-average = { workspace = true } lumio-protos = { workspace = true } async-trait = { workspace = true } clap = { workspace = true } diff --git a/ecosystem/indexer-grpc/indexer-grpc-cache-worker/src/worker.rs b/ecosystem/indexer-grpc/indexer-grpc-cache-worker/src/worker.rs index 8c4823d055..6fcf05679b 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-cache-worker/src/worker.rs +++ b/ecosystem/indexer-grpc/indexer-grpc-cache-worker/src/worker.rs @@ -3,6 +3,7 @@ use crate::metrics::{ERROR_COUNT, WAIT_FOR_FILE_STORE_COUNTER}; use anyhow::{bail, Context, Result}; +use futures::{self, future::join_all, StreamExt}; use lumio_indexer_grpc_utils::{ cache_operator::CacheOperator, compression_util::{FileStoreMetadata, StorageFormat}, @@ -12,12 +13,11 @@ use lumio_indexer_grpc_utils::{ file_store_operator::FileStoreOperator, types::RedisUrl, }; -use aptos_moving_average::MovingAverage; +use lumio_moving_average::MovingAverage; use lumio_protos::internal::fullnode::v1::{ stream_status::StatusType, transactions_from_node_response::Response, GetTransactionsFromNodeRequest, TransactionsFromNodeResponse, }; -use futures::{self, future::join_all, StreamExt}; use prost::Message; use tokio::task::JoinHandle; use tracing::{error, info}; diff --git a/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml index d0615917a2..3912b0b6ae 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml +++ b/ecosystem/indexer-grpc/indexer-grpc-data-service/Cargo.toml @@ -17,7 +17,7 @@ anyhow = { workspace = true } lumio-indexer-grpc-server-framework = { workspace = true } lumio-indexer-grpc-utils = { workspace = true } lumio-metrics-core = { workspace = true } -aptos-moving-average = { workspace = true } +lumio-moving-average = { workspace = true } lumio-protos = { workspace = true } lumio-transaction-filter = { workspace = true } async-trait = { workspace = true } diff --git a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs index 9961880305..dbcf5e17b3 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs +++ b/ecosystem/indexer-grpc/indexer-grpc-data-service/src/service.rs @@ -24,7 +24,7 @@ use lumio_indexer_grpc_utils::{ time_diff_since_pb_timestamp_in_secs, types::RedisUrl, }; -use aptos_moving_average::MovingAverage; +use lumio_moving_average::MovingAverage; use lumio_protos::{ indexer::v1::{raw_data_server::RawData, GetTransactionsRequest, TransactionsResponse}, transaction::v1::{transaction::TxnData, Transaction}, diff --git a/ecosystem/indexer-grpc/indexer-grpc-file-store/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-file-store/Cargo.toml index 1f0b69e7cc..a7e8af932a 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-file-store/Cargo.toml +++ b/ecosystem/indexer-grpc/indexer-grpc-file-store/Cargo.toml @@ -17,7 +17,7 @@ anyhow = { workspace = true } lumio-indexer-grpc-server-framework = { workspace = true } lumio-indexer-grpc-utils = { workspace = true } lumio-metrics-core = { workspace = true } -aptos-moving-average = { workspace = true } +lumio-moving-average = { workspace = true } async-trait = { workspace = true } clap = { workspace = true } futures = { workspace = true } diff --git a/ecosystem/indexer-grpc/indexer-grpc-file-store/src/processor.rs b/ecosystem/indexer-grpc/indexer-grpc-file-store/src/processor.rs index 0c80677304..0e035b5141 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-file-store/src/processor.rs +++ b/ecosystem/indexer-grpc/indexer-grpc-file-store/src/processor.rs @@ -11,7 +11,7 @@ use lumio_indexer_grpc_utils::{ file_store_operator::FileStoreOperator, types::RedisUrl, }; -use aptos_moving_average::MovingAverage; +use lumio_moving_average::MovingAverage; use std::time::Duration; use tracing::debug; diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml b/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml index 854d73f2ae..b19415ecc8 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml +++ b/ecosystem/indexer-grpc/indexer-grpc-fullnode/Cargo.toml @@ -37,7 +37,7 @@ lumio-indexer-grpc-utils = { workspace = true } lumio-logger = { workspace = true } lumio-mempool = { workspace = true } lumio-metrics-core = { workspace = true } -aptos-moving-average = { workspace = true } +lumio-moving-average = { workspace = true } lumio-protos = { workspace = true } lumio-runtimes = { workspace = true } lumio-storage-interface = { workspace = true } diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/fullnode_data_service.rs b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/fullnode_data_service.rs index 2678557999..dc4b4ada6f 100644 --- a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/fullnode_data_service.rs +++ b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/fullnode_data_service.rs @@ -6,12 +6,13 @@ use crate::{ stream_coordinator::IndexerStreamCoordinator, ServiceContext, }; +use futures::Stream; use lumio_indexer_grpc_utils::{ counters::{log_grpc_step_fullnode, IndexerGrpcStep}, timestamp_now_proto, }; use lumio_logger::{error, info}; -use aptos_moving_average::MovingAverage; +use lumio_moving_average::MovingAverage; use lumio_protos::{ indexer::v1::FullnodeInfo, internal::fullnode::v1::{ @@ -20,7 +21,6 @@ use lumio_protos::{ PingFullnodeResponse, StreamStatus, TransactionsFromNodeResponse, }, }; -use futures::Stream; use std::{ pin::Pin, time::{Duration, SystemTime, UNIX_EPOCH}, diff --git a/lumio-move/framework/README-MIRROR-REPO.md b/lumio-move/framework/README-MIRROR-REPO.md index 3f32985002..d6c190d7fb 100644 --- a/lumio-move/framework/README-MIRROR-REPO.md +++ b/lumio-move/framework/README-MIRROR-REPO.md @@ -14,7 +14,7 @@ To add a dependency from this repository, include the following in your `move.to ``` For example, to add `LumioFramework` from the `mainnet` branch, you would use: ``` -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } ``` Make sure to replace `subdir` with the appropriate path if you are referencing a different package within the framework. diff --git a/lumio-move/lumio-release-builder/src/components/feature_flags.rs b/lumio-move/lumio-release-builder/src/components/feature_flags.rs index 0bfc99765c..72b9d849d7 100644 --- a/lumio-move/lumio-release-builder/src/components/feature_flags.rs +++ b/lumio-move/lumio-release-builder/src/components/feature_flags.rs @@ -112,7 +112,7 @@ pub enum FeatureFlag { RejectUnstableBytecode, TransactionContextExtension, CoinToFungibleAssetMigration, - PrimaryAPTFungibleStoreAtUserAddress, + PrimaryLUMFungibleStoreAtUserAddress, ObjectNativeDerivedAddress, DispatchableFungibleAsset, NewAccountsDefaultToFaAptStore, @@ -327,7 +327,7 @@ impl From for LumioFeatureFlag { FeatureFlag::CoinToFungibleAssetMigration => { LumioFeatureFlag::COIN_TO_FUNGIBLE_ASSET_MIGRATION }, - FeatureFlag::PrimaryAPTFungibleStoreAtUserAddress => { + FeatureFlag::PrimaryLUMFungibleStoreAtUserAddress => { LumioFeatureFlag::PRIMARY_LUM_FUNGIBLE_STORE_AT_USER_ADDRESS }, FeatureFlag::ObjectNativeDerivedAddress => { @@ -505,7 +505,7 @@ impl From for FeatureFlag { FeatureFlag::CoinToFungibleAssetMigration }, LumioFeatureFlag::PRIMARY_LUM_FUNGIBLE_STORE_AT_USER_ADDRESS => { - FeatureFlag::PrimaryAPTFungibleStoreAtUserAddress + FeatureFlag::PrimaryLUMFungibleStoreAtUserAddress }, LumioFeatureFlag::OBJECT_NATIVE_DERIVED_ADDRESS => { FeatureFlag::ObjectNativeDerivedAddress diff --git a/lumio-move/lumio-sdk-builder/examples/golang/Makefile b/lumio-move/lumio-sdk-builder/examples/golang/Makefile index 2e4eb3d6a4..5bdeb0b5f7 100644 --- a/lumio-move/lumio-sdk-builder/examples/golang/Makefile +++ b/lumio-move/lumio-sdk-builder/examples/golang/Makefile @@ -5,13 +5,13 @@ clean: - rm -rf go.mod go.sum lumiostdlib lumiotypes test: - cargo run -p aptos-framework release - cargo run -p aptos-sdk-builder -- \ + cargo run -p lumio-framework release + cargo run -p lumio-sdk-builder -- \ --language go --module-name lumiostdlib \ --package-name testing \ - --with-aptos-types "../../../../testsuite/generate-format/tests/staged/aptos.yaml" \ + --with-lumio-types "../../../../testsuite/generate-format/tests/staged/aptos.yaml" \ --target-source-dir . \ - "../../../framework/aptos-framework/build/AptosFramework" + "../../../framework/lumio-framework/build/LumioFramework" - go mod init testing go mod edit -replace testing=`pwd` go get github.com/aptos-labs/serde-reflection/serde-generate/runtime/golang/bcs diff --git a/lumio-move/lumio-workspace-server/Cargo.toml b/lumio-move/lumio-workspace-server/Cargo.toml index 0175148919..d42d79e300 100644 --- a/lumio-move/lumio-workspace-server/Cargo.toml +++ b/lumio-move/lumio-workspace-server/Cargo.toml @@ -36,5 +36,5 @@ url = { workspace = true } uuid = { workspace = true } # indexer deps -aptos-indexer-processor-sdk = { workspace = true } +lumio-indexer-processor-sdk = { workspace = true } processor = { workspace = true } diff --git a/lumio-move/lumio-workspace-server/src/services/processors.rs b/lumio-move/lumio-workspace-server/src/services/processors.rs index 43cfcfd0cd..db2ad4d3bd 100644 --- a/lumio-move/lumio-workspace-server/src/services/processors.rs +++ b/lumio-move/lumio-workspace-server/src/services/processors.rs @@ -7,14 +7,14 @@ use crate::{ no_panic_println, }; use anyhow::{anyhow, Context, Result}; -use aptos_indexer_processor_sdk::{ - aptos_indexer_transaction_stream::TransactionStreamConfig, - postgres::utils::database::run_pending_migrations, server_framework::RunnableConfig, -}; -use lumio_localnet::{health_checker::HealthChecker, processors::get_processor_config}; use diesel::Connection; use diesel_async::{async_connection_wrapper::AsyncConnectionWrapper, pg::AsyncPgConnection}; use futures::{future::try_join_all, stream::FuturesUnordered, StreamExt, TryFutureExt}; +use lumio_indexer_processor_sdk::{ + lumio_indexer_transaction_stream::TransactionStreamConfig, + postgres::utils::database::run_pending_migrations, server_framework::RunnableConfig, +}; +use lumio_localnet::{health_checker::HealthChecker, processors::get_processor_config}; use processor::{ config::{ db_config::{DbConfig, PostgresConfig}, diff --git a/lumio-move/move-examples/aggregator_examples/Move.toml b/lumio-move/move-examples/aggregator_examples/Move.toml index 410d34d33b..b26836fa37 100644 --- a/lumio-move/move-examples/aggregator_examples/Move.toml +++ b/lumio-move/move-examples/aggregator_examples/Move.toml @@ -6,5 +6,5 @@ version = "0.0.0" aggregator_examples = "0xCAFE" [dependencies] -LumioStdlib = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-stdlib", rev = "mainnet" } -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioStdlib = { local = "../../framework/lumio-stdlib" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/argument_example/Move.toml b/lumio-move/move-examples/argument_example/Move.toml index 8776f3d090..00d77c3c47 100644 --- a/lumio-move/move-examples/argument_example/Move.toml +++ b/lumio-move/move-examples/argument_example/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" deploy_address = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/bcs-stream/Move.toml b/lumio-move/move-examples/bcs-stream/Move.toml index 8d840e7d53..83a36b184c 100644 --- a/lumio-move/move-examples/bcs-stream/Move.toml +++ b/lumio-move/move-examples/bcs-stream/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" bcs_stream = "0xCAFE" [dependencies] -LumioStdlib = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-stdlib", rev = "mainnet" } +LumioStdlib = { local = "../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/bonding_curve_launchpad/Move.toml b/lumio-move/move-examples/bonding_curve_launchpad/Move.toml index 902134de27..3e73f1cda6 100644 --- a/lumio-move/move-examples/bonding_curve_launchpad/Move.toml +++ b/lumio-move/move-examples/bonding_curve_launchpad/Move.toml @@ -15,12 +15,6 @@ deployer = "0xaaa" swap = "0xcafe" -[dependencies.LumioFramework] -git = "https://github.com/pontem-network/lumio-framework.git" -rev = "bbf569abd260d94bc30fe96da297d2aecb193644" -subdir = "lumio-framework" - -[dependencies.swap] -git = "https://github.com/pontem-network/lumio-framework.git" -rev = "bbf569abd260d94bc30fe96da297d2aecb193644" -subdir = "lumio-move/move-examples/swap" +[dependencies] +LumioStdlib = { local = "../../framework/lumio-stdlib" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/cli_args/Move.toml b/lumio-move/move-examples/cli_args/Move.toml index 2277fd2a97..301aac2f6f 100644 --- a/lumio-move/move-examples/cli_args/Move.toml +++ b/lumio-move/move-examples/cli_args/Move.toml @@ -6,7 +6,5 @@ upgrade_policy = "compatible" [addresses] test_account = "_" -[dependencies.LumioFramework] -git = "https://github.com/pontem-network/lumio-framework.git" -subdir = "lumio-framework" -rev = "mainnet" +[dependencies] +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/common_account/Move.toml b/lumio-move/move-examples/common_account/Move.toml index f147d11892..dd670478d7 100644 --- a/lumio-move/move-examples/common_account/Move.toml +++ b/lumio-move/move-examples/common_account/Move.toml @@ -3,7 +3,7 @@ name = "CommonAccount" version = "1.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] common_account = "_" diff --git a/lumio-move/move-examples/dao/nft_dao/Move.toml b/lumio-move/move-examples/dao/nft_dao/Move.toml index a3e5463ebe..2a4df5cfe8 100644 --- a/lumio-move/move-examples/dao/nft_dao/Move.toml +++ b/lumio-move/move-examples/dao/nft_dao/Move.toml @@ -8,5 +8,5 @@ dao_platform = "_" lumio_framework = "0x1" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioToken = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token", rev = "mainnet" } +LumioStdlib = { local = "../../../framework/lumio-stdlib" } +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/data_structures/Move.toml b/lumio-move/move-examples/data_structures/Move.toml index 755b943d4e..f5e0ef0590 100644 --- a/lumio-move/move-examples/data_structures/Move.toml +++ b/lumio-move/move-examples/data_structures/Move.toml @@ -3,8 +3,8 @@ name = "DataStructure" version = "0.0.1" [dependencies] -LumioStdlib = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-stdlib", rev = "mainnet" } -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioStdlib = { local = "../../framework/lumio-stdlib" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] diff --git a/lumio-move/move-examples/defi/Move.toml b/lumio-move/move-examples/defi/Move.toml index 019775b82f..9f48fef36b 100644 --- a/lumio-move/move-examples/defi/Move.toml +++ b/lumio-move/move-examples/defi/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" defi = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/drand/Move.toml b/lumio-move/move-examples/drand/Move.toml index f34a179e3b..8deefe3438 100644 --- a/lumio-move/move-examples/drand/Move.toml +++ b/lumio-move/move-examples/drand/Move.toml @@ -3,8 +3,7 @@ name = "DrandLottery" version = "0.0.1" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -#LumioStdlib = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-stdlib", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] diff --git a/lumio-move/move-examples/event/Move.toml b/lumio-move/move-examples/event/Move.toml index 3ff4b90ab7..93dd58fca0 100644 --- a/lumio-move/move-examples/event/Move.toml +++ b/lumio-move/move-examples/event/Move.toml @@ -8,4 +8,4 @@ lumio_framework = "0x1" event = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/fixed_point64/Move.toml b/lumio-move/move-examples/fixed_point64/Move.toml index 343f665f16..7e7c2548db 100644 --- a/lumio-move/move-examples/fixed_point64/Move.toml +++ b/lumio-move/move-examples/fixed_point64/Move.toml @@ -8,9 +8,7 @@ fixed_point64 = "0xdeadbeef" [dev-addresses] -[dependencies.LumioFramework] -git = "https://github.com/pontem-network/lumio-framework.git" -rev = "mainnet" -subdir = "lumio-framework" +[dependencies] +LumioFramework = { local = "../../framework/lumio-framework" } [dev-dependencies] diff --git a/lumio-move/move-examples/fungible_asset/fa_coin/Move.toml b/lumio-move/move-examples/fungible_asset/fa_coin/Move.toml index 8fc4b70a58..69462123ae 100644 --- a/lumio-move/move-examples/fungible_asset/fa_coin/Move.toml +++ b/lumio-move/move-examples/fungible_asset/fa_coin/Move.toml @@ -7,4 +7,4 @@ lumio_framework = "0x1" FACoin = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/fungible_asset/managed_fungible_asset/Move.toml b/lumio-move/move-examples/fungible_asset/managed_fungible_asset/Move.toml index cc8aaa765e..9c5dadda3a 100644 --- a/lumio-move/move-examples/fungible_asset/managed_fungible_asset/Move.toml +++ b/lumio-move/move-examples/fungible_asset/managed_fungible_asset/Move.toml @@ -8,5 +8,5 @@ lumio_token_objects = "0x4" example_addr = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioStdlib = { local = "../../../framework/lumio-stdlib" } +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/fungible_asset/managed_fungible_token/Move.toml b/lumio-move/move-examples/fungible_asset/managed_fungible_token/Move.toml index 322a2f2151..1748d08c6a 100644 --- a/lumio-move/move-examples/fungible_asset/managed_fungible_token/Move.toml +++ b/lumio-move/move-examples/fungible_asset/managed_fungible_token/Move.toml @@ -8,6 +8,6 @@ lumio_token_objects = "0x4" example_addr = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioStdlib = { local = "../../../framework/lumio-stdlib" } +LumioFramework = { local = "../../../framework/lumio-framework" } ManagedFungibleAsset = { local = "../managed_fungible_asset" } diff --git a/lumio-move/move-examples/fungible_asset/multisig_managed_coin/Move.toml b/lumio-move/move-examples/fungible_asset/multisig_managed_coin/Move.toml index 506c3cfd12..841ca487a1 100644 --- a/lumio-move/move-examples/fungible_asset/multisig_managed_coin/Move.toml +++ b/lumio-move/move-examples/fungible_asset/multisig_managed_coin/Move.toml @@ -7,5 +7,5 @@ lumio_framework = "0x1" example_addr = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } ManagedFungibleAsset = { local = "../managed_fungible_asset" } diff --git a/lumio-move/move-examples/fungible_asset/preminted_managed_coin/Move.toml b/lumio-move/move-examples/fungible_asset/preminted_managed_coin/Move.toml index 64a1d2ed3b..057f5e53ac 100644 --- a/lumio-move/move-examples/fungible_asset/preminted_managed_coin/Move.toml +++ b/lumio-move/move-examples/fungible_asset/preminted_managed_coin/Move.toml @@ -7,5 +7,5 @@ lumio_framework = "0x1" example_addr = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } ManagedFungibleAsset = { local = "../managed_fungible_asset" } diff --git a/lumio-move/move-examples/fungible_asset/stablecoin/Move.toml b/lumio-move/move-examples/fungible_asset/stablecoin/Move.toml index a3f135eb3a..6b8395d127 100644 --- a/lumio-move/move-examples/fungible_asset/stablecoin/Move.toml +++ b/lumio-move/move-examples/fungible_asset/stablecoin/Move.toml @@ -18,4 +18,4 @@ pauser = "0xdafe" denylister = "0xcade" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/governance/Move.toml b/lumio-move/move-examples/governance/Move.toml index 6caeb84a89..31411aebc4 100644 --- a/lumio-move/move-examples/governance/Move.toml +++ b/lumio-move/move-examples/governance/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" lumio_framework = "0x1" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/groth16_example/Move.toml b/lumio-move/move-examples/groth16_example/Move.toml index 8218f299f9..5be806b326 100644 --- a/lumio-move/move-examples/groth16_example/Move.toml +++ b/lumio-move/move-examples/groth16_example/Move.toml @@ -3,4 +3,4 @@ name = "GenericGroth16" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/hello_blockchain/Move.toml b/lumio-move/move-examples/hello_blockchain/Move.toml index c6183ea41d..b586423099 100644 --- a/lumio-move/move-examples/hello_blockchain/Move.toml +++ b/lumio-move/move-examples/hello_blockchain/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" hello_blockchain = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/hello_prover/Move.toml b/lumio-move/move-examples/hello_prover/Move.toml index 7cdd2ebba4..40a9760b4a 100644 --- a/lumio-move/move-examples/hello_prover/Move.toml +++ b/lumio-move/move-examples/hello_prover/Move.toml @@ -3,6 +3,6 @@ name = "hello_prover" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework/", rev = "main" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] diff --git a/lumio-move/move-examples/large_packages/large_package_example/Move.toml b/lumio-move/move-examples/large_packages/large_package_example/Move.toml index 7b18b8c726..426882e81e 100644 --- a/lumio-move/move-examples/large_packages/large_package_example/Move.toml +++ b/lumio-move/move-examples/large_packages/large_package_example/Move.toml @@ -4,7 +4,7 @@ version = "1.0.0" upgrade_policy = "compatible" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } [addresses] large_package_example = "_" diff --git a/lumio-move/move-examples/marketplace/Move.toml b/lumio-move/move-examples/marketplace/Move.toml index 17b4728eb3..f156a4d308 100644 --- a/lumio-move/move-examples/marketplace/Move.toml +++ b/lumio-move/move-examples/marketplace/Move.toml @@ -6,6 +6,6 @@ version = "0.0.0" marketplace = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioToken = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioStdlib = { local = "../../framework/lumio-stdlib" } +LumioFramework = { local = "../../framework/lumio-framework" } +LumioTokenObjects = { local = "../../framework/lumio-token-objects" } diff --git a/lumio-move/move-examples/message_board/Move.toml b/lumio-move/move-examples/message_board/Move.toml index 10faa45341..59bf3b2e76 100644 --- a/lumio-move/move-examples/message_board/Move.toml +++ b/lumio-move/move-examples/message_board/Move.toml @@ -3,7 +3,7 @@ name = "MessageBoard" version = "0.0.1" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] std = "0x1" diff --git a/lumio-move/move-examples/mint_nft/1-Create-NFT/Move.toml b/lumio-move/move-examples/mint_nft/1-Create-NFT/Move.toml index 6a63b05d1b..2ad4ccb343 100644 --- a/lumio-move/move-examples/mint_nft/1-Create-NFT/Move.toml +++ b/lumio-move/move-examples/mint_nft/1-Create-NFT/Move.toml @@ -3,8 +3,8 @@ name = "Examples" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioToken = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioToken = { local = "../../../framework/lumio-token" } [addresses] lumio_framework = "0x1" diff --git a/lumio-move/move-examples/mint_nft/2-Using-Resource-Account/Move.toml b/lumio-move/move-examples/mint_nft/2-Using-Resource-Account/Move.toml index 6a63b05d1b..2ad4ccb343 100644 --- a/lumio-move/move-examples/mint_nft/2-Using-Resource-Account/Move.toml +++ b/lumio-move/move-examples/mint_nft/2-Using-Resource-Account/Move.toml @@ -3,8 +3,8 @@ name = "Examples" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioToken = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioToken = { local = "../../../framework/lumio-token" } [addresses] lumio_framework = "0x1" diff --git a/lumio-move/move-examples/mint_nft/3-Adding-Admin/Move.toml b/lumio-move/move-examples/mint_nft/3-Adding-Admin/Move.toml index 8cde61fcb8..fb5c8ecabd 100644 --- a/lumio-move/move-examples/mint_nft/3-Adding-Admin/Move.toml +++ b/lumio-move/move-examples/mint_nft/3-Adding-Admin/Move.toml @@ -3,8 +3,8 @@ name = "Examples" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioToken = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioToken = { local = "../../../framework/lumio-token" } [addresses] lumio_framework = "0x1" diff --git a/lumio-move/move-examples/mint_nft/4-Getting-Production-Ready/Move.toml b/lumio-move/move-examples/mint_nft/4-Getting-Production-Ready/Move.toml index 8cde61fcb8..fb5c8ecabd 100644 --- a/lumio-move/move-examples/mint_nft/4-Getting-Production-Ready/Move.toml +++ b/lumio-move/move-examples/mint_nft/4-Getting-Production-Ready/Move.toml @@ -3,8 +3,8 @@ name = "Examples" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioToken = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioToken = { local = "../../../framework/lumio-token" } [addresses] lumio_framework = "0x1" diff --git a/lumio-move/move-examples/moon_coin/Move.toml b/lumio-move/move-examples/moon_coin/Move.toml index f99fed75b0..7a3d8d50f7 100644 --- a/lumio-move/move-examples/moon_coin/Move.toml +++ b/lumio-move/move-examples/moon_coin/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" MoonCoin = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/move-tutorial/step_2/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_2/basic_coin/Move.toml index 7e9a611151..bc554ee6ea 100644 --- a/lumio-move/move-examples/move-tutorial/step_2/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_2/basic_coin/Move.toml @@ -2,7 +2,5 @@ name = "basic_coin" version = "0.0.0" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_2_sol/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_2_sol/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_2_sol/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_2_sol/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_4/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_4/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_4/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_4/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_4_sol/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_4_sol/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_4_sol/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_4_sol/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_5/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_5/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_5/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_5/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_5_sol/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_5_sol/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_5_sol/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_5_sol/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_6/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_6/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_6/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_6/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_7/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_7/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_7/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_7/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_8/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_8/basic_coin/Move.toml index 541b640d9a..a818f697d9 100644 --- a/lumio-move/move-examples/move-tutorial/step_8/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_8/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xCAFE" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/move-tutorial/step_8_sol/basic_coin/Move.toml b/lumio-move/move-examples/move-tutorial/step_8_sol/basic_coin/Move.toml index e1aba31ab3..ba033c3cc5 100644 --- a/lumio-move/move-examples/move-tutorial/step_8_sol/basic_coin/Move.toml +++ b/lumio-move/move-examples/move-tutorial/step_8_sol/basic_coin/Move.toml @@ -5,7 +5,5 @@ version = "0.0.0" [addresses] named_addr = "0xDEADBEEF" -[dependencies.LumioStdlib] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-stdlib' +[dependencies] +LumioStdlib = { local = "../../../../framework/lumio-stdlib" } diff --git a/lumio-move/move-examples/my_first_dapp/move/Move.toml b/lumio-move/move-examples/my_first_dapp/move/Move.toml index faae424fcc..40a82a2edd 100644 --- a/lumio-move/move-examples/my_first_dapp/move/Move.toml +++ b/lumio-move/move-examples/my_first_dapp/move/Move.toml @@ -1,9 +1,9 @@ [package] name = 'my_todo_list' version = '1.0.0' -[dependencies.LumioFramework] -git = 'https://github.com/pontem-network/lumio-framework.git' -rev = 'main' -subdir = 'lumio-framework' + +[dependencies] +LumioFramework = { local = "../../../framework/lumio-framework" } + [addresses] todolist_addr = '_' diff --git a/lumio-move/move-examples/on_chain_dice/Move.toml b/lumio-move/move-examples/on_chain_dice/Move.toml index c0b78c21f8..4dbc7fec3e 100644 --- a/lumio-move/move-examples/on_chain_dice/Move.toml +++ b/lumio-move/move-examples/on_chain_dice/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" module_owner = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/package_manager/Move.toml b/lumio-move/move-examples/package_manager/Move.toml index 2e772615c2..6d645b3b83 100644 --- a/lumio-move/move-examples/package_manager/Move.toml +++ b/lumio-move/move-examples/package_manager/Move.toml @@ -4,7 +4,7 @@ version = "1.0.0" upgrade_policy = "compatible" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] deployer = "_" diff --git a/lumio-move/move-examples/post_mint_reveal_nft/Move.toml b/lumio-move/move-examples/post_mint_reveal_nft/Move.toml index ebdc1ab933..ca54ace3eb 100644 --- a/lumio-move/move-examples/post_mint_reveal_nft/Move.toml +++ b/lumio-move/move-examples/post_mint_reveal_nft/Move.toml @@ -3,8 +3,8 @@ name = "PostMint" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioToken = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } +LumioToken = { local = "../../framework/lumio-token" } [addresses] lumio_framework = "0x1" diff --git a/lumio-move/move-examples/pyth/Move.toml b/lumio-move/move-examples/pyth/Move.toml index 2f03d6eede..79ee5f0349 100644 --- a/lumio-move/move-examples/pyth/Move.toml +++ b/lumio-move/move-examples/pyth/Move.toml @@ -3,7 +3,7 @@ name = "Pyth" version = "0.0.1" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] pyth = "_" diff --git a/lumio-move/move-examples/raffle/Move.toml b/lumio-move/move-examples/raffle/Move.toml index 8414fef13d..71d0c20754 100644 --- a/lumio-move/move-examples/raffle/Move.toml +++ b/lumio-move/move-examples/raffle/Move.toml @@ -3,8 +3,8 @@ name = "raffle" version = "0.0.1" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioStdlib = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-stdlib", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } +LumioStdlib = { local = "../../framework/lumio-stdlib" } [addresses] diff --git a/lumio-move/move-examples/resource_account/Move.toml b/lumio-move/move-examples/resource_account/Move.toml index 5036a868da..56ff518d89 100644 --- a/lumio-move/move-examples/resource_account/Move.toml +++ b/lumio-move/move-examples/resource_account/Move.toml @@ -4,7 +4,7 @@ version = "0.0.0" upgrade_policy = "compatible" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } [addresses] # change it to `source_addr = "_" when calling `create-resource-account-and-publish-package` from the cli diff --git a/lumio-move/move-examples/resource_groups/primary/Move.toml b/lumio-move/move-examples/resource_groups/primary/Move.toml index 127e89d222..3bb1aaebef 100644 --- a/lumio-move/move-examples/resource_groups/primary/Move.toml +++ b/lumio-move/move-examples/resource_groups/primary/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" resource_groups_primary = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/resource_groups/secondary/Move.toml b/lumio-move/move-examples/resource_groups/secondary/Move.toml index 3e9aa48b39..1b5b3c9839 100644 --- a/lumio-move/move-examples/resource_groups/secondary/Move.toml +++ b/lumio-move/move-examples/resource_groups/secondary/Move.toml @@ -7,5 +7,5 @@ resource_groups_primary = "_" resource_groups_secondary = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } ResourceGroupsPrimary = { local = "../primary" } diff --git a/lumio-move/move-examples/rewards_pool/Move.toml b/lumio-move/move-examples/rewards_pool/Move.toml index 9e39944bcb..66f6f21c7f 100644 --- a/lumio-move/move-examples/rewards_pool/Move.toml +++ b/lumio-move/move-examples/rewards_pool/Move.toml @@ -6,4 +6,4 @@ version = "1.0.0" rewards_pool = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/scripts/minter/Move.toml b/lumio-move/move-examples/scripts/minter/Move.toml index 72c26dcd51..ee31c205ae 100644 --- a/lumio-move/move-examples/scripts/minter/Move.toml +++ b/lumio-move/move-examples/scripts/minter/Move.toml @@ -3,4 +3,4 @@ name = "Minter" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/scripts/minter/build/Minter/bytecode_scripts/main.mv b/lumio-move/move-examples/scripts/minter/build/Minter/bytecode_scripts/main.mv index 8176dde7dd..8daac0f2d2 100644 Binary files a/lumio-move/move-examples/scripts/minter/build/Minter/bytecode_scripts/main.mv and b/lumio-move/move-examples/scripts/minter/build/Minter/bytecode_scripts/main.mv differ diff --git a/lumio-move/move-examples/scripts/too_large/Move.toml b/lumio-move/move-examples/scripts/too_large/Move.toml index 64904d9f67..bf3a1ec747 100644 --- a/lumio-move/move-examples/scripts/too_large/Move.toml +++ b/lumio-move/move-examples/scripts/too_large/Move.toml @@ -3,5 +3,5 @@ name = "TooLargeTest" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -MoveStdlib = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "move-stdlib", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +MoveStdlib = { local = "../../../framework/move-stdlib" } diff --git a/lumio-move/move-examples/scripts/two_by_two_transfer/Move.toml b/lumio-move/move-examples/scripts/two_by_two_transfer/Move.toml index 504e31860c..163e9a7fac 100644 --- a/lumio-move/move-examples/scripts/two_by_two_transfer/Move.toml +++ b/lumio-move/move-examples/scripts/two_by_two_transfer/Move.toml @@ -3,4 +3,4 @@ name = "TwoByTwoTransfer" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/shared_account/Move.toml b/lumio-move/move-examples/shared_account/Move.toml index aefe75e483..5096c356eb 100644 --- a/lumio-move/move-examples/shared_account/Move.toml +++ b/lumio-move/move-examples/shared_account/Move.toml @@ -3,4 +3,4 @@ name = "Examples" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/split_transfer/Move.toml b/lumio-move/move-examples/split_transfer/Move.toml index 787063176e..20177ac620 100644 --- a/lumio-move/move-examples/split_transfer/Move.toml +++ b/lumio-move/move-examples/split_transfer/Move.toml @@ -3,4 +3,4 @@ name = "SplitTransfer" version = "0.0.0" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/staking/Move.toml b/lumio-move/move-examples/staking/Move.toml index 2304fe6975..0db358b5b9 100644 --- a/lumio-move/move-examples/staking/Move.toml +++ b/lumio-move/move-examples/staking/Move.toml @@ -3,7 +3,7 @@ name = "staking" version = "0.0.1" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } Pyth = { local = "../pyth" } [addresses] diff --git a/lumio-move/move-examples/swap/Move.toml b/lumio-move/move-examples/swap/Move.toml index 175651387a..319e3c8c01 100644 --- a/lumio-move/move-examples/swap/Move.toml +++ b/lumio-move/move-examples/swap/Move.toml @@ -8,4 +8,4 @@ deployer = "_" swap = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/tic-tac-toe/Move.toml b/lumio-move/move-examples/tic-tac-toe/Move.toml index 7e72b09a80..7a88963634 100644 --- a/lumio-move/move-examples/tic-tac-toe/Move.toml +++ b/lumio-move/move-examples/tic-tac-toe/Move.toml @@ -6,4 +6,4 @@ version = '1.0.0' tic_tac_toe = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } +LumioFramework = { local = "../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/token_objects/ambassador/Move.toml b/lumio-move/move-examples/token_objects/ambassador/Move.toml index b44065026a..4fffafe646 100644 --- a/lumio-move/move-examples/token_objects/ambassador/Move.toml +++ b/lumio-move/move-examples/token_objects/ambassador/Move.toml @@ -7,5 +7,5 @@ version = '1.0.0' ambassador = "0xCAFE" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioTokenObjects = { local = "../../../framework/lumio-token-objects" } diff --git a/lumio-move/move-examples/token_objects/guild/Move.toml b/lumio-move/move-examples/token_objects/guild/Move.toml index 468014495f..24a7f79341 100644 --- a/lumio-move/move-examples/token_objects/guild/Move.toml +++ b/lumio-move/move-examples/token_objects/guild/Move.toml @@ -6,5 +6,5 @@ version = '1.0.0' guild = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioTokenObjects = { local = "../../../framework/lumio-token-objects" } diff --git a/lumio-move/move-examples/token_objects/hero/Move.toml b/lumio-move/move-examples/token_objects/hero/Move.toml index 0b065ba65b..27a838a3dc 100644 --- a/lumio-move/move-examples/token_objects/hero/Move.toml +++ b/lumio-move/move-examples/token_objects/hero/Move.toml @@ -6,5 +6,5 @@ version = "0.0.0" hero = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioTokenObjects = { local = "../../../framework/lumio-token-objects" } diff --git a/lumio-move/move-examples/token_objects/knight/Move.toml b/lumio-move/move-examples/token_objects/knight/Move.toml index aadf8a6939..9d3ece0f60 100644 --- a/lumio-move/move-examples/token_objects/knight/Move.toml +++ b/lumio-move/move-examples/token_objects/knight/Move.toml @@ -6,5 +6,5 @@ version = '1.0.0' knight = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioTokenObjects = { local = "../../../framework/lumio-token-objects" } diff --git a/lumio-move/move-examples/token_objects/token_lockup/Move.toml b/lumio-move/move-examples/token_objects/token_lockup/Move.toml index 4e3caf2594..e2b75959d2 100644 --- a/lumio-move/move-examples/token_objects/token_lockup/Move.toml +++ b/lumio-move/move-examples/token_objects/token_lockup/Move.toml @@ -6,5 +6,5 @@ version = '1.0.0' token_lockup = "_" [dependencies] -LumioFramework = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-framework", rev = "mainnet" } -LumioTokenObjects = { git = "https://github.com/pontem-network/lumio-framework.git", subdir = "lumio-token-objects", rev = "mainnet" } +LumioFramework = { local = "../../../framework/lumio-framework" } +LumioTokenObjects = { local = "../../../framework/lumio-token-objects" } diff --git a/lumio-move/move-examples/upgrade_and_govern/genesis/Move.toml b/lumio-move/move-examples/upgrade_and_govern/genesis/Move.toml index 0925133c4b..6672b48c89 100644 --- a/lumio-move/move-examples/upgrade_and_govern/genesis/Move.toml +++ b/lumio-move/move-examples/upgrade_and_govern/genesis/Move.toml @@ -6,7 +6,5 @@ version = '1.0.0' [addresses] upgrade_and_govern = '_' -[dependencies.LumioFramework] -git = "https://github.com/pontem-network/lumio-framework.git" -subdir = "lumio-framework" -rev = "mainnet" +[dependencies] +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/lumio-move/move-examples/upgrade_and_govern/upgrade/Move.toml b/lumio-move/move-examples/upgrade_and_govern/upgrade/Move.toml index be0618a8ba..f701d99f0b 100644 --- a/lumio-move/move-examples/upgrade_and_govern/upgrade/Move.toml +++ b/lumio-move/move-examples/upgrade_and_govern/upgrade/Move.toml @@ -6,7 +6,5 @@ version = '1.1.0' [addresses] upgrade_and_govern = '_' -[dependencies.LumioFramework] -git = "https://github.com/pontem-network/lumio-framework.git" -subdir = "lumio-framework" -rev = "mainnet" +[dependencies] +LumioFramework = { local = "../../../framework/lumio-framework" } diff --git a/protos/python/lumio_protos/aptos/indexer/v1/raw_data_pb2.py b/protos/python/lumio_protos/lumio/indexer/v1/raw_data_pb2.py similarity index 100% rename from protos/python/lumio_protos/aptos/indexer/v1/raw_data_pb2.py rename to protos/python/lumio_protos/lumio/indexer/v1/raw_data_pb2.py diff --git a/protos/python/lumio_protos/aptos/indexer/v1/raw_data_pb2.pyi b/protos/python/lumio_protos/lumio/indexer/v1/raw_data_pb2.pyi similarity index 100% rename from protos/python/lumio_protos/aptos/indexer/v1/raw_data_pb2.pyi rename to protos/python/lumio_protos/lumio/indexer/v1/raw_data_pb2.pyi diff --git a/protos/python/lumio_protos/aptos/indexer/v1/raw_data_pb2_grpc.py b/protos/python/lumio_protos/lumio/indexer/v1/raw_data_pb2_grpc.py similarity index 100% rename from protos/python/lumio_protos/aptos/indexer/v1/raw_data_pb2_grpc.py rename to protos/python/lumio_protos/lumio/indexer/v1/raw_data_pb2_grpc.py diff --git a/protos/python/lumio_protos/aptos/internal/fullnode/v1/fullnode_data_pb2.py b/protos/python/lumio_protos/lumio/internal/fullnode/v1/fullnode_data_pb2.py similarity index 100% rename from protos/python/lumio_protos/aptos/internal/fullnode/v1/fullnode_data_pb2.py rename to protos/python/lumio_protos/lumio/internal/fullnode/v1/fullnode_data_pb2.py diff --git a/protos/python/lumio_protos/aptos/internal/fullnode/v1/fullnode_data_pb2.pyi b/protos/python/lumio_protos/lumio/internal/fullnode/v1/fullnode_data_pb2.pyi similarity index 100% rename from protos/python/lumio_protos/aptos/internal/fullnode/v1/fullnode_data_pb2.pyi rename to protos/python/lumio_protos/lumio/internal/fullnode/v1/fullnode_data_pb2.pyi diff --git a/protos/python/lumio_protos/aptos/internal/fullnode/v1/fullnode_data_pb2_grpc.py b/protos/python/lumio_protos/lumio/internal/fullnode/v1/fullnode_data_pb2_grpc.py similarity index 100% rename from protos/python/lumio_protos/aptos/internal/fullnode/v1/fullnode_data_pb2_grpc.py rename to protos/python/lumio_protos/lumio/internal/fullnode/v1/fullnode_data_pb2_grpc.py diff --git a/protos/python/lumio_protos/aptos/transaction/v1/transaction_pb2.py b/protos/python/lumio_protos/lumio/transaction/v1/transaction_pb2.py similarity index 100% rename from protos/python/lumio_protos/aptos/transaction/v1/transaction_pb2.py rename to protos/python/lumio_protos/lumio/transaction/v1/transaction_pb2.py diff --git a/protos/python/lumio_protos/aptos/transaction/v1/transaction_pb2.pyi b/protos/python/lumio_protos/lumio/transaction/v1/transaction_pb2.pyi similarity index 100% rename from protos/python/lumio_protos/aptos/transaction/v1/transaction_pb2.pyi rename to protos/python/lumio_protos/lumio/transaction/v1/transaction_pb2.pyi diff --git a/protos/python/lumio_protos/aptos/transaction/v1/transaction_pb2_grpc.py b/protos/python/lumio_protos/lumio/transaction/v1/transaction_pb2_grpc.py similarity index 100% rename from protos/python/lumio_protos/aptos/transaction/v1/transaction_pb2_grpc.py rename to protos/python/lumio_protos/lumio/transaction/v1/transaction_pb2_grpc.py diff --git a/protos/python/lumio_protos/aptos/util/timestamp/timestamp_pb2.py b/protos/python/lumio_protos/lumio/util/timestamp/timestamp_pb2.py similarity index 100% rename from protos/python/lumio_protos/aptos/util/timestamp/timestamp_pb2.py rename to protos/python/lumio_protos/lumio/util/timestamp/timestamp_pb2.py diff --git a/protos/python/lumio_protos/aptos/util/timestamp/timestamp_pb2.pyi b/protos/python/lumio_protos/lumio/util/timestamp/timestamp_pb2.pyi similarity index 100% rename from protos/python/lumio_protos/aptos/util/timestamp/timestamp_pb2.pyi rename to protos/python/lumio_protos/lumio/util/timestamp/timestamp_pb2.pyi diff --git a/protos/python/lumio_protos/aptos/util/timestamp/timestamp_pb2_grpc.py b/protos/python/lumio_protos/lumio/util/timestamp/timestamp_pb2_grpc.py similarity index 100% rename from protos/python/lumio_protos/aptos/util/timestamp/timestamp_pb2_grpc.py rename to protos/python/lumio_protos/lumio/util/timestamp/timestamp_pb2_grpc.py diff --git a/protos/typescript/src/index.lumio.bigquery_schema.transaction.v1.ts b/protos/typescript/src/index.lumio.bigquery_schema.transaction.v1.ts index 4fb576536c..bf41de1cc1 100644 --- a/protos/typescript/src/index.lumio.bigquery_schema.transaction.v1.ts +++ b/protos/typescript/src/index.lumio.bigquery_schema.transaction.v1.ts @@ -1,3 +1,3 @@ /* eslint-disable */ -export * from "./aptos/bigquery_schema/v1/transaction"; +export * from "./lumio/bigquery_schema/v1/transaction"; diff --git a/protos/typescript/src/index.lumio.indexer.v1.ts b/protos/typescript/src/index.lumio.indexer.v1.ts index 36492ee309..ffa30df9fa 100644 --- a/protos/typescript/src/index.lumio.indexer.v1.ts +++ b/protos/typescript/src/index.lumio.indexer.v1.ts @@ -1,5 +1,5 @@ /* eslint-disable */ -export * from "./aptos/indexer/v1/filter"; -export * from "./aptos/indexer/v1/raw_data"; -export * from "./aptos/indexer/v1/grpc"; +export * from "./lumio/indexer/v1/filter"; +export * from "./lumio/indexer/v1/raw_data"; +export * from "./lumio/indexer/v1/grpc"; diff --git a/protos/typescript/src/index.lumio.internal.fullnode.v1.ts b/protos/typescript/src/index.lumio.internal.fullnode.v1.ts index e7a3916b28..474c7618c8 100644 --- a/protos/typescript/src/index.lumio.internal.fullnode.v1.ts +++ b/protos/typescript/src/index.lumio.internal.fullnode.v1.ts @@ -1,3 +1,3 @@ /* eslint-disable */ -export * from "./aptos/internal/fullnode/v1/fullnode_data"; +export * from "./lumio/internal/fullnode/v1/fullnode_data"; diff --git a/protos/typescript/src/index.lumio.remote_executor.v1.ts b/protos/typescript/src/index.lumio.remote_executor.v1.ts index db0d964775..eaaf7e1f8d 100644 --- a/protos/typescript/src/index.lumio.remote_executor.v1.ts +++ b/protos/typescript/src/index.lumio.remote_executor.v1.ts @@ -1,3 +1,3 @@ /* eslint-disable */ -export * from "./aptos/remote_executor/v1/network_msg"; +export * from "./lumio/remote_executor/v1/network_msg"; diff --git a/protos/typescript/src/index.lumio.transaction.v1.ts b/protos/typescript/src/index.lumio.transaction.v1.ts index 21896c6ef5..33dc41cb20 100644 --- a/protos/typescript/src/index.lumio.transaction.v1.ts +++ b/protos/typescript/src/index.lumio.transaction.v1.ts @@ -1,3 +1,3 @@ /* eslint-disable */ -export * from "./aptos/transaction/v1/transaction"; +export * from "./lumio/transaction/v1/transaction"; diff --git a/protos/typescript/src/index.lumio.util.timestamp.ts b/protos/typescript/src/index.lumio.util.timestamp.ts index 8f0d4199a1..342a55f230 100644 --- a/protos/typescript/src/index.lumio.util.timestamp.ts +++ b/protos/typescript/src/index.lumio.util.timestamp.ts @@ -1,3 +1,3 @@ /* eslint-disable */ -export * from "./aptos/util/timestamp/timestamp"; +export * from "./lumio/util/timestamp/timestamp"; diff --git a/testsuite/fixtures/forge-test-runner-template.fixture b/testsuite/fixtures/forge-test-runner-template.fixture index 12100a2994..8f66ba1b4d 100644 --- a/testsuite/fixtures/forge-test-runner-template.fixture +++ b/testsuite/fixtures/forge-test-runner-template.fixture @@ -14,7 +14,7 @@ spec: serviceAccountName: forge containers: - name: main - image: 123.dkr.ecr.banana-east-1.amazonaws.com/aptos/forge:forge_asdf + image: 123.dkr.ecr.banana-east-1.amazonaws.com/lumio/forge:forge_asdf imagePullPolicy: Always command: - /bin/bash diff --git a/testsuite/fuzzer/google-oss-fuzz/Dockerfile b/testsuite/fuzzer/google-oss-fuzz/Dockerfile index 8d49e8a266..af246f7816 100644 --- a/testsuite/fuzzer/google-oss-fuzz/Dockerfile +++ b/testsuite/fuzzer/google-oss-fuzz/Dockerfile @@ -1,5 +1,5 @@ FROM gcr.io/oss-fuzz-base/base-builder-rust RUN apt-get update && apt-get install -y make autoconf automake libclang-dev libtool pkg-config -RUN git clone --depth=1 https://github.com/aptos-labs/aptos-core.git +RUN git clone --depth=1 ssh://git@github.com/pontem-network/lumio-node.git WORKDIR aptos-core COPY build.sh $SRC diff --git a/testsuite/loadtest-k6/src/indexer-grpc-test.ts b/testsuite/loadtest-k6/src/indexer-grpc-test.ts index 8d97e356d4..574ba03e57 100644 --- a/testsuite/loadtest-k6/src/indexer-grpc-test.ts +++ b/testsuite/loadtest-k6/src/indexer-grpc-test.ts @@ -36,7 +36,7 @@ export default () => { }; const metadata = { - "x-aptos-data-authorization": "dummy_token", + "x-lumio-data-authorization": "dummy_token", }; const params = { diff --git a/testsuite/test_framework/git.py b/testsuite/test_framework/git.py index daab14e88f..ff3a831b86 100644 --- a/testsuite/test_framework/git.py +++ b/testsuite/test_framework/git.py @@ -40,7 +40,7 @@ def status(self) -> bool: def branch_matches_remote(self, remote: str, ref: str) -> bool: """Check if the current branch matches the remote branch""" - # git ls-remote --heads https://github.com/aptos-labs/aptos-core.git rustielin/exp + # git ls-remote --heads ssh://git@github.com/pontem-network/lumio-node.git rustielin/exp remote_commit_hash = self.resolve_remote_ref(remote, ref) if remote_commit_hash is None: return False diff --git a/third_party/copy.bara.sky b/third_party/copy.bara.sky index 0589561a9b..b021420e53 100644 --- a/third_party/copy.bara.sky +++ b/third_party/copy.bara.sky @@ -1,5 +1,5 @@ moveUrl = "https://github.com/move-language/move-on-aptos.git" -aptosUrl = "https://github.com/aptos-labs/aptos-core.git" +lumioUrl = "ssh://git@github.com/pontem-network/lumio-node.git" # Workflow to pull from Move to Aptos. This creates a draft PR at the fixed branch `from_move` # which should be further massaged before sending out. @@ -28,7 +28,7 @@ core.workflow( core.workflow( name = "push_move", origin = git.github_origin( - url = aptosUrl, + url = lumioUrl, ref = "main", ), destination = git.destination( @@ -50,7 +50,7 @@ core.workflow( core.workflow( name = "push_move_direct", origin = git.github_origin( - url = aptosUrl, + url = lumioUrl, ref = "main", ), destination = git.github_destination( diff --git a/third_party/move/tools/move-cli/tests/cross_process_tests/Package1/Move.toml b/third_party/move/tools/move-cli/tests/cross_process_tests/Package1/Move.toml index 6915223ce1..3fa9d44a66 100644 --- a/third_party/move/tools/move-cli/tests/cross_process_tests/Package1/Move.toml +++ b/third_party/move/tools/move-cli/tests/cross_process_tests/Package1/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" std = "0x1" [dependencies] -MoveStdlib = { local = "../../../../move-stdlib" } +MoveStdlib = { local = "../../../../../move-stdlib" } diff --git a/third_party/move/tools/move-cli/tests/cross_process_tests/Package2/Move.toml b/third_party/move/tools/move-cli/tests/cross_process_tests/Package2/Move.toml index 6446872432..4eb794dd16 100644 --- a/third_party/move/tools/move-cli/tests/cross_process_tests/Package2/Move.toml +++ b/third_party/move/tools/move-cli/tests/cross_process_tests/Package2/Move.toml @@ -6,4 +6,4 @@ version = "0.0.0" std = "0x1" [dependencies] -MoveStdlib = { local = "../../../../move-stdlib" } +MoveStdlib = { local = "../../../../../move-stdlib" } diff --git a/third_party/move/tools/move-package-cache/src/main.rs b/third_party/move/tools/move-package-cache/src/main.rs index 85dea5256b..7431c3963e 100644 --- a/third_party/move/tools/move-package-cache/src/main.rs +++ b/third_party/move/tools/move-package-cache/src/main.rs @@ -16,7 +16,7 @@ async fn main() -> Result<()> { let cache = PackageCache::new_with_listener("./data", DebugPackageCacheListener).unwrap(); let lumio_framework_url = - Url::from_str("https://github.com/aptos-labs/aptos-framework").unwrap(); + Url::from_str("https://github.com/pontem-network/lumio-framework.git").unwrap(); let oid = cache .resolve_git_revision(&lumio_framework_url, "main") diff --git a/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/Move.lock b/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/Move.lock index 25c089831a..0602c71263 100644 --- a/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/Move.lock +++ b/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/Move.lock @@ -1,5 +1,5 @@ [git] -"github.com/aptos-labs/aptos-framework@main" = "fae5fee731d64e63e4028e27045792a053827dc5" -"github.com/aptos-labs/aptos-framework@testnet" = "a232ffcf03e3f527bfed0448f0f92fedeba5c30f" +"github.com/pontem-network/lumio-framework@main" = "fae5fee731d64e63e4028e27045792a053827dc5" +"github.com/pontem-network/lumio-framework@testnet" = "a232ffcf03e3f527bfed0448f0f92fedeba5c30f" [on_chain] diff --git a/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/output.md b/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/output.md index f8549fd153..eadbd14aa1 100644 --- a/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/output.md +++ b/third_party/move/tools/move-package-resolver/testsuite-online/dep-same-name/output.md @@ -1,5 +1,5 @@ error Package name conflict: MoveStdlib - git:github.com/aptos-labs/aptos-framework@fae5fee731d64e63e4028e27045792a053827dc5/move-stdlib - git:github.com/aptos-labs/aptos-framework@a232ffcf03e3f527bfed0448f0f92fedeba5c30f/move-stdlib + git:github.com/pontem-network/lumio-framework@fae5fee731d64e63e4028e27045792a053827dc5/move-stdlib + git:github.com/pontem-network/lumio-framework@a232ffcf03e3f527bfed0448f0f92fedeba5c30f/move-stdlib diff --git a/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-rev/output.md b/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-rev/output.md index 950fd60c7d..b66d8fcf6c 100644 --- a/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-rev/output.md +++ b/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-rev/output.md @@ -1,3 +1,3 @@ error -Failed to resolve rev string "bad-rev" in repo https://github.com/aptos-labs/aptos-framework +Failed to resolve rev string "bad-rev" in repo https://github.com/pontem-network/lumio-framework.git diff --git a/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-subdir/Move.lock b/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-subdir/Move.lock index 771d0d444f..d7aa001829 100644 --- a/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-subdir/Move.lock +++ b/third_party/move/tools/move-package-resolver/testsuite-online/git-bad-subdir/Move.lock @@ -1,4 +1,4 @@ [git] -"github.com/aptos-labs/aptos-framework@main" = "fae5fee731d64e63e4028e27045792a053827dc5" +"github.com/pontem-network/lumio-framework@main" = "fae5fee731d64e63e4028e27045792a053827dc5" [on_chain] diff --git a/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.lock b/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.lock index 771d0d444f..d7aa001829 100644 --- a/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.lock +++ b/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.lock @@ -1,4 +1,4 @@ [git] -"github.com/aptos-labs/aptos-framework@main" = "fae5fee731d64e63e4028e27045792a053827dc5" +"github.com/pontem-network/lumio-framework@main" = "fae5fee731d64e63e4028e27045792a053827dc5" [on_chain] diff --git a/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.toml b/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.toml index c311c43e9c..8d2c8e3396 100644 --- a/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.toml +++ b/third_party/move/tools/move-package-resolver/testsuite-online/git/Move.toml @@ -3,5 +3,5 @@ name = "Pack" version = "0.1.2" [dependencies] -AptosFramework = { git = "https://github.com/aptos-labs/lumio-framework", rev = "main", subdir = "lumio-framework" } -MoveStdlib = { git = "https://github.com/aptos-labs/lumio-framework", rev = "main", subdir = "move-stdlib" } +LumioFramework = { local = "../../../../../../lumio-move/framework/lumio-framework" } +MoveStdlib = { local = "../../../../../../lumio-move/framework/move-stdlib" } diff --git a/third_party/move/tools/move-package-resolver/testsuite-online/git/output.md b/third_party/move/tools/move-package-resolver/testsuite-online/git/output.md index e99d1edb8a..f5ebc2364e 100644 --- a/third_party/move/tools/move-package-resolver/testsuite-online/git/output.md +++ b/third_party/move/tools/move-package-resolver/testsuite-online/git/output.md @@ -3,9 +3,9 @@ success ```mermaid flowchart TD N0["Pack

local:testsuite-online/git

testsuite-online/git"] - N1["AptosFramework

git:github.com/aptos-labs/aptos-framework@fae5fee731d64e63e4028e27045792a053827dc5/aptos-framework

cache/git/checkouts/github.com%2Faptos-labs%2Faptos-framework@fae5fee731d64e63e4028e27045792a053827dc5/aptos-framework"] - N2["AptosStdlib

git:github.com/aptos-labs/aptos-framework@fae5fee731d64e63e4028e27045792a053827dc5/aptos-stdlib

cache/git/checkouts/github.com%2Faptos-labs%2Faptos-framework@fae5fee731d64e63e4028e27045792a053827dc5/aptos-stdlib"] - N3["MoveStdlib

git:github.com/aptos-labs/aptos-framework@fae5fee731d64e63e4028e27045792a053827dc5/move-stdlib

cache/git/checkouts/github.com%2Faptos-labs%2Faptos-framework@fae5fee731d64e63e4028e27045792a053827dc5/move-stdlib"] + N1["LumioFramework

git:github.com/pontem-network/lumio-framework@fae5fee731d64e63e4028e27045792a053827dc5/lumio-framework

cache/git/checkouts/github.com%2Faptos-labs%2Flumio-framework@fae5fee731d64e63e4028e27045792a053827dc5/lumio-framework"] + N2["AptosStdlib

git:github.com/pontem-network/lumio-framework@fae5fee731d64e63e4028e27045792a053827dc5/lumio-stdlib

cache/git/checkouts/github.com%2Faptos-labs%2Flumio-framework@fae5fee731d64e63e4028e27045792a053827dc5/lumio-stdlib"] + N3["MoveStdlib

git:github.com/pontem-network/lumio-framework@fae5fee731d64e63e4028e27045792a053827dc5/move-stdlib

cache/git/checkouts/github.com%2Faptos-labs%2Flumio-framework@fae5fee731d64e63e4028e27045792a053827dc5/move-stdlib"] N2 --> N3 N1 --> N2 N1 --> N3 diff --git a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml_deactivated b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml_deactivated index b6220b8e4c..75b8ee0372 100644 --- a/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml_deactivated +++ b/third_party/move/tools/move-package/tests/test_sources/compilation/std-lib-override/Move.toml_deactivated @@ -8,10 +8,10 @@ A = "0x42" [dev-addresses] -[dependencies.AptosFramework] -git = "https://github.com/aptos-labs/aptos-core.git" +[dependencies.LumioFramework] +git = "ssh://git@github.com/pontem-network/lumio-node.git" rev = "devnet" -subdir = "aptos-move/framework/aptos-framework" +subdir = "lumio-move/framework/lumio-framework" [dependencies.B] local = "./deps_only" diff --git a/third_party/move/tools/move-unit-test/tests/packages/dep/build/Dep/BuildInfo.yaml b/third_party/move/tools/move-unit-test/tests/packages/dep/build/Dep/BuildInfo.yaml index fd67676230..f156c69e6b 100644 --- a/third_party/move/tools/move-unit-test/tests/packages/dep/build/Dep/BuildInfo.yaml +++ b/third_party/move/tools/move-unit-test/tests/packages/dep/build/Dep/BuildInfo.yaml @@ -2,7 +2,7 @@ compiled_package_info: package_name: Dep address_alias_instantiation: {} - source_digest: B01B575F8492F72C72DBF502E1F788F49A9CA8AC335FB9E52B0455ACA35677E0 + source_digest: 452B088DBB6B0CB87AEA8CB36B672DECAEFD09084809A8075DE36EE1B5134930 build_flags: dev_mode: false test_mode: false @@ -10,11 +10,10 @@ compiled_package_info: generate_docs: false generate_abis: false generate_move_model: true - full_model_generation: false + full_model_generation: true install_dir: ~ force_recompilation: false additional_named_addresses: {} - architecture: ~ fetch_deps_only: false skip_fetch_latest_git_deps: false compiler_config: @@ -28,8 +27,10 @@ compiled_package_info: - legacy_entry_fun - "lint::allow_unsafe_randomness" - "lint::skip" + - module_lock - "mutation::skip" - native_interface + - persistent - randomness - resource_group - resource_group_member @@ -39,7 +40,7 @@ compiled_package_info: - view skip_attribute_checks: false compiler_version: V2_0 - language_version: V2_1 + language_version: "2.1" experiments: - optimize=on dependencies: [] diff --git a/third_party/move/tools/move-unit-test/tests/packages/dep/build/Dep/bytecode_modules/foo.mv b/third_party/move/tools/move-unit-test/tests/packages/dep/build/Dep/bytecode_modules/foo.mv deleted file mode 100644 index 50f81c51e9..0000000000 Binary files a/third_party/move/tools/move-unit-test/tests/packages/dep/build/Dep/bytecode_modules/foo.mv and /dev/null differ