review HighloadWalletV3 added by krigga; bulk send tests to come.

Author: neodix42

README.md

@@ -4,12 +4,14 @@
 [![Based on TON][ton-svg]][ton]
 ![GitHub last commit](https://img.shields.io/github/last-commit/neodiX42/ton4j)
 
-Java libraries for interacting with TON blockchain. 
-Do not forget to place tonlibjson library to your project. Latest Tonlib libraries can be found [here](https://github.com/ton-blockchain/ton/actions).
+Java libraries for interacting with TON blockchain.
+Do not forget to place tonlibjson library to your project. Latest Tonlib libraries can be
+found [here](https://github.com/ton-blockchain/ton/actions).
 
 ## Maven [![Maven Central][maven-central-svg]][maven-central]
 
 ```xml
+
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>smartcontract</artifactId>
@@ -20,6 +22,7 @@ Do not forget to place tonlibjson library to your project. Latest Tonlib librari
 ## Jitpack [![JitPack][jitpack-svg]][jitpack]
 
 ```xml
+
 <repositories>
     <repository>
         <id>jitpack.io</id>
@@ -29,6 +32,7 @@ Do not forget to place tonlibjson library to your project. Latest Tonlib librari
 ```
 
 ```xml
+
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>ton4j</artifactId>
@@ -45,7 +49,7 @@ You can use each submodule individually. Click the module below to get more deta
 * [Address](address/README.md) - create and parse TON wallet addresses.
 * [Mnemonic](mnemonic/README.md) - helpful methods for generating deterministic keys for TON blockchain.
 * [Emulator](emulator/README.md) - wrapper for using with external precompiled emulator shared library.
-* [Liteclient](liteclient/README.md) - wrapper for using with external precompiled lite-client binary. 
+* [Liteclient](liteclient/README.md) - wrapper for using with external precompiled lite-client binary.
 * [Utils](utils/README.md) - create private and public keys, convert data, etc.
 
 ### Features
@@ -54,18 +58,20 @@ You can use each submodule individually. Click the module below to get more deta
 * ✅ Cells serialization / deserialization
 * ✅ TL-B serialization / deserialization
 * ✅ Cell builder and cell slicer (reader)
-* ✅ Tonlib wrapper 
+* ✅ Tonlib wrapper
 * ✅ Support num, cell and slice as arguments for runMethod
 * ✅ Render List, Tuple, Slice, Cell and Number results from runMethod
 * ✅ Generate or import private key, sign, encrypt and decrypt using Tonlib
 * ✅ Encrypt/decrypt with mnemonic
 * ✅ Send external message
 * ✅ Get block transactions
 * ✅ Deploy contracts and send external messages using Tonlib
-* ✅ Wallets - Simple (V1), V2, V3, V4 (plugins), Lockup, Highload, DNS, Jetton, NFT, Payment-channels, Multisig
+* ✅ Wallets - Simple (V1), V2, V3, V4 (plugins), Lockup, Highload/Highload-V3, DNS, Jetton, NFT, Payment-channels,
+  Multisig
 * ✅ HashMap, HashMapE, PfxHashMap, PfxHashMapE, HashMapAug, HashMapAugE serialization / deserialization
 
 ### Todo
+
 * Support tuple and list as arguments for runMethod
 * Improve code coverage and add more integration tests
 * Add methods to store jettons metadata onchain

smartcontract/README.md

@@ -30,23 +30,29 @@ Currently, following wallet versions and revisions are supported:
 
 * V1R1
 * V1R2 [(see usage example)](v1r2-example.md)
-* V1R3 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV1R3DeployTransfer.java)
-* v2R1 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV2R1DeployTransferShort.java)
-* v2R2 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV2R2DeployTransferShort.java)
+*
+V1R3 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV1R3DeployTransfer.java)
+*
+v2R1 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV2R1DeployTransferShort.java)
+*
+v2R2 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV2R2DeployTransferShort.java)
 * v3R1
-* v3R2 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV3R2DeployTransferShort.java)
+*
+v3R2 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV3R2DeployTransferShort.java)
 * v4R1
 * v4R2 - subscription, plugins [(see usage example)](plugin-example.md)
-* Lockup - restricted [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestLockupWalletDeployTransfer.java)
-* Highload [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV2Highload.java) 
+* Lockup -
+  restricted [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestLockupWalletDeployTransfer.java)
+* Highload [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestWalletV2Highload.java)
+*
+Highload-V3 [(see usage example)](./src/test/java/org/ton/java/smartcontract/integrationtests/TestHighloadWalletV3.java)
 * Dns [(see usage example)](dns-example.md)
 * 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) 
+* 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)
 
-
 More examples on how to work with [smart-contracts](../smartcontract/src/main/java/org/ton/java/smartcontract) can be
 found in [here](../smartcontract/src/test/java/org/ton/java/smartcontract).
 

smartcontract/src/main/java/org/ton/java/smartcontract/highload/HighloadWalletV3.java

