@paulstinchcombe/gasless-nft-tx 0.6.6 → 0.7.0

package/README.md

@@ -299,9 +299,9 @@ const params: KAMI721CParams = {
 	name: 'My NFT Collection',
 	symbol: 'MNFT',
 	baseTokenURI: 'ipfs://QmYourBaseURI/',
-	initialMintPrice: parseEther('0.001'), // 0.001 ETH per mint
 	platformAddress: process.env.SIMPLE_ACCOUNT_ADDRESS as Address,
 	platformCommissionPercentage: 250, // 2.5%
+	adminAddress: process.env.SIMPLE_ACCOUNT_ADDRESS as Address, // Admin address
 };
 
 const result = await deployer.deployKAMI721C(params);
@@ -332,9 +332,9 @@ const params: KAMI721ACParams = {
 	name: 'Creator Collection',
 	symbol: 'CNFT',
 	baseTokenURI: 'ipfs://QmYourBaseURI/',
-	initialMintPrice: parseEther('0.001'),
 	platformAddress: process.env.SIMPLE_ACCOUNT_ADDRESS as Address,
 	platformCommissionPercentage: 250,
+	adminAddress: process.env.SIMPLE_ACCOUNT_ADDRESS as Address,
 };
 
 const result = await deployer.deployKAMI721AC(params);
@@ -366,9 +366,9 @@ Mint 10 NFTs for nearly the same gas cost as minting 1!
 const params: KAMI1155CParams = {
 	paymentToken: '0x0000000000000000000000000000000000000000',
 	baseTokenURI: 'ipfs://QmYourBaseURI/{id}.json', // {id} auto-replaced
-	initialMintPrice: parseEther('0.001'),
 	platformAddress: process.env.SIMPLE_ACCOUNT_ADDRESS as Address,
 	platformCommissionPercentage: 250,
+	adminAddress: process.env.SIMPLE_ACCOUNT_ADDRESS as Address,
 };
 
 const result = await deployer.deployKAMI1155C(params);
@@ -410,9 +410,9 @@ Deploy a KAMI721C contract (ERC721 + Creator).
 -   `name` (string): NFT collection name
 -   `symbol` (string): NFT collection symbol
 -   `baseTokenURI` (string): Base URI for token metadata
--   `initialMintPrice` (bigint): Price per mint in wei
 -   `platformAddress` (Address): Platform fee recipient
 -   `platformCommissionPercentage` (number): Platform fee (250 = 2.5%)
+-   `adminAddress` (Address): Admin address for contract management
 
 **Returns:**
 
@@ -447,9 +447,9 @@ Deploy a KAMI1155C contract (ERC1155 + Creator).
 
 -   `paymentToken` (Address): Payment token address
 -   `baseTokenURI` (string): Base URI with {id} placeholder
--   `initialMintPrice` (bigint): Price per token in wei
 -   `platformAddress` (Address): Platform fee recipient
 -   `platformCommissionPercentage` (number): Platform fee percentage
+-   `adminAddress` (Address): Admin address for contract management
 
 ##### getBalance
 
@@ -564,10 +564,19 @@ See the guide for cost analysis, implementation examples, and when users would n
 
 ## KAMI Handler APIs
 
-**Important**: All three KAMI handlers now have consistent APIs! (v0.5.3+)
+**Important**: All three KAMI handlers now have consistent APIs! (v0.7.0+)
 
 👉 **[KAMI721AC Handler API Reference](docs/KAMI721AC_HANDLER_API.md)**
 
+**What Changed in v0.7.0:**
+
+-   ✅ **New Constructor Parameters**: All contracts now require `adminAddress` parameter
+-   ✅ **Removed `initialMintPrice`**: Price is now set per-token during minting
+-   ✅ **New Methods Added**: `setMintRoyalties`, `setTransferRoyalties`, `setPlatformCommission`, `hasClaimed`, `hasActiveRentals`
+-   ✅ **Enhanced Royalty Management**: Token-specific and global royalty controls
+-   ✅ **Platform Commission Management**: Dynamic platform fee updates
+-   ✅ **Claim Tracking**: Built-in claim status tracking for KAMI721AC
+
 **What Changed in v0.5.3:**
 
 -   ✅ `KAMI721ACSimpleAccountHandler` now matches `KAMI721CSimpleAccountHandler` API
