make AccountStateActive serializable, improve getParticipants() in AdnlLiteClient, test getLibraries() in TonCenter

Author: neodix42

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

@@ -1995,15 +1995,48 @@ public SendMsgStatus sendMessage(Message externalMessage) {
     }
   }
 
+  public void flatValues(VmTuple tuple, List<VmStackValue> result) {
+    for (VmStackValue vmStackValue : tuple.getValues()) {
+      if (vmStackValue instanceof VmTuple) {
+        flatValues((VmTuple) vmStackValue, result);
+      }
+      else {
+        result.add(vmStackValue);
+      }
+    }
+  }
+
   public List<Participant> getElectionParticipants() {
     List<Participant> participants = new ArrayList<>();
     RunMethodResult result = runMethod(ELECTION_ADDRESS, "participant_list");
     VmStack vmStack = VmStack.deserialize(CellSlice.beginParse(Cell.fromBoc(result.result)));
+
+    List<VmStackValue> flatValues = new ArrayList<>();
+//    List<VmTuple> res = new ArrayList<>();
+
     for (VmStackValue l : vmStack.getStack().getTos()) {
-      VmStackValueTuple tuple = VmStackValueTuple.deserialize(CellSlice.beginParse(l.toCell()));
-      BigInteger addr = tuple.getData().getIntByIndex(0);
-      BigInteger stake = tuple.getData().getIntByIndex(1);
-      participants.add(Participant.builder().address(addr).stake(stake).build());
+      if (l instanceof VmStackValueNull) {
+        continue;
+      }
+      if (l instanceof VmTuple) {
+        flatValues((VmTuple) l, flatValues);
+      }
+    }
+    BigInteger addr = null;
+    BigInteger stake = null;
+    for (VmStackValue genericValue : flatValues) {
+
+      if (genericValue instanceof VmStackValueInt) {
+        addr = ((VmStackValueInt) genericValue).getValue();
+      }
+      if (genericValue instanceof VmStackValueTinyInt) {
+        stake = ((VmStackValueTinyInt) genericValue).getValue();
+      }
+      if (nonNull(addr) && nonNull(stake)) {
+        participants.add(Participant.builder().address(addr).stake(stake).build());
+        addr = null;
+        stake = null;
+      }
     }
     return participants;
   }

adnl/src/test/java/org/ton/ton4j/adnl/AdnlLiteClientTest.java

@@ -973,6 +973,16 @@ void testRunSmcMethodParticipantsList() throws Exception {
     log.info("runMethodResult {}", runMethodResult);
   }
 
