Sync With Upstream #30

l-monninger · 2024-07-02T08:17:45Z

Resolves #41

Description

Test Plan

Monza

Devnet merge

Make `services` pub

Let developers configure their VSCode without turning this into commit fests and battles of preferences.

chore: remove VSCode configuration from git

mzabaluev · 2024-07-08T18:44:15Z

api/src/transactions.rs

@@ -152,7 +152,7 @@ impl TransactionsApi {
        operation_id = "get_transactions",
        tag = "ApiTags::Transactions"
    )]
-    async fn get_transactions(
+    pub async fn get_transactions(


I'm not sure we need to expose all this stuff from the API crate.

mzabaluev · 2024-07-08T18:51:24Z

crates/aptos/CHANGELOG.md

-## Unreleased
- Add balance command to easily get account balances for APT currently
-
-## [3.4.1] - 2024/05/31


The aptos-turned-movement crate will need to be re-synced from the latest upstream to benefit from all the accumulated goodness and retain compat.

Or perhaps, expose the CLI entry points and relocate the movement binary to the movement repo, so that the delta here is minimized to feature-gating the unneeded code and deps.

Re-syncing is done in #43.

Would it work to rename the associated aptos directory to movement ?

mzabaluev · 2024-07-08T18:53:12Z

crates/aptos/src/account/list.rs

@@ -82,7 +82,7 @@ impl CliCommand<Vec<serde_json::Value>> for ListAccount {
            account
        } else {
            return Err(CliError::CommandArgumentError(
-                "Please provide an account using --account or run aptos init".to_string(),
+                "Please provide an account using --account or run movement init".to_string(),


On the other hand, there's this branding hardcoded anyway, so perhaps there is no benefit in maintaining an external binary.

crates/aptos/src/genesis/mod.rs

mzabaluev · 2024-07-08T19:12:26Z

storage/aptosdb/src/db/include/aptosdb_writer.rs

+    // Update in-memory state of the database and the metrics before reverting.
+    // Note that any failures in persisting the revert should be treated as
+    // non-recoverable.
+    fn pre_revert(


This is also a cherry-pick from #28, not yet used anywhere, but will be once that PR lands.

mzabaluev · 2024-07-08T19:15:36Z

storage/aptosdb/src/state_store/mod.rs

+        let lock = self.reset_lock();
+        lock.reset();
+    }
+
+    pub fn reset_lock(&self) -> ResetLock<'_> {


Another cherry-pick from #28; it looks like a needless refactoring now, but will come useful later.

testsuite/forge/Cargo.toml

testsuite/smoke-test/Cargo.toml

testsuite/testcases/Cargo.toml

mzabaluev · 2024-07-08T19:21:59Z

The changes look sensible now, apart from some minor issues. The only real concern that jumped at me is the added todo! macros, potentially introducing crashiness.

Replace todo! in struct value initializers with sensible values. Apply some typo fixes.

mzabaluev · 2024-07-09T15:19:30Z

The merge breaks the movement CLI (in ./crates/aptos), because it updates many of its dependencies, and resurrects others in a broken form, by seemingly resolving "removed by us/changed by them" conflicts in favor of the usually incomplete set of files changed upstream. The conflicts in Cargo.toml are also resolved in favor of resurrecting these dependencies. The code of the CLI crate, however, is retained at the old revision it was pulled from for Monza.

I think the sensible way forward is to completely check out the required crates from main, and solve #41 as part of this so that the movement CLI is up-to-date against its workspace dependencies. Unfortunately, this means partially overwriting some changes made for Monza. We can keep them in the monza branch and revisit if we decide to pick up work on that project again.

l-monninger · 2024-07-09T16:43:47Z

My mistake, I misused --all-targets I guess: rust-lang/cargo#10958

When syncing with upstream, merge conflicts of the "changed by them/ removed by us" kind have been resolved by updating the conflicting files to the latest upstream revision. This only partially recovered the source for crates that have been removed for Monza. Restore the crates fully. Some of the changes made for Monza are overwritten from upstream to reduce the delta and allow resurrecting some crates erased in the work for Monza: - ring dependency removal from aptos-crypto, moving the noise implementation to aptos-network; - removal of tokio synchronization slots from aptos-types. This means this branch no longer supports Monza, and those changes would need to be re-applied if the Monza direction is taken again.

The storage interface used by tests added by Movement needed to be updated to the upstream changes.

Pull the README from upstream and remove the duplicate workspace entry.

…m-fixups Sync With Upstream: fixups, updating the CLI to 3.5.0

The changes do not work if the "multi-threaded-cf" feature is enabled. We only tried this for Monza.

This reverts commit bc283e6.

crate aptos renamed to movement.

We only parameterized FinalityView with Arc<dyn DbReader>, so just bake it in rather than relying on a generic impl. When DbReaderWriter is refactored, we might get a better shot at improving this.

It was made private again in the merge.

0xmovses and others added 30 commits March 20, 2024 14:36

update zeroize

f6b95e4

Update Cargo.toml

1787d80

Update Cargo.toml

6b28c8a

Update Cargo.toml

c013d43

Update Cargo.toml

bd16447

add into

6611115

more into

d3cc82a

update visibility

bfa7d8f

derive serde for ValidatorSigner

830bb59

Merge pull request #1 from 0xmovses/main

1ea8eab

Monza

feat: monza-testing.

3eb1806

fix: pub api struct.

6d895d9

Merge pull request #2 from 0xmovses/devnet

3e689f9

Devnet merge

feat: pub modules.

3fc0632

fix: skipped patches.

8f40ae4

make serives pub

93b2626

Merge pull request #3 from movementlabsxyz/0xmovses/pub-services

7485ffe

Make `services` pub

fix dalek

316f509

pub mod network

1b60020

pub typo

806bbf9

add error logs for deserialization

37c6e39

pub mod core_mempool

dfe3407

Don't version control VSCode settings

595b0fd

Let developers configure their VSCode without turning this into commit fests and battles of preferences.

initial

6b328ea

add prunes

860baf6

comment

7f12fa3

fix: merge.

bada906

Merge pull request #4 from mzabaluev/mikhail/de-scm-vscode-config

2b7de20

chore: remove VSCode configuration from git

add revert_kv method

0c5cae5

add test

4b4d1d0

mzabaluev reviewed Jul 8, 2024

View reviewed changes

mzabaluev mentioned this pull request Jul 8, 2024

Resync movement CLI with latest upstream aptos CLI #41

Closed

mzabaluev added 4 commits July 9, 2024 13:02

movement: revert mod genesis from upstream

f7896c1

Replace todo! in struct value initializers with sensible values. Apply some typo fixes.

Remove debug printouts not present upstream

7018ed6

Remove nft-metadata-crawler-parser again

a3ddc83

aptos-storage-interface: recover tests

db4d9e1

mzabaluev added 5 commits July 9, 2024 20:05

aptos-node: recover mod indexer

cccee62

aptos-db: update tests

94a520e

The storage interface used by tests added by Movement needed to be updated to the upstream changes.

fix(indexer-grpc-server-framework): fixup

b75af9d

Pull the README from upstream and remove the duplicate workspace entry.

Sync movement CLI from aptos-cli-v3.5.0

436c7b0

mzabaluev mentioned this pull request Jul 9, 2024

Sync With Upstream: fixups, updating the CLI to 3.5.0 #43

Merged

Merge pull request #43 from movementlabsxyz/mikhail/sync-with-upstrea…

9dd70cc

…m-fixups Sync With Upstream: fixups, updating the CLI to 3.5.0

mzabaluev mentioned this pull request Jul 10, 2024

Last suzuka stable with faucet patch fix #42

Merged

21 tasks

mzabaluev added 9 commits July 10, 2024 22:51

fix(aptos-schemadb): revert single-threaded mode

bc283e6

The changes do not work if the "multi-threaded-cf" feature is enabled. We only tried this for Monza.

Revert "revert single-threaded mode"

b5029d5

This reverts commit bc283e6.

fix: more feature-agnostic rocksdb API use

862cd10

fix(aptos-release-builder): restore from upstream

480701a

fix: rename some aptos imports to movement

ec980f9

fix(aptos-smoke-test): restore from upstream

f4058ae

fix(aptos-testcases): rename imports

b53e8a0

crate aptos renamed to movement.

refactor(storage-interface): dyn FinalityView

4f47482

We only parameterized FinalityView with Arc<dyn DbReader>, so just bake it in rather than relying on a generic impl. When DbReaderWriter is refactored, we might get a better shot at improving this.

fix: make get_transaction_by_hash_inner public

76be1d3

It was made private again in the merge.

mzabaluev force-pushed the l-monninger/sync-with-upstream branch from 26e7d4d to 76be1d3 Compare July 11, 2024 05:32

mzabaluev mentioned this pull request Jul 11, 2024

Sync with upstream movementlabsxyz/movement#184

Merged

mzabaluev merged commit e4430d7 into movement Jul 11, 2024

mzabaluev mentioned this pull request Jul 12, 2024

aptos-db: revert_commit reordering and improvements #28

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync With Upstream #30

Sync With Upstream #30

l-monninger commented Jul 2, 2024 •

edited by mzabaluev

Loading

mzabaluev Jul 8, 2024

mzabaluev Jul 8, 2024

mzabaluev Jul 9, 2024

andygolay Jul 10, 2024 •

edited

Loading

mzabaluev Jul 8, 2024

mzabaluev Jul 8, 2024

mzabaluev Jul 8, 2024

mzabaluev commented Jul 8, 2024

mzabaluev commented Jul 9, 2024 •

edited

Loading

l-monninger commented Jul 9, 2024

Sync With Upstream #30

Sync With Upstream #30

Conversation

l-monninger commented Jul 2, 2024 • edited by mzabaluev Loading

Description

Test Plan

mzabaluev Jul 8, 2024

Choose a reason for hiding this comment

mzabaluev Jul 8, 2024

Choose a reason for hiding this comment

mzabaluev Jul 9, 2024

Choose a reason for hiding this comment

andygolay Jul 10, 2024 • edited Loading

Choose a reason for hiding this comment

mzabaluev Jul 8, 2024

Choose a reason for hiding this comment

mzabaluev Jul 8, 2024

Choose a reason for hiding this comment

mzabaluev Jul 8, 2024

Choose a reason for hiding this comment

mzabaluev commented Jul 8, 2024

mzabaluev commented Jul 9, 2024 • edited Loading

l-monninger commented Jul 9, 2024

l-monninger commented Jul 2, 2024 •

edited by mzabaluev

Loading

andygolay Jul 10, 2024 •

edited

Loading

mzabaluev commented Jul 9, 2024 •

edited

Loading