@@ -575,14 +584,36 @@ See the guide for cost analysis, implementation examples, and when users would n
 -   ✅ Added missing methods: `setPrice()`, `setTokenURI()`
 -   ✅ Batch methods now require `prices` and `uris` arrays
 
-**Migration Example:**
+**Migration Examples:**
 
 ```typescript
-// ❌ OLD (v0.5.2)
+// ❌ OLD Constructor (v0.6.x)
+const params = {
+	paymentToken: '0x...',
+	name: 'My NFT',
+	symbol: 'NFT',
+	baseTokenURI: 'ipfs://...',
+	initialMintPrice: parseEther('0.001'), // ❌ Removed
+	platformAddress: '0x...',
+	platformCommissionPercentage: 250,
+};
+
+// ✅ NEW Constructor (v0.7.0+)
+const params = {
+	paymentToken: '0x...',
+	name: 'My NFT',
+	symbol: 'NFT',
+	baseTokenURI: 'ipfs://...',
+	platformAddress: '0x...',
+	platformCommissionPercentage: 250,
+	adminAddress: '0x...', // ✅ Required
+};
+
+// ❌ OLD Mint (v0.5.2)
 await handler.mint(recipientAddress);
 
-// ✅ NEW (v0.5.3+)
-await handler.mint(recipientAddress, tokenPrice, tokenURI);
+// ✅ NEW Mint (v0.7.0+)
+await handler.mint(recipientAddress, tokenPrice, tokenURI, mintRoyalties);
 ```
 
 See the guide for complete API reference, migration instructions, and examples.

package/dist/KAMI-NFTs/KAMI1155C.sol

@@ -145,7 +145,6 @@ contract KAMI1155C is AccessControl, ERC1155, ERC1155Supply, ERC2981, Pausable {
     constructor(
         address paymentToken_,
         string memory baseTokenURI_,
-        uint256 /* initialMintPrice_ */,
         address platformAddress_,
         uint96 platformCommissionPercentage_,
         address adminAddress_
@@ -542,30 +541,33 @@ contract KAMI1155C is AccessControl, ERC1155, ERC1155Supply, ERC2981, Pausable {
      * - Caller must have approved sufficient payment tokens
      * - Caller must have sufficient payment token balance
      */
-    function mint(address recipient, uint256 amount, uint256 tokenPrice, string calldata tokenURI) external whenNotPaused {
+    function mint(address recipient, uint256 amount, uint256 tokenPrice, string calldata tokenURI, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external whenNotPaused {
         require(recipient != address(0), "Recipient cannot be zero address");
         require(amount > 0, "Amount must be greater than 0");
-        require(tokenPrice > 0, "Price must be greater than 0");
         require(bytes(tokenURI).length > 0, "Token URI cannot be empty");
 
-        uint256 totalPrice = tokenPrice * amount;
-        require(PAYMENT_TOKEN.balanceOf(msg.sender) >= totalPrice, "Insufficient payment token balance");
-        require(PAYMENT_TOKEN.allowance(msg.sender, address(this)) >= totalPrice, "Insufficient payment token allowance");
-        PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), totalPrice);
+        if(tokenPrice > 0) {
+            uint256 totalPrice = tokenPrice * amount;
+            require(PAYMENT_TOKEN.balanceOf(msg.sender) >= totalPrice, "Insufficient payment token balance");
+            require(PAYMENT_TOKEN.allowance(msg.sender, address(this)) >= totalPrice, "Insufficient payment token allowance");
+            PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), totalPrice);
+        }
 
         uint256 tokenId = _tokenIdCounter.current();
         _tokenIdCounter.increment();
         _mint(recipient, tokenId, amount, "");
 
+        if(tokenPrice > 0) {
+            if(mintRoyalties.length > 0) {
+                KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));
+            }
+        }
+
         // Set token price and URI
         tokenPrices[tokenId] = tokenPrice;
         tokenURIs[tokenId] = tokenURI;
 
