refactoring, synthetic sugar, documentation

neodix42 · Mar 2, 2023 · 89bad30 · 89bad30
1 parent 47836f7
commit 89bad30
Show file tree

Hide file tree

Showing 49 changed files with 844 additions and 190 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Do not forget to place tonlibjson library to your project. Latest Tonlib librari
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>smartcontract</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 
@@ -32,7 +32,7 @@ Do not forget to place tonlibjson library to your project. Latest Tonlib librari
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>ton4j</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 

diff --git a/address/README.md b/address/README.md
@@ -6,7 +6,7 @@
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>address</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 
@@ -17,7 +17,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>address</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 

diff --git a/address/pom.xml b/address/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.neodix42</groupId>
         <artifactId>top</artifactId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/bitstring/README.md b/bitstring/README.md
@@ -6,7 +6,7 @@
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>bitstring</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>bitstring</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 

diff --git a/bitstring/pom.xml b/bitstring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.neodix42</groupId>
         <artifactId>top</artifactId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/cell/README.md b/cell/README.md
@@ -6,7 +6,7 @@
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>cell</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>cell</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 

diff --git a/cell/pom.xml b/cell/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.neodix42</groupId>
         <artifactId>top</artifactId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/mnemonic/README.md b/mnemonic/README.md
@@ -6,7 +6,7 @@
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>mnemonic</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>mnemonic</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 

diff --git a/mnemonic/pom.xml b/mnemonic/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>top</artifactId>
         <groupId>io.github.neodix42</groupId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>io.github.neodix42</groupId>
     <artifactId>top</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 
     <modules>
         <module>bitstring</module>

