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

merge main to randomnet #12171

Merged
merged 40 commits into from
Feb 22, 2024
Merged

merge main to randomnet #12171

merged 40 commits into from
Feb 22, 2024

Conversation

zjma
Copy link
Contributor

@zjma zjma commented Feb 22, 2024

Description

Test Plan

alinush and others added 30 commits February 19, 2024 03:05
* Duplicated logic for creating the gas meter for view functions has been removed.
* Duplicated logic for calculating gas used for view functions has been removed.
* There was unreachable code in failure transaction cleanup, where the discarded
status has been returned immediately, but then re-checked again. The first check
is shifted inside.
* No more default transaction metadata.
* Scripts are now validated consistently.
* Simplifies transaction execution function signature to avoid `Option<String>`.
* Removes duplicated features from `AptosVM` and keeps them in `MoveVMExt`.
* Fixes a bug when script hash was not computed for `RunOnAbort`.

Related tests are moved  to `move-e2e-tests`.
Implement a pass to eliminate critical edges by splitting them with empty blocks
### Description

The block output limit is no longer hit with p2p txns.

### Test Plan

Forge `realistic_env_max_load` TPS improves.
* Minor aggregator cleanup

* Addressing PR comments
* Avoid cloning network sender using Arc pointers

* Removing a clone

* 100 node sweep test

* Removing a few clone operations

* reset forge test

* Removing some clones

* Removing clones
adopt AIP-61 terminology for consistency
* types update from randomnet

* update

* lint

* lint
* All validators broadcast commit messages

* Forge testing

* Increase timeout for forge

* test forge realistic_env_workload_sweep_test

* run realistic_env_workload_sweep_test

* run realistic_env_workload_sweep_test

* run sweep test

* increase forge runner duration

* forge testing

* Letting the proposer also broadcast commit decision for backward compatibility

* removing forge changes

* Added a TODO
* [vm] Resource access control: runtime engine

Implements the runtime engine for resource access control:

- a representation of access control specifiers in `loaded_data::runtime_access_specifiers`.
- a loader for access specifiers in `runtime::loader::access_specifier_loader`.
- a new stateful object representing the access control logic in `runtime::access_control`.
- finally the use of the `AccessControlState` in `runtime::interpreter`.

* Addressing reviewer comments.

* Addressing reviewer comments.

* typo: PTLA -> PTAL

* Rebasing: adjusting to upstream changes

* Rebasing
* update tests

* fix bug

* fix-12116

* fix missing space

* add expected got

* remove live-var tests

* fix had_erros

* fix

This comment has been minimized.

This comment has been minimized.

Copy link

codecov bot commented Feb 22, 2024

Codecov Report

Attention: Patch coverage is 65.01650% with 742 lines in your changes are missing coverage. Please review.

Project coverage is 70.1%. Comparing base (9ef872b) to head (f677b1a).
Report is 217 commits behind head on randomnet.

Files Patch % Lines
types/src/oidb/circuit_testcases.rs 0.0% 112 Missing ⚠️
types/src/oidb/openid_sig.rs 0.0% 101 Missing ⚠️
types/src/oidb/mod.rs 11.2% 95 Missing ⚠️
types/src/oidb/test_utils.rs 0.0% 75 Missing ⚠️
types/src/oidb/bn254_circom.rs 45.5% 74 Missing ⚠️
...-v2/src/pipeline/split_critical_edges_processor.rs 85.2% 38 Missing ⚠️
types/src/oidb/groth16_sig.rs 0.0% 38 Missing ⚠️
.../types/src/loaded_data/runtime_access_specifier.rs 88.3% 34 Missing ⚠️
types/src/oidb/groth16_vk.rs 54.5% 30 Missing ⚠️
aptos-move/aptos-vm/src/oidb_validation.rs 12.1% 29 Missing ⚠️
... and 15 more
Additional details and impacted files
@@              Coverage Diff               @@
##           randomnet   #12171       +/-   ##
==============================================
+ Coverage       69.8%    70.1%     +0.3%     
==============================================
  Files           2199      854     -1345     
  Lines         417217   189784   -227433     
