Added to Tonlib:

getRawAccountStatus() tryLocateTxByOutcomingMessage() tryLocateTxByIncomingMessage(); V4R2 wallet has now sendTonCoins method;
neodix42 · Mar 12, 2023 · efa1511 · efa1511
1 parent 8b9cec3
commit efa1511
Show file tree

Hide file tree

Showing 23 changed files with 353 additions and 64 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.2</version>
+    <version>0.1.3</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.2</version>
+    <version>0.1.3</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.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 
@@ -17,7 +17,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>address</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</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.2</version>
+        <version>0.1.3</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.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>bitstring</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</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.2</version>
+        <version>0.1.3</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.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>cell</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</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.2</version>
+        <version>0.1.3</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.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>mnemonic</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</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.2</version>
+        <version>0.1.3</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.2</version>
+    <version>0.1.3</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.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 
@@ -18,7 +18,7 @@
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>smartcontract</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</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.2</version>
+        <version>0.1.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/types/WalletVersion.java b/smartcontract/src/main/java/org/ton/java/smartcontract/types/WalletVersion.java
@@ -25,7 +25,11 @@ public enum WalletVersion {
     /**
      * reserved for internal usage
      */
-    config("Config");
+    config("Config"),
+    /**
+     * reserved for internal usage
+     */
+    unidentified("Unidentified");
 
     private final String value;
 

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/Wallet.java b/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/Wallet.java
@@ -56,6 +56,7 @@ public <T extends Contract> T create() {
             case multisig -> new MultisigWallet(options);
             case master -> throw new Error("not implemented");
             case config -> throw new Error("not implemented");
+            case unidentified -> throw new Error("not implemented");
         };
 
         return (T) result;

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/v4/WalletV4ContractR2.java b/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/v4/WalletV4ContractR2.java
@@ -313,4 +313,109 @@ private SubscriptionInfo parseSubscriptionData(List subscriptionData) {
                 .subscriptionId(subscriptionId.getNumber().longValue())
                 .build();
     }
+
+
+    /**
+     * 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(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 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 comment and default send-mode 3
+     *
+     * @param tonlib             Tonlib
+     * @param secretKey          byte[]
+     * @param destinationAddress Address
+     * @param amount             BigInteger
+     * @param seqno              long
+     * @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 without 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, 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[]
+     * @param sendMode           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/...java/org/ton/java/smartcontract/integrationtests/TestWalletV4R2PluginsDeployTransfer.java b/...java/org/ton/java/smartcontract/integrationtests/TestWalletV4R2PluginsDeployTransfer.java
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.ton.java.smartcontract.TestFaucet.FAUCET_ADDRESS_RAW;
 
 @Slf4j
 @RunWith(JUnit4.class)
@@ -49,8 +50,7 @@ public void testPlugins() throws InterruptedException {
                         .build())
                 .build();
 
-        Wallet wallet = new Wallet(WalletVersion.V4R2, options);
-        WalletV4ContractR2 contract = wallet.create();
+        WalletV4ContractR2 contract = new Wallet(WalletVersion.V4R2, options).create();
 
         InitExternalMessage msg = contract.createInitExternalMessage(keyPair.getSecretKey());
         Address walletAddress = msg.address;
@@ -233,5 +233,7 @@ public void testPlugins() throws InterruptedException {
         List<String> list = contract.getPluginsList(tonlib);
         log.info("pluginsList: {}", list);
         assertThat(list.isEmpty()).isTrue();
+
+        contract.sendTonCoins(tonlib, keyPair.getSecretKey(), Address.of(FAUCET_ADDRESS_RAW), Utils.toNano(0.33));
     }
 }
diff --git a/tlb/pom.xml b/tlb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>top</artifactId>
         <groupId>io.github.neodix42</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.github.neodix42</groupId>
             <artifactId>cell</artifactId>
-            <version>0.1.2</version>
+            <version>0.1.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/tonlib/README.md b/tonlib/README.md
@@ -8,7 +8,7 @@ Java Tonlib library uses JNA to access methods in native Tonlib shared library.
 <dependency>
     <groupId>io.github.neodix42</groupId>
     <artifactId>tonlib</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 
@@ -18,7 +18,7 @@ Java Tonlib library uses JNA to access methods in native Tonlib shared library.
 <dependency>
     <groupId>io.github.neodix42.ton4j</groupId>
     <artifactId>tonlib</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</version>
 </dependency>
 ```
 

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