From 1b4e9d30f5ac4350779adbbe9f08c8d518110a12 Mon Sep 17 00:00:00 2001 From: neodiX Date: Tue, 19 Nov 2024 21:50:35 +0400 Subject: [PATCH] remove devenv and blockchain modules --- README.md | 1 - .../src/main/java/org/ton/java/tonlib/Tonlib.java | 13 +++++++------ .../java/org/ton/java/tonlib/types/RawMessage.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 816a6f0e..e66ecadd 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,6 @@ You can use each submodule individually. Click the module below to get more deta * [Func](func/README.md) - wrapper for using with external precompiled func binary. * [Tolk](tolk/README.md) - wrapper for using with external precompiled tolk binary. * [TonConnect](tonconnect/README.md) - implementation of Ton Connect standard. -* [Blockchain](blockchain/README.md) - To Do. * [Utils](utils/README.md) - create private and public keys, convert data, etc. ### Features diff --git a/tonlib/src/main/java/org/ton/java/tonlib/Tonlib.java b/tonlib/src/main/java/org/ton/java/tonlib/Tonlib.java index 7f1f561d..784ae1ea 100644 --- a/tonlib/src/main/java/org/ton/java/tonlib/Tonlib.java +++ b/tonlib/src/main/java/org/ton/java/tonlib/Tonlib.java @@ -1514,16 +1514,17 @@ public RawTransaction tryLocateTxByIncomingMessage( /** * PR pending https://github.com/ton-blockchain/ton/pull/1379 todo * - * @param address - * @param msgHexHash - * @return + * @param address String + * @param msgHashBase64 msgHexHash + * @return RawTransaction */ - private RawTransaction getTxByMessageHash(String address, String msgHexHash) { + private RawTransaction getTxByMessageHash(String address, String msgHashBase64) { RawTransactions rawTransactions = getRawTransactions(address, null, null); for (RawTransaction tx : rawTransactions.getTransactions()) { if (nonNull(tx.getIn_msg())) { -// if (tx.getIn_msg().hashCode()) { -// } + if (tx.getIn_msg().getHash().equals(msgHashBase64)) { + return tx; + } } } return null; diff --git a/tonlib/src/main/java/org/ton/java/tonlib/types/RawMessage.java b/tonlib/src/main/java/org/ton/java/tonlib/types/RawMessage.java index ae436f63..39c386de 100644 --- a/tonlib/src/main/java/org/ton/java/tonlib/types/RawMessage.java +++ b/tonlib/src/main/java/org/ton/java/tonlib/types/RawMessage.java @@ -17,7 +17,7 @@ public class RawMessage implements Serializable { @SerializedName("@type") final String type = "raw.message"; - + String hash; AccountAddressOnly source; AccountAddressOnly destination; String value;