@neuraiproject/neurai-assets 1.0.1 → 1.0.2

package/README.md

@@ -96,23 +96,23 @@ const result = await assets.reissueAsset({
 ### Create UNIQUE Assets (NFTs)
 
 ```javascript
+// Without IPFS metadata
 const result = await assets.createUniqueAssets({
-  rootAssetName: 'MYTOKEN',
-  assetTags: [
-    {
-      tag: 'NFT001',
-      hasIpfs: true,
-      ipfsHash: 'QmNFT1...'
-    },
-    {
-      tag: 'NFT002',
-      hasIpfs: true,
-      ipfsHash: 'QmNFT2...'
-    }
-  ]
+  rootName: 'MYTOKEN',
+  assetTags: ['NFT001', 'NFT002', 'NFT003']
+});
+
+// With IPFS metadata (ipfsHashes must be same length as assetTags)
+const result = await assets.createUniqueAssets({
+  rootName: 'MYTOKEN',
+  assetTags: ['NFT001', 'NFT002'],
+  ipfsHashes: ['QmNFT1...', 'QmNFT2...']
 });
 ```
 
+> **Note**: UNIQUE asset properties (`units`, `reissuable`) are always `0` and are
+> set automatically by the node — they cannot be configured per asset.
+
 ### Create QUALIFIER (KYC Tags)
 
 ```javascript
@@ -363,6 +363,11 @@ When you create an asset, an **owner token** is automatically generated (e.g., `
 
 The library automatically validates that the owner token is returned in each operation to prevent accidental loss.
 
+> **UNIQUE assets exception**: When issuing UNIQUE assets (`ROOT#TAG`), the Neurai node
+> returns the owner token automatically as part of processing the `issue_unique` operation.
+> The library does not add a manual return output for this case — doing so would duplicate
+> the owner token in the outputs and cause the transaction to fail with "Assets would be burnt".
+
 ## Operation Costs
 
 | Operation | Cost (XNA burned) |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neuraiproject/neurai-assets",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Non-custodial Neurai asset management library for JavaScript",
   "main": "./src/index.js",
   "scripts": {

package/src/NeuraiAssets.js

@@ -167,7 +167,8 @@ class NeuraiAssets {
    * @returns {Promise<object>} Transaction data
    */
   async createQualifier(params) {
-    const builder = new IssueQualifierBuilder(this.rpc, this._buildParams(params));
+    const normalized = { ...params, assetName: params.assetName || params.qualifierName };
+    const builder = new IssueQualifierBuilder(this.rpc, this._buildParams(normalized));
     return await builder.build();
   }
 

package/src/builders/FreezeAddressBuilder.js

@@ -47,14 +47,7 @@ class FreezeAddressBuilder extends BaseAssetTransactionBuilder {
           );
         }
 
-        // Basic address validation
-        const validPrefixes = this.network === 'xna' ? ['N'] : ['m', 'n'];
-        if (!validPrefixes.some(prefix => address.startsWith(prefix))) {
-          throw new InvalidAddressError(
-            `addresses[${index}] has invalid prefix for network ${this.network}`,
-            address
-          );
-        }
+        // Address prefix validation is left to the node (varies by network)
       });
     }
 
@@ -162,13 +155,6 @@ class FreezeAddressBuilder extends BaseAssetTransactionBuilder {
       outputs.push({ [changeAddress]: parseFloat(xnaChange.toFixed(8)) });
     }
 
-    // Second: Owner token return (CRITICAL - must return or lost forever!)
-    const ownerTokenReturn = this.ownerTokenManager.createOwnerTokenReturnOutput(
-      ownerTokenName,
-      changeAddress
-    );
-    outputs.push(ownerTokenReturn);
-
     // Last: Freeze/Unfreeze operation
     let operationOutput;
     let targetAddresses = [];
@@ -180,7 +166,7 @@ class FreezeAddressBuilder extends BaseAssetTransactionBuilder {
           asset_name: assetName,
           addresses: targetAddresses
         });
-        outputs.push({ [targetAddresses[0]]: operationOutput });
+        outputs.push({ [changeAddress]: operationOutput });
         break;
 
       case 'UNFREEZE_ADDRESSES':
@@ -189,7 +175,7 @@ class FreezeAddressBuilder extends BaseAssetTransactionBuilder {
           asset_name: assetName,
           addresses: targetAddresses
         });
-        outputs.push({ [targetAddresses[0]]: operationOutput });
+        outputs.push({ [changeAddress]: operationOutput });
         break;
 
       case 'FREEZE_ASSET':