-        // Distribute mint royalties
-        // Temporarily comment out royalty distribution to fix test issues
-        // KamiRoyalty.distributeMintRoyalties(tokenId, totalPrice, PAYMENT_TOKEN);
-
-        emit TokenMinted(recipient, tokenId, amount, totalPrice);
+        emit TokenMinted(recipient, tokenId, amount, tokenPrice * amount);
     }
 
     /**
@@ -579,30 +581,33 @@ contract KAMI1155C is AccessControl, ERC1155, ERC1155Supply, ERC2981, Pausable {
      * - Caller must have approved sufficient payment tokens
      * - Caller must have sufficient payment token balance
      */
-    function mintFor(address recipient, uint256 amount, uint256 tokenPrice, string calldata tokenURI) external whenNotPaused {
+    function mintFor(address recipient, uint256 amount, uint256 tokenPrice, string calldata tokenURI, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external whenNotPaused {
         require(amount > 0, "Amount must be greater than 0");
         require(recipient != address(0), "Recipient cannot be zero address");
-        require(tokenPrice > 0, "Price must be greater than 0");
         require(bytes(tokenURI).length > 0, "Token URI cannot be empty");
 
-        uint256 totalPrice = tokenPrice * amount;
-        require(PAYMENT_TOKEN.balanceOf(msg.sender) >= totalPrice, "Insufficient payment token balance");
-        require(PAYMENT_TOKEN.allowance(msg.sender, address(this)) >= totalPrice, "Insufficient payment token allowance");
-        PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), totalPrice);
+        if(tokenPrice > 0) {
+            uint256 totalPrice = tokenPrice * amount;
+            require(PAYMENT_TOKEN.balanceOf(msg.sender) >= totalPrice, "Insufficient payment token balance");
+            require(PAYMENT_TOKEN.allowance(msg.sender, address(this)) >= totalPrice, "Insufficient payment token allowance");
+            PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), totalPrice);
+        }
 
         uint256 tokenId = _tokenIdCounter.current();
         _tokenIdCounter.increment();
         _mint(recipient, tokenId, amount, "");
 
+        if(tokenPrice > 0) {
+            if(mintRoyalties.length > 0) {
+                KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));
+            }
+        }
+
         // Set token price and URI
         tokenPrices[tokenId] = tokenPrice;
         tokenURIs[tokenId] = tokenURI;
 
-        // Distribute mint royalties
-        // Temporarily comment out royalty distribution to fix test issues
-        // KamiRoyalty.distributeMintRoyalties(tokenId, totalPrice, PAYMENT_TOKEN);
-
-        emit TokenMinted(recipient, tokenId, amount, totalPrice);
+        emit TokenMinted(recipient, tokenId, amount, tokenPrice * amount);
     }
 
     /**

package/dist/KAMI-NFTs/KAMI721AC.sol

@@ -135,7 +135,6 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
         string memory name_,
         string memory symbol_,
         string memory baseTokenURI_,
-        uint256 /* initialMintPrice_ */,
         address platformAddress_,
         uint96 platformCommissionPercentage_,
         address adminAddress_
@@ -593,26 +592,30 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
      * @param recipient Address to receive the minted token
      * @param tokenPrice Price for this specific token
      * @param uri Individual URI for this token's metadata
+     * @param mintRoyalties Array of royalty receivers and percentages
      */
-    function mint(address recipient, uint256 tokenPrice, string calldata uri) external whenNotPaused {
-        if (recipient == address(0)) revert ZeroAddress();
-        if (tokenPrice == 0) revert InvalidPrice();
+    function mint(address recipient, uint256 tokenPrice, string calldata uri, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external whenNotPaused {
+        if (recipient == address(0)) revert ZeroAddress();        
         if (bytes(uri).length == 0) revert EmptyTokenURI();
-        
-        // Transfer payment
-        PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
-        
+
+        if(tokenPrice > 0) {
+            PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
+        }
+
         // Mint token
         uint256 tokenId = _tokenIdCounter.current();
         _tokenIdCounter.increment();
         _safeMint(recipient, tokenId);
         
+        if(tokenPrice > 0) {
+            if(mintRoyalties.length > 0) {
+                KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));
+            }
+        }
+
         // Set token price and URI
         tokenPrices[tokenId] = tokenPrice;
         tokenURIs[tokenId] = uri;
-        
-        // Distribute mint royalties
-        KamiRoyalty.distributeMintRoyalties(tokenId, tokenPrice, PAYMENT_TOKEN);
     }
 
     // ============ CLAIMING FUNCTIONS ============
