Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,229 changes: 649 additions & 580 deletions Cargo.lock

Large diffs are not rendered by default.

40 changes: 24 additions & 16 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,42 @@ members = [
]

[workspace.dependencies]
tokio = "1.45.1"
serde = "1.0.217"
serde_json = "1.0.138"
tokio = "1.47.1"
serde = "1.0.228"
serde_json = "1.0.145"
dotenvy = "0.15.7"
chrono = { version = "=0.4.39", features = ["clock", "serde"] }
chrono = { version = "=0.4.42", features = ["clock", "serde"] }
diesel = "2.2.7"
diesel-async = "0.5.2"
diesel_migrations = "2.2.0"
anyhow = "1.0.95"
thiserror = "2.0.11"
anyhow = "1.0.100"
thiserror = "2.0.17"
once_cell = "1.20.3"
tracing = "0.1.41"
clap = "4.5.31"
async-trait = "0.1.83"
clap = "4.5.48"
async-trait = "0.1.89"
bcs = "0.1.6"
url = "2.5.4"
url = "2.5.7"
prometheus = "0.13.4"
tokio-util = "0.7.13"
tokio-util = "0.7.16"
futures = "0.3.31"
tempfile = "3.20.0"

# Main Sui Mono-repo
sui-indexer-alt-metrics = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
mysten-metrics = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
telemetry-subscribers = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-pg-db = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
move-core-types = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-types = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-indexer-alt-metrics = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
mysten-metrics = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
telemetry-subscribers = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-pg-db = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
move-core-types = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-types = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-package-resolver = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-move-build = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
move-binary-format = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-indexer-alt-framework = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-rpc-api = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-storage = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }
sui-field-count = { git = "https://github.com/MystenLabs/sui.git", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62"}

# New Rust SDK
sui-sdk-types = { git = "https://github.com/mystenlabs/sui-rust-sdk", package = "sui-sdk-types", rev="86a9e06"}
insta = "1.43.2"
4 changes: 2 additions & 2 deletions crates/ci-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
publish = false

[dev-dependencies]
insta = "1.42.2"
insta.workspace = true
tempfile.workspace = true
anyhow = "1.0.91"
anyhow.workspace = true
strip-ansi-escapes = "0.2.1"
8 changes: 4 additions & 4 deletions crates/mvr-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
sui-package-resolver = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-package-resolver.workspace = true
async-graphql = { version = "=7.0.1", features = ["dataloader"] }
axum = "0.8.1"
tokio = { workspace = true, features = ["full"] }
Expand Down Expand Up @@ -36,10 +36,10 @@ mvr-types = { path = "../mvr-types" }
mvr-schema = { path = "../mvr-schema" }

[dev-dependencies]
sui-move-build = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
move-binary-format = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-move-build.workspace = true
move-binary-format.workspace = true
reqwest = { version = "0.12.11", features = ["json"] }
insta = "1.42.2"
insta.workspace = true

[[bin]]
name = "mvr-api"
Expand Down
3 changes: 2 additions & 1 deletion crates/mvr-api/tests/mvr_test_cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ async fn setup(port: Option<u16>) -> Result<MvrTestCluster, anyhow::Error> {
}

async fn setup_dummy_data(db: &mut Db) -> Result<(), anyhow::Error> {
let c_pkg = MovePackage::new_initial(&build_test_modules("Cv1"), u64::MAX, 7, []).unwrap();
let protocol_config = ProtocolConfig::get_for_max_version_UNSAFE();
let c_pkg = MovePackage::new_initial(&build_test_modules("Cv1"), &protocol_config, []).unwrap();
let c_new = c_pkg
.new_upgraded(
ObjectID::from_single_byte(0xc2),
Expand Down
4 changes: 2 additions & 2 deletions crates/mvr-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name = "unit_tests"
path = "tests/unit_tests.rs"

[dependencies]
bin-version = { git = "https://github.com/mystenlabs/sui", package = "bin-version", rev = "0f91f6b" }
bin-version = { git = "https://github.com/mystenlabs/sui", package = "bin-version", rev = "3b96ab72dd5db2fb800837d6067bf45839178b62" }

clap = { workspace = true, features = ["derive"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
Expand All @@ -41,4 +41,4 @@ sui-sdk-types.workspace = true

[dev-dependencies]
expect-test = "1.5.0"
insta = "1.42.2"
insta.workspace = true
8 changes: 4 additions & 4 deletions crates/mvr-indexer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ edition = "2021"
[dependencies]
tokio.workspace = true
futures = "0.3.31"
sui-indexer-alt-framework = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-rpc-api = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
move-binary-format = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-indexer-alt-framework.workspace = true
sui-rpc-api.workspace = true
move-binary-format.workspace = true
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto" }
reqwest = { version = "^0.12", features = ["blocking", "json"] }

Expand Down Expand Up @@ -46,7 +46,7 @@ telemetry-subscribers.workspace = true
tokio-util.workspace = true

[dev-dependencies]
sui-storage = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b" }
sui-storage.workspace = true
sqlx = {version = "0.8.3", features = ["runtime-tokio", "postgres", "chrono"]}
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto" }
insta = { version = "1.43.1", features = ["json"] }
Expand Down
3 changes: 3 additions & 0 deletions crates/mvr-indexer/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ async fn main() -> Result<(), anyhow::Error> {
rpc_password: None,
},
Default::default(),
None, /* Metrics prefix */
metrics.registry(),
cancel.clone(),
)
Expand All @@ -135,6 +136,7 @@ async fn main() -> Result<(), anyhow::Error> {
store.clone(),
)))?;

let metrics_prefix = None;
let indexer = Indexer::new(
store,
indexer_args,
Expand All @@ -146,6 +148,7 @@ async fn main() -> Result<(), anyhow::Error> {
rpc_password: None,
},
Default::default(),
metrics_prefix,
metrics.registry(),
cancel.clone(),
)
Expand Down
2 changes: 1 addition & 1 deletion crates/mvr-schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"

[dependencies]
sui-field-count = { git = "https://github.com/MystenLabs/sui.git", rev = "0f91f6b"}
sui-field-count.workspace = true
diesel = { workspace = true, features = ["postgres", "uuid", "chrono", "serde_json", "numeric"] }
diesel_migrations.workspace = true
serde = { workspace = true }
Expand Down