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,846 changes: 870 additions & 976 deletions Cargo.lock

Large diffs are not rendered by default.

53 changes: 25 additions & 28 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ alloy = { version = "1.0", features = [
alloy-rlp = { version = "0.3", features = ["derive"] }
alloy-trie = "0.9"
anyhow = "1"
aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-framework = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-gas-algebra = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-gas-meter = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-gas-schedule = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-vm-environment = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-native-interface = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-storage-interface = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-table-natives = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-api-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-vm = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-vm-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
aptos-crypto = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-framework = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-gas-algebra = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-gas-meter = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-gas-schedule = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-vm-environment = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-native-interface = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-storage-interface = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-table-natives = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-api-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-vm = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
aptos-vm-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
arbitrary = "1"
bcs = { git = "https://github.com/aptos-labs/bcs" }
better_any = "0.1.1"
Expand All @@ -69,22 +69,22 @@ hex-literal = "0.4"
hyper = "0.14"
jsonwebtoken = { version = "9", default-features = false }
lazy_static = "1.5"
legacy-move-compiler = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
metrics = "0.24.2"
metrics-exporter-prometheus = "0.17.2"
move-binary-format = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-bytecode-utils = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-compiler = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-compiler-v2 = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-core-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-model = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-binary-format = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-bytecode-utils = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-compiler-v2 = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-core-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-model = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-package = { git = "https://github.com/MystenLabs/sui", tag = "testnet-v1.28.3" }
move-resource-viewer = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-table-extension = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-vm-runtime = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-vm-test-utils = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2", features = [
move-resource-viewer = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-table-extension = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-vm-runtime = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
move-vm-test-utils = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2", features = [
"table-extension",
] }
move-vm-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.27.2" }
move-vm-types = { git = "https://github.com/aptos-labs/aptos-core", tag = "aptos-node-v1.39.2" }
once_cell = "1.19"
op-alloy = { version = "0.23", features = ["full", "std", "k256", "serde"] }
openssl = "0.10"
Expand All @@ -109,6 +109,7 @@ tokio = { version = "1", features = ["full"] }
tokio-metrics = { version = "0.4.5", features = ["metrics-rs-integration"] }
tracing = "0.1"
tracing-subscriber = "0.3"
triomphe = "0.1"
toml = "0.8"
umi-api = { path = "api" }
umi-app = { path = "app" }
Expand All @@ -130,7 +131,3 @@ unwrap_used = "deny"

[patch.crates-io]
merlin = { git = "https://github.com/aptos-labs/merlin" }
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }

[patch."https://github.com/aptos-labs/aptos-core"]
aptos-metrics-core = { git = "https://github.com/UmiNetwork/aptos-metrics-core.git" }
2 changes: 1 addition & 1 deletion api/src/methods/get_block_by_hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ mod tests {
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
"miner": "0x0000000000000000000000000000000000000000",
"stateRoot": "0x7a60fc9568ab4beac4305f381312125963c32ffb7a0d5b3afdd4a9ecca902348",
"stateRoot": "0x8730d114b0a4b0cd3cdbd4c582dcd487c84bdfea3060f5377a3a84303694de8b",
"transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
Expand Down
2 changes: 1 addition & 1 deletion api/src/methods/get_block_by_number.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ mod tests {
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
"miner": "0x0000000000000000000000000000000000000000",
"stateRoot": "0x7a60fc9568ab4beac4305f381312125963c32ffb7a0d5b3afdd4a9ecca902348",
"stateRoot": "0x8730d114b0a4b0cd3cdbd4c582dcd487c84bdfea3060f5377a3a84303694de8b",
"transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
Expand Down
Loading
Loading