add Jetton NEOJ Faucet. Use it whenever you want to quickly top up a …

…wallet with some jettons. added more tests to send jettons using highload wallet v3r1.
neodix42 · Jul 28, 2024 · 4137514 · 4137514
1 parent 351b9d8
commit 4137514
Show file tree

Hide file tree

Showing 11 changed files with 642 additions and 49 deletions.
diff --git a/1-media/neo-jetton.json b/1-media/neo-jetton.json
@@ -1,7 +1,7 @@
 {
   "name": "Neo Jetton",
   "description": "Neo TON Jettons — the future is now.",
-  "image": "https://github.com/neodix42/ton4j/blob/main/1-media/neo-jetton.png",
+  "image": "https://raw.githubusercontent.com/neodix42/ton4j/main/1-media/neo-jetton.png",
   "symbol": "NEOJ",
   "decimals": "2"
 }
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
@@ -212,7 +212,7 @@ public JettonMinterData getJettonData(Tonlib tonlib) {
                 .build();
     }
 
-    public BigInteger getTotalSupply(Tonlib tonlib) {
+    public BigInteger getTotalSupply() {
         RunResult result;
         if (nonNull(customAddress)) {
             result = tonlib.runMethod(customAddress, "get_jetton_data");

diff --git a/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/ContractUtils.java b/smartcontract/src/main/java/org/ton/java/smartcontract/wallet/ContractUtils.java
@@ -3,6 +3,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.ton.java.address.Address;
+import org.ton.java.smartcontract.token.ft.JettonMinter;
+import org.ton.java.smartcontract.token.ft.JettonWallet;
 import org.ton.java.tonlib.Tonlib;
 import org.ton.java.utils.Utils;
 
@@ -32,18 +34,43 @@ public static void waitForDeployment(Tonlib tonlib, Address address, int timeout
 
     public static void waitForBalanceChange(Tonlib tonlib, Address address, int timeoutSeconds) {
         System.out.println("waiting for balance change up to " + timeoutSeconds + " sec");
-        BigInteger initialBalance = getBalance(tonlib, address);
+        BigInteger initialBalance = tonlib.getAccountBalance(address);
         int i = 0;
         do {
             if (++i * 2 >= timeoutSeconds) {
                 throw new Error("Balance was not changed within specified timeout.");
             }
             Utils.sleep(2);
         }
-        while (initialBalance.equals(getBalance(tonlib, address)));
+        while (initialBalance.equals(tonlib.getAccountBalance(address)));
     }
 
-    public static BigInteger getBalance(Tonlib tonlib, Address address) {
-        return new BigInteger(tonlib.getAccountState(address).getBalance());
+    public static void waitForJettonBalanceChange(Tonlib tonlib, Address jettonMinter, Address address, int timeoutSeconds) {
+        System.out.println("waiting for jetton balance change up to " + timeoutSeconds + " sec");
+        BigInteger initialBalance = getJettonBalance(tonlib, jettonMinter, address);
+        int i = 0;
+        do {
+            if (++i * 2 >= timeoutSeconds) {
+                throw new Error("Balance was not changed within specified timeout.");
+            }
+            Utils.sleep(2);
+        }
+        while (initialBalance.equals(getJettonBalance(tonlib, jettonMinter, address)));
+    }
+
+    public static BigInteger getJettonBalance(Tonlib tonlib, Address jettonMinter, Address destinationAddress) {
+
+        try {
+            JettonMinter jettonMinterWallet = JettonMinter.builder()
+                    .tonlib(tonlib)
+                    .customAddress(jettonMinter)
+                    .build();
+
+            JettonWallet jettonWallet = jettonMinterWallet.getJettonWallet(destinationAddress);
+
+            return jettonWallet.getBalance();
+        } catch (Exception e) {
+            return new BigInteger("-1");
+        }
     }
 }
diff --git a/smartcontract/src/test/java/org/ton/java/smartcontract/TestFaucet.java b/smartcontract/src/test/java/org/ton/java/smartcontract/TestFaucet.java
@@ -32,16 +32,7 @@ public class TestFaucet {
     public static String BOUNCEABLE = "kQC1Kha6NzVQHfGZl1UOftTEF1TuUB3tioQQiM5CeLZt5A_F";
 
     public static BigInteger topUpContract(Tonlib tonlib, Address destinationAddress, BigInteger amount) throws InterruptedException {
-        byte[] secretKey = Utils.hexToSignedBytes(SECRET_KEY);
-        TweetNaclFast.Signature.KeyPair keyPair = TweetNaclFast.Signature.keyPair_fromSeed(secretKey);
-
-//        Options options = Options.builder()
-//                .publicKey(keyPair.getPublicKey())
-//                .secretKey(keyPair.getSecretKey())
-//                .wc(0L)
-//                .build();
-//
-//        WalletV1ContractR3 faucet = new Wallet(WalletVersion.V1R3, options).create();
+        TweetNaclFast.Signature.KeyPair keyPair = TweetNaclFast.Signature.keyPair_fromSeed(Utils.hexToSignedBytes(SECRET_KEY));
 
         WalletV1R3 faucet = WalletV1R3.builder()
                 .tonlib(tonlib)
@@ -72,7 +63,7 @@ public static BigInteger topUpContract(Tonlib tonlib, Address destinationAddress
                 .seqno(faucet.getSeqno())
                 .destination(destinationAddress)
                 .amount(amount)
-                .comment("top-up from ton4j")
+                .comment("top-up from ton4j faucet")
                 .build();
 
         ExtMessageInfo extMessageInfo = faucet.send(config);
@@ -83,7 +74,7 @@ public static BigInteger topUpContract(Tonlib tonlib, Address destinationAddress
 
         ContractUtils.waitForBalanceChange(tonlib, destinationAddress, 60);
 
-        return ContractUtils.getBalance(tonlib, destinationAddress);
+        return tonlib.getAccountBalance(destinationAddress);
     }
 
     @Test

diff --git a/smartcontract/src/test/java/org/ton/java/smartcontract/TestJettonFaucet.java b/smartcontract/src/test/java/org/ton/java/smartcontract/TestJettonFaucet.java
@@ -0,0 +1,257 @@
+package org.ton.java.smartcontract;
+
+import com.iwebpp.crypto.TweetNaclFast;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.ton.java.address.Address;
+import org.ton.java.smartcontract.token.ft.JettonMinter;
+import org.ton.java.smartcontract.token.ft.JettonWallet;
+import org.ton.java.smartcontract.token.nft.NftUtils;
+import org.ton.java.smartcontract.types.WalletCodes;
+import org.ton.java.smartcontract.types.WalletV3Config;
+import org.ton.java.smartcontract.utils.MsgUtils;
+import org.ton.java.smartcontract.wallet.ContractUtils;
+import org.ton.java.smartcontract.wallet.v3.WalletV3R2;
+import org.ton.java.tonlib.Tonlib;
+import org.ton.java.tonlib.types.ExtMessageInfo;
+import org.ton.java.tonlib.types.FullAccountState;
+import org.ton.java.utils.Utils;
+
+import java.math.BigInteger;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+/**
+ * Faucet for NEOJ jettons.
+ */
+@Slf4j
+@RunWith(JUnit4.class)
+public class TestJettonFaucet {
+
+    public static String ADMIN_WALLET_PUBLIC_KEY = "d1d4515b2635b81de98d58f65502f2c242bb0e63615520341b83a12dd4d0f516";
+    public static String ADMIN_WALLET_SECRET_KEY = "be0bbb1725807ec0df984702a32a143864418400d797a48e267a120c3dc5f8d0d1d4515b2635b81de98d58f65502f2c242bb0e63615520341b83a12dd4d0f516";
+    public static String ADMIN_WALLET_ADDRESS = "0:98972d1ab4b86f6be34ad03d64bb5e2cb369f0d7b5e53f13348664672b893010";
+    public static String ADMIN_WALLET_BOUNCEABLE_ADDRESS = "EQCYly0atLhva-NK0D1ku14ss2nw17XlPxM0hmRnK4kwEO86";
+    public static String FAUCET_MASTER_ADDRESS = "kQAN6TAGauShFKDQvZCwNb_EeTUIjQDwRZ9t6GOn4FBzfg9Y";
+
+    public static BigInteger topUpContractWithNeoj(Tonlib tonlib, Address destinationAddress, BigInteger jettonsAmount) {
+
+        TweetNaclFast.Signature.KeyPair keyPair = TweetNaclFast.Signature.keyPair_fromSeed(Utils.hexToSignedBytes(ADMIN_WALLET_SECRET_KEY));
+
+        WalletV3R2 adminWallet = WalletV3R2.builder()
+                .tonlib(tonlib)
+                .walletId(42)
+                .keyPair(keyPair)
+                .build();
+
+        JettonMinter jettonMinterWallet = JettonMinter.builder()
+                .tonlib(tonlib)
+                .customAddress(Address.of(FAUCET_MASTER_ADDRESS))
+                .build();
+
+        JettonWallet adminJettonWallet = jettonMinterWallet.getJettonWallet(adminWallet.getAddress());
+
+        WalletV3Config walletV3Config = WalletV3Config.builder()
+                .walletId(42)
+                .seqno(adminWallet.getSeqno())
+                .destination(adminJettonWallet.getAddress())
+                .amount(Utils.toNano(0.06))
+//                .bounce(false)
+                .body(JettonWallet.createTransferBody(
+                        0,
+                        jettonsAmount,
+                        destinationAddress,           // recipient
+                        adminWallet.getAddress(),     // response address
+                        null,                         // custom payload
+                        BigInteger.ONE,               // forward amount
+                        MsgUtils.createTextMessageBody("jetton top up from ton4j faucet") // forward payload
+                )).build();
+        ExtMessageInfo extMessageInfo = adminWallet.send(walletV3Config);
+        assertThat(extMessageInfo.getError().getCode()).isZero();
+
+        if (extMessageInfo.getError().getCode() != 0) {
+            throw new Error(extMessageInfo.getError().getMessage());
+        }
+
+//        ContractUtils.waitForBalanceChange(tonlib, adminWallet.getAddress(), 60);
+        ContractUtils.waitForJettonBalanceChange(tonlib, Address.of(FAUCET_MASTER_ADDRESS), adminWallet.getAddress(), 60);
+        Utils.sleep(10);
+        return ContractUtils.getJettonBalance(tonlib, Address.of(FAUCET_MASTER_ADDRESS), destinationAddress);
+    }
+
+    @Test
+    public void testJettonFaucetBalance() {
+        Tonlib tonlib = Tonlib.builder()
+                .testnet(true)
+                .ignoreCache(false)
+                .build();
+
+        TweetNaclFast.Signature.KeyPair keyPair = TweetNaclFast.Signature.keyPair_fromSeed(Utils.hexToSignedBytes(ADMIN_WALLET_SECRET_KEY));
+
+        WalletV3R2 adminWallet = WalletV3R2.builder()
+                .tonlib(tonlib)
+                .walletId(42)
+                .keyPair(keyPair)
+                .build();
+
+        JettonMinter jettonMinterWallet = JettonMinter.builder()
+                .tonlib(tonlib)
+                .customAddress(Address.of(FAUCET_MASTER_ADDRESS))
+                .build();
+
+        JettonWallet adminJettonWallet = jettonMinterWallet.getJettonWallet(adminWallet.getAddress());
+
+        FullAccountState state = tonlib.getAccountState(Address.of(FAUCET_MASTER_ADDRESS));
+
+        log.info("TEST FAUCET BALANCE IN TONCOINS {}", Utils.formatNanoValue(state.getBalance(), 2));
+        log.info("TEST FAUCET BALANCE TOTAL SUPPLY: {}", Utils.formatJettonValue(jettonMinterWallet.getTotalSupply(), 2, 2));
+        log.info("TEST FAUCET ADMIN BALANCE in TONCOINS: {}", Utils.formatNanoValue(adminWallet.getBalance()));
+        log.info("TEST FAUCET ADMIN BALANCE in JETTONS: {}", Utils.formatJettonValue(adminJettonWallet.getBalance(), 2, 2));
+    }
+
+    @Test
+    public void createJettonFaucetAdminWallet() {
+        WalletV3R2 contract = WalletV3R2.builder()
+                .walletId(42)
+                .build();
+
+        assertThat(contract.getAddress()).isNotNull();
+        log.info("Private key {}", Utils.bytesToHex(contract.getKeyPair().getSecretKey()));
+        log.info("Public key {}", Utils.bytesToHex(contract.getKeyPair().getPublicKey()));
+        log.info("Non-bounceable address (for init): {}", contract.getAddress().toNonBounceable());
+        log.info("Bounceable address (for later access): {}", contract.getAddress().toBounceable());
+        log.info("Raw address: {}", contract.getAddress().toRaw());
+    }
+
+    @Test
+    public void deployJettonFaucetAdminWallet() throws InterruptedException {
+        byte[] secretKey = Utils.hexToSignedBytes(ADMIN_WALLET_SECRET_KEY);
+        TweetNaclFast.Signature.KeyPair keyPair = TweetNaclFast.Signature.keyPair_fromSeed(secretKey);
+
+        Tonlib tonlib = Tonlib.builder()
+                .testnet(true)
+                .ignoreCache(false)
+                .build();
+
+        WalletV3R2 adminWallet = WalletV3R2.builder()
+                .tonlib(tonlib)
+                .walletId(42)
+                .keyPair(keyPair)
+                .build();
+
+        log.info("Private key {}", Utils.bytesToHex(keyPair.getSecretKey()));
+        log.info("Public key {}", Utils.bytesToHex(keyPair.getPublicKey()));
+        log.info("Non-bounceable address (for init): {}", adminWallet.getAddress().toNonBounceable());
+        log.info("Bounceable address (for later access): {}", adminWallet.getAddress().toBounceable());
+        log.info("Raw address: {}", adminWallet.getAddress().toRaw());
+
+
+        BigInteger balance = TestFaucet.topUpContract(tonlib, Address.of(adminWallet.getAddress().toNonBounceable()), Utils.toNano(10));
+        Utils.sleep(30, "topping up...");
+
+        ExtMessageInfo extMessageInfo = adminWallet.deploy();
+        assertThat(extMessageInfo.getError().getCode()).isZero();
+    }
+
+    @Test
+    public void deployJettonFaucetMinter() {
+
+        Tonlib tonlib = Tonlib.builder()
+                .testnet(true)
+                .ignoreCache(false)
+                .build();
+
+        byte[] secretKey = Utils.hexToSignedBytes(ADMIN_WALLET_SECRET_KEY);
+        TweetNaclFast.Signature.KeyPair keyPair = TweetNaclFast.Signature.keyPair_fromSeed(secretKey);
+
+        WalletV3R2 adminWallet = WalletV3R2.builder()
+                .tonlib(tonlib)
+                .keyPair(keyPair)
+                .walletId(42)
+                .build();
+
+        JettonMinter minter = JettonMinter.builder()
+                .tonlib(tonlib)
+                .adminAddress(adminWallet.getAddress())
+                .content(NftUtils.createOffChainUriCell("https://raw.githubusercontent.com/neodix42/ton4j/main/1-media/neo-jetton.json"))
+                .jettonWalletCodeHex(WalletCodes.jettonWallet.getValue())
+                .build();
+
+        log.info("jetton minter address {}", minter.getAddress());
+
+        WalletV3Config walletV3Config = WalletV3Config.builder()
+                .walletId(42)
+                .seqno(adminWallet.getSeqno())
+                .destination(minter.getAddress())
+                .amount(Utils.toNano(2))
+                .stateInit(minter.getStateInit())
+                .comment("deploy minter")
+                .build();
+
+        ExtMessageInfo extMessageInfo = adminWallet.send(walletV3Config);
+        assertThat(extMessageInfo.getError().getCode()).isZero();
+    }
+
+    @Test
+    public void mintTestJettonsFaucet() {
+        Tonlib tonlib = Tonlib.builder()
+                .testnet(true)
+                .ignoreCache(false)
+                .build();
+
+        byte[] secretKey = Utils.hexToSignedBytes(ADMIN_WALLET_SECRET_KEY);
+        TweetNaclFast.Signature.KeyPair keyPair = TweetNaclFast.Signature.keyPair_fromSeed(secretKey);
+
+        WalletV3R2 adminWallet = WalletV3R2.builder()
+                .tonlib(tonlib)
+                .keyPair(keyPair)
+                .walletId(42)
+                .build();
+
+        WalletV3Config walletV3Config = WalletV3Config.builder()
+                .walletId(42)
+                .seqno(adminWallet.getSeqno())
+                .destination(Address.of(FAUCET_MASTER_ADDRESS))
+                .amount(Utils.toNano(0.1))
+                .body(JettonMinter.createMintBody(0,
+                        adminWallet.getAddress(),
+                        Utils.toNano(0.1),
+                        new BigInteger("10_000_000_000_000_000"),
+                        null,
+                        null,
+                        BigInteger.ONE,
+                        MsgUtils.createTextMessageBody("minting")))
+                .build();
+
+        ExtMessageInfo extMessageInfo = adminWallet.send(walletV3Config);
+        assertThat(extMessageInfo.getError().getCode()).isZero();
+    }
+
+    @Test
+    public void topUpAnyContractWithNeoJettons() {
+        Tonlib tonlib = Tonlib.builder()
+                .testnet(true)
+                .ignoreCache(false)
+                .build();
+        BigInteger newBalance = TestJettonFaucet.topUpContractWithNeoj(tonlib,
+                Address.of("0QCUqgn-Ix3kuzhPAkKKiqqXQazsJ98K3VSCi4QJ3ZTGC7O1"), BigInteger.valueOf(100));
+        log.info("new balance " + Utils.formatNanoValue(newBalance));
+    }
+
+    @Test
+    public void testJettonBalance() {
+
+        Tonlib tonlib = Tonlib.builder()
+                .testnet(true)
+                .ignoreCache(false)
+                .build();
+
+        log.info("balance: {}", ContractUtils.getJettonBalance(
+                tonlib,
+                Address.of(FAUCET_MASTER_ADDRESS),
+                Address.of("0:cf2d917d55ed2d9fde43b5a5b5512216c3a027661311bbd771c394892836b3a4")
+        ));
+    }
+}