fix: add codeHash to contract (#234)

* fix: add codeHash to contract * fix: add boc to transaction * fix: dart side transaction boc * fix: codegen * fix: transaction converting to json
broxus · Nov 12, 2023 · 911aec9 · 911aec9
1 parent e116162
commit 911aec9
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 22 deletions.
diff --git a/packages/flutter_nekoton_bridge/lib/nekoton/core/models/transaction.dart b/packages/flutter_nekoton_bridge/lib/nekoton/core/models/transaction.dart
@@ -19,6 +19,7 @@ sealed class Transaction with _$Transaction implements Comparable<Transaction> {
     @amountJsonConverter required final BigInt totalFees,
     required final Message inMessage,
     required final List<Message> outMessages,
+    required String boc,
   }) = _Transaction;
 
   factory Transaction.fromJson(Map<String, dynamic> json) =>

diff --git a/packages/flutter_nekoton_bridge/lib/nekoton/core/models/transaction.freezed.dart b/packages/flutter_nekoton_bridge/lib/nekoton/core/models/transaction.freezed.dart
@@ -35,6 +35,7 @@ mixin _$Transaction {
   BigInt get totalFees => throw _privateConstructorUsedError;
   Message get inMessage => throw _privateConstructorUsedError;
   List<Message> get outMessages => throw _privateConstructorUsedError;
+  String get boc => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -59,7 +60,8 @@ abstract class $TransactionCopyWith<$Res> {
       AccountStatus endStatus,
       @amountJsonConverter BigInt totalFees,
       Message inMessage,
-      List<Message> outMessages});
+      List<Message> outMessages,
+      String boc});
 
   $TransactionIdCopyWith<$Res> get id;
   $TransactionIdCopyWith<$Res>? get prevTransactionId;
@@ -90,6 +92,7 @@ class _$TransactionCopyWithImpl<$Res, $Val extends Transaction>
     Object? totalFees = null,
     Object? inMessage = null,
     Object? outMessages = null,
+    Object? boc = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -136,6 +139,10 @@ class _$TransactionCopyWithImpl<$Res, $Val extends Transaction>
           ? _value.outMessages
           : outMessages // ignore: cast_nullable_to_non_nullable
               as List<Message>,
+      boc: null == boc
+          ? _value.boc
+          : boc // ignore: cast_nullable_to_non_nullable
+              as String,
     ) as $Val);
   }
 
@@ -187,7 +194,8 @@ abstract class _$$TransactionImplCopyWith<$Res>
       AccountStatus endStatus,
       @amountJsonConverter BigInt totalFees,
       Message inMessage,
-      List<Message> outMessages});
+      List<Message> outMessages,
+      String boc});
 
   @override
   $TransactionIdCopyWith<$Res> get id;
@@ -219,6 +227,7 @@ class __$$TransactionImplCopyWithImpl<$Res>
     Object? totalFees = null,
     Object? inMessage = null,
     Object? outMessages = null,
+    Object? boc = null,
   }) {
     return _then(_$TransactionImpl(
       id: null == id
@@ -265,6 +274,10 @@ class __$$TransactionImplCopyWithImpl<$Res>
           ? _value._outMessages
           : outMessages // ignore: cast_nullable_to_non_nullable
               as List<Message>,
+      boc: null == boc
+          ? _value.boc
+          : boc // ignore: cast_nullable_to_non_nullable
+              as String,
     ));
   }
 }
@@ -283,7 +296,8 @@ class _$TransactionImpl extends _Transaction {
       required this.endStatus,
       @amountJsonConverter required this.totalFees,
       required this.inMessage,
-      required final List<Message> outMessages})
+      required final List<Message> outMessages,
+      required this.boc})
       : _outMessages = outMessages,
         super._();
 
@@ -322,9 +336,12 @@ class _$TransactionImpl extends _Transaction {
     return EqualUnmodifiableListView(_outMessages);
   }
 
+  @override
+  final String boc;
+
   @override
   String toString() {
-    return 'Transaction(id: $id, prevTransactionId: $prevTransactionId, createdAt: $createdAt, aborted: $aborted, exitCode: $exitCode, resultCode: $resultCode, origStatus: $origStatus, endStatus: $endStatus, totalFees: $totalFees, inMessage: $inMessage, outMessages: $outMessages)';
+    return 'Transaction(id: $id, prevTransactionId: $prevTransactionId, createdAt: $createdAt, aborted: $aborted, exitCode: $exitCode, resultCode: $resultCode, origStatus: $origStatus, endStatus: $endStatus, totalFees: $totalFees, inMessage: $inMessage, outMessages: $outMessages, boc: $boc)';
   }
 
   @override
@@ -351,7 +368,8 @@ class _$TransactionImpl extends _Transaction {
             (identical(other.inMessage, inMessage) ||
                 other.inMessage == inMessage) &&
             const DeepCollectionEquality()
-                .equals(other._outMessages, _outMessages));
+                .equals(other._outMessages, _outMessages) &&
+            (identical(other.boc, boc) || other.boc == boc));
   }
 
   @JsonKey(ignore: true)
