feat: support DECLARE tx v0

xJonathanLEI · Jul 1, 2023 · 0e64919 · 0e64919
1 parent fb6b8af
commit 0e64919
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 16 deletions.
diff --git a/starknet-core/src/types/codegen.rs b/starknet-core/src/types/codegen.rs
@@ -3,7 +3,7 @@
 //     https://github.com/xJonathanLEI/starknet-jsonrpc-codegen
 
 // Code generated with version:
-//     https://github.com/xJonathanLEI/starknet-jsonrpc-codegen#91e3a82e65d6a47f05418b6d9acc326e3d0b19c5
+//     https://github.com/xJonathanLEI/starknet-jsonrpc-codegen#14c217ef55ee23dcba2a956ddecb6e4bb9d02bb9
 
 // Code generation requested but not implemented for these types:
 // - `BLOCK_ID`
@@ -253,6 +253,25 @@ pub struct DeclareTransactionReceipt {
     pub events: Vec<Event>,
 }
 
+/// Declare contract transaction v0.
+///
+/// Declare contract transaction v0.
+#[derive(Debug, Clone)]
+pub struct DeclareTransactionV0 {
+    /// The hash identifying the transaction
+    pub transaction_hash: FieldElement,
+    /// The maximal fee that can be charged for including the transaction
+    pub max_fee: FieldElement,
+    /// Signature
+    pub signature: Vec<FieldElement>,
+    /// Nonce
+    pub nonce: FieldElement,
+    /// The hash of the declared class
+    pub class_hash: FieldElement,
+    /// The address of the account contract sending the declaration transaction
+    pub sender_address: FieldElement,
+}
+
 /// Declare contract transaction v1.
 ///
 /// Declare contract transaction v1.
@@ -1870,6 +1889,93 @@ impl<'de> Deserialize<'de> for DeclareTransactionReceipt {
     }
 }
 