@@ -209,13 +195,10 @@ class FreezeAddressBuilder extends BaseAssetTransactionBuilder {
     // 13. Order outputs (protocol requirement)
     const orderedOutputs = this.outputOrderer.order(outputs);
 
-    // 14. Validate owner token is returned (safety check)
-    this.ownerTokenManager.validateOwnerTokenReturn(inputs, orderedOutputs);
-
-    // 15. Create raw transaction
+    // 14. Create raw transaction
     const rawTx = await this.buildRawTransaction(inputs, orderedOutputs);
 
-    // 16. Format and return result
+    // 15. Format and return result
     const allUTXOs = [...baseCurrencyUTXOs, ownerTokenUTXO];
 
     return this.formatResult(

package/src/builders/IssueQualifierBuilder.js

@@ -9,7 +9,8 @@
  * - Quantity: 1-10 units only
  * - Units: Always 0 (non-divisible)
  * - Used to tag addresses for restricted asset compliance
- * - Creates owner token (#QUALIFIER!)
+ * - Root qualifiers do not create owner tokens
+ * - Sub-qualifiers consume and return the parent qualifier asset itself
  */
 
 const BaseAssetTransactionBuilder = require('./BaseAssetTransactionBuilder');
@@ -75,13 +76,14 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
     const isSub = this.isSubQualifier(assetName);
     const parsed = AssetNameParser.parse(assetName);
 
-    // 3. If sub-qualifier, check parent exists and get owner token
-    let ownerTokenUTXO = null;
-    let ownerTokenName = null;
+    // 3. If sub-qualifier, check parent exists and get parent qualifier input
+    let parentQualifierUTXOs = [];
+    let parentQualifierQuantity = null;
+    let parentQualifierName = null;
     const addresses = await this._getAddresses();
 
     if (isSub) {
-      const parentQualifierName = parsed.parent;
+      parentQualifierName = parsed.parent;
 
       // Check parent qualifier exists
       const parentExists = await this.assetExists(parentQualifierName);
@@ -92,18 +94,16 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
         );
       }
 
-      // Find parent's owner token
-      ownerTokenName = AssetNameParser.getOwnerTokenName(parentQualifierName);
+      // Find parent qualifier balance to spend and return as change
       try {
-        ownerTokenUTXO = await this.ownerTokenManager.findOwnerTokenUTXO(
-          ownerTokenName,
-          addresses
-        );
+        const selection = await this.utxoSelector.selectAssetUTXOs(addresses, parentQualifierName, 1);
+        parentQualifierUTXOs = selection.utxos;
+        parentQualifierQuantity = selection.totalAmount;
       } catch (error) {
-        if (error instanceof OwnerTokenNotFoundError) {
+        if (error.name === 'InsufficientFundsError') {
           throw new OwnerTokenNotFoundError(
-            `You must own the parent qualifier's owner token (${ownerTokenName}) to create a sub-qualifier.`,
-            ownerTokenName
+            `You must own the parent qualifier asset (${parentQualifierName}) to create a sub-qualifier.`,
+            parentQualifierName
           );
         }
         throw error;
@@ -129,7 +129,7 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
     const changeAddress = await this.getChangeAddress();
 
     // 7. Estimate fee
-    const outputCount = isSub ? 4 : 3; // Sub has owner token return
+    const outputCount = 3;
     const estimatedFee = await this.estimateFee(2, outputCount);
 
     // 8. Calculate total XNA needed
@@ -141,7 +141,7 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
     const totalXNAInput = utxoSelection.totalXNA;
 
     // 10. Recalculate fee with actual input count
-    const actualInputCount = baseCurrencyUTXOs.length + (ownerTokenUTXO ? 1 : 0);
+    const actualInputCount = baseCurrencyUTXOs.length + parentQualifierUTXOs.length;
     const actualFee = await this.estimateFee(actualInputCount, outputCount);
 
     // 11. Verify we have enough XNA
@@ -172,16 +172,16 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
       });
     });
 
-    // Add owner token input if sub-qualifier
-    if (ownerTokenUTXO) {
+    // Add parent qualifier inputs if sub-qualifier
+    parentQualifierUTXOs.forEach(parentUTXO => {
       inputs.push({
-        txid: ownerTokenUTXO.txid,
-        vout: ownerTokenUTXO.outputIndex,
-        address: ownerTokenUTXO.address,
-        assetName: ownerTokenUTXO.assetName,
-        satoshis: ownerTokenUTXO.satoshis
+        txid: parentUTXO.txid,
+        vout: parentUTXO.outputIndex,
+        address: parentUTXO.address,
+        assetName: parentUTXO.assetName,
+        satoshis: parentUTXO.satoshis
       });
-    }
+    });
 
     // 14. Build outputs (ORDER CRITICAL!)
     const outputs = [];
