AdnlLiteClient - add tests to all contracts to test adnl liteclient usage; VmCellSlice serialization fix.

Author: neodix42

adnl/src/main/java/org/ton/java/adnl/AdnlLiteClient.java

@@ -929,6 +929,14 @@ public Account getAccount(Address address) throws Exception {
     return getAccountState(getMasterchainInfo().getLast(), address).getAccount();
   }
 
+  public String getAccountStatus(Address address) throws Exception {
+    Account account = getAccountState(getMasterchainInfo().getLast(), address).getAccount();
+    if (account == null) {
+      return "UNINIT";
+    }
+    return account.getAccountStorage().getAccountStatus();
+  }
+
   public AccountState getAccountState(BlockIdExt id, Address accountAddress) throws Exception {
     return executeWithRetry(
         () -> {
@@ -1118,7 +1126,7 @@ public RunMethodResult runMethod(
       Address accountAddress, String methodName, VmStackValue... params) {
     try {
       List<VmStackValue> vmStackValuesReversed = Arrays.asList(params);
-      Collections.reverse(vmStackValuesReversed);
+      //      Collections.reverse(vmStackValuesReversed);
       VmStack vmStackParams =
           VmStack.builder()
               .depth(vmStackValuesReversed.size())
@@ -1889,7 +1897,7 @@ public void waitForBalanceChange(Address address, int timeoutSeconds) {
     do {
       if (++i * 2 >= timeoutSeconds) {
         throw new Error(
-            "Balance of " + address.toRaw() + "was not changed within specified timeout.");
+            "Balance of " + address.toRaw() + " was not changed within specified timeout.");
       }
       Utils.sleep(2);
     } while (initialBalance.equals(getBalance(address)));
@@ -1934,12 +1942,13 @@ public void sendRawMessageWithConfirmation(Message externalMessage, Address acco
 
       TransactionList rawTransactions;
       for (int i = 0; i < 12; i++) {
-        rawTransactions = getTransactions(account, 0, null, 10);
+        rawTransactions = getTransactions(account, 0, null, 2);
         for (Transaction tx : rawTransactions.getTransactionsParsed()) {
           if (nonNull(tx.getInOut().getIn())
               && Arrays.equals(
                   tx.getInOut().getIn().getNormalizedHash(), externalMessage.getNormalizedHash())) {
             log.info("Message has been delivered.");
+            return;
           }
         }
         Utils.sleep(5);

adnl/src/main/java/org/ton/java/adnl/AdnlTcpTransport.java

@@ -293,8 +293,10 @@ private void processIncomingPacket(byte[] packetData) {
 
       if (!Arrays.equals(receivedChecksum, calculatedChecksum)) {
         log.info("Invalid packet checksum");
-        log.info("Received checksum: {}", CryptoUtils.hex(receivedChecksum));
-        log.info("Calculated checksum: {}", CryptoUtils.hex(calculatedChecksum));
+        log.info(
+            "Received checksum: {}, Calculated checksum: {}",
+            CryptoUtils.hex(receivedChecksum),
+            CryptoUtils.hex(calculatedChecksum));
         return;
       }
 

smartcontract/src/main/java/org/ton/ton4j/smartcontract/LibraryDeployer.java

@@ -1,6 +1,7 @@
 package org.ton.ton4j.smartcontract;
 
 import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
 
 import lombok.Builder;
 import lombok.Data;
@@ -90,6 +91,9 @@ public Message prepareDeployMsg() {
   }
 
   public ExtMessageInfo deploy() {
+    if (nonNull(adnlLiteClient)) {
+      return send(prepareDeployMsg());
+    }
     return tonlib.sendRawMessage(prepareDeployMsg().toCell().toBase64());
   }
 }

smartcontract/src/main/java/org/ton/ton4j/smartcontract/dns/Dns.java

@@ -1,6 +1,9 @@
 package org.ton.ton4j.smartcontract.dns;
 
+import static java.util.Objects.nonNull;
+
 import lombok.Builder;
+import org.ton.java.adnl.AdnlLiteClient;
 import org.ton.ton4j.address.Address;
 import org.ton.ton4j.cell.Cell;
 import org.ton.ton4j.tonlib.Tonlib;
@@ -9,45 +12,53 @@
 @Builder
 public class Dns {
 
-    public static final String DNS_CATEGORY_NEXT_RESOLVER = "dns_next_resolver"; // Smart Contract address
-    public static final String DNS_CATEGORY_WALLET = "wallet"; // Smart Contract address
-    public static final String DNS_CATEGORY_SITE = "site"; // ADNL address
+  public static final String DNS_CATEGORY_NEXT_RESOLVER =
+      "dns_next_resolver"; // Smart Contract address
+  public static final String DNS_CATEGORY_WALLET = "wallet"; // Smart Contract address
+  public static final String DNS_CATEGORY_SITE = "site"; // ADNL address
 
-    private Tonlib tonlib;
+  private Tonlib tonlib;
+  private AdnlLiteClient adnlLiteClient;
 
-    public Address getRootDnsAddress() {
-        Cell cell = tonlib.getConfigParam(tonlib.getLast().getLast(), 4);
-        byte[] byteArray = cell.getBits().toByteArray();
-        if (byteArray.length != 256 / 8) {
-            throw new Error("Invalid ConfigParam 4 length " + byteArray.length);
-        }
-        String hex = Utils.bytesToHex(byteArray);
-        return Address.of("-1:" + hex);
+  public Address getRootDnsAddress() {
+    if (nonNull(adnlLiteClient)) {
+      return Address.of("-1:" + adnlLiteClient.getConfigParam4().getDnsRootAddr());
     }
 
-    public Object resolve(String domain, String category, boolean oneStep) {
-        Address rootDnsAddress = getRootDnsAddress();
-
-        return DnsUtils.dnsResolve(tonlib, rootDnsAddress, domain, category, oneStep);
+    Cell cell = tonlib.getConfigParam(tonlib.getLast().getLast(), 4);
+    byte[] byteArray = cell.getBits().toByteArray();
+    if (byteArray.length != 256 / 8) {
+      throw new Error("Invalid ConfigParam 4 length " + byteArray.length);
     }
+    String hex = Utils.bytesToHex(byteArray);
+    return Address.of("-1:" + hex);
+  }
 
-    public Object resolve(String domain, String category) {
-        return resolve(domain, category, false);
+  public Object resolve(String domain, String category, boolean oneStep) {
+    Address rootDnsAddress = getRootDnsAddress();
+    if (nonNull(adnlLiteClient)) {
+      return DnsUtils.dnsResolve(adnlLiteClient, rootDnsAddress, domain, category, oneStep);
     }
+    return DnsUtils.dnsResolve(tonlib, rootDnsAddress, domain, category, oneStep);
+  }
 
-    /**
-     * @param domain String e.g "sub.alice.ton"
-     * @return Address | null
-     */
-    public Object getWalletAddress(String domain) {
-        return this.resolve(domain, DNS_CATEGORY_WALLET);
-    }
+  public Object resolve(String domain, String category) {
+    return resolve(domain, category, false);
+  }
 
-    /**
-     * @param domain String e.g "sub.alice.ton"
-     * @return AdnlAddress | null
-     */
-    public Object getSiteAddress(String domain) {
-        return this.resolve(domain, DNS_CATEGORY_SITE);
-    }
+  /**
+   * @param domain String e.g "sub.alice.ton"
+   * @return Address | null
+   */
+  public Object getWalletAddress(String domain) {
+    return resolve(domain, DNS_CATEGORY_WALLET);
+  }
+
+  /**
+   * @param domain String e.g "sub.alice.ton"
+   * @return AdnlAddress | null
+   */
+  public Object getSiteAddress(String domain) {
+    return resolve(domain, DNS_CATEGORY_SITE);
+  }
 }