added support of initial pending queries;

implemented request to merge_inner_queries method;
supported off-chain signatures;

README.md

@@ -60,7 +60,7 @@ You can use each submodule individually. Click the module below to get more deta
 * ✅ Get block transactions
 * ✅ Get account transactions
 * ✅ Deploy contracts and send external messages using Tonlib
-* ✅ Wallets - Simple (V1), V2, V3, V4 (plugins), Lockup, Highload, DNS, Jetton, NFT, Payment-channels
+* ✅ Wallets - Simple (V1), V2, V3, V4 (plugins), Lockup, Highload, DNS, Jetton, NFT, Payment-channels, Multisig
 * ✅ HashMap, HashMapE, PfxHashMap and PfxHashMapE serialization / deserialization
 
 ### Todo

smartcontract/README.md

@@ -43,6 +43,7 @@ Currently, following wallet versions and revisions are supported:
 * Jetton [(see usage example)](jetton-example.md)
 * NFT [(see usage example)](nft-example.md)
 * Payment channels [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestPayments.java) 
+* Multisig [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletMultisig.java)
 * Custom contract [(see usage example)](custom-smc-example.md)
 
 

smartcontract/src/main/java/org/ton/java/smartcontract/types/MultisigConfig.java

@@ -19,16 +19,17 @@ public class MultisigConfig {
      * Whitelist of allowed destinations
      */
     public List<OwnerInfo> owners;
+    public List<PendingQuery> pendingQueries;
 
     public long rootI;
     /**
      * Minimum amount of signatures for order to execute.
      * <p>
      * E.g. n = 5, k = 3, means at least 3 out of 5 signatures must be collected
      */
-    public long k;
+    public int k;
     /**
      * total amount of private kyes
      */
-    public long n;
+    public int n;
 }

smartcontract/src/main/java/org/ton/java/smartcontract/types/MultisigSignature.java

@@ -0,0 +1,13 @@
+package org.ton.java.smartcontract.types;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+
+@Builder
+@Getter
+@ToString
+public class MultisigSignature {
+    long pubKeyPosition;
+    byte[] signature;
+}

smartcontract/src/main/java/org/ton/java/smartcontract/types/OwnerInfo.java

@@ -10,5 +10,4 @@
 public class OwnerInfo {
     byte[] publicKey;
     long flood;
-
 }

smartcontract/src/main/java/org/ton/java/smartcontract/types/PendingQuery.java

@@ -0,0 +1,21 @@
+package org.ton.java.smartcontract.types;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
+import org.ton.java.cell.Cell;
+
+import java.math.BigInteger;
+
+@Builder
+@Getter
+@ToString
+public class PendingQuery {
+    BigInteger queryId;
+    long creatorI;
+    long cnt; // current number of collected confirmations
+
+    // bits of length n, with active bit at position of public keys array. 101 - signed with pubkey[0] and pubkey[2]
+    long cntBits;
+    Cell msg;
+}

smartcontract/src/main/java/org/ton/java/smartcontract/wallet/WalletContract.java

@@ -136,7 +136,7 @@ default ExternalMessage createExternalMessage(Cell signingMessage,
 
         if (seqno == 0) {
             if (isNull(getOptions().publicKey)) {
-                TweetNaclFast.Signature.KeyPair keyPair = Utils.generateSignatureKeyPairFromSeed(secretKey); //) TweetNaclFast.Box.keyPair_fromSecretKey(
+                TweetNaclFast.Signature.KeyPair keyPair = Utils.generateSignatureKeyPairFromSeed(secretKey);
                 getOptions().publicKey = keyPair.getPublicKey();
             }
             StateInit deploy = createStateInit();

smartcontract/src/test/java/org/ton/java/smartcontract/TestFaucet.java

@@ -14,6 +14,7 @@
 import org.ton.java.tonlib.Tonlib;
 import org.ton.java.tonlib.types.AccountAddressOnly;
 import org.ton.java.tonlib.types.FullAccountState;
+import org.ton.java.tonlib.types.VerbosityLevel;
 import org.ton.java.utils.Utils;
 
 import java.math.BigInteger;
@@ -134,4 +135,13 @@ public void deployFaucetWallet() {
                 .build();
         tonlib.sendRawMessage(msg.message.toBocBase64(false));
     }
+
+    @Test
+    public void topUpAnyContract() throws InterruptedException {
+        Tonlib tonlib = Tonlib.builder()
+                .testnet(true)
+                .verbosityLevel(VerbosityLevel.DEBUG)
+                .build();
+        TestFaucet.topUpContract(tonlib, Address.of("0QB0gEuvySej-7ZZBAdaBSydBB_oVYUUnp9Ciwm05kJsNKau"), Utils.toNano(5));
+    }
 }