Merge branch 'develop'

Author: ohager

.vscode/settings.json

@@ -8,5 +8,8 @@
     "editor.detectIndentation": false,
     "java.import.projectSelection": "automatic",
     "workbench.colorTheme": "Default Dark Modern",
-    "java.server.launchMode": "Standard"
+    "java.server.launchMode": "Standard",
+    "[java]": {
+        "editor.formatOnSave": true
+    }
 }

conf/node-default.properties

@@ -89,12 +89,12 @@
 # DB.LockTimeout = 60
 
 ## Maximum number of rows to be inserted in a single SQL statement.
-## Defaults to 10000, should be ok in most situations.
+## Defaults to 1000, should be ok in most situations.
 ## May be fine-tuned according to your DBMS or your machine's performance.
 ## Warning: a high value (> 15000 rows) is known to generate queries too big for an SQLite backend
-# DB.InsertBatchMaxSize = 10000
+# DB.InsertBatchMaxSize = 1000
 
-## Enable the indirect incoming tracker service. 
+## Enable the indirect incoming tracker service.
 ## This allows you to see transactions where you are paid but are not the direct recipient, eg, Multi-Outs.
 # node.indirectIncomingService.enable = true
 
@@ -107,7 +107,7 @@
 ### CPU  Settings ###
 #####################
 
-## Uncomment this to limit the number of CPU cores the wallet sees. 
+## Uncomment this to limit the number of CPU cores the wallet sees.
 ## Default is half available by setting to -1
 # CPU.NumCores = 4
 
@@ -193,7 +193,7 @@
 # P2P.getMorePeers = yes
 
 ## If the database of peers exceeds this value, more peers will not be downloaded.
-## This value will never be below MaxConnections. 
+## This value will never be below MaxConnections.
 # P2P.getMorePeersThreshold = 400
 
 ## Peer networking connect timeout for outgoing connections.
@@ -357,7 +357,7 @@
 ## Your reward recipient is the one you provide the passphrase here.
 # RewardRecipientPassphrases=id1:passphrase1;id2:passphrase2;id3:passphrase3;
 
-## Allow anyone to use the "submitNonce" API call. This call can be abused to force your node to perform lots of work to effectively mine for others. 
+## Allow anyone to use the "submitNonce" API call. This call can be abused to force your node to perform lots of work to effectively mine for others.
 ## Enabling this option will only allow accounts whose passphrases are in SoloMiningPassphrases to mine through this node.
 # AllowOtherSoloMiners=false
 

src/brs/at/AtApiPlatformImpl.java

