types migration

Cargo.toml

@@ -118,6 +118,7 @@ libp2p-swarm-derive = { version = "0.35" }
 typenum = "1"
 cbor4ii = { version = "1.0", features = ["serde1"] }
 serde_bytes = { version = "0.11" }
+semver = "1"
 num_cpus = "1"
 dashmap = "6"
 memoize = { version = "0.4", features = ["full"] }

hotshot-builder-core-refactored/src/testing/basic.rs

@@ -8,7 +8,7 @@ use hotshot_example_types::state_types::{TestInstanceState, TestValidatedState};
 use hotshot_types::data::VidCommitment;
 use hotshot_types::data::{Leaf2, QuorumProposal2, QuorumProposalWrapper, ViewNumber};
 use hotshot_types::event::LeafInfo;
-use hotshot_types::simple_certificate::QuorumCertificate;
+use hotshot_types::simple_certificate::QuorumCertificate2;
 use hotshot_types::traits::block_contents::BlockHeader;
 use hotshot_types::traits::node_implementation::{ConsensusTime, NodeType};
 use hotshot_types::utils::BuilderCommitment;
@@ -186,9 +186,7 @@ async fn test_pruning() {
     // everything else is boilerplate.
 
     let mock_qc =
-        QuorumCertificate::genesis::<TestVersions>(&Default::default(), &Default::default())
-            .await
-            .to_qc2();
+        QuorumCertificate2::genesis::<TestVersions>(&Default::default(), &Default::default()).await;
     let leaf = Leaf2::from_quorum_proposal(&QuorumProposalWrapper {
         proposal: QuorumProposal2 {
             block_header: <TestBlockHeader as BlockHeader<TestTypes>>::genesis(

hotshot-builder-core/src/service.rs

@@ -1552,12 +1552,12 @@ mod test {
     use hotshot_types::data::EpochNumber;
     use hotshot_types::data::Leaf2;
     use hotshot_types::data::{QuorumProposal2, QuorumProposalWrapper};
+    use hotshot_types::simple_certificate::QuorumCertificate2;
     use hotshot_types::traits::block_contents::Transaction;
     use hotshot_types::traits::node_implementation::Versions;
     use hotshot_types::{
         data::{vid_commitment, Leaf, ViewNumber},
         message::Proposal,
-        simple_certificate::QuorumCertificate,
         traits::{node_implementation::ConsensusTime, signature_key::BuilderSignatureKey},
         utils::BuilderCommitment,
     };
@@ -4099,12 +4099,11 @@ mod test {
                 proposal: QuorumProposal2::<TestTypes> {
                     block_header: leaf.block_header().clone(),
                     view_number,
-                    justify_qc: QuorumCertificate::genesis::<TestVersions>(
+                    justify_qc: QuorumCertificate2::genesis::<TestVersions>(
                         &TestValidatedState::default(),
                         &TestInstanceState::default(),
                     )
-                    .await
-                    .to_qc2(),
+                    .await,
                     upgrade_certificate: None,
                     view_change_evidence: None,
                     next_epoch_justify_qc: None,
@@ -4175,12 +4174,11 @@ mod test {
                 proposal: QuorumProposal2::<TestTypes> {
                     block_header: leaf.block_header().clone(),
                     view_number,
-                    justify_qc: QuorumCertificate::genesis::<TestVersions>(
+                    justify_qc: QuorumCertificate2::genesis::<TestVersions>(
                         &TestValidatedState::default(),
                         &TestInstanceState::default(),
                     )
-                    .await
-                    .to_qc2(),
+                    .await,
                     upgrade_certificate: None,
                     view_change_evidence: None,
                     next_epoch_justify_qc: None,
@@ -4242,12 +4240,11 @@ mod test {
                 proposal: QuorumProposal2::<TestTypes> {
                     block_header: leaf.block_header().clone(),
                     view_number,
-                    justify_qc: QuorumCertificate::genesis::<TestVersions>(
+                    justify_qc: QuorumCertificate2::genesis::<TestVersions>(
                         &TestValidatedState::default(),
                         &TestInstanceState::default(),
                     )
-                    .await
-                    .to_qc2(),
+                    .await,
                     upgrade_certificate: None,
                     view_change_evidence: None,
                     next_epoch_justify_qc: None,

hotshot-builder-core/src/testing/basic_test.rs

@@ -5,7 +5,7 @@ pub use hotshot_types::{
     data::{EpochNumber, Leaf, ViewNumber},
     message::Proposal,
     signature_key::BLSPubKey,
-    simple_certificate::{QuorumCertificate, SimpleCertificate, SuccessThreshold},
+    simple_certificate::{QuorumCertificate2, SimpleCertificate, SuccessThreshold},
     traits::{
         block_contents::BlockPayload,
         node_implementation::{ConsensusTime, NodeType},
@@ -172,12 +172,11 @@ mod tests {
         let mut previous_commitment = initial_commitment;
         let mut previous_view = ViewNumber::new(0);
         let mut previous_quorum_proposal = {
-            let previous_jc = QuorumCertificate::<TestTypes>::genesis::<TestVersions>(
+            let previous_jc = QuorumCertificate2::<TestTypes>::genesis::<TestVersions>(
                 &TestValidatedState::default(),
                 &TestInstanceState::default(),
             )
-            .await
-            .to_qc2();
+            .await;
 
             QuorumProposalWrapper::<TestTypes> {
                 proposal: QuorumProposal2::<TestTypes> {

hotshot-builder-core/src/testing/finalization_test.rs

@@ -21,10 +21,10 @@ use hotshot_example_types::{
     node_types::{TestTypes, TestVersions},
     state_types::{TestInstanceState, TestValidatedState},
 };
+use hotshot_types::simple_certificate::QuorumCertificate2;
 use hotshot_types::{
     data::{vid_commitment, DaProposal2, QuorumProposal2, QuorumProposalWrapper, ViewNumber},
     message::Proposal,
-    simple_certificate::QuorumCertificate,
     traits::{
         block_contents::BlockHeader,
         node_implementation::{ConsensusTime, Versions},
@@ -332,12 +332,11 @@ async fn progress_round_with_transactions(
             proposal: QuorumProposal2::<TestTypes> {
                 block_header,
                 view_number: next_view,
-                justify_qc: QuorumCertificate::<TestTypes>::genesis::<TestVersions>(
+                justify_qc: QuorumCertificate2::<TestTypes>::genesis::<TestVersions>(
                     &TestValidatedState::default(),
                     &TestInstanceState::default(),
                 )
-                .await
-                .to_qc2(),
+                .await,
                 upgrade_certificate: None,
                 view_change_evidence: None,
                 next_epoch_justify_qc: None,

hotshot-builder-core/src/testing/mod.rs

@@ -17,7 +17,7 @@ use hotshot_types::{
         vid_commitment, DaProposal2, Leaf2, QuorumProposal2, QuorumProposalWrapper, ViewNumber,
     },
     message::Proposal,
-    simple_certificate::{QuorumCertificate, SimpleCertificate, SuccessThreshold},
+    simple_certificate::{QuorumCertificate2, SimpleCertificate, SuccessThreshold},
     simple_vote::QuorumData2,
     traits::{
         node_implementation::{ConsensusTime, Versions},
@@ -186,12 +186,13 @@ pub async fn calc_proposal_msg<V: Versions>(
     };
 
     let justify_qc = match prev_quorum_proposal.as_ref() {
-        None => QuorumCertificate::<TestTypes>::genesis::<TestVersions>(
-            &TestValidatedState::default(),
-            &TestInstanceState::default(),
-        )
-        .await
-        .to_qc2(),
+        None => {
+            QuorumCertificate2::<TestTypes>::genesis::<TestVersions>(
+                &TestValidatedState::default(),
+                &TestInstanceState::default(),
+            )
+            .await
+        }
         Some(prev_proposal) => {
             let prev_justify_qc = prev_proposal.justify_qc();
             let quorum_data = QuorumData2::<TestTypes> {

hotshot-example-types/src/storage_types.rs

@@ -20,7 +20,7 @@ use hotshot_types::{
         QuorumProposalWrapper, VidCommitment,
     },
     event::HotShotAction,
-    message::Proposal,
+    message::{convert_proposal, Proposal},
     simple_certificate::{NextEpochQuorumCertificate2, QuorumCertificate2, UpgradeCertificate},
     traits::{
         node_implementation::{ConsensusTime, NodeType},
@@ -362,13 +362,7 @@ impl<TYPES: NodeType> Storage<TYPES> for TestStorage<TYPES> {
         Ok(())
     }
 
-    async fn migrate_consensus(
-        &self,
-        _convert_leaf: fn(Leaf<TYPES>) -> Leaf2<TYPES>,
-        convert_proposal: fn(
-            Proposal<TYPES, QuorumProposal<TYPES>>,
-        ) -> Proposal<TYPES, QuorumProposal2<TYPES>>,
-    ) -> Result<()> {
+    async fn migrate_consensus(&self) -> Result<()> {
         let mut storage_writer = self.inner.write().await;
 
         for (view, proposal) in storage_writer.proposals.clone().iter() {

hotshot-query-service/Cargo.toml

@@ -79,6 +79,7 @@ jf-vid = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfis
 ] }
 lazy_static = "1"
 prometheus = "0.13"
+semver = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 snafu = "0.8"

hotshot-query-service/migrations/postgres/V500__types_migration.sql

@@ -0,0 +1,23 @@
+CREATE TABLE leaf2
+(
+    height     BIGINT  PRIMARY KEY REFERENCES header (height) ON DELETE CASCADE,
+    hash       VARCHAR NOT NULL UNIQUE,
+    block_hash VARCHAR NOT NULL REFERENCES header (hash) ON DELETE CASCADE,
+    leaf JSONB NOT NULL,
+    qc   JSONB NOT NULL
+);
+
+CREATE TABLE types_migration ( 
+    id SERIAL PRIMARY KEY,
+    completed bool NOT NULL DEFAULT false
+);
+
+INSERT INTO types_migration ("completed") VALUES (false);
+
+
+CREATE TABLE vid2
+(
+    height BIGINT PRIMARY KEY REFERENCES header (height) ON DELETE CASCADE,
+    common BYTEA  NOT NULL,
+    share  BYTEA
+);

hotshot-query-service/migrations/sqlite/V300__types_migration.sql

@@ -0,0 +1,22 @@
+CREATE TABLE leaf2
+(
+    height     BIGINT  PRIMARY KEY REFERENCES header (height) ON DELETE CASCADE,
+    hash       VARCHAR NOT NULL UNIQUE,
+    block_hash VARCHAR NOT NULL REFERENCES header (hash) ON DELETE CASCADE,
+    leaf JSONB NOT NULL,
+    qc   JSONB NOT NULL
+);
+
+CREATE TABLE types_migration ( 
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    completed bool NOT NULL DEFAULT false
+);
+
+INSERT INTO types_migration ("completed") VALUES (false);
+
+CREATE TABLE vid2
+(
+    height BIGINT PRIMARY KEY REFERENCES header (height) ON DELETE CASCADE,
+    common BYTEA  NOT NULL,
+    share  BYTEA
+);