Merge branch 'mhbdev/master'

Author: justdmitry

TonLibDotNet.Demo/Samples/AccountBalanceAndTransactions.cs

@@ -8,7 +8,7 @@ public class AccountBalanceAndTransactions : ISample
         private readonly ITonClient tonClient;
         private readonly ILogger logger;
 
-        private const string account = "EQCD39VS5jcptHL8vMjEXrzGaRcCVYto7HUn4bpAOg8xqB2N"; // TON Foundation wallet
+        private const string account = "Ef8zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM0vF"; // Elector wallet
 
         public AccountBalanceAndTransactions(ITonClient tonClient, ILogger<AccountBalanceAndTransactions> logger)
         {
@@ -34,7 +34,7 @@ public async Task Run(bool inMainnet)
             var rast = await tonClient.RawGetAccountState(account);
             logger.LogInformation("Acc info via RawGetAccountState(): balance = {Value} nanoton or {Value} TON", rast.Balance, TonUtils.Coins.FromNano(rast.Balance));
 
-            var txs = await tonClient.RawGetTransactions(account, rast.LastTransactionId);
+            var txs = await tonClient.RawGetTransactionsV2(account, rast.LastTransactionId, 5);
             foreach (var item in txs.TransactionsList)
             {
                 if (item.InMsg?.Value > 0)

TonLibDotNet/Extensions/TonClientRawExtensions.cs

@@ -57,5 +57,77 @@ public static Task<Transactions> RawGetTransactions(this ITonClient client, stri
         {
             return RawGetTransactions(client, new Types.AccountAddress(accountAddress), fromTransactionId);
         }
+
+        /// <summary>
+        /// Get specified number of transactions for specified account, starting from specified one.
+        /// </summary>
+        /// <param name="client">ITonClient instance.</param>
+        /// <param name="accountAddress">Address to get transactions for.</param>
+        /// <param name="fromTransactionId">Transaction to start from (this and previous will be returned).</param>
+        /// <param name="count">Number of transactions to return.</param>
+        /// <remarks>To get recent/last transactions - use LastTransactionId value from <see cref="RawGetAccountState(ITonClient, Types.AccountAddress)"/> or <see cref="TonClientExtensions.GetAccountState(ITonClient, Types.AccountAddress)"/> responses.</remarks>
+        /// <seealso href="https://github.com/ton-blockchain/ton/blob/v2023.01/tonlib/tonlib/TonlibClient.cpp#L2826"/>
+        public static Task<Transactions> RawGetTransactionsV2(this ITonClient client, Types.AccountAddress accountAddress, Types.Internal.TransactionId fromTransactionId, int count)
+        {
+            ArgumentNullException.ThrowIfNull(accountAddress);
+            ArgumentNullException.ThrowIfNull(fromTransactionId);
+            if (string.IsNullOrEmpty(accountAddress.Value))
+            {
+                throw new ArgumentNullException(nameof(accountAddress));
+            }
+            if (string.IsNullOrEmpty(fromTransactionId.Hash))
+            {
+                throw new ArgumentNullException(nameof(fromTransactionId));
+            }
+            if (count <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count), "Must be positive");
+            }
+
+            return client.Execute(new GetTransactionsV2(accountAddress, fromTransactionId, count));
+        }
+
+        /// <inheritdoc cref="RawGetTransactionsV2(ITonClient, Types.AccountAddress, Types.Internal.TransactionId, int)"/>
+        public static Task<Transactions> RawGetTransactionsV2(this ITonClient client, string accountAddress, Types.Internal.TransactionId fromTransactionId, int count)
+        {
+            return RawGetTransactionsV2(client, new Types.AccountAddress(accountAddress), fromTransactionId, count);
+        }
+
+        /// <summary>
+        /// Get specified number of transactions for specified account, starting from specified one, and try to decrypt messages with specified private key.
+        /// </summary>
+        /// <param name="client">ITonClient instance.</param>
+        /// <param name="privateKey">Private key to decode messages.</param>
+        /// <param name="accountAddress">Address to get transactions for.</param>
+        /// <param name="fromTransactionId">Transaction to start from (this and previous will be returned).</param>
+        /// <param name="count">Number of transactions to return.</param>
+        /// <remarks>To get recent/last transactions - use LastTransactionId value from <see cref="RawGetAccountState(ITonClient, Types.AccountAddress)"/> or <see cref="TonClientExtensions.GetAccountState(ITonClient, Types.AccountAddress)"/> responses.</remarks>
+        /// <seealso href="https://github.com/ton-blockchain/ton/blob/v2023.01/tonlib/tonlib/TonlibClient.cpp#L2826"/>
+        public static Task<Transactions> RawGetTransactionsV2(this ITonClient client, Types.InputKey privateKey, Types.AccountAddress accountAddress, Types.Internal.TransactionId fromTransactionId, int count)
+        {
+            ArgumentNullException.ThrowIfNull(privateKey);
+            ArgumentNullException.ThrowIfNull(accountAddress);
+            ArgumentNullException.ThrowIfNull(fromTransactionId);
+            if (string.IsNullOrEmpty(accountAddress.Value))
+            {
+                throw new ArgumentNullException(nameof(accountAddress));
+            }
+            if (string.IsNullOrEmpty(fromTransactionId.Hash))
+            {
+                throw new ArgumentNullException(nameof(fromTransactionId));
+            }
+            if (count <= 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(count), "Must be positive");
+            }
+
+            return client.Execute(new GetTransactionsV2(accountAddress, fromTransactionId, count) { PrivateKey = privateKey, TryDecodeMessages = true });
+        }
+
+        /// <inheritdoc cref="RawGetTransactionsV2(ITonClient, Types.InputKey, Types.AccountAddress, Types.Internal.TransactionId, int)"/>
+        public static Task<Transactions> RawGetTransactionsV2(this ITonClient client, Types.InputKey privateKey, string accountAddress, Types.Internal.TransactionId fromTransactionId, int count)
+        {
+            return RawGetTransactionsV2(client, privateKey, new Types.AccountAddress(accountAddress), fromTransactionId, count);
+        }
     }
 }

TonLibDotNet/Requests/Raw/GetTransactionsV2.cs

@@ -0,0 +1,25 @@
+using TonLibDotNet.Types;
+
+namespace TonLibDotNet.Requests.Raw
+{
+    [TLSchema("raw.getTransactionsV2 private_key:InputKey account_address:accountAddress from_transaction_id:internal.transactionId count:# try_decode_messages:Bool = raw.Transactions")]
+    public class GetTransactionsV2 : RequestBase<Types.Raw.Transactions>
+    {
+        public GetTransactionsV2(AccountAddress accountAddress, Types.Internal.TransactionId fromTransactionId, int count)
+        {
+            AccountAddress = accountAddress ?? throw new ArgumentNullException(nameof(accountAddress));
+            FromTransactionId = fromTransactionId ?? throw new ArgumentNullException(nameof(fromTransactionId));
+            Count = count;
+        }
+
+        public InputKey? PrivateKey { get; set; }
+
+        public AccountAddress AccountAddress { get; set; }
+
+        public Types.Internal.TransactionId FromTransactionId { get; set; }
+
+        public int Count { get; set; }
+
+        public bool TryDecodeMessages { get; set; }
+    }
+}