[WEEKLY RELEASE] Bump HotShot #2344

QuentinI · 2024-12-02T14:54:10Z

Updates HotShot with epoch related changes, incleading new Leaf2 and QuorumProposal2 types.
Moves the Marketplace upgrade to version 0.99 to make room for the Epoch upgrade which will be carried out first.

QuentinI · 2024-12-02T15:37:25Z

sequencer/src/api.rs

-                },
-            },
-        ) {
+        if let Err(err) = consensus.update_leaf(leaf, Arc::clone(&state), delta) {


update_saved_leaves and update_validated_state_map are now private. I figured update_leaf should cover the need for both of those

sequencer/src/persistence/fs.rs

sequencer/src/persistence/sql.rs

QuentinI · 2024-12-02T15:41:44Z

types/src/v0/traits.rs

@@ -498,6 +503,7 @@ pub trait SequencerPersistence: Sized + Send + Sync + 'static {
        // starting in a view in which we had already voted before the restart, and prevents
        // unnecessary catchup from starting in a view earlier than the anchor leaf.
        let view = max(highest_voted_view, leaf.view_number());
+        let epoch = todo!();


No idea where this should come from. I'd expect there to be Leaf2::epoch_number(), but that's not a thing.

The tests still hang: block hight is stuck when upgrade happens around view 110.

…-move-marketplace-version

The .git suffix isn't necessary and inconsistency seems to cause Cargo.lock to change in some cases.

sveitser

I think this looks okay now. Since many collaborated should have more than a single approval though.

imabdulbasit · 2024-12-05T13:45:23Z

Cargo.toml

-hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.74" }
-hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.82" }
+hotshot-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", branch = "hotshot/0.5.82" }


point to tag?

sequencer/src/persistence/sql.rs

ss-es

looks good on the whole, just left some comments

node-metrics/src/service/client_state/mod.rs

sequencer/src/api.rs

ss-es · 2024-12-05T15:42:13Z

sequencer/src/api.rs

@@ -1265,22 +1249,26 @@ mod api_tests {
                &ValidatedState::default(),
                &NodeState::mock(),
            )
-            .await,
+            .await
+            .to_qc2(),


sequencer/src/api/sql.rs

sequencer/src/context.rs

sequencer/src/persistence.rs

tbro and others added 8 commits November 6, 2024 13:33

Move Marketplace to higher version and create new v0_3 placeholder

961c465

test fixes

6a16d58

change number in test.yaml

d84422c

demo-native-mp should be running w/ test profile

306b8f8

fixes

9a90b40

mark error

f3ea371

Compiles

4a6ff12

Lints

fda4934

QuentinI force-pushed the hotshot/0.5.82 branch from 37a5d77 to fda4934 Compare December 2, 2024 15:34

Merge branch 'main' into hotshot/0.5.82

49ae17e

QuentinI commented Dec 2, 2024

View reviewed changes

sequencer/src/persistence/fs.rs Show resolved Hide resolved

QuentinI commented Dec 2, 2024

View reviewed changes

sequencer/src/persistence/sql.rs Show resolved Hide resolved

QuentinI commented Dec 2, 2024

View reviewed changes

sequencer/src/persistence/sql.rs Outdated Show resolved Hide resolved

QuentinI commented Dec 2, 2024

View reviewed changes

QuentinI and others added 15 commits December 2, 2024 17:02

Fix contract adapter

675d005

fix execute_one_with_retries

4fdf6e0

Move todo to comments

a9382d9

Merge branch 'main' into hotshot/0.5.82

2521f95

Merge branch 'tb/marketplace/infinate-version' into hotshot/0.5.82

2a71c1f

fix v3 serialization

a7cc721

uncomment base and upgrade versions

043c598

Fix versions in upgrade tests

e0495c2

The tests still hang: block hight is stuck when upgrade happens around view 110.

update epoch version to v100

f7856d0

Store v2 types as v1

fca10fc

Store v2 types as v1: fs

cc39a1f

Merge branch 'main' into hotshot/0.5.82

b7e7e65

Merge remote-tracking branch 'origin/main' into ma/weekly-update-plus…

7b659dd

…-move-marketplace-version

trigger CI

2b0cefc

Cargo.lock

0f4153e

sveitser added 4 commits December 5, 2024 12:31

leaf downgrade: panic if losing DRB info

4e2e339

Use consistent hotshot repo URL

86b88e1

The .git suffix isn't necessary and inconsistency seems to cause Cargo.lock to change in some cases.

nit: hotshot dependency consistent casing

ee2559e

cleanup: remove unnecessary whitespace changes

ec115f3

sveitser self-requested a review December 5, 2024 13:42

sveitser approved these changes Dec 5, 2024

View reviewed changes

imabdulbasit reviewed Dec 5, 2024

View reviewed changes

QuentinI commented Dec 5, 2024

View reviewed changes

sequencer/src/persistence/sql.rs Outdated Show resolved Hide resolved

imabdulbasit and others added 4 commits December 5, 2024 19:38

revert qp2 change in migrate_quorum_proposal_leaf_hashes and fix test

a84d232

Link to issue in migrate_consensus

4677783

Update drb_seed size

307bff9

Update lockfile

c4a6a2c

ss-es reviewed Dec 5, 2024

View reviewed changes

QuentinI added 8 commits December 5, 2024 18:09

Update query service

621404f

Fix query service

69ea9de

Use DRB consts

33eac8e

Merge remote-tracking branch 'origin/main' into hotshot/0.5.82

6db42ca

Use DRB consts x2

e5d3568

Update events-service

6f7fd9e

Update sequencer-sqlite lockfile

2d9eb09

Update sequencer-sqlite lockfile

74e345e

imabdulbasit approved these changes Dec 5, 2024

View reviewed changes

imabdulbasit and others added 5 commits December 6, 2024 00:15

update query-service

6ce0169

db max connections = 25 for dev node tests

b24c6c5

update query-service

7fe8751

Fix no-storage decides

f3244b9

Branches -> tags

f0bfe82

ss-es approved these changes Dec 6, 2024

View reviewed changes

QuentinI merged commit 4a09be2 into main Dec 6, 2024
23 checks passed

QuentinI deleted the hotshot/0.5.82 branch December 6, 2024 17:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WEEKLY RELEASE] Bump HotShot #2344

[WEEKLY RELEASE] Bump HotShot #2344

QuentinI commented Dec 2, 2024 •

edited by sveitser

Loading

QuentinI Dec 2, 2024

QuentinI Dec 2, 2024

sveitser left a comment

imabdulbasit Dec 5, 2024

ss-es left a comment

ss-es Dec 5, 2024

[WEEKLY RELEASE] Bump HotShot #2344

[WEEKLY RELEASE] Bump HotShot #2344

Conversation

QuentinI commented Dec 2, 2024 • edited by sveitser Loading

QuentinI Dec 2, 2024

Choose a reason for hiding this comment

QuentinI Dec 2, 2024

Choose a reason for hiding this comment

sveitser left a comment

Choose a reason for hiding this comment

imabdulbasit Dec 5, 2024

Choose a reason for hiding this comment

ss-es left a comment

Choose a reason for hiding this comment

ss-es Dec 5, 2024

Choose a reason for hiding this comment

QuentinI commented Dec 2, 2024 •

edited by sveitser

Loading