@@ -523,22 +523,36 @@ public long getPreviousBalance(AtMachineState state) {
 
   @Override
   public void sendToAddressInB(long val, AtMachineState state) {
-    if (val < 1)
+    if (val < 1) {
+      logger.debug("sendToAddressInB aborted: val {} < 1", val);
       return;
+    }
+
+    logger.debug(
+      "sendToAddressInB start - val: {}, version: {}",
+      val,
+      state.getVersion()
+    );
 
     if (state.getVersion() > 2) {
       long assetId = AtApiHelper.getLong(state.getB2());
+      logger.debug("sendToAddressInB asset path - assetId: {}", assetId);
       if (assetId != 0L) {
         long assetBalance = state.getgBalance(assetId);
+        logger.debug("asset balance: {}", assetBalance);
         if (val > assetBalance) {
+          logger.debug("adjusting val from {} to asset balance {}", val, assetBalance);
           val = assetBalance;
         }
 
         // optional coin amount besides the asset
         long amount = AtApiHelper.getLong(state.getB3());
+        logger.debug("coin amount in B3 before adjustment: {}", amount);
         if (amount > 0L) {
           long balance = state.getgBalance();
+          logger.debug("available coin balance: {}", balance);
           if (amount > balance) {
+            logger.debug("adjusting coin amount from {} to balance {}", amount, balance);
             amount = balance;
           }
           state.setgBalance(balance - amount);
@@ -548,35 +562,72 @@ public void sendToAddressInB(long val, AtMachineState state) {
 
         AtTransaction tx = new AtTransaction(TransactionType.ColoredCoins.ASSET_TRANSFER,
           state.getId(), state.getB1().clone(), amount, assetId, val, null);
+        logger.debug(
+          "asset transfer tx created - sender: {}, assetId: {}, amount: {}, quantity: {}",
+          AtApiHelper.getLong(state.getId()),
+          assetId,
+          amount,
+          val
+        );
         state.addTransaction(tx);
 
         state.setgBalance(assetId, assetBalance - val);
+        logger.debug(
+          "sendToAddressInB asset path end - new asset gBalance: {}",
+          state.getgBalance(assetId)
+        );
         return;
       }
     }
 
     if (val > state.getgBalance()) {
+      logger.debug(
+        "adjusting val from {} to current gBalance {}",
+        val,
+        state.getgBalance()
+      );
       val = state.getgBalance();
     }
     AtTransaction tx = new AtTransaction(TransactionType.Payment.ORDINARY, state.getId(), state.getB1().clone(), val, null);
+    logger.debug(
+      "ordinary payment tx created - sender: {}, amount: {}",
+      AtApiHelper.getLong(state.getId()),
+      val
+    );
     state.addTransaction(tx);
 
     state.setgBalance(state.getgBalance() - val);
+    logger.debug("sendToAddressInB end - new gBalance: {}", state.getgBalance());
   }
 
   @Override
   public void mintAsset(AtMachineState state) {
     if (state.getVersion() < 3) {
+      logger.debug("mintAsset aborted: AT version {} < 3", state.getVersion());
       return;
     }
 
     long assetId = AtApiHelper.getLong(state.getB2());
     long accountId = AtApiHelper.getLong(state.getId());
     long quantity = AtApiHelper.getLong(state.getB1());
 
+    logger.debug(
+      "mintAsset input - assetId: {}, accountId: {}, quantity: {}, current gBalance: {}",
+      assetId,
+      accountId,
+      quantity,
+      state.getgBalance(assetId)
+    );
+
     Asset asset = Signum.getStores().getAssetStore().getAsset(assetId);
     if (asset == null || asset.getAccountId() != accountId || quantity <= 0L) {
       // only assets that we have created internally and no burning by mint
+      logger.debug(
+        "mintAsset aborted: asset null={}, account check={}, quantity={} <= 0",
+        asset == null,
+        asset != null && asset.getAccountId() != accountId,
+        quantity
+      );
       return;
     }
 
@@ -585,11 +636,28 @@ public void mintAsset(AtMachineState state) {
     long newSupply = circulatingSupply + quantity;
     if (newSupply > Constants.MAX_ASSET_QUANTITY_QNT) {
       // do not mint extra to keep the limit
+      logger.debug(
+        "mintAsset aborted: newSupply {} > MAX_ASSET_QUANTITY_QNT {}",
+        newSupply,
+        Constants.MAX_ASSET_QUANTITY_QNT
+      );
       return;
     }
 
+    logger.debug(
+      "mintAsset creating transaction - version: {}, newSupply: {}",
+      state.getVersion(),
+      newSupply
+    );
+
     AtTransaction tx = new AtTransaction(TransactionType.ColoredCoins.ASSET_MINT,
       state.getId(), null, 0L, assetId, quantity, null);
+    logger.debug(
+      "mintAsset tx created - sender: {}, assetId: {}, quantity: {}",
+      AtApiHelper.getLong(state.getId()),
+      assetId,
+      quantity
+    );
     state.addTransaction(tx);
 
     state.setgBalance(assetId, state.getgBalance(assetId) + quantity);

src/brs/at/AtController.java

@@ -6,6 +6,7 @@
 import brs.fluxcapacitor.FluxValues;
 import brs.props.Props;
 import brs.util.Convert;
+import brs.TransactionType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.helpers.NOPLogger;
@@ -16,6 +17,7 @@
 import java.security.MessageDigest;
 import java.util.*;
 
+
 public abstract class AtController {
   private AtController() {
   }
@@ -515,37 +517,57 @@ private static int getCostOfOneAT() {
     return AtConstants.AT_ID_SIZE + 16;
   }
 
-  //platform based implementations
-  //platform based
-  private static long makeTransactions(AT at, int blockHeight, long generatorId) throws AtException {
-    long totalAmount = 0;
-    if (!Signum.getFluxCapacitor().getValue(FluxValues.AT_FIX_BLOCK_4, at.getHeight())) {
-      for (AtTransaction tx : at.getTransactions()) {
-        if (AT.findPendingTransaction(tx.getRecipientId(), blockHeight, generatorId)) {
-          throw new AtException("Conflicting transaction found");
+    private static long makeTransactions(AT at, int blockHeight, long generatorId) throws AtException {
+        long totalAmount = 0;
+
+        // Start with the transactions as provided
+        List<AtTransaction> ordered = new ArrayList<>(at.getTransactions());
+        
+        ordered.sort((tx1, tx2) -> {
+            if (tx1.getAssetId() == tx2.getAssetId()) {
+                boolean tx1isMint = tx1.getType() == TransactionType.ColoredCoins.ASSET_MINT;
+                boolean tx2isMint = tx2.getType() == TransactionType.ColoredCoins.ASSET_MINT;
+                boolean tx1isTransfer = tx1.getType() == TransactionType.ColoredCoins.ASSET_TRANSFER;
+                boolean tx2isTransfer = tx2.getType() == TransactionType.ColoredCoins.ASSET_TRANSFER;
+
+                if (tx1isMint && tx2isTransfer) return -1;
+                if (tx1isTransfer && tx2isMint) return 1;
+            }
+            return 0;
+        });
+
+
+        if (!Signum.getFluxCapacitor().getValue(FluxValues.AT_FIX_BLOCK_4, at.getHeight())) {
+            for (AtTransaction tx : ordered) {
+                if (AT.findPendingTransaction(tx.getRecipientId(), blockHeight, generatorId)) {
+                    throw new AtException("Conflicting transaction found");
+                }
+            }
         }
-      }
-    }
-    for (AtTransaction tx : at.getTransactions()) {
-      totalAmount += tx.getAmount();
-      AT.addPendingTransaction(tx, blockHeight, generatorId);
-      if (logger.isDebugEnabled()) {
-        logger.debug("Transaction to {}, amount {}", tx.getRecipientId() == null ? 0L : Convert.toUnsignedLong(AtApiHelper.getLong(tx.getRecipientId())), tx.getAmount());
-      }
-    }
-    AT.addMapUpdates(at.getMapUpdates(), blockHeight, generatorId);
 
-    return totalAmount;
-  }
+        for (AtTransaction tx : ordered) {
+            totalAmount += tx.getAmount();
+            AT.addPendingTransaction(tx, blockHeight, generatorId);
+            if (logger.isDebugEnabled()) {
+                logger.debug(
+                    "Transaction to {}, amount {}",
+                    tx.getRecipientId() == null ? 0L : Convert.toUnsignedLong(AtApiHelper.getLong(tx.getRecipientId())),
+                    tx.getAmount()
+                );
+            }
+        }
 
-  //platform based
-  private static long getATAccountBalance(Long id) {
-    Account.Balance atAccount = Account.getAccountBalance(id);
+        AT.addMapUpdates(at.getMapUpdates(), blockHeight, generatorId);
 
-    if (atAccount != null) {
-      return atAccount.getBalanceNqt();
+        return totalAmount;
     }
 
-    return 0;
-  }
-}
+    private static long getATAccountBalance(Long id) {
+        Account.Balance atAccount = Account.getAccountBalance(id);
+        if (atAccount != null) {
+            return atAccount.getBalanceNqt();
+        }
+        return 0;
+    }
+
+}

src/brs/at/AtMachineState.java

@@ -691,4 +691,4 @@ public long getSteps() {
             return steps;
         }
     }
-}
+}

src/brs/db/sql/SqlATStore.java

@@ -175,7 +175,7 @@ public List<Long> getOrderedATs() {
         )
       ).and(
         AT_STATE.FREEZE_WHEN_SAME_BALANCE.isFalse().or(
-          "account_balance.balance - at_state.prev_balance >= at_state.min_activate_amount"
+          ACCOUNT_BALANCE.BALANCE.minus(AT_STATE.PREV_BALANCE).ge(AT_STATE.MIN_ACTIVATE_AMOUNT)
         )
       ).orderBy(
         AT_STATE.PREV_HEIGHT.asc(), AT_STATE.NEXT_HEIGHT.asc(), AT.ID.asc()

src/brs/db/sql/VersionedBatchEntitySqlTable.java

@@ -81,6 +81,14 @@ public void finish() {
     // As recommended for databases,
     // not more than 1000 items should be put in subqueries
     int UpdateMaxBatchSize = 1_000;
+
+    // As recommended for databases,
+    // not more than 1000 items should be inserted in a single batch
+    /**
+     * The batch size is set to 1000, which is a common practice for bulk inserts.
+     */
+    int InsertMaxBatchSize = 1_000;
+
     Db.useDSLContext(ctx -> {
 
       Field<Long> idField = tableClass.field(dbKeyFactory.getPKColumns()[0], Long.class);
@@ -100,7 +108,21 @@ public void finish() {
             .execute();
         }
 
-        bulkInsert(txContext, getBatch().values());
+        /**
+         * Bulk insert of new entities.
+         * This is done in batches to avoid memory issues with large datasets.
+         * The entities are collected from the batch and inserted in sublists of size InsertMaxBatchSize.
+         * This allows us to insert a large number of entities without running into memory issues.
+         * This is a mutation operation, so it must be inside the transactional scope.
+         */
+        List<T> entitiesToInsert = new ArrayList<>(getBatch().values());
+
+        int entitiesListSize = entitiesToInsert.size();
+        for (int from = 0; from < entitiesListSize; from += InsertMaxBatchSize) {
+          int to = Math.min(from + InsertMaxBatchSize, entitiesListSize);
+          bulkInsert(txContext, entitiesToInsert.subList(from, to));
+        }
+
         // mutation, so must be inside the transactional scope
         getBatch().clear();
       });

src/brs/props/Props.java

@@ -104,7 +104,7 @@ public class Props {
     public static final Prop<String> BRS_CHECKPOINT_HASH = new Prop<>("node.checkPointPrevHash",
             "8f76beca852b41447ac59fbdf78750e43dde97f9fc09ec8f071eeb03c43420f0");
     public static final Prop<String> BRS_PK_CHECKS = new Prop<>("node.pkChecks",
-            "dba639ec3450e0b1;169b3b99ce28a350;a83c47e772a35586;6db77a51a7def19d;c4823aa7028f6735;fb0e32a5bc032257;15a35aa0515e3584;27fcf52c3bc40fba;c4823aa7028f6735;981454e22b5ac976;0cb15471ad76fcd1;");
+            "dba639ec3450e0b1;169b3b99ce28a350;a83c47e772a35586;6db77a51a7def19d;c4823aa7028f6735;fb0e32a5bc032257;15a35aa0515e3584;27fcf52c3bc40fba;981454e22b5ac976;0cb15471ad76fcd1;");
 
     // GPU options
     public static final Prop<Boolean> GPU_ACCELERATION = new Prop<>("GPU.Acceleration", false);
@@ -114,7 +114,7 @@ public class Props {
     public static final Prop<Integer> GPU_UNVERIFIED_QUEUE = new Prop<>("GPU.UnverifiedQueue", 1000);
     public static final Prop<Integer> GPU_HASHES_PER_BATCH = new Prop<>("GPU.HashesPerBatch", 1000);
     public static final Prop<Integer> GPU_MEM_PERCENT = new Prop<>("GPU.MemPercent", 50);
-  
+
     // CPU options
     public static final Prop<Integer> CPU_NUM_CORES = new Prop<>("CPU.NumCores", -1);
     public static final Prop<Integer> BLOCK_PROCESS_THREAD_DELAY = new Prop<>("CPU.BlockThreadDelay", 500);
@@ -140,7 +140,7 @@ public class Props {
     public static final Prop<Integer> BRS_BLOCK_CACHE_MB = new Prop<>("node.blockCacheMB", 40);
     public static final Prop<Integer> BRS_AT_PROCESSOR_CACHE_BLOCK_COUNT = new Prop<>("node.atProcessorCacheBlockCount",
             1000);
-    public static final Prop<Integer> DB_INSERT_BATCH_MAX_SIZE = new Prop<>("DB.InsertBatchMaxSize", 10000);
+    public static final Prop<Integer> DB_INSERT_BATCH_MAX_SIZE = new Prop<>("DB.InsertBatchMaxSize", 1000);
 
     // P2P options
     public static final Prop<Integer> P2P_PORT = new Prop<>("P2P.Port", 8123);