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.

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

Sync with upstream (aptos-cli-v4.0.0) #60

Open
wants to merge 212 commits into
base: main
Choose a base branch
from
Open

Conversation

mzabaluev
Copy link
Collaborator

@mzabaluev mzabaluev commented Aug 15, 2024

Resolves: #54 #55

As previously with this kind of PRs, comparing against upstream's merge point.
To be merged into movement when ready.

Andy Golay and others added 14 commits July 17, 2024 03:02
Check the tx events have been removed. This should
include new block events, but we can't directly test
that because the test block data generator used in aptos-db
does not generate BlockMetadata transactions.

Make variable naming more consistent in the tests.
…es-and-reorder

aptos-db: `revert_commit` reordering and improvements
…it-config

Change CLI init config branding from Aptos to Movement
Add finalized_block_height method for FinalityView,
retrieving a previously set block height.
This is needed for sanity checks.
…eight-getter

`finalized_block_height` getter for `FinalityView`
Remove all upstream GitHub workflows, save the one
we're going to use with adaptations.
andygolay and others added 10 commits August 27, 2024 12:21
Replaced with instruction during choose network prompt.
Fix: Recommend --skip-faucet flag on movement init with testnet and link to faucet after creating profile
We were returning `            return Err(
                "For testnet, start over and run movement init --skip-faucet");`

which compiled locally for me, but I noticed it caused CI to fail [this job](movementlabsxyz/movement#506) with error

```
   Compiling aptos-node v0.0.0-main (/home/runner/actions-runner/_work/movement/movement/aptos-core/aptos-node)
error[E0308]: mismatched types
   --> crates/aptos/src/common/init.rs:130:24
    |
130 |             return Err("For testnet, start over and run movement init --skip-faucet");
    |                    --- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `CliError`, found `&str`
    |                    |
    |                    arguments to this enum variant are incorrect
    |
help: the type constructed contains `&'static str` due to the type of the argument passed
   --> crates/aptos/src/common/init.rs:130:20
    |
130 |             return Err("For testnet, start over and run movement init --skip-faucet");
    |                    ^^^^-------------------------------------------------------------^
    |                        |
    |                        this argument influences the type of `Err`
```

It looks like we need to specify the arg type, hence this fix.
Co-authored-by: Mikhail Zabaluev <mikhail.zabaluev@movementlabs.xyz>
…t-fix

Fix error return format in init.rs
@andygolay
Copy link

@mzabaluev is this PR stale, as of now? Or would it still be worth considering merging?

I'm wondering how we can do this sort of PR in a manageable way going forward.

The team had discussed automatic notifications about changes, which we could cherry pick... would that make sense to do?

I'm a little overwhelmed with the magnitude of the diff here, so, just thinking about what to do with this PR and PRs like it going forward.

@mzabaluev
Copy link
Collaborator Author

mzabaluev commented Nov 26, 2024

I've opened movement#901 to discuss the syncing approach.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants