Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update aptos-core dependency #27

Merged
merged 5 commits into from
Apr 12, 2024
Merged

Update aptos-core dependency #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3457694
remove sov-labs and implemntations
0xmovses Apr 11, 2024
3a9677e
remove workspace members
0xmovses Apr 11, 2024
f201dc4
fix build
0xmovses Apr 11, 2024
c2a8722
use mvmtlabs aptos-vore
0xmovses Apr 11, 2024
bd72190
update git url
0xmovses Apr 11, 2024
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
13,890 changes: 16 additions & 13,874 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

91 changes: 32 additions & 59 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,7 @@

resolver = "2"

members = [
"m2/rollup",
"m2/stf",
# protocol units
"protocol-units/sov-aptos",
"protocol-units/sov-modules/sov-aptos-vm",
# "protocol-units/rest-to-json-rpc"
]

[workspace.features]
sov-aptos = ["experimental"]
defailt = ["m2/rollup"]
members = ["rollup"]

[workspace.package]
version = "0.3.0"
Expand All @@ -37,7 +26,10 @@ anyhow = "1.0.68"
derive_more = { version = "0.99.11", default-features = false }
bytes = { version = "1.2.1", default-features = false }
clap = { version = "4.4.10", features = ["derive"] }
hex = { version = "0.4.3", default-features = false, features = ["alloc", "serde"] }
hex = { version = "0.4.3", default-features = false, features = [
"alloc",
"serde",
] }
async-trait = "0.1.71"
borsh = { version = "0.10.3", features = ["rc", "bytes"] }
tracing = "0.1.40"
Expand All @@ -54,29 +46,6 @@ rand = "0.7.3"
rand_core = "0.5.1"
zstd-sys = "2.0.9"

# Sovereign Labs dependencies
sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-accounts = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-bank = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-ledger-rpc = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-sequencer-registry = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-modules-rollup-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-stf-runner = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-db = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-sequencer = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-mock-zkvm = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-first-read-last-write-cache = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-cli = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-mock-da = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-celestia-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-prover-storage-manager = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-chain-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }
sov-test-utils = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" }

risc0-build = "0.20"

# aptos dependencies
Expand All @@ -91,26 +60,26 @@ ethers-middleware = { version = "=2.0.10", default-features = false }
# Aptos dependencies
# We use a forked version so that we can override dependency versions. This is required
# to be avoid depenedency conflicts with other Sovereign Labs crates.
aptos-vm = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-sdk = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-consensus-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-crypto = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-db = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-api-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-api = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-storage-interface = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-block-executor = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-vm-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-vm-logging = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-language-e2e-tests = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-framework = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-config = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-vm-genesis = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-executor = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-executor-types = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-executor-test-helpers = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-bitvec = { git = "https://github.com/0xmovses/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }
aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "830bb59ead3c5082734486adf1dd5177d349d2a1" }

move-binary-format = { git = "https://github.com/diem/move" }
move-table-extension = { git = "https://github.com/diem/move" }
Expand All @@ -124,10 +93,14 @@ reth-rpc-types-compat = { git = "https://github.com/paradigmxyz/reth", rev = "c0
reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "c0655fed8915490f82d4acf8900a16a10554cbfb" }

# Matches reth dependency. Using exact revision for matching our tightly coupled usage of both reth and revm crates
revm = { version = "5.0.0", default-features = false, features = ["serde"] }
revm = { version = "8.0.0", default-features = false, features = ["serde"] }
# Used just to be safe about breaking changes
revm-primitives = { version = "=2.0.0", default-features = false }
secp256k1 = { version = "0.27", default-features = false, features = ["global-context", "rand-std", "recovery"] }
secp256k1 = { version = "0.27", default-features = false, features = [
"global-context",
"rand-std",
"recovery",
] }

[workspace.lints.rust]
dead_code = "deny"
Expand All @@ -150,4 +123,4 @@ merlin = { git = "https://github.com/aptos-labs/merlin" }
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
ed25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curve25519-4.1.0-risczero.1" }
zstd-sys = { git = "https://github.com/gyscos/zstd-rs.git", rev = "1779b385b42b08f958b767a37878dfa6a0b4f6a4" }
zstd-sys = { git = "https://github.com/gyscos/zstd-rs.git", rev = "1779b385b42b08f958b767a37878dfa6a0b4f6a4" }
16 changes: 0 additions & 16 deletions m2/provers/risc0/Cargo.toml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions m2/provers/risc0/build.rs
View file
Open in desktop

This file was deleted.

Loading
Loading