Updates/merge cuttlefish #1007

dhedey · 2024-10-09T01:33:01Z

Summary

A PR to update the engine in the node to align with Cuttlefish.

This PR just gets the bottlenose node compiling/syncing with the Cuttlefish engine code. It does not yet implement any explicit cuttlefish functionality in the node, and there are a number of todo!s left in which will be fixed in later work.

Testing

The testing strategy is that:

Existing tests pass
Can sync a stokenet node with a fresh ledger

(Need to check that our backwards compatibility test suite works 👍)

github-actions · 2024-10-09T01:33:40Z

Phylum Report Link

codecov-commenter · 2024-10-14T18:18:55Z

Codecov Report

Attention: Patch coverage is 48.88287% with 755 lines in your changes missing coverage. Please review.

Project coverage is 43.1%. Comparing base (93bc7ea) to head (fb722dc).

Files with missing lines	Patch %	Lines
...-server/src/core_api/handlers/transaction_parse.rs	0.0%	101 Missing ⚠️
...e-rust/state-manager/src/transaction/validation.rs	2.3%	83 Missing ⚠️
...er/src/mempool/pending_transaction_result_cache.rs	25.0%	57 Missing ⚠️
...-rust/state-manager/src/transaction/preparation.rs	76.8%	37 Missing ⚠️
...erver/src/core_api/handlers/stream_transactions.rs	0.0%	27 Missing ⚠️
...rust/state-manager/src/jni/transaction_preparer.rs	0.0%	27 Missing ⚠️
core-rust/state-manager/src/types.rs	62.1%	25 Missing ⚠️
...src/protocol/protocol_updates/protocol_updaters.rs	11.5%	23 Missing ⚠️
...e_api/conversions/substates/access_rules_module.rs	0.0%	22 Missing ⚠️
...r/src/engine_state_api/conversions/access_rules.rs	0.0%	20 Missing ⚠️
... and 75 more

Additional details and impacted files

@@             Coverage Diff             @@
##             develop   #1007     +/-   ##
===========================================
- Coverage       43.5%   43.1%   -0.4%     
+ Complexity      4571    4570      -1     
===========================================
  Files           1731    1730      -1     
  Lines          53028   52805    -223     
  Branches        1514    1515      +1     
===========================================
- Hits           23072   22781    -291     
- Misses         29477   29545     +68     
  Partials         479     479