@@ -3,10 +3,7 @@
 import org.ton.java.address.Address;
 import org.ton.java.cell.Cell;
 import org.ton.java.cell.CellBuilder;
-import org.ton.java.cell.TonHashMap;
-import org.ton.java.smartcontract.types.Destination;
 import org.ton.java.smartcontract.types.ExternalMessage;
-import org.ton.java.smartcontract.types.HighloadConfig;
 import org.ton.java.smartcontract.types.HighloadV3BatchItem;
 import org.ton.java.smartcontract.types.HighloadV3Config;
 import org.ton.java.smartcontract.types.WalletCodes;
@@ -25,12 +22,11 @@
 
 public class HighloadWalletV3 implements WalletContract {
 
-    //https://github.com/ton-blockchain/ton/blob/master/crypto/smartcont/highload-wallet-v2-code.fc
     Options options;
     Address address;
 
     /**
-     * interface to <a href="https://github.com/ton-blockchain/ton/blob/master/crypto/smartcont/highload-wallet-v2-code.fc">highload smart-contract</a>
+     * interface to <a href="https://github.com/ton-blockchain/highload-wallet-contract-v3/blob/main/contracts/highload-wallet-v3.func">highload-v3 smart-contract</a>
      *
      * @param options Options - mandatory -  highloadQueryId, walletId, publicKey
      */
@@ -95,6 +91,15 @@ public Cell createSigningMessage(long seqno) {
         return message.endCell();
     }
 
+    /**
+     * Construct MsgInner according to TL-B:
+     * <pre>
+     *     _ {n:#}  subwallet_id:uint32 message_to_send:^Cell send_mode:uint8 query_id:QueryId created_at:uint64 timeout:uint22 = MsgInner;`
+     * </pre>
+     *
+     * @param highloadConfig HighloadV3Config
+     * @return Cell
+     */
     public Cell createSigningMessageInternal(HighloadV3Config highloadConfig) {
         CellBuilder message = CellBuilder.beginCell();
         message.storeUint(BigInteger.valueOf(getOptions().walletId), 32);

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

@@ -7,29 +7,29 @@ public class HighloadQueryId {
     static final int BITNUMBER_SIZE = 10;
 
     int shift;
-    int bitnumber;
+    int bitNumber;
 
     public HighloadQueryId() {
         shift = 0;
-        bitnumber = 0;
+        bitNumber = 0;
     }
 
-    public static HighloadQueryId fromShiftAndBitNumber(int shift, int bitnumber) throws IllegalArgumentException {
+    public static HighloadQueryId fromShiftAndBitNumber(int shift, int bitNumber) throws IllegalArgumentException {
         if (shift < 0) {
             throw new IllegalArgumentException("Shift cannot be less than 0");
         }
         if (shift > MAX_SHIFT) {
             throw new IllegalArgumentException("Shift cannot be greater than " + MAX_SHIFT);
         }
-        if (bitnumber < 0) {
-            throw new IllegalArgumentException("Bitnumber cannot be less than 0");
+        if (bitNumber < 0) {
+            throw new IllegalArgumentException("BitNumber cannot be less than 0");
         }
-        if (bitnumber > MAX_BITNUMBER) {
-            throw new IllegalArgumentException("Bitnumber cannot be greater than " + MAX_BITNUMBER);
+        if (bitNumber > MAX_BITNUMBER) {
+            throw new IllegalArgumentException("BitNumber cannot be greater than " + MAX_BITNUMBER);
         }
         HighloadQueryId qid = new HighloadQueryId();
         qid.shift = shift;
-        qid.bitnumber = bitnumber;
+        qid.bitNumber = bitNumber;
         return qid;
     }
 
@@ -42,16 +42,16 @@ public static HighloadQueryId fromQueryId(int queryId) {
     }
 
     public int getQueryId() {
-        return (shift << BITNUMBER_SIZE) + bitnumber;
+        return (shift << BITNUMBER_SIZE) + bitNumber;
     }
 
     public boolean hasNext() {
-        boolean isEnd = bitnumber >= (MAX_BITNUMBER - 1) && shift >= MAX_SHIFT; // last usable queryId is left for emergency withdrawal
+        boolean isEnd = bitNumber >= (MAX_BITNUMBER - 1) && shift >= MAX_SHIFT; // last usable queryId is left for emergency withdrawal
         return !isEnd;
     }
 
     public HighloadQueryId getNext() throws IllegalStateException {
-        int newBitnumber = bitnumber + 1;
+        int newBitnumber = bitNumber + 1;
         int newShift = shift;
 
         if (newShift >= MAX_SHIFT && newBitnumber > (MAX_BITNUMBER - 1)) {
@@ -73,11 +73,11 @@ public int getShift() {
         return shift;
     }
 
-    public int getBitnumber() {
-        return bitnumber;
+    public int getBitNumber() {
+        return bitNumber;
     }
 
     public int toSeqno() {
-        return shift * 1023 + bitnumber;
+        return shift * 1023 + bitNumber;
     }
 }