==============================================
- Hits          291411   133134   -158277     
+ Misses        125806    56650    -69156     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

commit a50ffec
Author: Zhoujun Ma <[email protected]>
Date:   Thu Feb 22 21:10:12 2024 +0000

    lint

commit 388350f
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 13:04:28 2024 -0800

    update

commit 76f7eca
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 12:56:04 2024 -0800

    update

commit a663542
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 12:54:18 2024 -0800

    update

commit b439449
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 12:34:14 2024 -0800

    update

commit 3378ceb
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 12:17:06 2024 -0800

    update

commit 6cd6685
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 12:15:05 2024 -0800

    update

commit 6d89f37
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 12:13:51 2024 -0800

    update

commit 980f257
Author: zhoujun.ma <[email protected]>
Date:   Thu Feb 22 12:12:04 2024 -0800

    update

commit 16e9349
Author: Zhoujun Ma <[email protected]>
Date:   Thu Feb 22 18:25:08 2024 +0000

    lint

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

✅ Forge suite compat success on aptos-node-v1.9.5 ==> f677b1a045fda6ae6d9c9260b5cf918e49b44ea0

Compatibility test results for aptos-node-v1.9.5 ==> f677b1a045fda6ae6d9c9260b5cf918e49b44ea0 (PR)
1. Check liveness of validators at old version: aptos-node-v1.9.5
compatibility::simple-validator-upgrade::liveness-check : committed: 5696 txn/s, latency: 5032 ms, (p50: 4800 ms, p90: 5400 ms, p99: 10100 ms), latency samples: 250640
2. Upgrading first Validator to new version: f677b1a045fda6ae6d9c9260b5cf918e49b44ea0
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 786 txn/s, latency: 34698 ms, (p50: 41500 ms, p90: 51900 ms, p99: 53700 ms), latency samples: 56620
3. Upgrading rest of first batch to new version: f677b1a045fda6ae6d9c9260b5cf918e49b44ea0
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 154 txn/s, submitted: 360 txn/s, expired: 205 txn/s, latency: 34749 ms, (p50: 41700 ms, p90: 53800 ms, p99: 96600 ms), latency samples: 20968
4. upgrading second batch to new version: f677b1a045fda6ae6d9c9260b5cf918e49b44ea0
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 2959 txn/s, latency: 10229 ms, (p50: 9800 ms, p90: 17200 ms, p99: 17800 ms), latency samples: 136140
5. check swarm health
Compatibility test for aptos-node-v1.9.5 ==> f677b1a045fda6ae6d9c9260b5cf918e49b44ea0 passed
Test Ok

Copy link
Contributor

✅ Forge suite realistic_env_max_load success on f677b1a045fda6ae6d9c9260b5cf918e49b44ea0

two traffics test: inner traffic : committed: 7314 txn/s, latency: 5359 ms, (p50: 5100 ms, p90: 6600 ms, p99: 12500 ms), latency samples: 3159940
two traffics test : committed: 100 txn/s, latency: 2171 ms, (p50: 2100 ms, p90: 2300 ms, p99: 7500 ms), latency samples: 1760
Latency breakdown for phase 0: ["QsBatchToPos: max: 0.248, avg: 0.206", "QsPosToProposal: max: 0.457, avg: 0.426", "ConsensusProposalToOrdered: max: 0.583, avg: 0.553", "ConsensusOrderedToCommit: max: 0.453, avg: 0.437", "ConsensusProposalToCommit: max: 1.006, avg: 0.989"]
Max round gap was 1 [limit 4] at version 666671. Max no progress secs was 4.248388 [limit 15] at version 666671.
Test Ok

@zjma zjma merged commit d78f690 into randomnet Feb 22, 2024
45 checks passed
@zjma zjma deleted the zjma/merge_main_to_randomnet_2 branch February 22, 2024 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CICD:run-e2e-tests when this label is present github actions will run all land-blocking e2e tests from the PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.