@@ -368,7 +386,8 @@ class _$TransactionImpl extends _Transaction {
       endStatus,
       totalFees,
       inMessage,
-      const DeepCollectionEquality().hash(_outMessages));
+      const DeepCollectionEquality().hash(_outMessages),
+      boc);
 
   @JsonKey(ignore: true)
   @override
@@ -396,7 +415,8 @@ abstract class _Transaction extends Transaction {
       required final AccountStatus endStatus,
       @amountJsonConverter required final BigInt totalFees,
       required final Message inMessage,
-      required final List<Message> outMessages}) = _$TransactionImpl;
+      required final List<Message> outMessages,
+      required final String boc}) = _$TransactionImpl;
   const _Transaction._() : super._();
 
   factory _Transaction.fromJson(Map<String, dynamic> json) =
@@ -429,6 +449,8 @@ abstract class _Transaction extends Transaction {
   @override
   List<Message> get outMessages;
   @override
+  String get boc;
+  @override
   @JsonKey(ignore: true)
   _$$TransactionImplCopyWith<_$TransactionImpl> get copyWith =>
       throw _privateConstructorUsedError;

diff --git a/packages/flutter_nekoton_bridge/lib/nekoton/core/models/transaction.g.dart b/packages/flutter_nekoton_bridge/lib/nekoton/core/models/transaction.g.dart
diff --git a/packages/nekoton_bridge/native/Cargo.toml b/packages/nekoton_bridge/native/Cargo.toml
@@ -27,6 +27,7 @@ nekoton = { git = "https://github.com/broxus/nekoton.git", features = [
     "gql_transport",
     "jrpc_transport",
     "proto_transport",
+    "extended_models",
 ], rev = "d70dd09d4d482987541f1816fd3bce970710178c" }
 nekoton-abi = { git = "https://github.com/broxus/nekoton.git", rev = "d70dd09d4d482987541f1816fd3bce970710178c" }
 nekoton-utils = { git = "https://github.com/broxus/nekoton.git", rev = "d70dd09d4d482987541f1816fd3bce970710178c" }

diff --git a/packages/nekoton_bridge/native/src/nekoton_wrapper/helpers/mod.rs b/packages/nekoton_bridge/native/src/nekoton_wrapper/helpers/mod.rs
@@ -6,7 +6,7 @@ use crate::nekoton_wrapper::HandleError;
 use nekoton::transport::models::RawContractState;
 use nekoton_abi::MethodName;
 use std::str::FromStr;
-use ton_block::{Deserializable, MaybeDeserialize, Serializable};
+use ton_block::{AccountStuff, Deserializable, MaybeDeserialize, Serializable};
 use ton_types::SliceData;
 
 pub mod abi_api;
@@ -249,13 +249,15 @@ pub fn make_full_contract_state(
                 &state.account.storage.state,
                 ton_block::AccountState::AccountActive { state_init: _ }
             );
+            let account = state.account.clone();
+            let code_hash = get_code_hash(&account).handle_error()?;
 
             Some(FullContractState {
-                balance: state.account.storage.balance.grams.as_u128().to_string(),
+                balance: account.storage.balance.grams.as_u128().to_string(),
                 gen_timings: state.timings,
                 last_transaction_id: Some(state.last_transaction_id),
                 is_deployed,
-                code_hash: None,
+                code_hash: Some(code_hash),
                 boc,
             })
         }
@@ -267,3 +269,16 @@ pub fn make_full_contract_state(
         Some(state) => Ok(Some(serde_json::to_string(&state).handle_error()?)),
     }
 }
+
+pub fn get_code_hash(account: &AccountStuff) -> anyhow::Result<String> {
+    match account.clone().storage.state {
+        ton_block::AccountState::AccountActive { state_init, .. } => {
+            let toc = state_init.code.as_ref().map(ton_types::serialize_toc);
+            match toc {
+                Some(t) => Ok(t.map(base64::encode).handle_error()?),
+                None => Err("WalletNotDeployed").handle_error()?,
+            }
+        }
+        _ => Err("WalletNotDeployed").handle_error()?,
+    }
+}
diff --git a/packages/nekoton_bridge/native/src/nekoton_wrapper/transport/mod.rs b/packages/nekoton_bridge/native/src/nekoton_wrapper/transport/mod.rs
@@ -5,7 +5,8 @@ use crate::nekoton_wrapper::transport::models::{
     AccountsList, RawContractStateHelper, TransactionsList,
 };
 use crate::nekoton_wrapper::{
-    helpers::make_full_contract_state, parse_address, parse_hash, HandleError,
+    helpers::{make_boc, make_full_contract_state},
+    parse_address, parse_hash, HandleError,
 };
 use async_trait::async_trait;
 use duplicate::duplicate_item;