@@ -194,21 +194,14 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
       outputs.push({ [changeAddress]: parseFloat(xnaChange.toFixed(8)) });
     }
 
-    // Third: Owner token return (if sub-qualifier)
-    if (ownerTokenUTXO && ownerTokenName) {
-      const ownerTokenReturn = this.ownerTokenManager.createOwnerTokenReturnOutput(
-        ownerTokenName,
-        changeAddress
-      );
-      outputs.push(ownerTokenReturn);
-    }
-
     // Last: Issue qualifier operation
     const issueQualifierOutput = OutputFormatter.formatIssueQualifierOutput({
       asset_name: assetName,
       asset_quantity: quantity,
       has_ipfs: hasIpfs,
-      ipfs_hash: ipfsHash
+      ipfs_hash: ipfsHash,
+      root_change_address: isSub ? changeAddress : undefined,
+      change_quantity: isSub ? parentQualifierQuantity : undefined
     });
 
     outputs.push({ [toAddress]: issueQualifierOutput });
@@ -216,18 +209,11 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
     // 15. Order outputs (protocol requirement)
     const orderedOutputs = this.outputOrderer.order(outputs);
 
-    // 16. Validate owner token is returned if sub-qualifier
-    if (ownerTokenUTXO) {
-      this.ownerTokenManager.validateOwnerTokenReturn(inputs, orderedOutputs);
-    }
-
-    // 17. Create raw transaction
+    // 16. Create raw transaction
     const rawTx = await this.buildRawTransaction(inputs, orderedOutputs);
 
-    // 18. Format and return result
-    const allUTXOs = ownerTokenUTXO
-      ? [...baseCurrencyUTXOs, ownerTokenUTXO]
-      : baseCurrencyUTXOs;
+    // 17. Format and return result
+    const allUTXOs = [...baseCurrencyUTXOs, ...parentQualifierUTXOs];
 
     return this.formatResult(
       rawTx,
@@ -240,8 +226,7 @@ class IssueQualifierBuilder extends BaseAssetTransactionBuilder {
         assetName,
         qualifierType: isSub ? 'SUB_QUALIFIER' : 'QUALIFIER',
         parentQualifier: isSub ? parsed.parent : null,
-        ownerTokenName: assetName + '!',
-        parentOwnerTokenUsed: ownerTokenName,
+        parentQualifierUsed: parentQualifierName,
         operationType: isSub ? 'ISSUE_SUB_QUALIFIER' : 'ISSUE_QUALIFIER'
       }
     );

package/src/builders/IssueRestrictedBuilder.js

@@ -9,12 +9,12 @@
  * - Requires verifier string (boolean logic with qualifiers)
  * - Only addresses meeting verifier requirements can receive/hold
  * - Can freeze individual addresses or entire asset
- * - Creates owner token ($ASSET!)
+ * - Creates owner token (ASSET!)
  */
 
 const BaseAssetTransactionBuilder = require('./BaseAssetTransactionBuilder');