diff --git a/smartcontract/README.md b/smartcontract/README.md
@@ -7,7 +7,7 @@
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>smartcontract</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 
@@ -18,7 +18,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>smartcontract</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
 </dependency>
 ```
 

diff --git a/smartcontract/pom.xml b/smartcontract/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.neodix42</groupId>
         <artifactId>top</artifactId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/dns/DnsCollection.java b/smartcontract/src/main/java/org/ton/java/smartcontract/dns/DnsCollection.java
@@ -169,7 +169,6 @@ public void deploy(Tonlib tonlib, WalletContract wallet, BigInteger msgValue, Tw
                 seqno,
                 payload.endCell(),
                 (byte) 3, //send mode
-                false, //dummy signature
                 this.createStateInit().stateInit
         );
 

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/highload/HighloadWallet.java b/smartcontract/src/main/java/org/ton/java/smartcontract/highload/HighloadWallet.java
@@ -17,6 +17,8 @@
 
 import java.math.BigInteger;
 
+import static java.util.Objects.nonNull;
+
 public class HighloadWallet implements WalletContract {
 
     //https://github.com/ton-blockchain/ton/blob/master/crypto/smartcont/highload-wallet-v2-code.fc
@@ -113,7 +115,7 @@ public String getPublicKey(Tonlib tonlib) {
      */
     public void sendTonCoins(Tonlib tonlib, byte[] secretKey, HighloadConfig highloadConfig) {
         Cell signingMessageAll = createSigningMessageInternal(highloadConfig);
-        ExternalMessage msg = createExternalMessage(signingMessageAll, secretKey, 1, false);
+        ExternalMessage msg = createExternalMessage(signingMessageAll, secretKey, 1);
         tonlib.sendRawMessage(msg.message.toBocBase64(false));
     }
 
@@ -125,7 +127,12 @@ private Cell createDict(HighloadConfig highloadConfig) {
         for (Destination destination : highloadConfig.getDestinations()) {
 
             Cell orderHeader = Contract.createInternalMessageHeader(destination.getAddress(), destination.getAmount());
-            Cell order = Contract.createCommonMsgInfo(orderHeader);
+            Cell order;
+            if (nonNull(destination.getComment())) {
+                order = Contract.createCommonMsgInfo(orderHeader, null, CellBuilder.beginCell().storeUint(0, 32).storeString(destination.getComment()).endCell());
+            } else {
+                order = Contract.createCommonMsgInfo(orderHeader);
+            }
 
             CellBuilder p = CellBuilder.beginCell();
             p.storeUint(destination.getMode(), 8); // mode

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/lockup/LockupWalletV1.java b/smartcontract/src/main/java/org/ton/java/smartcontract/lockup/LockupWalletV1.java
@@ -228,13 +228,109 @@ public long getSeqno(Tonlib tonlib) {
         return seqno.getNumber().longValue();
     }
 
+    public void deploy(Tonlib tonlib, byte[] secretKey) {
+        tonlib.sendRawMessage(createInitExternalMessage(secretKey).message.toBocBase64(false));
+    }
+
+    /**
+     * Sends amount of toncoins to destination address using auto-fetched seqno without the body and default send-mode 3
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     */
     public void sendTonCoins(Tonlib tonlib, byte[] secretKey, Address destinationAddress, BigInteger amount) {
         long seqno = getSeqno(tonlib);
         ExternalMessage msg = createTransferMessage(secretKey, destinationAddress, amount, seqno);
         tonlib.sendRawMessage(Utils.bytesToBase64(msg.message.toBoc(false)));
     }
 
-    public void deploy(Tonlib tonlib, byte[] secretKey) {
-        tonlib.sendRawMessage(createInitExternalMessage(secretKey).message.toBocBase64(false));
+    /**
+     * Sends amount of toncoins to destination address using specified seqno with the body and default send-mode 3
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     * @param body               byte[]
+     */
+    public void sendTonCoins(Tonlib tonlib, byte[] secretKey, Address destinationAddress, BigInteger amount, long seqno, byte[] body) {
+        ExternalMessage msg = createTransferMessage(secretKey, destinationAddress, amount, seqno, body);
+        tonlib.sendRawMessage(msg.message.toBocBase64(false));
+    }
+
+    /**
+     * Sends amount of toncoins to destination address using specified seqno with the body and specified send-mode
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     * @param body               byte[]
+     * @param sendMode           byte
+     */
+    public void sendTonCoins(Tonlib tonlib, byte[] secretKey, Address destinationAddress, BigInteger amount, long seqno, byte[] body, byte sendMode) {
+        ExternalMessage msg = createTransferMessage(secretKey, destinationAddress, amount, seqno, body, sendMode);
+        tonlib.sendRawMessage(msg.message.toBocBase64(false));
+    }
+
+    /**
+     * Sends amount of toncoins to destination address using auto-fetched seqno with the body and default send-mode 3
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     * @param body               byte[]
+     */
+    public void sendTonCoins(Tonlib tonlib, byte[] secretKey, Address destinationAddress, BigInteger amount, byte[] body) {
+        long seqno = getSeqno(tonlib);
+        ExternalMessage msg = createTransferMessage(secretKey, destinationAddress, amount, seqno, body);
+        tonlib.sendRawMessage(msg.message.toBocBase64(false));
+    }
+
+    /**
+     * Sends amount of toncoins to destination address using specified seqno with the body and default send-mode 3
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     * @param comment            String
+     */
+    public void sendTonCoins(Tonlib tonlib, byte[] secretKey, Address destinationAddress, BigInteger amount, long seqno, String comment) {
+        ExternalMessage msg = createTransferMessage(secretKey, destinationAddress, amount, seqno, CellBuilder.beginCell().storeUint(0, 32).storeString(comment).endCell());
+        tonlib.sendRawMessage(msg.message.toBocBase64(false));
+    }
+
+    /**
+     * Sends amount of toncoins to destination address using auto-fetched seqno with the comment and default send-mode 3
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     * @param comment            String
+     */
+    public void sendTonCoins(Tonlib tonlib, byte[] secretKey, Address destinationAddress, BigInteger amount, String comment) {
+        long seqno = getSeqno(tonlib);
+        ExternalMessage msg = createTransferMessage(secretKey, destinationAddress, amount, seqno, CellBuilder.beginCell().storeUint(0, 32).storeString(comment).endCell());
+        tonlib.sendRawMessage(msg.message.toBocBase64(false));
+    }
+
+    /**
+     * Sends amount of toncoins to destination address using auto-fetched seqno with the body and specified send-mode
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     * @param body               byte[]
+     */
+    public void sendTonCoins(Tonlib tonlib, byte[] secretKey, Address destinationAddress, BigInteger amount, byte[] body, byte sendMode) {
+        long seqno = getSeqno(tonlib);
+        ExternalMessage msg = createTransferMessage(secretKey, destinationAddress, amount, seqno, body, sendMode);
+        tonlib.sendRawMessage(msg.message.toBocBase64(false));
     }
 }
diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/payments/FromWallet.java b/smartcontract/src/main/java/org/ton/java/smartcontract/payments/FromWallet.java
@@ -115,7 +115,6 @@ public ExternalMessage createExtMsg(Cell payload, boolean needStateInit, BigInte
                 seqno,
                 payload, // body
                 (byte) 3,
-                false,
                 stateInit);
     }
 }
diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/token/ft/JettonMinter.java b/smartcontract/src/main/java/org/ton/java/smartcontract/token/ft/JettonMinter.java
@@ -236,7 +236,6 @@ public void deploy(Tonlib tonlib, WalletContract adminWallet, BigInteger walletM
                 seqno,
                 (Cell) null, // body
                 (byte) 3, //send mode
-                false, //dummy signature
                 this.createStateInit().stateInit);
 
         tonlib.sendRawMessage(Utils.bytesToBase64(extMsg.message.toBoc(false)));

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/token/nft/NftCollection.java b/smartcontract/src/main/java/org/ton/java/smartcontract/token/nft/NftCollection.java
@@ -289,7 +289,6 @@ public void deploy(Tonlib tonlib, WalletContract wallet, BigInteger msgValue, Tw
                 seqno,
                 payload,
                 (byte) 3, //send mode
-                false, //dummy signature
                 this.createStateInit().stateInit
         );
 

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/token/nft/NftMarketplace.java b/smartcontract/src/main/java/org/ton/java/smartcontract/token/nft/NftMarketplace.java
@@ -78,7 +78,6 @@ public void deploy(Tonlib tonlib, WalletContract wallet, BigInteger msgValue, Tw
                 seqno,
                 payload,
                 (byte) 3, //send mode
-                false, //dummy signature
                 this.createStateInit().stateInit
         );
 

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/types/Destination.java b/smartcontract/src/main/java/org/ton/java/smartcontract/types/Destination.java
@@ -14,4 +14,5 @@ public class Destination {
     byte mode; // default mode 3
     Address address;
     BigInteger amount;
+    String comment;
 }
diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/Contract.java b/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/Contract.java
@@ -183,10 +183,10 @@ default Cell createInternalMessageHeader(String dest,
                 createdLt, createdAt);
     }
 
-    static Cell createInternalMessageHeader(Address dest, BigInteger gramValue) {
+    static Cell createInternalMessageHeader(Address dest, BigInteger toncoinValue) {
         return createInternalMessageHeader(
                 dest,
-                gramValue,
+                toncoinValue,
                 true,
                 null,
                 false,
@@ -198,10 +198,10 @@ static Cell createInternalMessageHeader(Address dest, BigInteger gramValue) {
                 BigInteger.ZERO);
     }
 
-    static Cell createInternalMessageHeader(String dest, BigInteger gramValue) {
+    static Cell createInternalMessageHeader(String dest, BigInteger toncoinValue) {
         return createInternalMessageHeader(
                 Address.of(dest),
-                gramValue,
+                toncoinValue,
                 true,
                 null,
                 false,