@@ -624,16 +627,27 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
      * - Caller must have approved sufficient payment tokens
      * - Caller must have sufficient payment token balance
      */
-    function claim(uint256 tokenPrice, string calldata uri) external {
+    function claim(uint256 tokenPrice, string calldata uri, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external {
         if (hasClaimed[msg.sender]) revert AlreadyClaimed();
         if (tokenPrice == 0) revert InvalidPrice();
         if (bytes(uri).length == 0) revert EmptyTokenURI();
-        PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
+
+        if(tokenPrice > 0) {
+            PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
+        }
+
         uint256 tokenId = _tokenIdCounter.current();
         _tokenIdCounter.increment();
         _safeMint(msg.sender, tokenId);
         tokenPrices[tokenId] = tokenPrice;
         tokenURIs[tokenId] = uri;
+
+        if(tokenPrice > 0) {
+            if(mintRoyalties.length > 0) {
+                KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));
+            }
+        }
+
         KamiRoyalty.distributeMintRoyalties(tokenId, tokenPrice, PAYMENT_TOKEN);
         hasClaimed[msg.sender] = true;
         emit TokenClaimed(msg.sender, tokenId, tokenPrice);
@@ -649,7 +663,7 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
      * - Recipients array must not be empty or exceed 100
      * - No zero addresses
      */
-    function batchClaimFor(address[] calldata recipients, uint256[] calldata prices, string[] calldata uris) external {
+    function batchClaimFor(address[] calldata recipients, uint256[] calldata prices, string[] calldata uris, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external {
         if (!hasRole(OWNER_ROLE, msg.sender)) revert CallerNotOwner();
         if (recipients.length == 0) revert EmptyRecipientsArray();
         if (recipients.length > 100) revert TooManyRecipients();
@@ -662,7 +676,9 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
             if (bytes(uris[i]).length == 0) revert EmptyTokenURI();
             totalCost += prices[i];
         }
-        PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), totalCost);
+        if(totalCost > 0) {
+            PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), totalCost);
+        }
         
         for (uint256 i = 0; i < recipients.length; i++) {
             address recipient = recipients[i];
@@ -673,8 +689,13 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
             _safeMint(recipient, tokenId);
             tokenPrices[tokenId] = prices[i];
             tokenURIs[tokenId] = uris[i];
-            KamiRoyalty.distributeMintRoyalties(tokenId, prices[i], PAYMENT_TOKEN);
             hasClaimed[recipient] = true;
+            if(prices[i] > 0) {
+                if(mintRoyalties.length > 0) {
+                    KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));
+                }
+                KamiRoyalty.distributeMintRoyalties(tokenId, prices[i], PAYMENT_TOKEN);
+            }
         }
         emit BatchClaimedFor(msg.sender, recipients, totalCost);
     }
@@ -688,7 +709,7 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
      * - Recipients array must not be empty or exceed 100
      * - No zero addresses
      */