+  @Test
+  void testRunSmcMethodParticipantsListMethod() {
+    log.info("Testing runSmcMethod participant_list query");
+    assertTrue(client.isConnected(), "Client should be connected");
+
+    List<Participant> participants = client.getElectionParticipants();
+
+    log.info("runMethodResult {}", participants);
+  }
+
   @Test
   void testRunSmcMethodSeqno() {
     log.info("Testing runSmcMethod seqno query");

tlb/src/main/java/org/ton/ton4j/tlb/Account.java

@@ -9,6 +9,8 @@
 import org.ton.ton4j.cell.CellBuilder;
 import org.ton.ton4j.cell.CellSlice;
 
+import static java.util.Objects.isNull;
+
 @Builder
 @Data
 public class Account implements Serializable {
@@ -45,10 +47,33 @@ public static Account deserialize(CellSlice cs) {
   }
 
   public StateInit getStateInit() {
+    if (isNull(accountStorage)) {
+      return null;
+    }
     return ((AccountStateActive) accountStorage.getAccountState()).getStateInit();
   }
 
   public BigInteger getBalance() {
+    if (isNull(accountStorage)) {
+      return null;
+    }
     return accountStorage.getBalance().getCoins();
   }
+
+  public String getAccountState() {
+    if (isNull(accountStorage) || isNull(accountStorage.getAccountState())) {
+      return "uninitialized";
+    }
+    if (accountStorage.getAccountState() instanceof AccountStateActive) {
+      return "active";
+    }
+    if (accountStorage.getAccountState() instanceof AccountStateFrozen) {
+      return "frozen";
+    }
+    if (accountStorage.getAccountState() instanceof AccountStateUninit) {
+      return "uninitialized";
+    } else {
+      return "unknown";
+    }
+  }
 }

tlb/src/main/java/org/ton/ton4j/tlb/AccountStateActive.java

@@ -6,9 +6,11 @@
 import org.ton.ton4j.cell.CellBuilder;
 import org.ton.ton4j.cell.CellSlice;
 
+import java.io.Serializable;
+
 @Builder
 @Data
-public class AccountStateActive implements AccountState {
+public class AccountStateActive implements AccountState, Serializable {
   int magic;
   StateInit stateInit;
 

tlb/src/main/java/org/ton/ton4j/tlb/MsgAddress.java

@@ -3,6 +3,8 @@
 import org.ton.ton4j.cell.Cell;
 import org.ton.ton4j.cell.CellSlice;
 
+import java.io.Serializable;
+
 /**
  *
  *
@@ -23,7 +25,7 @@
  * _ _:MsgAddressExt = MsgAddress;
  * }</pre>
  */
-public interface MsgAddress {
+public interface MsgAddress extends Serializable {
   Cell toCell();
 
   static MsgAddress deserialize(CellSlice cs) {

tlb/src/main/java/org/ton/ton4j/tlb/ShardDescr.java

@@ -83,15 +83,15 @@ private String getMagic() {
     return Long.toHexString(magic);
   }
 
-  private String getRootHash() {
+  public String getRootHash() {
     return rootHash.toString(16);
   }
 
-  private String getFileHash() {
+  public String getFileHash() {
     return fileHash.toString(16);
   }
 
-  private String getNextValidatorShard() {
+  public String getNextValidatorShard() {
     return nextValidatorShard.toString(16);
   }
 

tlb/src/main/java/org/ton/ton4j/tlb/StorageExtraInfo.java

@@ -3,7 +3,9 @@
 import org.ton.ton4j.cell.Cell;
 import org.ton.ton4j.cell.CellSlice;
 
-public interface StorageExtraInfo {
+import java.io.Serializable;
+
+public interface StorageExtraInfo extends Serializable {
 
   Cell toCell();
 

toncenter/src/test/java/org/ton/ton4j/toncenter/TonCenterTest.java

@@ -1,12 +1,15 @@
 package org.ton.ton4j.toncenter;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.DecoderException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.ton.ton4j.cell.Cell;
 import org.ton.ton4j.cell.CellBuilder;
 import org.ton.ton4j.toncenter.model.*;
+import org.ton.ton4j.utils.Utils;
+
 import static org.ton.ton4j.toncenter.model.CommonResponses.*;
 
 import java.math.BigInteger;
@@ -563,21 +566,22 @@ public void testGetConfigAll() {
   }
 
   @Test
-  public void testGetLibraries() {
+  public void testGetLibraries() throws DecoderException {
+    List<String> libraryHashes;
     if (network == Network.MAINNET) {
-      log.info("Not yet implemented in MAINNET");
-      return;
+      libraryHashes = Arrays.asList(
+              Utils.hexStringToBase64("459BAABBCDD21981E937B0FFE73F9D52837F84ED3C117AD1260D535EC162800A")
+      );
+    }
+    else {
+      libraryHashes = Arrays.asList(
+              "IINLe3KxEhR+Gy+0V7hOdNGjDwT3N9T2KmaOlVLSty8="
+      );
     }
     enforceRateLimit();
     TonCenter client = TonCenter.builder().apiKey(apiKey).network(network).build();
 
     try {
-
-      // Test with some example library hashes (these may not exist, but tests the endpoint structure)
-      List<String> libraryHashes = Arrays.asList(
-          "IINLe3KxEhR+Gy+0V7hOdNGjDwT3N9T2KmaOlVLSty8=" // in testnet only
-//          "20834b7b72b112147e1b2fb457b84e74d1a30f04f737d4f62a668e9552d2b72f" // in testnet only
-      );
 
       TonResponse<GetLibrariesResponse> response = client.getLibraries(libraryHashes);
       log.info("response {}", response.getResult());