sync with main

Author: quetool

crates/yttrium/src/chain_abstraction/dart_compat_models.rs

@@ -72,11 +72,11 @@ impl From<PulseMetadataCompat> for PulseMetadata {
     fn from(compat: PulseMetadataCompat) -> Self {
         let url = compat.url.and_then(|s| url::Url::parse(&s).ok());
         let bundle_id = compat.bundle_id.clone();
-        let package_name = compat.package_name.clone();
+        // let package_name = compat.package_name.clone();
         let sdk_version = compat.sdk_version.clone();
         let sdk_platform = compat.sdk_platform.clone();
 
-        Self { url, bundle_id, package_name, sdk_version, sdk_platform }
+        Self { url, bundle_id, sdk_version, sdk_platform }
     }
 }
 
@@ -113,7 +113,7 @@ impl From<CallCompat> for Call {
         let to = Address::from_str(&compat.to).unwrap();
         let value = U256::from(compat.value);
         // Convert hex string back to Bytes
-        let input = Bytes::from(hex::decode(&compat.input[2..]).unwrap());  // Skip "0x" prefix
+        let input = Bytes::from(hex::decode(&compat.input[2..]).unwrap()); // Skip "0x" prefix
 
         Call { to, value, input }
     }
@@ -493,7 +493,7 @@ impl From<FeeEstimatedTransactionCompat> for FeeEstimatedTransaction {
             to: Address::from_str(&compat.to).unwrap(),
             value: U256::from_str(&compat.value).unwrap(),
             // Convert hex string back to Bytes
-            input: Bytes::from(hex::decode(&compat.input[2..]).unwrap()),  // Skip "0x" prefix
+            input: Bytes::from(hex::decode(&compat.input[2..]).unwrap()), // Skip "0x" prefix
             gas_limit: U64::from_str(&compat.gas_limit).unwrap(),
             nonce: U64::from_str(&compat.nonce).unwrap(),
             max_fee_per_gas: U128::from_str(&compat.max_fee_per_gas).unwrap(),
@@ -787,17 +787,18 @@ impl From<PrepareDetailedResponseSuccessCompat>
 #[frb(dart_metadata=("freezed"))]
 pub struct PrepareResponseErrorCompat {
     pub error: BridgingErrorCompat,
+    pub reason: String,
 }
 
 impl From<PrepareResponseError> for PrepareResponseErrorCompat {
     fn from(original: PrepareResponseError) -> Self {
-        Self { error: original.error.into() }
+        Self { error: original.error.into(), reason: original.reason }
     }
 }
 
 impl From<PrepareResponseErrorCompat> for PrepareResponseError {
     fn from(compat: PrepareResponseErrorCompat) -> Self {
-        Self { error: compat.error.into() }
+        Self { error: compat.error.into(), reason: compat.reason }
     }
 }
 
@@ -893,7 +894,7 @@ pub struct TransactionCompat {
     pub from: String,
     pub to: String,
     pub value: String,
-    pub input: String,  // Changed from Vec<u8> to String
+    pub input: String, // Changed from Vec<u8> to String
     pub gas_limit: u64,
     pub nonce: u64,
 }
@@ -907,7 +908,7 @@ impl From<Transaction> for TransactionCompat {
             to: original.to.to_string(),
             value: original.value.to_string(),
             // Convert Bytes to hex string
-            input: hex::encode(original.input.0),  // or format!("0x{}", hex::encode(original.input.0)) for 0x prefix
+            input: hex::encode(original.input.0), // or format!("0x{}", hex::encode(original.input.0)) for 0x prefix
             gas_limit: original.gas_limit.to(),
             nonce: original.nonce.to(),
         }
@@ -927,7 +928,7 @@ impl From<TransactionCompat> for Transaction {
         let to = Address::from_str(&compat.to).unwrap();
         let value = U256::from_str(&compat.value).unwrap();
         // Convert hex string back to Bytes
-        let input = Bytes::from(hex::decode(&compat.input[2..]).unwrap());  // Skip "0x" prefix
+        let input = Bytes::from(hex::decode(&compat.input[2..]).unwrap()); // Skip "0x" prefix
         let gas_limit = U64::from(compat.gas_limit);
         let nonce = U64::from(compat.nonce);
 

crates/yttrium/src/frb_generated.rs

@@ -591,8 +591,10 @@ impl SseDecode
             <crate::chain_abstraction::api::prepare::BridgingError>::sse_decode(
                 deserializer,
             );
+        let mut var_reason = <String>::sse_decode(deserializer);
         return crate::chain_abstraction::api::prepare::PrepareResponseError {
             error: var_error,
+            reason: var_reason,
         };
     }
 }
@@ -1176,7 +1178,11 @@ impl flutter_rust_bridge::IntoDart
     for crate::chain_abstraction::api::prepare::PrepareResponseError
 {
     fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
-        [self.error.into_into_dart().into_dart()].into_dart()
+        [
+            self.error.into_into_dart().into_dart(),
+            self.reason.into_into_dart().into_dart(),
+        ]
+        .into_dart()
     }
 }
 impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive
@@ -1817,6 +1823,7 @@ impl SseEncode
         <crate::chain_abstraction::api::prepare::BridgingError>::sse_encode(
             self.error, serializer,
         );
+        <String>::sse_encode(self.reason, serializer);
     }
 }
 

crates/yttrium_dart/lib/generated/chain_abstraction/api/prepare.dart

@@ -17,18 +17,21 @@ enum BridgingError {
 /// response
 class PrepareResponseError {
   final BridgingError error;
+  final String reason;
 
   const PrepareResponseError({
     required this.error,
+    required this.reason,
   });
 
   @override
-  int get hashCode => error.hashCode;
+  int get hashCode => error.hashCode ^ reason.hashCode;
 
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       other is PrepareResponseError &&
           runtimeType == other.runtimeType &&
-          error == other.error;
+          error == other.error &&
+          reason == other.reason;
 }

crates/yttrium_dart/lib/generated/frb_generated.dart

@@ -676,10 +676,11 @@ class YttriumDartApiImpl extends YttriumDartApiImplPlatform
   PrepareResponseError dco_decode_prepare_response_error(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
     final arr = raw as List<dynamic>;
-    if (arr.length != 1)
-      throw Exception('unexpected arr length: expect 1 but see ${arr.length}');
+    if (arr.length != 2)
+      throw Exception('unexpected arr length: expect 2 but see ${arr.length}');
     return PrepareResponseError(
       error: dco_decode_bridging_error(arr[0]),
+      reason: dco_decode_String(arr[1]),
     );
   }
 
@@ -1245,7 +1246,8 @@ class YttriumDartApiImpl extends YttriumDartApiImplPlatform
       SseDeserializer deserializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
     var var_error = sse_decode_bridging_error(deserializer);
-    return PrepareResponseError(error: var_error);
+    var var_reason = sse_decode_String(deserializer);
+    return PrepareResponseError(error: var_error, reason: var_reason);
   }
 
   @protected
@@ -1739,6 +1741,7 @@ class YttriumDartApiImpl extends YttriumDartApiImplPlatform
       PrepareResponseError self, SseSerializer serializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
     sse_encode_bridging_error(self.error, serializer);
+    sse_encode_String(self.reason, serializer);
   }
 
   @protected