Flag	Coverage Δ
rust	`43.1% <48.8%> (-0.4%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
...core-api-server/src/core_api/conversions/common.rs	`0.0% <ø> (ø)`
...ore-api-server/src/core_api/conversions/context.rs	`0.0% <ø> (ø)`
...core-api-server/src/core_api/conversions/errors.rs	`0.0% <ø> (ø)`
...i-server/src/core_api/conversions/keys_and_sigs.rs	`0.0% <ø> (ø)`
...re-api-server/src/core_api/conversions/numerics.rs	`45.5% <ø> (ø)`
...-api-server/src/core_api/conversions/pagination.rs	`0.0% <ø> (ø)`
core-rust/core-api-server/src/core_api/errors.rs	`0.0% <ø> (ø)`
...ts/state_account_all_fungible_resource_balances.rs	`0.0% <ø> (ø)`
...pi/handlers/lts/state_account_deposit_behaviour.rs	`0.0% <ø> (ø)`
...api/handlers/lts/state_account_resource_balance.rs	`0.0% <ø> (ø)`
... and 153 more

github-actions · 2024-10-14T19:29:34Z

Docker tags
docker.io/radixdlt/private-babylon-node:pr-1007
docker.io/radixdlt/private-babylon-node:1975a35004
docker.io/radixdlt/private-babylon-node:sha-1975a35

sonarcloud · 2024-10-14T22:13:06Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
96.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

iamyulong · 2024-10-16T09:05:41Z

core-rust/core-api-server/src/core_api/conversions/addressing.rs

@@ -140,6 +140,10 @@ pub fn to_api_substate_id(
            SubstateType::BootLoaderModuleFieldKernelBoot,
            models::PartitionKind::Field,
        ),
+        TypedSubstateKey::BootLoader(TypedBootLoaderSubstateKey::BootLoaderField(
+            BootLoaderField::TransactionValidationConfiguration,
+        )) => todo!(),


Just to confirm that we've got a good way to track all these todos. :)

iamyulong · 2024-10-16T09:09:15Z

core-rust/core-api-server/src/core_api/conversions/receipt.rs

@@ -711,7 +704,7 @@ pub fn to_api_costing_parameters(
        xrd_usd_price: to_api_decimal(&engine_costing_parameters.usd_price),
        xrd_storage_price: to_api_decimal(&engine_costing_parameters.state_storage_price),
        xrd_archive_storage_price: to_api_decimal(&engine_costing_parameters.archive_storage_price),
-        tip_percentage: to_api_u16_as_i32(transaction_costing_parameters.tip_percentage),
+        tip_percentage: tip_percentage_decimal.try_into().unwrap_or(i32::MAX),


Should we unwrap?

iamyulong · 2024-10-16T09:27:10Z

core-rust/state-manager/src/jni/mempool.rs

@@ -217,11 +204,11 @@ impl From<MempoolAddError> for MempoolAddErrorJava {
    fn from(err: MempoolAddError) -> Self {
        match err {
            MempoolAddError::PriorityThresholdNotMet {
+                min_tip_basis_points_required: min_tip_percentage_required,
+                tip_basis_points: tip_percentage,
+            } => MempoolAddErrorJava::PriorityThresholdNotMet {


Minor: remove these confusing renames?

iamyulong · 2024-10-16T09:32:30Z

core-rust/state-manager/src/mempool/mod.rs

-                    }
+            MempoolAddError::PriorityThresholdNotMet {
+                min_tip_basis_points_required: min_tip_percentage_required,
+                tip_basis_points: tip_percentage,


Minor: remove these confusing renames?

iamyulong · 2024-10-16T09:33:22Z

core-rust/state-manager/src/mempool/mod.rs

+                    write!(f, "Priority Threshold not met. There is no known tip to guarantee mempool submission.")
+                }
+                Some(min_tip_percentage_required) => {
+                    write!(f, "Priority Threshold not met: tip is {tip_percentage} while min tip required {min_tip_percentage_required}")


tip => basis point

iamyulong · 2024-10-16T09:38:35Z

core-rust/state-manager/src/protocol/test.rs

            .transactions
            .remove(0);
-        let ProtocolUpdateTransactionDetails::FlashV1Transaction(flash) = validator_fee_fix;
+        let ProtocolUpdateTransaction::FlashTransactionV1(flash) = validator_fee_fix else {
+            panic!();


Maybe add a message here?

dhedey changed the base branch from main to develop October 9, 2024 01:33

dhedey mentioned this pull request Oct 12, 2024

Chore/fixes for node integration radixdlt/radixdlt-scrypto#1955

Merged

chore: Update Cargo.toml (does not compile)

1a4cd1b

dhedey force-pushed the updates/merge-cuttlefish branch from bb451a1 to 5bd7685 Compare October 12, 2024 02:21

updates: Node compiles with cuttelfish engine

50ccfea

dhedey force-pushed the updates/merge-cuttlefish branch from 5bd7685 to 50ccfea Compare October 14, 2024 17:48

tweak: Update to rustc 1.81.0 in docker

d5f6171

dhedey marked this pull request as ready for review October 14, 2024 19:09

tweak: Ignore MultiNodeRebootTest

fb722dc

iamyulong approved these changes Oct 16, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates/merge cuttlefish #1007

Updates/merge cuttlefish #1007

dhedey commented Oct 9, 2024 •

edited

Loading

github-actions bot commented Oct 9, 2024

codecov-commenter commented Oct 14, 2024 •

edited

Loading

github-actions bot commented Oct 14, 2024 •

edited

Loading

sonarcloud bot commented Oct 14, 2024

iamyulong Oct 16, 2024

iamyulong Oct 16, 2024

iamyulong Oct 16, 2024

iamyulong Oct 16, 2024

iamyulong Oct 16, 2024

iamyulong Oct 16, 2024

Updates/merge cuttlefish #1007

Are you sure you want to change the base?

Updates/merge cuttlefish #1007

Conversation

dhedey commented Oct 9, 2024 • edited Loading

Summary

Testing

github-actions bot commented Oct 9, 2024

Phylum Report Link

codecov-commenter commented Oct 14, 2024 • edited Loading

Codecov Report

github-actions bot commented Oct 14, 2024 • edited Loading

sonarcloud bot commented Oct 14, 2024

Quality Gate passed

iamyulong Oct 16, 2024

Choose a reason for hiding this comment

iamyulong Oct 16, 2024

Choose a reason for hiding this comment

iamyulong Oct 16, 2024

Choose a reason for hiding this comment

iamyulong Oct 16, 2024

Choose a reason for hiding this comment

iamyulong Oct 16, 2024

Choose a reason for hiding this comment

iamyulong Oct 16, 2024

Choose a reason for hiding this comment

dhedey commented Oct 9, 2024 •

edited

Loading

codecov-commenter commented Oct 14, 2024 •

edited

Loading

github-actions bot commented Oct 14, 2024 •

edited

Loading