Add gas vesion list, and fix gas version for derived object id native function #13047

igor-aptos · 2024-04-26T00:36:29Z

Description

Type of Change

Which Components or Systems Does This Change Impact?

How Has This Been Tested?

Key Areas to Review

Checklist

I have read and followed the CONTRIBUTING doc
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I identified and added all stakeholders and component owners affected by this change as reviewers
I tested both happy and unhappy path of the functionality
I have made corresponding changes to the documentation

trunk-io · 2024-04-26T00:36:33Z

⏱️ 15h 24m total CI duration on this PR

Job	Cumulative Duration	Recent Runs
windows-build	2h 39m	🟩 🟩 🟩 🟩
rust-targeted-unit-tests	2h 3m	🟩 🟩 ⬜ 🟩 🟩 (+1 more)
rust-smoke-tests	1h 50m	🟩 ⬜ ⬜ 🟩
execution-performance / single-node-performance	1h 41m	🟩 🟩 🟩 🟩
rust-unit-tests	1h 16m	🟩 ⬜ 🟥 🟩
rust-move-tests	1h 4m	🟩 🟩 🟩 🟩 🟩 (+1 more)
rust-images / rust-all	51m	🟩 🟩 🟩 🟩
forge-e2e-test / forge	44m	🟩 ⬜ ⬜ 🟩
forge-compat-test / forge	42m	🟥 🟥 ⬜ 🟥 🟥
rust-lints	34m	🟩 🟩 🟩 🟩 🟩 (+1 more)
run-tests-main-branch	27m	🟩 🟩 🟩 🟩 🟩 (+1 more)
cli-e2e-tests / run-cli-tests	27m	🟥 ⬜ 🟩 🟥
rust-build-cached-packages	20m	🟩 🟩 🟩 🟩
check	16m	🟩 🟩 🟩 🟩
general-lints	11m	🟩 🟩 🟩 🟩 🟩 (+1 more)
check-dynamic-deps	7m	🟩 🟩 🟩 🟩 🟩 (+1 more)
node-api-compatibility-tests / node-api-compatibility-tests	3m	🟩 🟩 🟩 🟩
semgrep/ci	2m	🟩 🟩 🟩 🟩 🟩 (+1 more)
file_change_determinator	1m	🟩 🟩 🟩 🟩 🟩 (+1 more)
file_change_determinator	1m	🟩 🟩 🟩 🟩 🟩 (+1 more)
execution-performance / file_change_determinator	45s	🟩 🟩 🟩 🟩
file_change_determinator	44s	🟩 🟩 🟩 🟩
permission-check	24s	🟩 🟩 🟩 🟩 🟩 (+1 more)
permission-check	24s	🟩 🟩 🟩 🟩 🟩 (+1 more)
permission-check	16s	🟩 🟩 🟩 🟩 🟩 (+1 more)
permission-check	16s	🟩 🟩 🟩 🟩 🟩 (+1 more)
determine-docker-build-metadata	12s	🟩 🟩 🟩 🟩
permission-check	11s	🟩 🟩 🟩 🟩

🚨 3 jobs on the last run were significantly faster/slower than expected

Job	Duration	vs 7d avg
cli-e2e-tests / run-cli-tests	9m	7m
rust-targeted-unit-tests	22m	17m
rust-build-cached-packages	4m	5m

_{settings ⋅ feedback ⋅ docs ⋅ learn more about trunk.io}

JoshLind

