Skip to content

Commit a105163

Browse files
0xmovses0xmovses
committed
chore: bump aptos deps to l1-migration
1 parent 7620678 commit a105163

2 files changed

Lines changed: 62 additions & 59 deletions

File tree

‎Cargo.toml‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ members = [
4343
"protocol-units/execution/maptos/framework/migrations/*",
4444
"protocol-units/da-sequencer/config",
4545
"protocol-units/da-sequencer/client",
46-
"protocol-units/da-sequencer/node"
46+
"protocol-units/da-sequencer/node",
4747
]
4848

4949
[workspace.package]
@@ -160,46 +160,46 @@ borsh = { version = "0.10" } # todo: internalize jmt and bump
160160

161161
### We use a forked version so that we can override dependency versions. This is required
162162
### to be avoid dependency conflicts with other Sovereign Labs crates.
163-
aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
164-
aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
165-
aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
166-
aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
167-
aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
168-
aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
169-
aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
170-
aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67", features = [
171-
"cloneable-private-keys",
163+
aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
164+
aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
165+
aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
166+
aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
167+
aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
168+
aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
169+
aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
170+
aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00", features = [
171+
"cloneable-private-keys",
172172
] }
173173

174-
aptos-crypto-derive = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
175-
aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
176-
aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
177-
aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
178-
aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
179-
aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
180-
aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
181-
aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
182-
aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
183-
aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
184-
aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
185-
aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
186-
aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
187-
aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
188-
aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
189-
aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
190-
aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
191-
aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
192-
aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
193-
aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
194-
aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
195-
aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
196-
aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
197-
aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
198-
aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
199-
aptos-release-builder = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
200-
aptos-gas-schedule = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
201-
move-package = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
202-
movement = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
174+
aptos-crypto-derive = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
175+
aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
176+
aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
177+
aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
178+
aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
179+
aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
180+
aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
181+
aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
182+
aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
183+
aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
184+
aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
185+
aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
186+
aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
187+
aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
188+
aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
189+
aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
190+
aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
191+
aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
192+
aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
193+
aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
194+
aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
195+
aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
196+
aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
197+
aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
198+
aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
199+
aptos-release-builder = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
200+
aptos-gas-schedule = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
201+
move-package = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
202+
movement = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "62b89109de0dd86349359fcc05d527ecda670d00" }
203203

204204
# Indexer
205205
processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "20be1190105908fd4fea4e78c330997658e9428e" }
@@ -220,9 +220,9 @@ move-table-extension = { git = "https://github.com/diem/move" }
220220
move-core-types = { git = "https://github.com/diem/move" }
221221

222222
secp256k1 = { version = "0.27", default-features = false, features = [
223-
"global-context",
224-
"rand-std",
225-
"recovery",
223+
"global-context",
224+
"rand-std",
225+
"recovery",
226226
] }
227227

228228
## Celestia Dependencies
@@ -232,15 +232,15 @@ celestia-types = { git = "https://github.com/eigerco/lumina", rev = "c6e5b7f5e3a
232232
# External Dependencies
233233

234234
alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
235-
"node-bindings",
236-
"rpc-types-trace",
237-
"json-rpc",
238-
"json-abi",
239-
"rpc-client",
240-
"signers",
241-
"signer-yubihsm",
242-
"pubsub",
243-
"providers",
235+
"node-bindings",
236+
"rpc-types-trace",
237+
"json-rpc",
238+
"json-abi",
239+
"rpc-client",
240+
"signers",
241+
"signer-yubihsm",
242+
"pubsub",
243+
"providers",
244244
] }
245245
alloy-rpc-types-eth = "0.1.3"
246246
alloy-eips = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
@@ -249,15 +249,15 @@ alloy-network = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b17
249249
alloy-primitives = { version = "0.7.2", default-features = false }
250250
alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
251251
alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
252-
"ws",
252+
"ws",
253253
] }
254254
alloy-rlp = "0.3.5"
255255
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
256256
alloy-sol-types = { version = "0.7.2", features = ["json"] }
257257
alloy-signer = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
258258
alloy-transport = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
259259
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
260-
"reqwest-rustls-tls",
260+
"reqwest-rustls-tls",
261261
] }
262262
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
263263

@@ -282,8 +282,8 @@ fail = "0.5.1"
282282
futures = "0.3.17"
283283
hashbrown = "0.14.3"
284284
hex = { version = "0.4.3", default-features = false, features = [
285-
"alloc",
286-
"serde",
285+
"alloc",
286+
"serde",
287287
] }
288288
ics23 = { version = "0.11.0" }
289289
k256 = { version = "0.13.3" }
@@ -310,10 +310,10 @@ reqwest = "0.12.4"
310310
risc0-build = "0.20"
311311
risc0-zkvm = { version = "0.21", features = ["std", "getrandom"] }
312312
rocksdb = { version = "0.22.0", features = [
313-
"snappy",
314-
"lz4",
315-
"zstd",
316-
"zlib",
313+
"snappy",
314+
"lz4",
315+
"zstd",
316+
"zlib",
317317
], default-features = false }
318318
schemars = { version = "0.8.16", features = ["derive"] }
319319
serde_with = "3.7.0"

‎protocol-units/execution/maptos/framework/releases/pre-l1-merge/src/cached.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ pub mod full {
5454

5555
let mut enable_feature_flags = AptosFeatureFlag::default_features();
5656

57+
//Todo update aptos core deps to be on l1-migration branch.
58+
//Add in the latest features that are not present here
59+
5760
// To Enable
5861
enable_feature_flags.push(AptosFeatureFlag::GOVERNED_GAS_POOL);
5962
enable_feature_flags.push(AptosFeatureFlag::PARTIAL_GOVERNANCE_VOTING);

0 commit comments

Comments
 (0)