@@ -216,8 +217,9 @@ impl TransportBoxTrait for name {
         let transactions = raw_transactions
             .clone()
             .into_iter()
-            .filter_map(|e| Transaction::try_from((e.hash, e.data)).ok())
-            .collect::<Vec<_>>();
+            .map(|e| convert_transaction_to_json(&Transaction::try_from((e.hash, e.data))?))
+            .collect::<anyhow::Result<Vec<_>>>();
+        let transactions = transactions?;
 
         let continuation = raw_transactions.last().and_then(|e| {
             (e.data.prev_trans_lt != 0).then_some(TransactionId {
@@ -260,7 +262,9 @@ impl TransportBoxTrait for name {
 
         match transaction {
             None => Ok(None),
-            Some(_) => Ok(Some(serde_json::to_string(&transaction).handle_error()?)),
+            Some(t) => Ok(Some(serde_json::to_string(&convert_transaction_to_json(
+                &t,
+            )?)?)),
         }
     }
 
@@ -279,7 +283,7 @@ impl TransportBoxTrait for name {
             Some(t) => {
                 let trans = RawTransactionDef {
                     hash,
-                    data: Transaction::try_from((t.hash, t.data))?,
+                    data: convert_transaction_to_json(&Transaction::try_from((t.hash, t.data))?)?,
                 };
                 Ok(Some(serde_json::to_string(&trans).handle_error()?))
             }
@@ -451,8 +455,9 @@ impl TransportBoxTrait for GqlTransportBox {
         let transactions = raw_transactions
             .clone()
             .into_iter()
-            .filter_map(|e| Transaction::try_from((e.hash, e.data)).ok())
-            .collect::<Vec<_>>();
+            .map(|e| convert_transaction_to_json(&Transaction::try_from((e.hash, e.data))?))
+            .collect::<anyhow::Result<Vec<_>>>();
+        let transactions = transactions?;
 
         let continuation = raw_transactions.last().and_then(|e| {
             (e.data.prev_trans_lt != 0).then_some(TransactionId {
@@ -494,7 +499,9 @@ impl TransportBoxTrait for GqlTransportBox {
             .handle_error()?;
         match transaction {
             None => Ok(None),
-            Some(_) => Ok(Some(serde_json::to_string(&transaction).handle_error()?)),
+            Some(t) => Ok(Some(serde_json::to_string(&convert_transaction_to_json(
+                &t,
+            )?)?)),
         }
     }
 
@@ -513,7 +520,7 @@ impl TransportBoxTrait for GqlTransportBox {
             Some(t) => {
                 let trans = RawTransactionDef {
                     hash,
-                    data: Transaction::try_from((t.hash, t.data))?,
+                    data: convert_transaction_to_json(&Transaction::try_from((t.hash, t.data))?)?,
                 };
                 Ok(Some(serde_json::to_string(&trans).handle_error()?))
             }
@@ -608,3 +615,20 @@ impl TransportBoxTrait for GqlTransportBox {
         Ok(next_block_id)
     }
 }
+
+pub fn convert_transaction_to_json(t: &Transaction) -> anyhow::Result<serde_json::Value> {
+    Ok(serde_json::json!({
+        "id" : t.id,
+        "prevTransId": t.prev_trans_id,
+        "createdAt": t.created_at,
+        "aborted": t.aborted,
+        "exitCode": t.exit_code,
+        "resultCode": t.result_code,
+        "origStatus":t.orig_status,
+        "endStatus":t.end_status,
+        "totalFees" : t.total_fees.to_string(),
+        "inMessage": t.in_msg,
+        "outMessages": t.out_msgs,
+        "boc": make_boc(&t.raw)?,
+    }))
+}
diff --git a/packages/nekoton_bridge/native/src/nekoton_wrapper/transport/models.rs b/packages/nekoton_bridge/native/src/nekoton_wrapper/transport/models.rs
@@ -1,5 +1,5 @@
 use nekoton::{
-    core::models::{Transaction, TransactionsBatchInfo},
+    core::models::TransactionsBatchInfo,
     transport::models::{ExistingContract, RawContractState},
 };
 use nekoton_abi::{GenTimings, LastTransactionId, TransactionId};
@@ -37,7 +37,8 @@ pub struct FullContractState {
 
 #[derive(Serialize)]
 pub struct TransactionsList {
-    pub transactions: Vec<Transaction>,
+    // item=Transaction, to get it use `convert_transaction_to_json`
+    pub transactions: Vec<serde_json::Value>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub continuation: Option<TransactionId>,
     pub info: Option<TransactionsBatchInfo>,
@@ -58,7 +59,9 @@ pub struct AccountsList {
 pub struct RawTransactionDef {
     #[serde(with = "serde_hex_array")]
     pub hash: UInt256,
-    pub data: Transaction,
+
+    // data=Transaction, to get it use `convert_transaction_to_json`
+    pub data: serde_json::Value,
 }
 
 #[derive(Serialize)]