Update token mint logic

Author: RogerPodacter

config/derive_ethscriptions_blocks.rb

@@ -176,12 +176,9 @@ module Clockwork
           exit 1
 
         rescue EthBlockImporter::ValidationStalledError => e
-          # Validation is behind - wait longer and keep trying
           Rails.logger.info "[#{Time.now}] ⏸️  VALIDATION BEHIND: #{e.message}"
-          puts "[#{Time.now}] ⏸️  Validation is behind - waiting #{import_interval * 2}s for validation to catch up..."
-          sleep import_interval * 2  # Wait longer when validation is behind
-          # Don't exit - continue the loop to retry
-
+          puts "[#{Time.now}] ⏸️  Validation is behind - waiting #{import_interval}s for validation to catch up..."
+          # Don't sleep here - the loop's sleep at line 192 will handle it
         rescue => e
           Rails.logger.error "Import error: #{e.class} - #{e.message}"
           Rails.logger.error e.backtrace.first(20).join("\n")

contracts/src/TokenManager.sol

@@ -123,6 +123,11 @@ contract TokenManager is IProtocolHandler {
         // Validate mint amount matches token's configured limit
         require(mintOp.amount == token.mintAmount, "amt mismatch");
 
+        // Validate mint ID is within valid range (1 to maxId)
+        // maxId = maxSupply / mintAmount (both are in user units, not 18 decimals)
+        uint256 maxId = token.maxSupply / token.mintAmount;
+        require(mintOp.id >= 1 && mintOp.id <= maxId, "Invalid mint ID");
+
         // Track this ethscription as a token item
         tokenItems[txHash] = TokenItem({
             deployTxHash: token.deployTxHash,

contracts/test/EthscriptionsToken.t.sol

@@ -394,4 +394,123 @@ contract EthscriptionsTokenTest is TestSetup {
         assertEq(token.name(), "erc-20 TEST");  // Token name format is "protocol tick"
         assertEq(token.cap(), 1000000 ether); // Original cap, not the duplicate's
     }
+
+    function testMintWithInvalidIdZero() public {
+        // Deploy the token first
+        testTokenDeploy();
+
+        // Try to mint with ID 0 (invalid - must be >= 1)
+        vm.prank(bob);
+        string memory mintContent = 'data:,{"p":"erc-20","op":"mint","tick":"TEST","id":"0","amt":"1000"}';
+
+        TokenManager.MintOperation memory mintOp = TokenManager.MintOperation({
+            tick: "TEST",
+            id: 0, // Invalid ID - should be >= 1
+            amount: 1000
+        });
+
+        bytes32 invalidMintHash = bytes32(uint256(0xDEAD));
+        Ethscriptions.CreateEthscriptionParams memory mintParams = createTokenParams(
+            invalidMintHash,
+            bob,
+            mintContent,
+            "erc-20",
+            "mint",
+            abi.encode(mintOp)
+        );
+
+        // Create the ethscription - mint should fail due to invalid ID
+        uint256 tokenId = ethscriptions.createEthscription(mintParams);
+
+        // Ethscription should still be created (but mint failed)
+        assertEq(ethscriptions.ownerOf(tokenId), bob);
+
+        // Verify no tokens were minted due to invalid ID
+        address tokenAddr = tokenManager.getTokenAddressByTick("TEST");
+        EthscriptionsERC20 token = EthscriptionsERC20(tokenAddr);
+        assertEq(token.balanceOf(bob), 0); // Bob should have no tokens
+
+        // Verify total minted didn't increase
+        TokenManager.TokenInfo memory info = tokenManager.getTokenInfo(DEPLOY_TX_HASH);
+        assertEq(info.totalMinted, 0);
+    }
+
+    function testMintWithIdTooHigh() public {
+        // Deploy the token first
+        testTokenDeploy();
+
+        // Try to mint with ID beyond maxId (maxSupply/mintAmount = 1000000/1000 = 1000)
+        vm.prank(bob);
+        string memory mintContent = 'data:,{"p":"erc-20","op":"mint","tick":"TEST","id":"1001","amt":"1000"}';
+
+        TokenManager.MintOperation memory mintOp = TokenManager.MintOperation({
+            tick: "TEST",
+            id: 1001, // Invalid ID - maxId is 1000
+            amount: 1000
+        });
+
+        bytes32 invalidMintHash = bytes32(uint256(0xBEEF));
+        Ethscriptions.CreateEthscriptionParams memory mintParams = createTokenParams(
+            invalidMintHash,
+            bob,
+            mintContent,
+            "erc-20",
+            "mint",
+            abi.encode(mintOp)
+        );
+
+        // Create the ethscription - mint should fail due to ID too high
+        uint256 tokenId = ethscriptions.createEthscription(mintParams);
+
+        // Ethscription should still be created (but mint failed)
+        assertEq(ethscriptions.ownerOf(tokenId), bob);
+
+        // Verify no tokens were minted due to invalid ID
+        address tokenAddr = tokenManager.getTokenAddressByTick("TEST");
+        EthscriptionsERC20 token = EthscriptionsERC20(tokenAddr);
+        assertEq(token.balanceOf(bob), 0); // Bob should have no tokens
+
+        // Verify total minted didn't increase
+        TokenManager.TokenInfo memory info = tokenManager.getTokenInfo(DEPLOY_TX_HASH);
+        assertEq(info.totalMinted, 0);
+    }
+
+    function testMintWithMaxValidId() public {
+        // Deploy the token first
+        testTokenDeploy();
+
+        // Mint with the maximum valid ID (maxSupply/mintAmount = 1000000/1000 = 1000)
+        vm.prank(bob);
+        string memory mintContent = 'data:,{"p":"erc-20","op":"mint","tick":"TEST","id":"1000","amt":"1000"}';
+
+        TokenManager.MintOperation memory mintOp = TokenManager.MintOperation({
+            tick: "TEST",
+            id: 1000, // Maximum valid ID
+            amount: 1000
+        });
+
+        bytes32 validMintHash = bytes32(uint256(0xCAFE));
+        Ethscriptions.CreateEthscriptionParams memory mintParams = createTokenParams(
+            validMintHash,
+            bob,
+            mintContent,
+            "erc-20",
+            "mint",
+            abi.encode(mintOp)
+        );
+
+        uint256 tokenId = ethscriptions.createEthscription(mintParams);
+
+        // Verify Bob owns the mint ethscription NFT
+        assertEq(ethscriptions.ownerOf(tokenId), bob);
+
+        // Verify Bob has the tokens (1000 * 10^18 with 18 decimals)
+        address tokenAddr = tokenManager.getTokenAddressByTick("TEST");
+        EthscriptionsERC20 token = EthscriptionsERC20(tokenAddr);
+        assertEq(token.balanceOf(bob), 1000 ether); // Should have tokens
+
+        // Verify total minted increased
+        TokenManager.TokenInfo memory info = tokenManager.getTokenInfo(DEPLOY_TX_HASH);
+        assertEq(info.totalMinted, 1000);
+    }
 }