LGTM (but don't trust me) 😄

JoshLind · 2024-04-26T04:30:56Z

aptos-move/aptos-gas-schedule/src/gas_schedule/aptos_framework.rs

@@ -309,7 +309,7 @@ crate::gas_schedule::macros::define_gas_parameters!(

        [object_exists_at_base: InternalGas, { 7.. => "object.exists_at.base" }, 919],
        // Based on SHA3-256's cost
-        [object_user_derived_address_base: InternalGas, { 16.. => "object.user_derived_address.base" }, 14704],
+        [object_user_derived_address_base: InternalGas, { gas_feature_versions::RELEASE_V1_12.. => "object.user_derived_address.base" }, 14704],


Seems like this is the only non-refactor/change? Seems reasonable.

vgao1996 · 2024-04-26T06:28:00Z

aptos-move/aptos-gas-schedule/src/gas_schedule/aptos_framework.rs

-        [function_info_check_dispatch_type_compatibility_impl_base: InternalGas, { 17.. => "function_info.check_dispatch_type_compatibility_impl.base" }, 1002],
-        [function_info_load_function_base: InternalGas, { 17.. => "function_info.load_function.base" }, 551],
-        [dispatchable_fungible_asset_dispatch_base: InternalGas, { 17.. => "dispatchable_fungible_asset.dispatch.base" }, 551],
+        [function_info_check_is_identifier_base: InternalGas, { gas_feature_versions::RELEASE_V1_12.. => "function_info.is_identifier.base" }, 551],


Cleaner to just import gas_feature_versions::RELEASE_V1_12?

… function

github-actions · 2024-04-26T22:41:27Z

❌ Forge suite `compat` failure on `aptos-node-v1.11.2` ==> `54426a6d9d87f38308b59a2e13b4b0b9ed272d76`

Compatibility test results for aptos-node-v1.11.2 ==> 54426a6d9d87f38308b59a2e13b4b0b9ed272d76 (PR)
1. Check liveness of validators at old version: aptos-node-v1.11.2
compatibility::simple-validator-upgrade::liveness-check : committed: 6825 txn/s, latency: 4923 ms, (p50: 4800 ms, p90: 8100 ms, p99: 8700 ms), latency samples: 259380
2. Upgrading first Validator to new version: 54426a6d9d87f38308b59a2e13b4b0b9ed272d76
Test Failed: Tried executing 10 txns, request counters: "success 0, failed submit [0], failed wait [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10], by client: [(0, 0, 180): http://aptos-node-1-validator.forge-compat-pr-13047.svc:8080/v1/]"

Caused by:
    Unknown error Ledger on endpoint (http://aptos-node-1-validator.forge-compat-pr-13047.svc:8080/v1/) is more than 60s behind current time, timing out waiting for the transaction. Warning, transaction (eb962422) might still succeed.

Stack backtrace:
   0: anyhow::error::<impl core::convert::From<E> for anyhow::Error>::from
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/anyhow-1.0.79/src/error.rs:565:25
   1: <core::result::Result<T,F> as core::ops::try_trait::FromResidual<core::result::Result<core::convert::Infallible,E>>>::from_residual
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/core/src/result.rs:1963:27
   2: aptos_transaction_emitter_lib::emitter::transaction_executor::RestApiReliableTransactionSubmitter::submit_check_and_retry::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/transaction_executor.rs:127:28
   3: <futures_util::future::maybe_done::MaybeDone<Fut> as core::future::future::Future>::poll
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/futures-util-0.3.30/src/future/maybe_done.rs:95:38
   4: <futures_util::future::join_all::JoinAll<F> as core::future::future::Future>::poll
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/futures-util-0.3.30/src/future/join_all.rs:143:24
   5: <aptos_transaction_emitter_lib::emitter::transaction_executor::RestApiReliableTransactionSubmitter as aptos_transaction_generator_lib::ReliableTransactionSubmitter>::execute_transactions_with_counter::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/transaction_executor.rs:309:10
   6: <core::pin::Pin<P> as core::future::future::Future>::poll
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/core/src/future/future.rs:125:9
   7: aptos_transaction_emitter_lib::emitter::account_minter::AccountMinter::create_and_fund_seed_accounts::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/account_minter.rs:434:18
   8: aptos_transaction_emitter_lib::emitter::account_minter::AccountMinter::create_and_fund_accounts::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/account_minter.rs:326:14
   9: aptos_transaction_emitter_lib::emitter::create_accounts::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/mod.rs:1195:14
  10: aptos_transaction_emitter_lib::emitter::TxnEmitter::start_job::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/mod.rs:717:10
  11: aptos_transaction_emitter_lib::emitter::TxnEmitter::emit_txn_for_impl::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/mod.rs:827:14
  12: aptos_transaction_emitter_lib::emitter::TxnEmitter::emit_txn_for::{{closure}}
             at ./crates/transaction-emitter-lib/src/emitter/mod.rs:859:14
  13: tokio::runtime::park::CachedParkThread::block_on::{{closure}}
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/park.rs:282:63
  14: tokio::runtime::coop::with_budget
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/coop.rs:107:5
  15: tokio::runtime::coop::budget
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/coop.rs:73:5
  16: tokio::runtime::park::CachedParkThread::block_on
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/park.rs:282:31
  17: tokio::runtime::context::blocking::BlockingRegionGuard::block_on
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/context/blocking.rs:66:9
  18: tokio::runtime::scheduler::multi_thread::MultiThread::block_on::{{closure}}
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/scheduler/multi_thread/mod.rs:87:13
  19: tokio::runtime::context::runtime::enter_runtime
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/context/runtime.rs:65:16
  20: tokio::runtime::scheduler::multi_thread::MultiThread::block_on
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/scheduler/multi_thread/mod.rs:86:9
  21: tokio::runtime::runtime::Runtime::block_on
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/tokio-1.35.1/src/runtime/runtime.rs:350:50
  22: aptos_testcases::generate_traffic
             at ./testsuite/testcases/src/lib.rs:105:17
  23: <aptos_testcases::compatibility_test::SimpleValidatorUpgrade as aptos_forge::interface::network::NetworkTest>::run
             at ./testsuite/testcases/src/compatibility_test.rs:83:24
  24: aptos_forge::runner::Forge<F>::run::{{closure}}
             at ./testsuite/forge/src/runner.rs:598:42
  25: aptos_forge::runner::run_test
             at ./testsuite/forge/src/runner.rs:666:11
  26: aptos_forge::runner::Forge<F>::run
             at ./testsuite/forge/src/runner.rs:598:30
  27: forge::run_forge
             at ./testsuite/forge-cli/src/main.rs:427:11
  28: forge::main
             at ./testsuite/forge-cli/src/main.rs:353:21
  29: core::ops::function::FnOnce::call_once
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/core/src/ops/function.rs:250:5
  30: std::sys_common::backtrace::__rust_begin_short_backtrace
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/sys_common/backtrace.rs:154:18
  31: std::rt::lang_start::{{closure}}
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:167:18
  32: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &F>::call_once
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/core/src/ops/function.rs:284:13
  33: std::panicking::try::do_call
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:552:40
  34: std::panicking::try
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:516:19
  35: std::panic::catch_unwind
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panic.rs:142:14
  36: std::rt::lang_start_internal::{{closure}}
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:148:48
  37: std::panicking::try::do_call
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:552:40
  38: std::panicking::try
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:516:19
  39: std::panic::catch_unwind
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panic.rs:142:14
  40: std::rt::lang_start_internal
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:148:20
  41: std::rt::lang_start
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:166:17
  42: __libc_start_main
  43: _start
Trailing Log Lines:
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:516:19
  39: std::panic::catch_unwind
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panic.rs:142:14
  40: std::rt::lang_start_internal
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:148:20
  41: std::rt::lang_start
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:166:17
  42: __libc_start_main
  43: _start


Swarm logs can be found here: See fgi output for more information.
{"level":"INFO","source":{"package":"aptos_forge","file":"testsuite/forge/src/backend/k8s/cluster_helper.rs:292"},"thread_name":"main","hostname":"forge-compat-pr-13047-1714170827-aptos-node-v1-11-2","timestamp":"2024-04-26T22:41:21.298037Z","message":"Deleting namespace forge-compat-pr-13047: Some(NamespaceStatus { conditions: None, phase: Some(\"Terminating\") })"}
{"level":"INFO","source":{"package":"aptos_forge","file":"testsuite/forge/src/backend/k8s/cluster_helper.rs:400"},"thread_name":"main","hostname":"forge-compat-pr-13047-1714170827-aptos-node-v1-11-2","timestamp":"2024-04-26T22:41:21.298068Z","message":"aptos-node resources for Forge removed in namespace: forge-compat-pr-13047"}
Failed to run tests:
Tests Failed

failures:
    compatibility::simple-validator-upgrade

test result: FAILED. 0 passed; 1 failed; 0 filtered out

Error: Tests Failed

Stack backtrace:
   0: anyhow::error::<impl anyhow::Error>::msg
             at /usr/local/cargo/registry/src/index.crates.io-6f17d22bba15001f/anyhow-1.0.79/src/error.rs:83:36
   1: aptos_forge::runner::Forge<F>::run
             at ./testsuite/forge/src/runner.rs:618:13
   2: forge::run_forge
             at ./testsuite/forge-cli/src/main.rs:427:11
   3: forge::main
             at ./testsuite/forge-cli/src/main.rs:353:21
   4: core::ops::function::FnOnce::call_once
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/core/src/ops/function.rs:250:5
   5: std::sys_common::backtrace::__rust_begin_short_backtrace
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/sys_common/backtrace.rs:154:18
   6: std::rt::lang_start::{{closure}}
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:167:18
   7: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &F>::call_once
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/core/src/ops/function.rs:284:13
   8: std::panicking::try::do_call
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:552:40
   9: std::panicking::try
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:516:19
  10: std::panic::catch_unwind
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panic.rs:142:14
  11: std::rt::lang_start_internal::{{closure}}
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:148:48
  12: std::panicking::try::do_call
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:552:40
  13: std::panicking::try
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panicking.rs:516:19
  14: std::panic::catch_unwind
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/panic.rs:142:14
  15: std::rt::lang_start_internal
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:148:20
  16: std::rt::lang_start
             at /rustc/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/src/rt.rs:166:17
  17: __libc_start_main
  18: _start
Debugging output:
NAME                                    READY   STATUS      RESTARTS   AGE
aptos-node-0-validator-0                1/1     Running     0          6m40s
aptos-node-1-validator-0                1/1     Running     0          4m35s
aptos-node-2-validator-0                1/1     Running     0          6m40s
aptos-node-3-validator-0                1/1     Running     0          6m40s
genesis-aptos-genesis-eforge153-qzcrx   0/1     Completed   0          7m11s

github-actions · 2024-04-26T22:46:48Z

✅ Forge suite `realistic_env_max_load` success on `54426a6d9d87f38308b59a2e13b4b0b9ed272d76`

two traffics test: inner traffic : committed: 8064 txn/s, latency: 4871 ms, (p50: 4500 ms, p90: 5700 ms, p99: 10800 ms), latency samples: 3475740
two traffics test : committed: 100 txn/s, latency: 1984 ms, (p50: 1800 ms, p90: 2100 ms, p99: 7700 ms), latency samples: 1800
Latency breakdown for phase 0: ["QsBatchToPos: max: 0.209, avg: 0.202", "QsPosToProposal: max: 0.211, avg: 0.198", "ConsensusProposalToOrdered: max: 0.457, avg: 0.436", "ConsensusOrderedToCommit: max: 0.350, avg: 0.335", "ConsensusProposalToCommit: max: 0.791, avg: 0.771"]
Max round gap was 1 [limit 4] at version 546461. Max no progress secs was 4.910025 [limit 15] at version 546461.
Test Ok

igor-aptos requested review from junkil-park, vgao1996, zekun000 and sherry-x April 26, 2024 00:36

JoshLind approved these changes Apr 26, 2024

View reviewed changes

vgao1996 approved these changes Apr 26, 2024

View reviewed changes

igor-aptos force-pushed the igor/fix_gas_version_for_native_object branch from 11a311f to abd571e Compare April 26, 2024 19:32

igor-aptos enabled auto-merge (squash) April 26, 2024 20:27

This comment has been minimized.

Sign in to view

Add gas vesion list, and fix gas version for derived object id native…

54426a6

… function

igor-aptos force-pushed the igor/fix_gas_version_for_native_object branch from abd571e to 54426a6 Compare April 26, 2024 21:37

This comment has been minimized.

Sign in to view

igor-aptos force-pushed the igor/fix_gas_version_for_native_object branch from 54426a6 to b7310b9 Compare April 26, 2024 21:52

This comment has been minimized.

Sign in to view

igor-aptos force-pushed the igor/fix_gas_version_for_native_object branch from b7310b9 to 54426a6 Compare April 26, 2024 22:18

This comment has been minimized.

Sign in to view

sherry-x disabled auto-merge April 26, 2024 23:50

sherry-x merged commit 55a32ed into main Apr 26, 2024
73 of 81 checks passed

sherry-x deleted the igor/fix_gas_version_for_native_object branch April 26, 2024 23:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add gas vesion list, and fix gas version for derived object id native function #13047

Add gas vesion list, and fix gas version for derived object id native function #13047

igor-aptos commented Apr 26, 2024

trunk-io bot commented Apr 26, 2024 •

edited

Loading

JoshLind left a comment

JoshLind Apr 26, 2024 •

edited

Loading

vgao1996 Apr 26, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

github-actions bot commented Apr 26, 2024

github-actions bot commented Apr 26, 2024

Add gas vesion list, and fix gas version for derived object id native function #13047

Add gas vesion list, and fix gas version for derived object id native function #13047

Conversation

igor-aptos commented Apr 26, 2024

Description

Type of Change

Which Components or Systems Does This Change Impact?

How Has This Been Tested?

Key Areas to Review

Checklist

trunk-io bot commented Apr 26, 2024 • edited Loading

JoshLind left a comment

Choose a reason for hiding this comment

JoshLind Apr 26, 2024 • edited Loading

Choose a reason for hiding this comment

vgao1996 Apr 26, 2024

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

github-actions bot commented Apr 26, 2024

❌ Forge suite compat failure on aptos-node-v1.11.2 ==> 54426a6d9d87f38308b59a2e13b4b0b9ed272d76

github-actions bot commented Apr 26, 2024

✅ Forge suite realistic_env_max_load success on 54426a6d9d87f38308b59a2e13b4b0b9ed272d76

trunk-io bot commented Apr 26, 2024 •

edited

Loading

JoshLind Apr 26, 2024 •

edited

Loading

❌ Forge suite `compat` failure on `aptos-node-v1.11.2` ==> `54426a6d9d87f38308b59a2e13b4b0b9ed272d76`

✅ Forge suite `realistic_env_max_load` success on `54426a6d9d87f38308b59a2e13b4b0b9ed272d76`