-    function batchClaim(address[] calldata recipients, uint256[] calldata prices, string[] calldata uris) external {
+    function batchClaim(address[] calldata recipients, uint256[] calldata prices, string[] calldata uris, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external {
         if (recipients.length == 0) revert EmptyRecipientsArray();
         if (recipients.length > 100) revert TooManyRecipients();
         if (recipients.length != prices.length) revert ArrayLengthMismatch();
@@ -700,13 +721,18 @@ contract KAMI721AC is AccessControl, ERC721Enumerable, ERC2981, Pausable {
             if (hasClaimed[recipient]) revert RecipientAlreadyClaimed();
             if (prices[i] == 0) revert InvalidPrice();
             if (bytes(uris[i]).length == 0) revert EmptyTokenURI();
-            PAYMENT_TOKEN.safeTransferFrom(recipient, address(this), prices[i]);
+            if(prices[i] > 0) {
+                PAYMENT_TOKEN.safeTransferFrom(recipient, address(this), prices[i]);
+            }
             uint256 tokenId = _tokenIdCounter.current();
             _tokenIdCounter.increment();
             _safeMint(recipient, tokenId);
             tokenPrices[tokenId] = prices[i];
             tokenURIs[tokenId] = uris[i];
-            KamiRoyalty.distributeMintRoyalties(tokenId, prices[i], PAYMENT_TOKEN);
+            if(mintRoyalties.length > 0) {
+                KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));            
+                KamiRoyalty.distributeMintRoyalties(tokenId, prices[i], PAYMENT_TOKEN);
+            }
             hasClaimed[recipient] = true;
         }
         emit BatchClaimed(msg.sender, recipients);

package/dist/KAMI-NFTs/KAMI721C.sol

@@ -116,7 +116,6 @@ contract KAMI721C is AccessControl, ERC721Enumerable, ERC2981, Pausable {
         string memory name_,
         string memory symbol_,
         string memory baseTokenURI_,
-        uint256 /* initialMintPrice_ */,
         address platformAddress_,
         uint96 platformCommissionPercentage_,
         address adminAddress_
@@ -157,20 +156,27 @@ contract KAMI721C is AccessControl, ERC721Enumerable, ERC2981, Pausable {
      * @param recipient Address to receive the minted token
      * @param tokenPrice Price for this specific token
      * @param uri Individual URI for this token's metadata
+     * @param mintRoyalties Array of royalty receivers and percentages
      */
-    function mint(address recipient, uint256 tokenPrice, string calldata uri) external whenNotPaused {
-        if (recipient == address(0)) revert ZeroAddress();
-        if (tokenPrice == 0) revert InvalidPrice();
+    function mint(address recipient, uint256 tokenPrice, string calldata uri, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external whenNotPaused {
+        if (recipient == address(0)) revert ZeroAddress();        
         if (bytes(uri).length == 0) revert EmptyTokenURI();
-        
-        // Transfer payment
-        PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
-        
+
+        if(tokenPrice > 0) {
+            PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
+        }
+
         // Mint token
         uint256 tokenId = _tokenIdCounter.current();
         _tokenIdCounter.increment();
         _safeMint(recipient, tokenId);
         
+        if(tokenPrice > 0) {
+            if(mintRoyalties.length > 0) {
+                KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));
+            }
+        }
+
         // Set token price and URI
         tokenPrices[tokenId] = tokenPrice;
         tokenURIs[tokenId] = uri;
@@ -186,25 +192,29 @@ contract KAMI721C is AccessControl, ERC721Enumerable, ERC2981, Pausable {
      * @param tokenPrice Price for this specific token
      * @param uri Individual URI for this token's metadata
      */
-    function mintFor(address recipient, uint256 tokenPrice, string calldata uri) external whenNotPaused {
-        if (tokenPrice == 0) revert InvalidPrice();
+    function mintFor(address recipient, uint256 tokenPrice, string calldata uri, KamiNFTCore.RoyaltyData[] calldata mintRoyalties) external whenNotPaused {
         if (recipient == address(0)) revert ZeroAddress();
         if (bytes(uri).length == 0) revert EmptyTokenURI();
         
         // Transfer payment from caller
-        PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
+        if(tokenPrice > 0) {
+            PAYMENT_TOKEN.safeTransferFrom(msg.sender, address(this), tokenPrice);
+        }
         
         // Mint token to recipient
         uint256 tokenId = _tokenIdCounter.current();
         _tokenIdCounter.increment();
         _safeMint(recipient, tokenId);
         
+        if(tokenPrice > 0) {
+            if(mintRoyalties.length > 0) {
+                KamiRoyalty.setTokenMintRoyalties(tokenId, mintRoyalties, KamiNFTCore.getExternalExistsReference(address(this)));
+            }
+        }
+
         // Set token price and URI
         tokenPrices[tokenId] = tokenPrice;
         tokenURIs[tokenId] = uri;
-        
-        // Distribute mint royalties
-        KamiRoyalty.distributeMintRoyalties(tokenId, tokenPrice, PAYMENT_TOKEN);
     }
 
     /**

package/dist/KAMI-NFTs/artifacts/contracts/KAMI1155C.sol/KAMI1155C.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../build-info/5eb46d5ad8af8f68e7c4b12971657018.json"
+  "buildInfo": "../../build-info/cffd3b201717c864a74349217cf20680.json"
 }