-const { OutputFormatter } = require('../utils');
-const { AssetExistsError } = require('../errors');
+const { OutputFormatter, AssetNameParser } = require('../utils');
+const { AssetExistsError, OwnerTokenNotFoundError } = require('../errors');
 const { IpfsValidator, VerifierValidator } = require('../validators');
 
 class IssueRestrictedBuilder extends BaseAssetTransactionBuilder {
@@ -98,21 +98,39 @@ class IssueRestrictedBuilder extends BaseAssetTransactionBuilder {
     const toAddress = await this.getToAddress();
     const changeAddress = await this.getChangeAddress();
 
-    // 6. Estimate fee
-    const estimatedFee = await this.estimateFee(1, 3);
+    // 6. Find owner token UTXO (CRITICAL: node requires it as input)
+    const ownerTokenName = AssetNameParser.getOwnerTokenName(assetName);
+    let ownerTokenUTXO;
+    try {
+      ownerTokenUTXO = await this.ownerTokenManager.findOwnerTokenUTXO(
+        ownerTokenName,
+        addresses
+      );
+    } catch (error) {
+      if (error instanceof OwnerTokenNotFoundError) {
+        throw new OwnerTokenNotFoundError(
+          `You must own the owner token (${ownerTokenName}) to issue the restricted asset ${assetName}.`,
+          ownerTokenName
+        );
+      }
+      throw error;
+    }
 
-    // 7. Calculate total XNA needed
+    // 7. Estimate fee (+1 for owner token input)
+    const estimatedFee = await this.estimateFee(2, 4);
+
+    // 8. Calculate total XNA needed
     const totalXNANeeded = burnInfo.amount + estimatedFee;
 
-    // 8. Select XNA UTXOs
+    // 9. Select XNA UTXOs
     const utxoSelection = await this.selectUTXOs(totalXNANeeded, null, 0);
     const baseCurrencyUTXOs = utxoSelection.xnaUTXOs;
     const totalXNAInput = utxoSelection.totalXNA;
 
-    // 9. Recalculate fee with actual input count
-    const actualFee = await this.estimateFee(baseCurrencyUTXOs.length, 3);
+    // 10. Recalculate fee with actual input count (+1 for owner token)
+    const actualFee = await this.estimateFee(baseCurrencyUTXOs.length + 1, 4);
 
-    // 10. Verify we have enough XNA
+    // 11. Verify we have enough XNA
     const totalRequired = burnInfo.amount + actualFee;
     if (totalXNAInput < totalRequired) {
       const additionalNeeded = totalRequired - totalXNAInput + 0.001;
@@ -120,22 +138,35 @@ class IssueRestrictedBuilder extends BaseAssetTransactionBuilder {
       baseCurrencyUTXOs.push(...additionalSelection.xnaUTXOs);
     }
 
-    // 11. Calculate XNA change
+    // 12. Calculate XNA change
     const finalTotalInput = baseCurrencyUTXOs.reduce(
       (sum, utxo) => sum + utxo.satoshis / 100000000,
       0
     );
     const xnaChange = finalTotalInput - burnInfo.amount - actualFee;
 
-    // 12. Build inputs
-    const inputs = baseCurrencyUTXOs.map(utxo => ({
-      txid: utxo.txid,
-      vout: utxo.outputIndex,
-      address: utxo.address,
-      satoshis: utxo.satoshis
-    }));
+    // 13. Build inputs (XNA + owner token)
+    const inputs = [];
 
-    // 13. Build outputs (ORDER CRITICAL!)
+    baseCurrencyUTXOs.forEach(utxo => {
+      inputs.push({
+        txid: utxo.txid,
+        vout: utxo.outputIndex,
+        address: utxo.address,
+        satoshis: utxo.satoshis
+      });
+    });
+
+    // Add owner token input (node requires it to issue restricted asset)
+    inputs.push({
+      txid: ownerTokenUTXO.txid,
+      vout: ownerTokenUTXO.outputIndex,
+      address: ownerTokenUTXO.address,
+      assetName: ownerTokenUTXO.assetName,
+      satoshis: ownerTokenUTXO.satoshis
+    });
+
+    // 14. Build outputs (ORDER CRITICAL!)
     const outputs = [];
 
     // First: Burn output
@@ -154,28 +185,31 @@ class IssueRestrictedBuilder extends BaseAssetTransactionBuilder {
       units: units,
       reissuable: reissuable,
       has_ipfs: hasIpfs,
-      ipfs_hash: ipfsHash
+      ipfs_hash: ipfsHash,
+      owner_change_address: changeAddress
     });
 
     outputs.push({ [toAddress]: issueRestrictedOutput });
 
-    // 14. Order outputs (protocol requirement)
+    // 15. Order outputs (protocol requirement)
     const orderedOutputs = this.outputOrderer.order(outputs);
 
-    // 15. Create raw transaction
+    // 16. Create raw transaction
     const rawTx = await this.buildRawTransaction(inputs, orderedOutputs);
 
-    // 16. Format and return result
+    // 17. Format and return result
+    const allUTXOs = [...baseCurrencyUTXOs, ownerTokenUTXO];
+
     return this.formatResult(
       rawTx,
-      baseCurrencyUTXOs,
+      allUTXOs,
       inputs,
       orderedOutputs,
       actualFee,
       burnInfo.amount,
       {
         assetName,
-        ownerTokenName: assetName + '!',
+        ownerTokenName,
         verifierString,
         requiredQualifiers,
         operationType: 'ISSUE_RESTRICTED'

package/src/builders/IssueUniqueBuilder.js

@@ -202,14 +202,9 @@ class IssueUniqueBuilder extends BaseAssetTransactionBuilder {
       outputs.push({ [changeAddress]: parseFloat(xnaChange.toFixed(8)) });
     }
 
-    // Third: Owner token return (CRITICAL - must return or lost forever!)
-    const ownerTokenReturn = this.ownerTokenManager.createOwnerTokenReturnOutput(
-      ownerTokenName,
-      changeAddress
-    );
-    outputs.push(ownerTokenReturn);
-
     // Last: Issue unique operation
+    // NOTE: owner token return is handled automatically by the node when processing
+    // issue_unique — adding it manually would cause TOKEN! to appear twice in outputs
     const issueUniqueOutput = OutputFormatter.formatIssueUniqueOutput({
       root_name: rootName,
       asset_tags: assetTags,
@@ -221,16 +216,14 @@ class IssueUniqueBuilder extends BaseAssetTransactionBuilder {
     // 15. Order outputs (protocol requirement)
     const orderedOutputs = this.outputOrderer.order(outputs);
 
-    // 16. Validate owner token is returned (safety check)
-    this.ownerTokenManager.validateOwnerTokenReturn(inputs, orderedOutputs);
-
-    // 17. Create raw transaction
+    // 16. Create raw transaction
+    // NOTE: validateOwnerTokenReturn removed — the node returns TOKEN! automatically
     const rawTx = await this.buildRawTransaction(inputs, orderedOutputs);
 
-    // 18. Build list of created NFT names
+    // 17. Build list of created NFT names
     const createdNFTs = assetTags.map(tag => `${rootName}#${tag}`);
 
-    // 19. Format and return result
+    // 18. Format and return result
     const allUTXOs = [...baseCurrencyUTXOs, ownerTokenUTXO];
 
     return this.formatResult(

package/src/builders/ReissueBuilder.js

@@ -200,7 +200,8 @@ class ReissueBuilder extends BaseAssetTransactionBuilder {
       asset_name: assetName,
       asset_quantity: this.toSatoshis(quantity, units),
       reissuable: reissuable !== undefined ? reissuable : undefined,
-      new_ipfs: newIpfs || undefined
+      new_ipfs: newIpfs || undefined,
+      owner_change_address: changeAddress
     });
 
     outputs.push({ [toAddress]: reissueOutput });

package/src/builders/ReissueRestrictedBuilder.js

@@ -5,7 +5,7 @@
  * Reissue Restricted:
  * - Mints additional supply of restricted asset
  * - Cost: 200 XNA (burned)
- * - Requires asset's owner token ($ASSET!)
+ * - Requires asset's owner token (ASSET!)
  * - Can update verifier string
  * - Can lock asset (make it non-reissuable)
  * - Can update IPFS metadata
@@ -200,14 +200,6 @@ class ReissueRestrictedBuilder extends BaseAssetTransactionBuilder {
       outputs.push({ [changeAddress]: parseFloat(xnaChange.toFixed(8)) });
     }
 
-    // Third: Owner token return (CRITICAL - must return or lost forever!)
-    const ownerReturnAddress = this.params.ownerChangeAddress || changeAddress;
-    const ownerTokenReturn = this.ownerTokenManager.createOwnerTokenReturnOutput(
-      ownerTokenName,
-      ownerReturnAddress
-    );
-    outputs.push(ownerTokenReturn);
-
     // Last: Reissue restricted operation
     const units = assetData.units || 0;
     const reissueRestrictedOutput = OutputFormatter.formatReissueRestrictedOutput({
@@ -216,7 +208,8 @@ class ReissueRestrictedBuilder extends BaseAssetTransactionBuilder {
       change_verifier: changeVerifier,
       new_verifier: changeVerifier ? newVerifier : undefined,
       reissuable: reissuable !== undefined ? reissuable : undefined,
-      new_ipfs: newIpfs || undefined
+      new_ipfs: newIpfs || undefined,
+      owner_change_address: this.params.ownerChangeAddress || changeAddress
     });
 
     outputs.push({ [toAddress]: reissueRestrictedOutput });
@@ -224,13 +217,10 @@ class ReissueRestrictedBuilder extends BaseAssetTransactionBuilder {
     // 16. Order outputs (protocol requirement)
     const orderedOutputs = this.outputOrderer.order(outputs);
 
-    // 17. Validate owner token is returned (safety check)
-    this.ownerTokenManager.validateOwnerTokenReturn(inputs, orderedOutputs);
-
-    // 18. Create raw transaction
+    // 17. Create raw transaction
     const rawTx = await this.buildRawTransaction(inputs, orderedOutputs);
 
-    // 19. Format and return result
+    // 18. Format and return result
     const allUTXOs = [...baseCurrencyUTXOs, ownerTokenUTXO];
 
     // Extract qualifiers from new verifier if changed

package/src/builders/TagAddressBuilder.js

@@ -6,13 +6,13 @@
  * - Assign qualifier tags to addresses (for restricted asset compliance)
  * - Remove qualifier tags from addresses
  * - Cost: 0.1 XNA per address (burned)
- * - Requires qualifier's owner token (#QUALIFIER!)
+ * - Requires spending the qualifier asset itself (#QUALIFIER)
  * - Used to mark addresses as KYC'd, accredited, etc.
  * - Owner token must be returned
  */
 
 const BaseAssetTransactionBuilder = require('./BaseAssetTransactionBuilder');
-const { OutputFormatter, AssetNameParser } = require('../utils');
+const { OutputFormatter } = require('../utils');
 const { AssetNotFoundError, OwnerTokenNotFoundError, InvalidAddressError } = require('../errors');
 
 class TagAddressBuilder extends BaseAssetTransactionBuilder {
@@ -32,6 +32,10 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
       throw new Error('addresses is required and must be a non-empty array');
     }
 
+    if (params.addresses.length > 10) {
+      throw new Error('addresses array cannot exceed 10 entries per transaction (node limit)');
+    }
+
     // Validate qualifier name
     this.validateAssetName(params.qualifierName, 'QUALIFIER');
 
@@ -44,14 +48,7 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
         );
       }
 
-      // Basic address validation (starts with N or m/n depending on network)
-      const validPrefixes = this.network === 'xna' ? ['N'] : ['m', 'n'];
-      if (!validPrefixes.some(prefix => address.startsWith(prefix))) {
-        throw new InvalidAddressError(
-          `addresses[${index}] has invalid prefix for network ${this.network}`,
-          address
-        );
-      }
+      // Address prefix validation is left to the node (varies by network)
     });
 
     return true;
@@ -69,7 +66,6 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
     const {
       qualifierName,
       addresses: targetAddresses,
-      assetData = ''
     } = this.params;
 
     // 2. Check if qualifier exists
@@ -85,19 +81,18 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
     const addresses = await this._getAddresses();
     const changeAddress = await this.getChangeAddress();
 
-    // 4. Find qualifier's owner token (CRITICAL: must have this)
-    const ownerTokenName = AssetNameParser.getOwnerTokenName(qualifierName);
-    let ownerTokenUTXO;
+    // 4. Find qualifier asset balance (CRITICAL: must have this)
+    let qualifierUTXOs;
+    let qualifierQuantity;
     try {
-      ownerTokenUTXO = await this.ownerTokenManager.findOwnerTokenUTXO(
-        ownerTokenName,
-        addresses
-      );
+      const selection = await this.utxoSelector.selectAssetUTXOs(addresses, qualifierName, 1);
+      qualifierUTXOs = selection.utxos;
+      qualifierQuantity = selection.totalAmount;
     } catch (error) {
-      if (error instanceof OwnerTokenNotFoundError) {
+      if (error.name === 'InsufficientFundsError') {
         throw new OwnerTokenNotFoundError(
-          `You must own the qualifier's owner token (${ownerTokenName}) to tag/untag addresses.`,
-          ownerTokenName
+          `You must own the qualifier asset (${qualifierName}) to tag/untag addresses.`,
+          qualifierName
         );
       }
       throw error;
@@ -121,7 +116,7 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
     const totalXNAInput = utxoSelection.totalXNA;
 
     // 9. Recalculate fee with actual input count
-    const actualInputCount = baseCurrencyUTXOs.length + 1; // +1 for owner token
+    const actualInputCount = baseCurrencyUTXOs.length + qualifierUTXOs.length;
     const actualFee = await this.estimateFee(actualInputCount, 3);
 
     // 10. Verify we have enough XNA
@@ -139,7 +134,7 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
     );
     const xnaChange = finalTotalInput - burnInfo.amount - actualFee;
 
-    // 12. Build inputs (XNA + owner token)
+    // 12. Build inputs (XNA + qualifier asset)
     const inputs = [];
 
     // Add XNA inputs
@@ -152,13 +147,14 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
       });
     });
 
-    // Add owner token input
-    inputs.push({
-      txid: ownerTokenUTXO.txid,
-      vout: ownerTokenUTXO.outputIndex,
-      address: ownerTokenUTXO.address,
-      assetName: ownerTokenUTXO.assetName,
-      satoshis: ownerTokenUTXO.satoshis
+    qualifierUTXOs.forEach(utxo => {
+      inputs.push({
+        txid: utxo.txid,
+        vout: utxo.outputIndex,
+        address: utxo.address,
+        assetName: utxo.assetName,
+        satoshis: utxo.satoshis
+      });
     });
 
     // 13. Build outputs (ORDER CRITICAL!)
@@ -172,39 +168,30 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
       outputs.push({ [changeAddress]: parseFloat(xnaChange.toFixed(8)) });
     }
 
-    // Third: Owner token return (CRITICAL - must return or lost forever!)
-    const ownerTokenReturn = this.ownerTokenManager.createOwnerTokenReturnOutput(
-      ownerTokenName,
-      changeAddress
-    );
-    outputs.push(ownerTokenReturn);
-
-    // Last: Tag/Untag operation
-    // Note: Using first address as transaction output address (protocol requirement)
+    // Last: Tag/Untag operation. The node creates the qualifier change output
+    // from the operation object itself, so this must be sent to the change address.
     const operationOutput = isUntag
       ? OutputFormatter.formatUntagAddressesOutput({
-          tag_name: qualifierName,
-          addresses: targetAddresses
+          qualifier: qualifierName,
+          addresses: targetAddresses,
+          change_quantity: qualifierQuantity
         })
       : OutputFormatter.formatTagAddressesOutput({
-          tag_name: qualifierName,
+          qualifier: qualifierName,
           addresses: targetAddresses,
-          asset_data: assetData
+          change_quantity: qualifierQuantity
         });
 
-    outputs.push({ [targetAddresses[0]]: operationOutput });
+    outputs.push({ [changeAddress]: operationOutput });
 
     // 14. Order outputs (protocol requirement)
     const orderedOutputs = this.outputOrderer.order(outputs);
 
-    // 15. Validate owner token is returned (safety check)
-    this.ownerTokenManager.validateOwnerTokenReturn(inputs, orderedOutputs);
-
-    // 16. Create raw transaction
+    // 15. Create raw transaction
     const rawTx = await this.buildRawTransaction(inputs, orderedOutputs);
 
-    // 17. Format and return result
-    const allUTXOs = [...baseCurrencyUTXOs, ownerTokenUTXO];
+    // 16. Format and return result
+    const allUTXOs = [...baseCurrencyUTXOs, ...qualifierUTXOs];
 
     return this.formatResult(
       rawTx,
@@ -215,7 +202,7 @@ class TagAddressBuilder extends BaseAssetTransactionBuilder {
       burnInfo.amount,
       {
         qualifierName,
-        ownerTokenUsed: ownerTokenName,
+        qualifierAssetUsed: qualifierName,
         targetAddresses,
         addressCount,
         operationType: isUntag ? 'UNTAG_ADDRESSES' : 'TAG_ADDRESSES'

package/src/constants/fees.js

@@ -13,8 +13,8 @@ const ASSET_COSTS = {
   ISSUE_RESTRICTED: 3000,
   REISSUE: 200,
   REISSUE_RESTRICTED: 200,
-  TAG_ADDRESS: 0.1,   // Per address
-  UNTAG_ADDRESS: 0.1, // Per address
+  TAG_ADDRESS: 0.2,   // Per address
+  UNTAG_ADDRESS: 0.2, // Per address
   FREEZE_ADDRESS: 0,  // No cost (requires owner token)
   UNFREEZE_ADDRESS: 0, // No cost (requires owner token)
   FREEZE_ASSET: 0,    // No cost (requires owner token)

package/src/constants/networks.js

@@ -14,7 +14,7 @@ const NETWORKS = {
   TESTNET: {
     name: 'xna-test',
     displayName: 'Neurai Testnet',
-    addressPrefix: 'm',
+    addressPrefix: 't',
     assetNameMaxLength: 32,  // Same as mainnet
     defaultRPCPort: 19101,
     coin: 'TXNA'
@@ -96,7 +96,7 @@ function getNetworkConfig(networkName) {
 function detectNetworkFromAddress(address) {
   if (address.startsWith('N')) {
     return 'xna';
-  } else if (address.startsWith('m') || address.startsWith('n')) {
+  } else if (address.startsWith('t')) {
     return 'xna-test';
   } else {
     throw new Error(`Cannot detect network from address: ${address}`);

package/src/utils/assetNameParser.js

@@ -128,6 +128,9 @@ class AssetNameParser {
     if (this.isOwnerToken(assetName)) {
       return assetName;
     }
+    if (this.isRestricted(assetName)) {
+      return assetName.slice(1) + '!';
+    }
     return assetName + '!';
   }
 

package/src/utils/networkDetector.js

@@ -52,8 +52,8 @@ class NetworkDetector {
       return 'xna';
     }
 
-    // Testnet addresses start with 'm' or 'n'
-    if (address.startsWith(NETWORKS.TESTNET.addressPrefix) || address.startsWith('n')) {
+    // Testnet addresses start with 't' (prefix byte 0x7f = 127)
+    if (address.startsWith(NETWORKS.TESTNET.addressPrefix)) {
       return 'xna-test';
     }
 

package/src/utils/outputFormatter.js

@@ -39,13 +39,18 @@ class OutputFormatter {
   static formatIssueUniqueOutput(params) {
     const { root_name, asset_tags, ipfs_hashes } = params;
 
-    return {
+    const output = {
       issue_unique: {
         root_name,
-        asset_tags,
-        ipfs_hashes: ipfs_hashes || []
+        asset_tags
       }
     };
+
+    if (ipfs_hashes && ipfs_hashes.length > 0) {
+      output.issue_unique.ipfs_hashes = ipfs_hashes;
+    }
+
+    return output;
   }
 
   /**
@@ -61,10 +66,11 @@ class OutputFormatter {
       units,
       reissuable,
       has_ipfs,
-      ipfs_hash
+      ipfs_hash,
+      owner_change_address
     } = params;
 
-    return {
+    const output = {
       issue_restricted: {
         asset_name,
         asset_quantity,
@@ -75,6 +81,12 @@ class OutputFormatter {
         ipfs_hash: ipfs_hash || ''
       }
     };
+
+    if (owner_change_address) {
+      output.issue_restricted.owner_change_address = owner_change_address;
+    }
+
+    return output;
   }
 
   /**
@@ -87,10 +99,12 @@ class OutputFormatter {
       asset_name,
       asset_quantity,
       has_ipfs,
-      ipfs_hash
+      ipfs_hash,
+      root_change_address,
+      change_quantity
     } = params;
 
-    return {
+    const output = {
       issue_qualifier: {
         asset_name,
         asset_quantity,
@@ -98,6 +112,16 @@ class OutputFormatter {
         ipfs_hash: ipfs_hash || ''
       }
     };
+
+    if (root_change_address) {
+      output.issue_qualifier.root_change_address = root_change_address;
+    }
+
+    if (change_quantity !== undefined && change_quantity !== null) {
+      output.issue_qualifier.change_quantity = change_quantity;
+    }
+
+    return output;
   }
 
   /**
@@ -110,7 +134,8 @@ class OutputFormatter {
       asset_name,
       asset_quantity,
       reissuable,
-      new_ipfs
+      new_ipfs,
+      owner_change_address
     } = params;
 
     const output = {
@@ -129,6 +154,10 @@ class OutputFormatter {
       output.reissue.ipfs_hash = new_ipfs;
     }
 
+    if (owner_change_address) {
+      output.reissue.owner_change_address = owner_change_address;
+    }
+
     return output;
   }
 
@@ -144,7 +173,8 @@ class OutputFormatter {
       change_verifier,
       new_verifier,
       reissuable,
-      new_ipfs
+      new_ipfs,
+      owner_change_address
     } = params;
 
     const output = {
@@ -167,6 +197,10 @@ class OutputFormatter {
       output.reissue_restricted.ipfs_hash = new_ipfs;
     }
 
+    if (owner_change_address) {
+      output.reissue_restricted.owner_change_address = owner_change_address;
+    }
+
     return output;
   }
 
@@ -191,18 +225,23 @@ class OutputFormatter {
    */
   static formatTagAddressesOutput(params) {
     const {
-      tag_name,
+      qualifier,
       addresses,
-      asset_data
+      change_quantity
     } = params;
 
-    return {
+    const output = {
       tag_addresses: {
-        tag_name,
-        addresses,
-        asset_data: asset_data || ''
+        qualifier,
+        addresses
       }
     };
+
+    if (change_quantity !== undefined && change_quantity !== null) {
+      output.tag_addresses.change_quantity = change_quantity;
+    }
+
+    return output;
   }
 
   /**
@@ -212,16 +251,23 @@ class OutputFormatter {
    */
   static formatUntagAddressesOutput(params) {
     const {
-      tag_name,
-      addresses
+      qualifier,
+      addresses,
+      change_quantity
     } = params;
 
-    return {
+    const output = {
       untag_addresses: {
-        tag_name,
+        qualifier,
         addresses
       }
     };
+
+    if (change_quantity !== undefined && change_quantity !== null) {
+      output.untag_addresses.change_quantity = change_quantity;
+    }
+
+    return output;
   }
 
   /**

package/tests/unit/utils/assetNameParser.test.js

@@ -120,7 +120,7 @@ describe('AssetNameParser', () => {
   describe('getOwnerTokenName', () => {
     it('should add ! to get owner token name', () => {
       expect(AssetNameParser.getOwnerTokenName('MYTOKEN')).to.equal('MYTOKEN!');
-      expect(AssetNameParser.getOwnerTokenName('$SECURITY')).to.equal('$SECURITY!');
+      expect(AssetNameParser.getOwnerTokenName('$SECURITY')).to.equal('SECURITY!');
     });
 
     it('should return as-is if already an owner token', () => {