+impl Serialize for DeclareTransactionV0 {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        #[serde_as]
+        #[derive(Serialize)]
+        struct Tagged<'a> {
+            #[serde_as(as = "UfeHex")]
+            pub transaction_hash: &'a FieldElement,
+            #[serde_as(as = "UfeHex")]
+            pub max_fee: &'a FieldElement,
+            #[serde_as(as = "NumAsHex")]
+            pub version: &'a u64,
+            #[serde_as(as = "[UfeHex]")]
+            pub signature: &'a [FieldElement],
+            #[serde_as(as = "UfeHex")]
+            pub nonce: &'a FieldElement,
+            pub r#type: &'a str,
+            #[serde_as(as = "UfeHex")]
+            pub class_hash: &'a FieldElement,
+            #[serde_as(as = "UfeHex")]
+            pub sender_address: &'a FieldElement,
+        }
+
+        let tagged = Tagged {
+            transaction_hash: &self.transaction_hash,
+            max_fee: &self.max_fee,
+            version: &0,
+            signature: &self.signature,
+            nonce: &self.nonce,
+            r#type: "DECLARE",
+            class_hash: &self.class_hash,
+            sender_address: &self.sender_address,
+        };
+
+        Tagged::serialize(&tagged, serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for DeclareTransactionV0 {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        #[serde_as]
+        #[derive(Deserialize)]
+        #[cfg_attr(feature = "no_unknown_fields", serde(deny_unknown_fields))]
+        struct Tagged {
+            #[serde_as(as = "UfeHex")]
+            pub transaction_hash: FieldElement,
+            #[serde_as(as = "UfeHex")]
+            pub max_fee: FieldElement,
+            #[serde(skip_serializing_if = "Option::is_none")]
+            #[serde_as(as = "Option<NumAsHex>")]
+            pub version: Option<u64>,
+            #[serde_as(as = "Vec<UfeHex>")]
+            pub signature: Vec<FieldElement>,
+            #[serde_as(as = "UfeHex")]
+            pub nonce: FieldElement,
+            #[serde(skip_serializing_if = "Option::is_none")]
+            pub r#type: Option<String>,
+            #[serde_as(as = "UfeHex")]
+            pub class_hash: FieldElement,
+            #[serde_as(as = "UfeHex")]
+            pub sender_address: FieldElement,
+        }
+
+        let tagged = Tagged::deserialize(deserializer)?;
+
+        if let Some(tag_field) = &tagged.version {
+            if tag_field != &0 {
+                return Err(serde::de::Error::custom("invalid `version` value"));
+            }
+        }
+
+        if let Some(tag_field) = &tagged.r#type {
+            if tag_field != "DECLARE" {
+                return Err(serde::de::Error::custom("invalid `type` value"));
+            }
+        }
+
+        Ok(Self {
+            transaction_hash: tagged.transaction_hash,
+            max_fee: tagged.max_fee,
+            signature: tagged.signature,
+            nonce: tagged.nonce,
+            class_hash: tagged.class_hash,
+            sender_address: tagged.sender_address,
+        })
+    }
+}
+
 impl Serialize for DeclareTransactionV1 {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         #[serde_as]

diff --git a/starknet-core/src/types/mod.rs b/starknet-core/src/types/mod.rs
@@ -18,20 +18,20 @@ pub use codegen::{
     BlockStatus, BlockTag, BlockWithTxHashes, BlockWithTxs, BroadcastedDeclareTransactionV1,
     BroadcastedDeclareTransactionV2, BroadcastedDeployAccountTransaction,
     BroadcastedInvokeTransactionV0, BroadcastedInvokeTransactionV1, CompressedLegacyContractClass,
-    ContractStorageDiffItem, DeclareTransactionReceipt, DeclareTransactionV1, DeclareTransactionV2,
-    DeclaredClassItem, DeployAccountTransaction, DeployAccountTransactionReceipt,
-    DeployTransaction, DeployTransactionReceipt, DeployedContractItem, EmittedEvent,
-    EntryPointsByType, Event, EventFilter, EventFilterWithPage, EventsChunk, FeeEstimate,
-    FlattenedSierraClass, FunctionCall, FunctionStateMutability, InvokeTransactionReceipt,
-    InvokeTransactionV0, InvokeTransactionV1, L1HandlerTransaction, L1HandlerTransactionReceipt,
-    LegacyContractEntryPoint, LegacyEntryPointsByType, LegacyEventAbiEntry, LegacyEventAbiType,
-    LegacyFunctionAbiEntry, LegacyFunctionAbiType, LegacyStructAbiEntry, LegacyStructAbiType,
-    LegacyStructMember, LegacyTypedParameter, MsgToL1, NonceUpdate, PendingBlockWithTxHashes,
-    PendingBlockWithTxs, PendingDeclareTransactionReceipt, PendingDeployAccountTransactionReceipt,
-    PendingDeployTransactionReceipt, PendingInvokeTransactionReceipt,
-    PendingL1HandlerTransactionReceipt, PendingStateUpdate, ReplacedClassItem, ResultPageRequest,
-    SierraEntryPoint, StarknetError, StateDiff, StateUpdate, StorageEntry, SyncStatus,
-    TransactionStatus,
+    ContractStorageDiffItem, DeclareTransactionReceipt, DeclareTransactionV0, DeclareTransactionV1,
+    DeclareTransactionV2, DeclaredClassItem, DeployAccountTransaction,
+    DeployAccountTransactionReceipt, DeployTransaction, DeployTransactionReceipt,
+    DeployedContractItem, EmittedEvent, EntryPointsByType, Event, EventFilter, EventFilterWithPage,
+    EventsChunk, FeeEstimate, FlattenedSierraClass, FunctionCall, FunctionStateMutability,
+    InvokeTransactionReceipt, InvokeTransactionV0, InvokeTransactionV1, L1HandlerTransaction,
+    L1HandlerTransactionReceipt, LegacyContractEntryPoint, LegacyEntryPointsByType,
+    LegacyEventAbiEntry, LegacyEventAbiType, LegacyFunctionAbiEntry, LegacyFunctionAbiType,
+    LegacyStructAbiEntry, LegacyStructAbiType, LegacyStructMember, LegacyTypedParameter, MsgToL1,
+    NonceUpdate, PendingBlockWithTxHashes, PendingBlockWithTxs, PendingDeclareTransactionReceipt,
+    PendingDeployAccountTransactionReceipt, PendingDeployTransactionReceipt,
+    PendingInvokeTransactionReceipt, PendingL1HandlerTransactionReceipt, PendingStateUpdate,
+    ReplacedClassItem, ResultPageRequest, SierraEntryPoint, StarknetError, StateDiff, StateUpdate,
+    StorageEntry, SyncStatus, TransactionStatus,
 };
 
 // TODO: move generated request code to `starknet-providers`
@@ -194,6 +194,8 @@ pub enum BroadcastedInvokeTransaction {
 #[derive(Debug, Clone, Deserialize)]
 #[serde(tag = "version")]
 pub enum DeclareTransaction {
+    #[serde(rename = "0x0")]
+    V0(DeclareTransactionV0),
     #[serde(rename = "0x1")]
     V1(DeclareTransactionV1),
     #[serde(rename = "0x2")]

diff --git a/starknet-core/src/types/serde_impls.rs b/starknet-core/src/types/serde_impls.rs
@@ -175,6 +175,7 @@ mod enum_ser_impls {
     impl Serialize for DeclareTransaction {
         fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
             match self {
+                Self::V0(variant) => variant.serialize(serializer),
                 Self::V1(variant) => variant.serialize(serializer),
                 Self::V2(variant) => variant.serialize(serializer),
             }

diff --git a/starknet-providers/src/sequencer/models/conversions.rs b/starknet-providers/src/sequencer/models/conversions.rs
@@ -137,7 +137,16 @@ impl TryFrom<DeclareTransaction> for core::DeclareTransaction {
     type Error = ConversionError;
 
     fn try_from(value: DeclareTransaction) -> Result<Self, Self::Error> {
-        if value.version == FieldElement::ONE {
+        if value.version == FieldElement::ZERO {
+            Ok(Self::V0(core::DeclareTransactionV0 {
+                transaction_hash: value.transaction_hash,
+                max_fee: value.max_fee,
+                signature: value.signature,
+                nonce: value.nonce,
+                class_hash: value.class_hash,
+                sender_address: value.sender_address,
+            }))
+        } else if value.version == FieldElement::ONE {
             Ok(Self::V1(core::DeclareTransactionV1 {
                 transaction_hash: value.transaction_hash,
                 max_fee: value.max_fee,