(more) Syn 2.0 updates

Cargo.toml

@@ -49,8 +49,11 @@ test_network = { version = "=2.0.0-pre-rc.16", path = "core/test_network" }
 
 proc-macro-error = "1.0.4"
 proc-macro2 = "1.0.49"
-syn = { version = "1.0.107", default-features = false }
+syn = { package = "syn", version = "1.0.109", default-features = false }
+syn2 = { package = "syn", version = "2.0.25", default-features = false }
 quote = "1.0.23"
+manyhow = { version = "0.5.1", features = ["darling"] }
+darling = "0.20.1"
 
 futures = { version = "0.3.25", default-features = false }
 async-stream = "0.3.3"

cli/derive/Cargo.toml

@@ -11,9 +11,9 @@ license.workspace = true
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.107", features = ["parsing", "printing", "extra-traits"] }
-quote = "1.0.23"
-proc-macro2 = "1.0.49"
+syn = { workspace = true, features = ["parsing", "printing", "extra-traits"] }
+quote = { workspace = true }
+proc-macro2 = { workspace = true }
 
 [dev-dependencies]
-warp = "0.3.3"
+warp = { workspace = true }

core/src/block_sync.rs

@@ -204,7 +204,7 @@ pub mod message {
     }
 
     /// Message's variants that are used by peers to communicate in the process of consensus.
-    #[version_with_scale(n = 1, versioned = "VersionedMessage")]
+    #[version_with_scale(version = 1, versioned_alias = "VersionedMessage")]
     #[derive(Debug, Clone, Decode, Encode, FromVariant)]
     pub enum Message {
         /// Request for blocks after the block with `Hash` for the peer with `PeerId`.

core/src/sumeragi/message.rs

@@ -41,7 +41,7 @@ impl VersionedPacket {
 }
 
 /// Helper structure, wrapping messages and view change proofs.
-#[version_with_scale(n = 1, versioned = "VersionedPacket")]
+#[version_with_scale(version = 1, versioned_alias = "VersionedPacket")]
 #[derive(Debug, Clone, Decode, Encode)]
 pub struct MessagePacket {
     /// Proof of view change. As part of this message handling, all

data_model/src/block.rs

@@ -156,7 +156,7 @@ mod committed {
         }
 
         /// The `CommittedBlock` struct represents a block accepted by consensus
-        #[version_with_scale(n = 1, versioned = "VersionedCommittedBlock")]
+        #[version_with_scale(version = 1, versioned_alias = "VersionedCommittedBlock")]
         #[derive(
             Debug,
             Display,
@@ -395,14 +395,14 @@ pub mod stream {
         use super::*;
 
         /// Request sent to subscribe to blocks stream starting from the given height.
-        #[version_with_scale(n = 1, versioned = "VersionedBlockSubscriptionRequest")]
+        #[version_with_scale(version = 1, versioned_alias = "VersionedBlockSubscriptionRequest")]
         #[derive(Debug, Clone, Copy, Constructor, Decode, Encode, IntoSchema)]
         #[repr(transparent)]
         pub struct BlockSubscriptionRequest(pub NonZeroU64);
 
         /// Message sent by the stream producer
         /// Block sent by the peer.
-        #[version_with_scale(n = 1, versioned = "VersionedBlockMessage")]
+        #[version_with_scale(version = 1, versioned_alias = "VersionedBlockMessage")]
         #[derive(Debug, Clone, Decode, Encode, IntoSchema)]
         #[repr(transparent)]
         pub struct BlockMessage(pub VersionedCommittedBlock);