@story-protocol/core-sdk 1.4.0-rc.1 → 1.4.0

package/dist/story-protocol-core-sdk.esm.js

@@ -4442,6 +4442,11 @@ var DisputeClient = /*#__PURE__*/function () {
  * Will be converted to bigint for contract calls.
  */
 
+/**
+ * Input for token id, can be bigint or number.
+ * Will be converted to bigint for contract calls.
+ */
+
 /**
  * The type of revenue share.
  * It is used to determine the type of revenue share to be used in the revenue share calculation and throw error when the revenue share is not valid.
@@ -4455,6 +4460,25 @@ var RevShareType = /*#__PURE__*/function (RevShareType) {
   return RevShareType;
 }({});
 
+/**
+ * Input for license terms id, can be bigint or number.
+ * Will be converted to bigint for contract calls.
+ */
+
+/**
+ * Input for deadline, can be bigint or number.
+ * Will be converted to bigint for contract calls.
+ */
+
+/**
+ * Input for revenue share, can be number.
+ */
+
+/**
+ * Input for fee, can be bigint or number.
+ * Will be converted to bigint for contract calls.
+ */
+
 /**
  * Permission level
  */
@@ -4552,9 +4576,6 @@ var royaltyPolicyInputToAddress = function royaltyPolicyInputToAddress(input, ch
 var getRevenueShare = function getRevenueShare(revShare) {
   var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : RevShareType.COMMERCIAL_REVENUE_SHARE;
   var revShareNumber = Number(revShare);
-  if (isNaN(revShareNumber)) {
-    throw new Error("".concat(type, " must be a valid number."));
-  }
   if (revShareNumber < 0 || revShareNumber > 100) {
     throw new Error("".concat(type, " must be between 0 and 100."));
   }
@@ -4606,7 +4627,7 @@ var getPermissionSignature = /*#__PURE__*/function () {
   };
 }();
 var getDeadline = function getDeadline(unixTimestamp, deadline) {
-  if (deadline && (isNaN(Number(deadline)) || BigInt(deadline) < 0n)) {
+  if (deadline && BigInt(deadline) < 0n) {
     throw new Error("Invalid deadline value.");
   }
   return deadline ? unixTimestamp + BigInt(deadline) : unixTimestamp + 1000n;
@@ -4709,7 +4730,7 @@ var validateLicenseConfig = function validateLicenseConfig(licensingConfig) {
     };
   }
   var licenseConfig = {
-    expectMinimumGroupRewardShare: Number(licensingConfig.expectMinimumGroupRewardShare),
+    expectMinimumGroupRewardShare: getRevenueShare(licensingConfig.expectMinimumGroupRewardShare, RevShareType.EXPECT_MINIMUM_GROUP_REWARD_SHARE),
     commercialRevShare: getRevenueShare(licensingConfig.commercialRevShare),
     mintingFee: BigInt(licensingConfig.mintingFee),
     expectGroupRewardPool: validateAddress(licensingConfig.expectGroupRewardPool),
@@ -4718,14 +4739,6 @@ var validateLicenseConfig = function validateLicenseConfig(licensingConfig) {
     isSet: licensingConfig.isSet,
     disabled: licensingConfig.disabled
   };
-  if (isNaN(licenseConfig.expectMinimumGroupRewardShare)) {
-    throw new Error("The expectMinimumGroupRewardShare must be a valid number.");
-  }
-  if (licenseConfig.expectMinimumGroupRewardShare < 0 || licenseConfig.expectMinimumGroupRewardShare > 100) {
-    throw new Error("The expectMinimumGroupRewardShare must be greater than 0 and less than 100.");
-  } else {
-    licenseConfig.expectMinimumGroupRewardShare = getRevenueShare(licenseConfig.expectMinimumGroupRewardShare, RevShareType.EXPECT_MINIMUM_GROUP_REWARD_SHARE);
-  }
   if (licenseConfig.mintingFee < 0) {
     throw new Error("The mintingFee must be greater than 0.");
   }
@@ -4815,7 +4828,7 @@ var GroupClient = /*#__PURE__*/function () {
     key: "mintAndRegisterIpAndAttachLicenseAndAddToGroup",
     value: (function () {
       var _mintAndRegisterIpAndAttachLicenseAndAddToGroup = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(request) {
-        var _request$txOptions2, groupId, recipient, spgNftContract, deadline, isRegistered, ipAccount, _yield$ipAccount$stat, state, blockTimestamp, calculatedDeadline, _yield$getPermissionS, sigAddToGroupSignature, object, txHash, receipt, log, _t2;
+        var _request$maxAllowedRe, _request$txOptions2, groupId, recipient, spgNftContract, deadline, isRegistered, ipAccount, _yield$ipAccount$stat, state, blockTimestamp, calculatedDeadline, _yield$getPermissionS, sigAddToGroupSignature, object, txHash, receipt, log, _t2;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.p = _context2.n) {
             case 0:
@@ -4866,7 +4879,7 @@ var GroupClient = /*#__PURE__*/function () {
                 allowDuplicates: request.allowDuplicates || true,
                 spgNftContract: validateAddress(spgNftContract),
                 recipient: validateAddress(recipient || this.wallet.account.address),
-                maxAllowedRewardShare: BigInt(getRevenueShare(request.maxAllowedRewardShare, RevShareType.MAX_ALLOWED_REWARD_SHARE)),
+                maxAllowedRewardShare: BigInt(getRevenueShare((_request$maxAllowedRe = request.maxAllowedRewardShare) !== null && _request$maxAllowedRe !== void 0 ? _request$maxAllowedRe : 100, RevShareType.MAX_ALLOWED_REWARD_SHARE)),
                 licensesData: this.getLicenseData(request.licenseData),
                 ipMetadata: getIpMetadataForWorkflow(request.ipMetadata),
                 sigAddToGroup: {
@@ -4925,7 +4938,7 @@ var GroupClient = /*#__PURE__*/function () {
     key: "registerIpAndAttachLicenseAndAddToGroup",
     value: (function () {
       var _registerIpAndAttachLicenseAndAddToGroup = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(request) {
-        var _request$txOptions3, ipIdAddress, isRegistered, ipAccount, _yield$ipAccount$stat2, state, blockTimestamp, calculatedDeadline, _yield$getPermissionS2, sigAddToGroupSignature, _yield$getPermissionS3, sigMetadataAndAttachSignature, object, txHash, receipt, log, _t3;
+        var _request$maxAllowedRe2, _request$txOptions3, ipIdAddress, isRegistered, ipAccount, _yield$ipAccount$stat2, state, blockTimestamp, calculatedDeadline, _yield$getPermissionS2, sigAddToGroupSignature, _yield$getPermissionS3, sigMetadataAndAttachSignature, object, txHash, receipt, log, _t3;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.p = _context3.n) {
             case 0:
@@ -5017,7 +5030,7 @@ var GroupClient = /*#__PURE__*/function () {
                 licensesData: this.getLicenseData(request.licenseData),
                 ipMetadata: getIpMetadataForWorkflow(request.ipMetadata),
                 tokenId: BigInt(request.tokenId),
-                maxAllowedRewardShare: BigInt(getRevenueShare(request.maxAllowedRewardShare, RevShareType.MAX_ALLOWED_REWARD_SHARE)),
+                maxAllowedRewardShare: BigInt(getRevenueShare((_request$maxAllowedRe2 = request.maxAllowedRewardShare) !== null && _request$maxAllowedRe2 !== void 0 ? _request$maxAllowedRe2 : 100, RevShareType.MAX_ALLOWED_REWARD_SHARE)),
                 sigAddToGroup: {
                   signer: validateAddress(this.wallet.account.address),
                   deadline: calculatedDeadline,
@@ -5127,7 +5140,7 @@ var GroupClient = /*#__PURE__*/function () {
     key: "registerGroupAndAttachLicenseAndAddIps",
     value: (function () {
       var _registerGroupAndAttachLicenseAndAddIps = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(request) {
-        var _request$txOptions5, object, i, isRegistered, _i, isAttachedLicenseTerms, txHash, txReceipt, groupId, _t5;
+        var _request$maxAllowedRe3, _request$txOptions5, object, i, isRegistered, _i, isAttachedLicenseTerms, txHash, txReceipt, groupId, _t5;
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.p = _context5.n) {
             case 0:
@@ -5136,7 +5149,7 @@ var GroupClient = /*#__PURE__*/function () {
                 groupPool: validateAddress(request.groupPool),
                 ipIds: request.ipIds,
                 licenseData: this.getLicenseData(request.licenseData)[0],
-                maxAllowedRewardShare: BigInt(getRevenueShare(request.maxAllowedRewardShare))
+                maxAllowedRewardShare: BigInt(getRevenueShare((_request$maxAllowedRe3 = request.maxAllowedRewardShare) !== null && _request$maxAllowedRe3 !== void 0 ? _request$maxAllowedRe3 : 100, RevShareType.MAX_ALLOWED_REWARD_SHARE))
               };
               i = 0;
             case 1:
@@ -5379,7 +5392,7 @@ var GroupClient = /*#__PURE__*/function () {
               addIpParam = {
                 groupIpId: validateAddress(groupIpId),
                 ipIds: validateAddresses(ipIds),
-                maxAllowedRewardShare: BigInt(getRevenueShare(maxAllowedRewardSharePercentage === undefined ? 100 : maxAllowedRewardSharePercentage, RevShareType.MAX_ALLOWED_REWARD_SHARE_PERCENTAGE))
+                maxAllowedRewardShare: BigInt(getRevenueShare(maxAllowedRewardSharePercentage !== null && maxAllowedRewardSharePercentage !== void 0 ? maxAllowedRewardSharePercentage : 100, RevShareType.MAX_ALLOWED_REWARD_SHARE_PERCENTAGE))
               };
               _context8.n = 2;
               return this.groupingModuleClient.addIp(addIpParam);
@@ -6429,9 +6442,9 @@ _defineProperty(PILFlavor, "validateLicenseTerms", function (params, chainId) {
   // Validate commercial use and derivatives
   _PILFlavor.verifyCommercialUse(normalized);
   _PILFlavor.verifyDerivatives(normalized);
-
-  // Validate and normalize commercialRevShare
-  normalized.commercialRevShare = getRevenueShare(normalized.commercialRevShare);
+  if (normalized.commercialRevShare > 100 || normalized.commercialRevShare < 0) {
+    throw new PILFlavorError("commercialRevShare must be between 0 and 100.");
+  }
   return normalized;
 });
 _defineProperty(PILFlavor, "verifyCommercialUse", function (terms) {
@@ -6557,6 +6570,7 @@ var validateLicenseTermsData = /*#__PURE__*/function () {
             break;
           }
           licenseTerm = PILFlavor.validateLicenseTerms(licenseTermsData[i].terms, chainId);
+          licenseTerm.commercialRevShare = getRevenueShare(licenseTerm.commercialRevShare);
           royaltyModuleReadOnlyClient = new RoyaltyModuleReadOnlyClient(rpcClient);
           if (!(validateAddress(licenseTerm.royaltyPolicy) !== zeroAddress)) {
             _context2.n = 3;
@@ -6660,6 +6674,7 @@ var getRoyaltyShares = function getRoyaltyShares(royaltyShares) {
 };
 var validateDerivativeData = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(_ref3) {
+    var _derivativeDataInput$, _derivativeDataInput$2;
     var derivativeDataInput, rpcClient, wallet, chainId, licenseTemplateAddress, ipAssetRegistryClient, licenseRegistryReadOnlyClient, derivativeData, i, parentId, isParentIpRegistered, isAttachedLicenseTerms, _yield$licenseRegistr, royaltyPercent;
     return _regenerator().w(function (_context3) {
       while (1) switch (_context3.n) {
@@ -6675,9 +6690,9 @@ var validateDerivativeData = /*#__PURE__*/function () {
             }),
             licenseTemplate: validateAddress(derivativeDataInput.licenseTemplate || licenseTemplateAddress),
             royaltyContext: zeroAddress,
-            maxMintingFee: BigInt(derivativeDataInput.maxMintingFee || 0),
-            maxRts: Number(derivativeDataInput.maxRts === undefined ? MAX_ROYALTY_TOKEN : derivativeDataInput.maxRts),
-            maxRevenueShare: getRevenueShare(derivativeDataInput.maxRevenueShare === undefined ? 100 : derivativeDataInput.maxRevenueShare, RevShareType.MAX_REVENUE_SHARE)
+            maxMintingFee: BigInt((_derivativeDataInput$ = derivativeDataInput.maxMintingFee) !== null && _derivativeDataInput$ !== void 0 ? _derivativeDataInput$ : 0),
+            maxRts: validateMaxRts(derivativeDataInput.maxRts),
+            maxRevenueShare: getRevenueShare((_derivativeDataInput$2 = derivativeDataInput.maxRevenueShare) !== null && _derivativeDataInput$2 !== void 0 ? _derivativeDataInput$2 : 100, RevShareType.MAX_REVENUE_SHARE)
           };
           if (!(derivativeData.parentIpIds.length === 0)) {
             _context3.n = 1;
@@ -6703,7 +6718,6 @@ var validateDerivativeData = /*#__PURE__*/function () {
           }
           throw new Error("The maxMintingFee must be greater than 0.");
         case 4:
-          validateMaxRts(derivativeData.maxRts);
           i = 0;
         case 5:
           if (!(i < derivativeData.parentIpIds.length)) {
@@ -6765,12 +6779,12 @@ var validateDerivativeData = /*#__PURE__*/function () {
   };
 }();
 var validateMaxRts = function validateMaxRts(maxRts) {
-  if (isNaN(maxRts)) {
-    throw new Error("The maxRts must be a number.");
-  }
-  if (maxRts < 0 || maxRts > MAX_ROYALTY_TOKEN) {
+  if (maxRts === undefined) {
+    return MAX_ROYALTY_TOKEN;
+  } else if (maxRts < 0 || maxRts > MAX_ROYALTY_TOKEN) {
     throw new Error("The maxRts must be greater than 0 and less than ".concat(MAX_ROYALTY_TOKEN, "."));
   }
+  return maxRts;
 };
 var getIpIdAddress = /*#__PURE__*/function () {
   var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(_ref5) {
@@ -7969,6 +7983,53 @@ var prepareRoyaltyTokensDistributionRequests = /*#__PURE__*/function () {
   };
 }();
 
+var setMaxLicenseTokens = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    var maxLicenseTokensData, licensorIpId, licenseTermsIds, totalLicenseTokenLimitHookClient, templateAddress, licenseTermsMaxLimitTxHashes, i, maxLicenseTokens, txHash;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          maxLicenseTokensData = _ref.maxLicenseTokensData, licensorIpId = _ref.licensorIpId, licenseTermsIds = _ref.licenseTermsIds, totalLicenseTokenLimitHookClient = _ref.totalLicenseTokenLimitHookClient, templateAddress = _ref.templateAddress;
+          licenseTermsMaxLimitTxHashes = [];
+          i = 0;
+        case 1:
+          if (!(i < maxLicenseTokensData.length)) {
+            _context.n = 5;
+            break;
+          }
+          maxLicenseTokens = maxLicenseTokensData[i].maxLicenseTokens;
+          if (!(maxLicenseTokens === undefined || maxLicenseTokens < 0n)) {
+            _context.n = 2;
+            break;
+          }
+          return _context.a(3, 4);
+        case 2:
+          _context.n = 3;
+          return totalLicenseTokenLimitHookClient.setTotalLicenseTokenLimit({
+            licensorIpId: licensorIpId,
+            licenseTemplate: templateAddress,
+            licenseTermsId: licenseTermsIds[i],
+            limit: BigInt(maxLicenseTokens)
+          });
+        case 3:
+          txHash = _context.v;
+          if (txHash) {
+            licenseTermsMaxLimitTxHashes.push(txHash);
+          }
+        case 4:
+          i++;
+          _context.n = 1;
+          break;
+        case 5:
+          return _context.a(2, licenseTermsMaxLimitTxHashes);
+      }
+    }, _callee);
+  }));
+  return function setMaxLicenseTokens(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
 var IPAssetClient = /*#__PURE__*/function () {
   function IPAssetClient(rpcClient, wallet, chainId) {
     _classCallCheck(this, IPAssetClient);
@@ -7992,6 +8053,7 @@ var IPAssetClient = /*#__PURE__*/function () {
     this.wallet = wallet;
     this.chainId = chainId;
     this.walletAddress = this.wallet.account.address;
+    this.licenseTemplateAddress = this.licenseTemplateClient.address;
   }
   return _createClass(IPAssetClient, [{
     key: "generateCreatorMetadata",
@@ -8378,7 +8440,7 @@ var IPAssetClient = /*#__PURE__*/function () {
     key: "batchRegisterDerivative",
     value: (function () {
       var _batchRegisterDerivative = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(request) {
-        var contracts, licenseModuleAddress, _iterator2, _step2, arg, calculatedDeadline, ipAccount, data, _yield$ipAccount$stat, state, signature, txHash, _t6, _t7, _t8;
+        var contracts, licenseModuleAddress, _iterator2, _step2, _arg$maxMintingFee, _arg$maxRevenueShare, arg, calculatedDeadline, ipAccount, data, _yield$ipAccount$stat, state, signature, txHash, _t6, _t7, _t8;
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.p = _context5.n) {
             case 0:
@@ -8419,7 +8481,7 @@ var IPAssetClient = /*#__PURE__*/function () {
                 functionName: "registerDerivative",
                 args: [arg.childIpId, arg.parentIpIds, arg.licenseTermsIds.map(function (id) {
                   return BigInt(id);
-                }), arg.licenseTemplate || this.licenseTemplateClient.address, zeroAddress, BigInt(arg.maxMintingFee || 0), Number(arg.maxRts === undefined ? MAX_ROYALTY_TOKEN : arg.maxRts), getRevenueShare(arg.maxRevenueShare === undefined ? 100 : arg.maxRevenueShare, RevShareType.MAX_REVENUE_SHARE)]
+                }), arg.licenseTemplate || this.licenseTemplateAddress, zeroAddress, BigInt((_arg$maxMintingFee = arg.maxMintingFee) !== null && _arg$maxMintingFee !== void 0 ? _arg$maxMintingFee : 0), validateMaxRts(arg.maxRts), getRevenueShare((_arg$maxRevenueShare = arg.maxRevenueShare) !== null && _arg$maxRevenueShare !== void 0 ? _arg$maxRevenueShare : 100, RevShareType.MAX_REVENUE_SHARE)]
               });
               _context5.n = 8;
               return ipAccount.state();
@@ -8509,9 +8571,8 @@ var IPAssetClient = /*#__PURE__*/function () {
                   return BigInt(id);
                 }),
                 royaltyContext: zeroAddress,
-                maxRts: Number(request.maxRts)
+                maxRts: validateMaxRts(request.maxRts)
               };
-              validateMaxRts(req.maxRts);
               _context6.n = 1;
               return this.isRegistered(request.childIpId);
             case 1:
@@ -8580,39 +8641,34 @@ var IPAssetClient = /*#__PURE__*/function () {
     value: (function () {
       var _mintAndRegisterIpAssetWithPilTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(request) {
         var _this3 = this;
-        var _request$txOptions4, _request$options2, _yield$validateLicens, licenseTerms, _yield$transformRegis, transformRequest, encodedTxData, contractCall, rsp, computedLicenseTermsIds, maxLicenseTokensTxHashes, _t0;
+        var _request$txOptions4, _request$options2, _yield$transformRegis, transformRequest, encodedTxData, contractCall, rsp, computedLicenseTermsIds, maxLicenseTokensTxHashes, _t0;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.p = _context7.n) {
             case 0:
               _context7.p = 0;
               _context7.n = 1;
-              return validateLicenseTermsData(request.licenseTermsData, this.rpcClient, this.chainId);
-            case 1:
-              _yield$validateLicens = _context7.v;
-              licenseTerms = _yield$validateLicens.licenseTerms;
-              _context7.n = 2;
               return transformRegistrationRequest({
                 request: request,
                 rpcClient: this.rpcClient,
                 wallet: this.wallet,
                 chainId: this.chainId
               });
-            case 2:
+            case 1:
               _yield$transformRegis = _context7.v;
               transformRequest = _yield$transformRegis.transformRequest;
               encodedTxData = this.licenseAttachmentWorkflowsClient.mintAndRegisterIpAndAttachPilTermsEncode(transformRequest);
               if (!((_request$txOptions4 = request.txOptions) !== null && _request$txOptions4 !== void 0 && _request$txOptions4.encodedTxDataOnly)) {
-                _context7.n = 3;
+                _context7.n = 2;
                 break;
               }
               return _context7.a(2, {
                 encodedTxData: encodedTxData
               });
-            case 3:
+            case 2:
               contractCall = function contractCall() {
                 return _this3.licenseAttachmentWorkflowsClient.mintAndRegisterIpAndAttachPilTerms(transformRequest);
               };
-              _context7.n = 4;
+              _context7.n = 3;
               return this.handleRegistrationWithFees({
                 wipOptions: (_request$options2 = request.options) === null || _request$options2 === void 0 ? void 0 : _request$options2.wipOptions,
                 sender: this.walletAddress,
@@ -8622,31 +8678,35 @@ var IPAssetClient = /*#__PURE__*/function () {
                 contractCall: contractCall,
                 txOptions: request.txOptions
               });
-            case 4:
+            case 3:
               rsp = _context7.v;
-              _context7.n = 5;
-              return this.getLicenseTermsId(licenseTerms);
-            case 5:
+              _context7.n = 4;
+              return this.getLicenseTermsId(transformRequest.licenseTermsData.map(function (data) {
+                return data.terms;
+              }));
+            case 4:
               computedLicenseTermsIds = _context7.v;
-              _context7.n = 6;
-              return this.setMaxLicenseTokens({
+              _context7.n = 5;
+              return setMaxLicenseTokens({
                 maxLicenseTokensData: request.licenseTermsData,
                 licensorIpId: rsp.ipId,
-                licenseTermsIds: computedLicenseTermsIds
+                licenseTermsIds: computedLicenseTermsIds,
+                totalLicenseTokenLimitHookClient: this.totalLicenseTokenLimitHookClient,
+                templateAddress: this.licenseTemplateAddress
               });
-            case 6:
+            case 5:
               maxLicenseTokensTxHashes = _context7.v;
               return _context7.a(2, _objectSpread2(_objectSpread2({}, rsp), {}, {
                 licenseTermsIds: computedLicenseTermsIds
               }, maxLicenseTokensTxHashes.length > 0 && {
                 maxLicenseTokensTxHashes: maxLicenseTokensTxHashes
               }));
-            case 7:
-              _context7.p = 7;
+            case 6:
+              _context7.p = 6;
               _t0 = _context7.v;
               return _context7.a(2, handleError(_t0, "Failed to mint and register IP and attach PIL terms"));
           }
-        }, _callee7, this, [[0, 7]]);
+        }, _callee7, this, [[0, 6]]);
       }));
       function mintAndRegisterIpAssetWithPilTerms(_x8) {
         return _mintAndRegisterIpAssetWithPilTerms.apply(this, arguments);
@@ -8740,10 +8800,12 @@ var IPAssetClient = /*#__PURE__*/function () {
               licenseTermsIds = _context8.v;
               results[j].licenseTermsIds = licenseTermsIds;
               _context8.n = 13;
-              return this.setMaxLicenseTokens({
+              return setMaxLicenseTokens({
                 maxLicenseTokensData: licenseTermsData,
                 licensorIpId: results[j].ipId,
-                licenseTermsIds: licenseTermsIds
+                licenseTermsIds: licenseTermsIds,
+                totalLicenseTokenLimitHookClient: this.totalLicenseTokenLimitHookClient,
+                templateAddress: this.licenseTemplateAddress
               });
             case 13:
               maxLicenseTokensTxHashes = _context8.v;
@@ -8781,7 +8843,7 @@ var IPAssetClient = /*#__PURE__*/function () {
     key: "registerIpAndAttachPilTerms",
     value: (function () {
       var _registerIpAndAttachPilTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(request) {
-        var _request$txOptions5, ipIdAddress, isRegistered, _yield$validateLicens2, licenseTerms, _yield$transformRegis2, _transformRequest, txHash, txReceipt, log, licenseTermsIds, maxLicenseTokensTxHashes, _t11;
+        var _request$txOptions5, ipIdAddress, isRegistered, _yield$validateLicens, licenseTerms, _yield$transformRegis2, _transformRequest, txHash, txReceipt, log, licenseTermsIds, maxLicenseTokensTxHashes, _t11;
         return _regenerator().w(function (_context9) {
           while (1) switch (_context9.p = _context9.n) {
             case 0:
@@ -8810,8 +8872,8 @@ var IPAssetClient = /*#__PURE__*/function () {
               _context9.n = 4;
               return validateLicenseTermsData(request.licenseTermsData, this.rpcClient, this.chainId);
             case 4:
-              _yield$validateLicens2 = _context9.v;
-              licenseTerms = _yield$validateLicens2.licenseTerms;
+              _yield$validateLicens = _context9.v;
+              licenseTerms = _yield$validateLicens.licenseTerms;
               _context9.n = 5;
               return transformRegistrationRequest({
                 request: request,
@@ -8846,10 +8908,12 @@ var IPAssetClient = /*#__PURE__*/function () {
             case 9:
               licenseTermsIds = _context9.v;
               _context9.n = 10;
-              return this.setMaxLicenseTokens({
+              return setMaxLicenseTokens({
                 maxLicenseTokensData: request.licenseTermsData,
                 licensorIpId: log.ipId,
-                licenseTermsIds: licenseTermsIds
+                licenseTermsIds: licenseTermsIds,
+                totalLicenseTokenLimitHookClient: this.totalLicenseTokenLimitHookClient,
+                templateAddress: this.licenseTemplateAddress
               });
             case 10:
               maxLicenseTokensTxHashes = _context9.v;
@@ -9395,120 +9459,6 @@ var IPAssetClient = /*#__PURE__*/function () {
       }
       return batchMintAndRegisterIp;
     }()
-    /**
-     * Register Programmable IP License Terms (if unregistered) and attach it to IP.
-     *
-     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicensingModule.sol#L19 | `LicenseTermsAttached`} event.
-     */
-    )
-  }, {
-    key: "registerPilTermsAndAttach",
-    value: (function () {
-      var _registerPilTermsAndAttach = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15(request) {
-        var _request$txOptions9, ipId, isRegistered, _yield$validateLicens3, licenseTerms, licenseTermsData, calculatedDeadline, ipAccount, _yield$ipAccount$stat2, state, signature, _object2, txHash, licenseTermsIds, maxLicenseTokensTxHashes, _t22;
-        return _regenerator().w(function (_context15) {
-          while (1) switch (_context15.p = _context15.n) {
-            case 0:
-              _context15.p = 0;
-              ipId = request.ipId;
-              _context15.n = 1;
-              return this.isRegistered(ipId);
-            case 1:
-              isRegistered = _context15.v;
-              if (isRegistered) {
-                _context15.n = 2;
-                break;
-              }
-              throw new Error("The IP with id ".concat(ipId, " is not registered."));
-            case 2:
-              _context15.n = 3;
-              return validateLicenseTermsData(request.licenseTermsData, this.rpcClient, this.chainId);
-            case 3:
-              _yield$validateLicens3 = _context15.v;
-              licenseTerms = _yield$validateLicens3.licenseTerms;
-              licenseTermsData = _yield$validateLicens3.licenseTermsData;
-              _context15.n = 4;
-              return getCalculatedDeadline(this.rpcClient, request.deadline);
-            case 4:
-              calculatedDeadline = _context15.v;
-              ipAccount = new IpAccountImplClient(this.rpcClient, this.wallet, ipId);
-              _context15.n = 5;
-              return ipAccount.state();
-            case 5:
-              _yield$ipAccount$stat2 = _context15.v;
-              state = _yield$ipAccount$stat2.result;
-              _context15.n = 6;
-              return generateOperationSignature({
-                ipIdAddress: ipId,
-                methodType: SignatureMethodType.REGISTER_PIL_TERMS_AND_ATTACH,
-                deadline: calculatedDeadline,
-                state: state,
-                wallet: this.wallet,
-                chainId: this.chainId
-              });
-            case 6:
-              signature = _context15.v;
-              _object2 = {
-                ipId: ipId,
-                licenseTermsData: licenseTermsData,
-                sigAttachAndConfig: {
-                  signer: validateAddress(this.walletAddress),
-                  deadline: calculatedDeadline,
-                  signature: signature
-                }
-              };
-              if (!((_request$txOptions9 = request.txOptions) !== null && _request$txOptions9 !== void 0 && _request$txOptions9.encodedTxDataOnly)) {
-                _context15.n = 7;
-                break;
-              }
-              return _context15.a(2, {
-                encodedTxData: this.licenseAttachmentWorkflowsClient.registerPilTermsAndAttachEncode(_object2)
-              });
-            case 7:
-              _context15.n = 8;
-              return this.licenseAttachmentWorkflowsClient.registerPilTermsAndAttach(_object2);
-            case 8:
-              txHash = _context15.v;
-              _context15.n = 9;
-              return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
-                hash: txHash
-              }));
-            case 9:
-              _context15.n = 10;
-              return this.getLicenseTermsId(licenseTerms);
-            case 10:
-              licenseTermsIds = _context15.v;
-              _context15.n = 11;
-              return this.setMaxLicenseTokens({
-                maxLicenseTokensData: request.licenseTermsData,
-                licensorIpId: ipId,
-                licenseTermsIds: licenseTermsIds
-              });
-            case 11:
-              maxLicenseTokensTxHashes = _context15.v;
-              return _context15.a(2, _objectSpread2({
-                txHash: txHash,
-                licenseTermsIds: licenseTermsIds
-              }, maxLicenseTokensTxHashes.length > 0 && {
-                maxLicenseTokensTxHashes: maxLicenseTokensTxHashes
-              }));
-            case 12:
-              _context15.n = 14;
-              break;
-            case 13:
-              _context15.p = 13;
-              _t22 = _context15.v;
-              return _context15.a(2, handleError(_t22, "Failed to register PIL terms and attach"));
-            case 14:
-              return _context15.a(2);
-          }
-        }, _callee15, this, [[0, 13]]);
-      }));
-      function registerPilTermsAndAttach(_x14) {
-        return _registerPilTermsAndAttach.apply(this, arguments);
-      }
-      return registerPilTermsAndAttach;
-    }()
     /**
      * Mint an NFT from a collection and register it as a derivative IP using license tokens.
      * Requires caller to have the minter role or the SPG NFT to allow public minting. Caller must own the license tokens and have approved DerivativeWorkflows to transfer them.
@@ -9519,70 +9469,69 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "mintAndRegisterIpAndMakeDerivativeWithLicenseTokens",
     value: (function () {
-      var _mintAndRegisterIpAndMakeDerivativeWithLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(request) {
+      var _mintAndRegisterIpAndMakeDerivativeWithLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16(request) {
         var _this8 = this;
-        var _request$txOptions0, _request$options6, licenseTokenIds, _object3, encodedTxData, contractCall, _t23;
-        return _regenerator().w(function (_context17) {
-          while (1) switch (_context17.p = _context17.n) {
+        var _request$txOptions9, _request$options6, licenseTokenIds, _object2, encodedTxData, contractCall, _t22;
+        return _regenerator().w(function (_context16) {
+          while (1) switch (_context16.p = _context16.n) {
             case 0:
-              _context17.p = 0;
-              _context17.n = 1;
+              _context16.p = 0;
+              _context16.n = 1;
               return this.validateLicenseTokenIds(request.licenseTokenIds);
             case 1:
-              licenseTokenIds = _context17.v;
-              _object3 = {
+              licenseTokenIds = _context16.v;
+              _object2 = {
                 spgNftContract: validateAddress(request.spgNftContract),
                 recipient: validateAddress(request.recipient || this.walletAddress),
                 ipMetadata: getIpMetadataForWorkflow(request.ipMetadata),
                 licenseTokenIds: licenseTokenIds,
                 royaltyContext: zeroAddress,
-                maxRts: Number(request.maxRts),
+                maxRts: validateMaxRts(request.maxRts),
                 allowDuplicates: request.allowDuplicates || true
               };
-              validateMaxRts(_object3.maxRts);
-              encodedTxData = this.derivativeWorkflowsClient.mintAndRegisterIpAndMakeDerivativeWithLicenseTokensEncode(_object3);
-              if (!((_request$txOptions0 = request.txOptions) !== null && _request$txOptions0 !== void 0 && _request$txOptions0.encodedTxDataOnly)) {
-                _context17.n = 2;
+              encodedTxData = this.derivativeWorkflowsClient.mintAndRegisterIpAndMakeDerivativeWithLicenseTokensEncode(_object2);
+              if (!((_request$txOptions9 = request.txOptions) !== null && _request$txOptions9 !== void 0 && _request$txOptions9.encodedTxDataOnly)) {
+                _context16.n = 2;
                 break;
               }
-              return _context17.a(2, {
+              return _context16.a(2, {
                 encodedTxData: encodedTxData
               });
             case 2:
               contractCall = /*#__PURE__*/function () {
-                var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee16() {
-                  return _regenerator().w(function (_context16) {
-                    while (1) switch (_context16.n) {
+                var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee15() {
+                  return _regenerator().w(function (_context15) {
+                    while (1) switch (_context15.n) {
                       case 0:
-                        return _context16.a(2, _this8.derivativeWorkflowsClient.mintAndRegisterIpAndMakeDerivativeWithLicenseTokens(_object3));
+                        return _context15.a(2, _this8.derivativeWorkflowsClient.mintAndRegisterIpAndMakeDerivativeWithLicenseTokens(_object2));
                     }
-                  }, _callee16);
+                  }, _callee15);
                 }));
                 return function contractCall() {
                   return _ref4.apply(this, arguments);
                 };
               }();
-              return _context17.a(2, this.handleRegistrationWithFees({
+              return _context16.a(2, this.handleRegistrationWithFees({
                 wipOptions: _objectSpread2(_objectSpread2({}, (_request$options6 = request.options) === null || _request$options6 === void 0 ? void 0 : _request$options6.wipOptions), {}, {
                   // need to disable multicall to avoid needing to transfer the license
                   // token to the multicall contract.
                   useMulticallWhenPossible: false
                 }),
                 sender: this.walletAddress,
-                spgNftContract: _object3.spgNftContract,
+                spgNftContract: _object2.spgNftContract,
                 spgSpenderAddress: this.derivativeWorkflowsClient.address,
                 encodedTxs: [encodedTxData],
                 contractCall: contractCall,
                 txOptions: request.txOptions
               }));
             case 3:
-              _context17.p = 3;
-              _t23 = _context17.v;
-              return _context17.a(2, handleError(_t23, "Failed to mint and register IP and make derivative with license tokens"));
+              _context16.p = 3;
+              _t22 = _context16.v;
+              return _context16.a(2, handleError(_t22, "Failed to mint and register IP and make derivative with license tokens"));
           }
-        }, _callee17, this, [[0, 3]]);
+        }, _callee16, this, [[0, 3]]);
       }));
-      function mintAndRegisterIpAndMakeDerivativeWithLicenseTokens(_x15) {
+      function mintAndRegisterIpAndMakeDerivativeWithLicenseTokens(_x14) {
         return _mintAndRegisterIpAndMakeDerivativeWithLicenseTokens.apply(this, arguments);
       }
       return mintAndRegisterIpAndMakeDerivativeWithLicenseTokens;
@@ -9596,14 +9545,14 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "registerIpAndMakeDerivativeWithLicenseTokens",
     value: (function () {
-      var _registerIpAndMakeDerivativeWithLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(request) {
-        var _request$txOptions1, tokenId, ipIdAddress, isRegistered, licenseTokenIds, calculatedDeadline, signature, _object4, txHash, receipt, log, _t24;
-        return _regenerator().w(function (_context18) {
-          while (1) switch (_context18.p = _context18.n) {
+      var _registerIpAndMakeDerivativeWithLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee17(request) {
+        var _request$txOptions0, tokenId, ipIdAddress, isRegistered, licenseTokenIds, calculatedDeadline, signature, _object3, txHash, receipt, log, _t23;
+        return _regenerator().w(function (_context17) {
+          while (1) switch (_context17.p = _context17.n) {
             case 0:
-              _context18.p = 0;
+              _context17.p = 0;
               tokenId = BigInt(request.tokenId);
-              _context18.n = 1;
+              _context17.n = 1;
               return getIpIdAddress({
                 nftContract: request.nftContract,
                 tokenId: tokenId,
@@ -9612,26 +9561,26 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 1:
-              ipIdAddress = _context18.v;
-              _context18.n = 2;
+              ipIdAddress = _context17.v;
+              _context17.n = 2;
               return this.isRegistered(ipIdAddress);
             case 2:
-              isRegistered = _context18.v;
+              isRegistered = _context17.v;
               if (!isRegistered) {
-                _context18.n = 3;
+                _context17.n = 3;
                 break;
               }
               throw new Error("The NFT with id ".concat(tokenId, " is already registered as IP."));
             case 3:
-              _context18.n = 4;
+              _context17.n = 4;
               return this.validateLicenseTokenIds(request.licenseTokenIds);
             case 4:
-              licenseTokenIds = _context18.v;
-              _context18.n = 5;
+              licenseTokenIds = _context17.v;
+              _context17.n = 5;
               return getCalculatedDeadline(this.rpcClient, request.deadline);
             case 5:
-              calculatedDeadline = _context18.v;
-              _context18.n = 6;
+              calculatedDeadline = _context17.v;
+              _context17.n = 6;
               return generateOperationSignature({
                 ipIdAddress: ipIdAddress,
                 methodType: SignatureMethodType.REGISTER_IP_AND_MAKE_DERIVATIVE_WITH_LICENSE_TOKENS,
@@ -9640,8 +9589,8 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 6:
-              signature = _context18.v;
-              _object4 = _objectSpread2(_objectSpread2({}, request), {}, {
+              signature = _context17.v;
+              _object3 = _objectSpread2(_objectSpread2({}, request), {}, {
                 tokenId: tokenId,
                 licenseTokenIds: licenseTokenIds,
                 royaltyContext: zeroAddress,
@@ -9651,44 +9600,43 @@ var IPAssetClient = /*#__PURE__*/function () {
                   deadline: calculatedDeadline,
                   signature: signature
                 },
-                maxRts: Number(request.maxRts)
+                maxRts: validateMaxRts(request.maxRts)
               });
-              validateMaxRts(_object4.maxRts);
-              if (!((_request$txOptions1 = request.txOptions) !== null && _request$txOptions1 !== void 0 && _request$txOptions1.encodedTxDataOnly)) {
-                _context18.n = 7;
+              if (!((_request$txOptions0 = request.txOptions) !== null && _request$txOptions0 !== void 0 && _request$txOptions0.encodedTxDataOnly)) {
+                _context17.n = 7;
                 break;
               }
-              return _context18.a(2, {
-                encodedTxData: this.derivativeWorkflowsClient.registerIpAndMakeDerivativeWithLicenseTokensEncode(_object4)
+              return _context17.a(2, {
+                encodedTxData: this.derivativeWorkflowsClient.registerIpAndMakeDerivativeWithLicenseTokensEncode(_object3)
               });
             case 7:
-              _context18.n = 8;
-              return this.derivativeWorkflowsClient.registerIpAndMakeDerivativeWithLicenseTokens(_object4);
+              _context17.n = 8;
+              return this.derivativeWorkflowsClient.registerIpAndMakeDerivativeWithLicenseTokens(_object3);
             case 8:
-              txHash = _context18.v;
-              _context18.n = 9;
+              txHash = _context17.v;
+              _context17.n = 9;
               return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
                 hash: txHash
               }));
             case 9:
-              receipt = _context18.v;
+              receipt = _context17.v;
               log = this.getIpIdAndTokenIdsFromEvent(receipt)[0];
-              return _context18.a(2, _objectSpread2({
+              return _context17.a(2, _objectSpread2({
                 txHash: txHash
               }, log));
             case 10:
-              _context18.n = 12;
+              _context17.n = 12;
               break;
             case 11:
-              _context18.p = 11;
-              _t24 = _context18.v;
-              return _context18.a(2, handleError(_t24, "Failed to register IP and make derivative with license tokens"));
+              _context17.p = 11;
+              _t23 = _context17.v;
+              return _context17.a(2, handleError(_t23, "Failed to register IP and make derivative with license tokens"));
             case 12:
-              return _context18.a(2);
+              return _context17.a(2);
           }
-        }, _callee18, this, [[0, 11]]);
+        }, _callee17, this, [[0, 11]]);
       }));
-      function registerIpAndMakeDerivativeWithLicenseTokens(_x16) {
+      function registerIpAndMakeDerivativeWithLicenseTokens(_x15) {
         return _registerIpAndMakeDerivativeWithLicenseTokens.apply(this, arguments);
       }
       return registerIpAndMakeDerivativeWithLicenseTokens;
@@ -9704,23 +9652,23 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens",
     value: (function () {
-      var _registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(request) {
-        var _getRoyaltyShares, royaltyShares, totalAmount, _yield$validateLicens4, licenseTerms, calculatedDeadline, ipIdAddress, isRegistered, _yield$transformRegis5, _transformRequest4, registerIpAndAttachPilTermsAndDeployRoyaltyVaultTxHash, txReceipt, ipId, licenseTermsIds, ipRoyaltyVault, distributeRoyaltyTokensTxHash, maxLicenseTokensTxHashes, _t25;
-        return _regenerator().w(function (_context19) {
-          while (1) switch (_context19.p = _context19.n) {
+      var _registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee18(request) {
+        var _getRoyaltyShares, royaltyShares, totalAmount, _yield$validateLicens2, licenseTerms, calculatedDeadline, ipIdAddress, isRegistered, _yield$transformRegis5, _transformRequest4, registerIpAndAttachPilTermsAndDeployRoyaltyVaultTxHash, txReceipt, ipId, licenseTermsIds, ipRoyaltyVault, distributeRoyaltyTokensTxHash, maxLicenseTokensTxHashes, _t24;
+        return _regenerator().w(function (_context18) {
+          while (1) switch (_context18.p = _context18.n) {
             case 0:
-              _context19.p = 0;
+              _context18.p = 0;
               _getRoyaltyShares = getRoyaltyShares(request.royaltyShares), royaltyShares = _getRoyaltyShares.royaltyShares, totalAmount = _getRoyaltyShares.totalAmount;
-              _context19.n = 1;
+              _context18.n = 1;
               return validateLicenseTermsData(request.licenseTermsData, this.rpcClient, this.chainId);
             case 1:
-              _yield$validateLicens4 = _context19.v;
-              licenseTerms = _yield$validateLicens4.licenseTerms;
-              _context19.n = 2;
+              _yield$validateLicens2 = _context18.v;
+              licenseTerms = _yield$validateLicens2.licenseTerms;
+              _context18.n = 2;
               return getCalculatedDeadline(this.rpcClient, request.deadline);
             case 2:
-              calculatedDeadline = _context19.v;
-              _context19.n = 3;
+              calculatedDeadline = _context18.v;
+              _context18.n = 3;
               return getIpIdAddress({
                 nftContract: validateAddress(request.nftContract),
                 tokenId: BigInt(request.tokenId),
@@ -9729,18 +9677,18 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 3:
-              ipIdAddress = _context19.v;
-              _context19.n = 4;
+              ipIdAddress = _context18.v;
+              _context18.n = 4;
               return this.isRegistered(ipIdAddress);
             case 4:
-              isRegistered = _context19.v;
+              isRegistered = _context18.v;
               if (!isRegistered) {
-                _context19.n = 5;
+                _context18.n = 5;
                 break;
               }
               throw new Error("The NFT with id ".concat(request.tokenId, " is already registered as IP."));
             case 5:
-              _context19.n = 6;
+              _context18.n = 6;
               return transformRegistrationRequest({
                 request: request,
                 rpcClient: this.rpcClient,
@@ -9748,25 +9696,25 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 6:
-              _yield$transformRegis5 = _context19.v;
+              _yield$transformRegis5 = _context18.v;
               _transformRequest4 = _yield$transformRegis5.transformRequest;
-              _context19.n = 7;
+              _context18.n = 7;
               return this.royaltyTokenDistributionWorkflowsClient.registerIpAndAttachPilTermsAndDeployRoyaltyVault(_transformRequest4);
             case 7:
-              registerIpAndAttachPilTermsAndDeployRoyaltyVaultTxHash = _context19.v;
-              _context19.n = 8;
+              registerIpAndAttachPilTermsAndDeployRoyaltyVaultTxHash = _context18.v;
+              _context18.n = 8;
               return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
                 hash: registerIpAndAttachPilTermsAndDeployRoyaltyVaultTxHash
               }));
             case 8:
-              txReceipt = _context19.v;
+              txReceipt = _context18.v;
               ipId = this.getIpIdAndTokenIdsFromEvent(txReceipt)[0].ipId;
-              _context19.n = 9;
+              _context18.n = 9;
               return this.getLicenseTermsId(licenseTerms);
             case 9:
-              licenseTermsIds = _context19.v;
+              licenseTermsIds = _context18.v;
               ipRoyaltyVault = this.royaltyModuleEventClient.parseTxIpRoyaltyVaultDeployedEvent(txReceipt)[0].ipRoyaltyVault;
-              _context19.n = 10;
+              _context18.n = 10;
               return this.distributeRoyaltyTokens({
                 ipId: ipId,
                 deadline: calculatedDeadline,
@@ -9776,21 +9724,23 @@ var IPAssetClient = /*#__PURE__*/function () {
                 txOptions: request.txOptions
               });
             case 10:
-              distributeRoyaltyTokensTxHash = _context19.v;
-              _context19.n = 11;
+              distributeRoyaltyTokensTxHash = _context18.v;
+              _context18.n = 11;
               return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
                 hash: distributeRoyaltyTokensTxHash
               }));
             case 11:
-              _context19.n = 12;
-              return this.setMaxLicenseTokens({
+              _context18.n = 12;
+              return setMaxLicenseTokens({
                 maxLicenseTokensData: request.licenseTermsData,
                 licensorIpId: ipId,
-                licenseTermsIds: licenseTermsIds
+                licenseTermsIds: licenseTermsIds,
+                totalLicenseTokenLimitHookClient: this.totalLicenseTokenLimitHookClient,
+                templateAddress: this.licenseTemplateAddress
               });
             case 12:
-              maxLicenseTokensTxHashes = _context19.v;
-              return _context19.a(2, _objectSpread2({
+              maxLicenseTokensTxHashes = _context18.v;
+              return _context18.a(2, _objectSpread2({
                 registerIpAndAttachPilTermsAndDeployRoyaltyVaultTxHash: registerIpAndAttachPilTermsAndDeployRoyaltyVaultTxHash,
                 distributeRoyaltyTokensTxHash: distributeRoyaltyTokensTxHash,
                 ipId: ipId,
@@ -9800,13 +9750,13 @@ var IPAssetClient = /*#__PURE__*/function () {
                 maxLicenseTokensTxHashes: maxLicenseTokensTxHashes
               }));
             case 13:
-              _context19.p = 13;
-              _t25 = _context19.v;
-              return _context19.a(2, handleError(_t25, "Failed to register IP and attach license terms and distribute royalty tokens"));
+              _context18.p = 13;
+              _t24 = _context18.v;
+              return _context18.a(2, handleError(_t24, "Failed to register IP and attach license terms and distribute royalty tokens"));
           }
-        }, _callee19, this, [[0, 13]]);
+        }, _callee18, this, [[0, 13]]);
       }));
-      function registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens(_x17) {
+      function registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens(_x16) {
         return _registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens.apply(this, arguments);
       }
       return registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens;
@@ -9821,14 +9771,14 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens",
     value: (function () {
-      var _registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee20(request) {
+      var _registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(request) {
         var _this9 = this;
-        var _request$options7, ipIdAddress, _yield$transformRegis6, _transformRequest5, _getRoyaltyShares2, royaltyShares, totalAmount, isRegistered, encodedTxData, contractCall, _yield$this$handleReg, txHash, ipId, tokenId, receipt, ipRoyaltyVault, distributeRoyaltyTokensTxHash, _t26;
-        return _regenerator().w(function (_context20) {
-          while (1) switch (_context20.p = _context20.n) {
+        var _request$options7, ipIdAddress, _yield$transformRegis6, _transformRequest5, _getRoyaltyShares2, royaltyShares, totalAmount, isRegistered, encodedTxData, contractCall, _yield$this$handleReg, txHash, ipId, tokenId, receipt, ipRoyaltyVault, distributeRoyaltyTokensTxHash, _t25;
+        return _regenerator().w(function (_context19) {
+          while (1) switch (_context19.p = _context19.n) {
             case 0:
-              _context20.p = 0;
-              _context20.n = 1;
+              _context19.p = 0;
+              _context19.n = 1;
               return getIpIdAddress({
                 nftContract: validateAddress(request.nftContract),
                 tokenId: BigInt(request.tokenId),
@@ -9837,8 +9787,8 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 1:
-              ipIdAddress = _context20.v;
-              _context20.n = 2;
+              ipIdAddress = _context19.v;
+              _context19.n = 2;
               return transformRegistrationRequest({
                 request: request,
                 rpcClient: this.rpcClient,
@@ -9846,15 +9796,15 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 2:
-              _yield$transformRegis6 = _context20.v;
+              _yield$transformRegis6 = _context19.v;
               _transformRequest5 = _yield$transformRegis6.transformRequest;
               _getRoyaltyShares2 = getRoyaltyShares(request.royaltyShares), royaltyShares = _getRoyaltyShares2.royaltyShares, totalAmount = _getRoyaltyShares2.totalAmount;
-              _context20.n = 3;
+              _context19.n = 3;
               return this.isRegistered(ipIdAddress);
             case 3:
-              isRegistered = _context20.v;
+              isRegistered = _context19.v;
               if (!isRegistered) {
-                _context20.n = 4;
+                _context19.n = 4;
                 break;
               }
               throw new Error("The NFT with id ".concat(request.tokenId, " is already registered as IP."));
@@ -9863,7 +9813,7 @@ var IPAssetClient = /*#__PURE__*/function () {
               contractCall = function contractCall() {
                 return _this9.royaltyTokenDistributionWorkflowsClient.registerIpAndMakeDerivativeAndDeployRoyaltyVault(_transformRequest5);
               };
-              _context20.n = 5;
+              _context19.n = 5;
               return this.handleRegistrationWithFees({
                 wipOptions: _objectSpread2(_objectSpread2({}, (_request$options7 = request.options) === null || _request$options7 === void 0 ? void 0 : _request$options7.wipOptions), {}, {
                   useMulticallWhenPossible: false
@@ -9876,13 +9826,13 @@ var IPAssetClient = /*#__PURE__*/function () {
                 txOptions: _objectSpread2({}, request.txOptions)
               });
             case 5:
-              _yield$this$handleReg = _context20.v;
+              _yield$this$handleReg = _context19.v;
               txHash = _yield$this$handleReg.txHash;
               ipId = _yield$this$handleReg.ipId;
               tokenId = _yield$this$handleReg.tokenId;
               receipt = _yield$this$handleReg.receipt;
               if (!(tokenId === undefined || !ipId || !receipt)) {
-                _context20.n = 6;
+                _context19.n = 6;
                 break;
               }
               throw new Error("Failed to register derivative ip and deploy royalty vault.");
@@ -9890,7 +9840,7 @@ var IPAssetClient = /*#__PURE__*/function () {
               ipRoyaltyVault = this.royaltyModuleEventClient.parseTxIpRoyaltyVaultDeployedEvent(receipt).filter(function (item) {
                 return item.ipId === ipId;
               })[0].ipRoyaltyVault;
-              _context20.n = 7;
+              _context19.n = 7;
               return this.distributeRoyaltyTokens({
                 ipId: ipId,
                 deadline: request.deadline,
@@ -9900,13 +9850,13 @@ var IPAssetClient = /*#__PURE__*/function () {
                 txOptions: request.txOptions
               });
             case 7:
-              distributeRoyaltyTokensTxHash = _context20.v;
-              _context20.n = 8;
+              distributeRoyaltyTokensTxHash = _context19.v;
+              _context19.n = 8;
               return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
                 hash: distributeRoyaltyTokensTxHash
               }));
             case 8:
-              return _context20.a(2, {
+              return _context19.a(2, {
                 registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokensTxHash: txHash,
                 distributeRoyaltyTokensTxHash: distributeRoyaltyTokensTxHash,
                 ipId: ipId,
@@ -9914,13 +9864,13 @@ var IPAssetClient = /*#__PURE__*/function () {
                 ipRoyaltyVault: ipRoyaltyVault
               });
             case 9:
-              _context20.p = 9;
-              _t26 = _context20.v;
-              return _context20.a(2, handleError(_t26, "Failed to register derivative IP and attach license terms and distribute royalty tokens"));
+              _context19.p = 9;
+              _t25 = _context19.v;
+              return _context19.a(2, handleError(_t25, "Failed to register derivative IP and attach license terms and distribute royalty tokens"));
           }
-        }, _callee20, this, [[0, 9]]);
+        }, _callee19, this, [[0, 9]]);
       }));
-      function registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens(_x18) {
+      function registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens(_x17) {
         return _registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens.apply(this, arguments);
       }
       return registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens;
@@ -9934,19 +9884,19 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens",
     value: (function () {
-      var _mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee21(request) {
+      var _mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee20(request) {
         var _this0 = this;
-        var _request$options8, _yield$validateLicens5, licenseTerms, _yield$transformRegis7, _transformRequest6, encodedTxData, contractCall, _yield$this$handleReg2, txHash, ipId, tokenId, receipt, licenseTermsIds, ipRoyaltyVault, maxLicenseTokensTxHashes, _t27;
-        return _regenerator().w(function (_context21) {
-          while (1) switch (_context21.p = _context21.n) {
+        var _request$options8, _yield$validateLicens3, licenseTerms, _yield$transformRegis7, _transformRequest6, encodedTxData, contractCall, _yield$this$handleReg2, txHash, ipId, tokenId, receipt, licenseTermsIds, ipRoyaltyVault, maxLicenseTokensTxHashes, _t26;
+        return _regenerator().w(function (_context20) {
+          while (1) switch (_context20.p = _context20.n) {
             case 0:
-              _context21.p = 0;
-              _context21.n = 1;
+              _context20.p = 0;
+              _context20.n = 1;
               return validateLicenseTermsData(request.licenseTermsData, this.rpcClient, this.chainId);
             case 1:
-              _yield$validateLicens5 = _context21.v;
-              licenseTerms = _yield$validateLicens5.licenseTerms;
-              _context21.n = 2;
+              _yield$validateLicens3 = _context20.v;
+              licenseTerms = _yield$validateLicens3.licenseTerms;
+              _context20.n = 2;
               return transformRegistrationRequest({
                 request: request,
                 rpcClient: this.rpcClient,
@@ -9954,13 +9904,13 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 2:
-              _yield$transformRegis7 = _context21.v;
+              _yield$transformRegis7 = _context20.v;
               _transformRequest6 = _yield$transformRegis7.transformRequest;
               encodedTxData = this.royaltyTokenDistributionWorkflowsClient.mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokensEncode(_transformRequest6);
               contractCall = function contractCall() {
                 return _this0.royaltyTokenDistributionWorkflowsClient.mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens(_transformRequest6);
               };
-              _context21.n = 3;
+              _context20.n = 3;
               return this.handleRegistrationWithFees({
                 wipOptions: (_request$options8 = request.options) === null || _request$options8 === void 0 ? void 0 : _request$options8.wipOptions,
                 sender: this.walletAddress,
@@ -9971,33 +9921,35 @@ var IPAssetClient = /*#__PURE__*/function () {
                 txOptions: request.txOptions
               });
             case 3:
-              _yield$this$handleReg2 = _context21.v;
+              _yield$this$handleReg2 = _context20.v;
               txHash = _yield$this$handleReg2.txHash;
               ipId = _yield$this$handleReg2.ipId;
               tokenId = _yield$this$handleReg2.tokenId;
               receipt = _yield$this$handleReg2.receipt;
               if (receipt) {
-                _context21.n = 4;
+                _context20.n = 4;
                 break;
               }
-              return _context21.a(2, {
+              return _context20.a(2, {
                 txHash: txHash
               });
             case 4:
-              _context21.n = 5;
+              _context20.n = 5;
               return this.getLicenseTermsId(licenseTerms);
             case 5:
-              licenseTermsIds = _context21.v;
+              licenseTermsIds = _context20.v;
               ipRoyaltyVault = this.royaltyModuleEventClient.parseTxIpRoyaltyVaultDeployedEvent(receipt)[0].ipRoyaltyVault;
-              _context21.n = 6;
-              return this.setMaxLicenseTokens({
+              _context20.n = 6;
+              return setMaxLicenseTokens({
                 maxLicenseTokensData: request.licenseTermsData,
                 licensorIpId: ipId,
-                licenseTermsIds: licenseTermsIds
+                licenseTermsIds: licenseTermsIds,
+                totalLicenseTokenLimitHookClient: this.totalLicenseTokenLimitHookClient,
+                templateAddress: this.licenseTemplateAddress
               });
             case 6:
-              maxLicenseTokensTxHashes = _context21.v;
-              return _context21.a(2, _objectSpread2({
+              maxLicenseTokensTxHashes = _context20.v;
+              return _context20.a(2, _objectSpread2({
                 txHash: txHash,
                 ipId: ipId,
                 licenseTermsIds: licenseTermsIds,
@@ -10007,13 +9959,13 @@ var IPAssetClient = /*#__PURE__*/function () {
                 maxLicenseTokensTxHashes: maxLicenseTokensTxHashes
               }));
             case 7:
-              _context21.p = 7;
-              _t27 = _context21.v;
-              return _context21.a(2, handleError(_t27, "Failed to mint and register IP and attach PIL terms and distribute royalty tokens"));
+              _context20.p = 7;
+              _t26 = _context20.v;
+              return _context20.a(2, handleError(_t26, "Failed to mint and register IP and attach PIL terms and distribute royalty tokens"));
           }
-        }, _callee21, this, [[0, 7]]);
+        }, _callee20, this, [[0, 7]]);
       }));
-      function mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens(_x19) {
+      function mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens(_x18) {
         return _mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens.apply(this, arguments);
       }
       return mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens;
@@ -10027,14 +9979,14 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens",
     value: (function () {
-      var _mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(request) {
+      var _mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee21(request) {
         var _this1 = this;
-        var _request$options9, _yield$transformRegis8, _transformRequest7, encodedTxData, contractCall, _t28;
-        return _regenerator().w(function (_context22) {
-          while (1) switch (_context22.p = _context22.n) {
+        var _request$options9, _yield$transformRegis8, _transformRequest7, encodedTxData, contractCall, _t27;
+        return _regenerator().w(function (_context21) {
+          while (1) switch (_context21.p = _context21.n) {
             case 0:
-              _context22.p = 0;
-              _context22.n = 1;
+              _context21.p = 0;
+              _context21.n = 1;
               return transformRegistrationRequest({
                 request: request,
                 rpcClient: this.rpcClient,
@@ -10042,13 +9994,13 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 1:
-              _yield$transformRegis8 = _context22.v;
+              _yield$transformRegis8 = _context21.v;
               _transformRequest7 = _yield$transformRegis8.transformRequest;
               encodedTxData = this.royaltyTokenDistributionWorkflowsClient.mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokensEncode(_transformRequest7);
               contractCall = function contractCall() {
                 return _this1.royaltyTokenDistributionWorkflowsClient.mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens(_transformRequest7);
               };
-              _context22.n = 2;
+              _context21.n = 2;
               return this.handleRegistrationWithFees({
                 spgNftContract: _transformRequest7.spgNftContract,
                 wipOptions: (_request$options9 = request.options) === null || _request$options9 === void 0 ? void 0 : _request$options9.wipOptions,
@@ -10060,15 +10012,15 @@ var IPAssetClient = /*#__PURE__*/function () {
                 txOptions: request.txOptions
               });
             case 2:
-              return _context22.a(2, _context22.v);
+              return _context21.a(2, _context21.v);
             case 3:
-              _context22.p = 3;
-              _t28 = _context22.v;
-              return _context22.a(2, handleError(_t28, "Failed to mint and register IP and make derivative and distribute royalty tokens"));
+              _context21.p = 3;
+              _t27 = _context21.v;
+              return _context21.a(2, handleError(_t27, "Failed to mint and register IP and make derivative and distribute royalty tokens"));
           }
-        }, _callee22, this, [[0, 3]]);
+        }, _callee21, this, [[0, 3]]);
       }));
-      function mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens(_x20) {
+      function mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens(_x19) {
         return _mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens.apply(this, arguments);
       }
       return mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens;
@@ -10076,12 +10028,12 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "distributeRoyaltyTokens",
     value: function () {
-      var _distributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee23(request) {
+      var _distributeRoyaltyTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(request) {
         var _yield$transferDistri, transformRequest, txHash;
-        return _regenerator().w(function (_context23) {
-          while (1) switch (_context23.n) {
+        return _regenerator().w(function (_context22) {
+          while (1) switch (_context22.n) {
             case 0:
-              _context23.n = 1;
+              _context22.n = 1;
               return transferDistributeRoyaltyTokensRequest({
                 request: request,
                 rpcClient: this.rpcClient,
@@ -10089,22 +10041,22 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 1:
-              _yield$transferDistri = _context23.v;
+              _yield$transferDistri = _context22.v;
               transformRequest = _yield$transferDistri.transformRequest;
-              _context23.n = 2;
+              _context22.n = 2;
               return this.royaltyTokenDistributionWorkflowsClient.distributeRoyaltyTokens(transformRequest);
             case 2:
-              txHash = _context23.v;
-              _context23.n = 3;
+              txHash = _context22.v;
+              _context22.n = 3;
               return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
                 hash: txHash
               }));
             case 3:
-              return _context23.a(2, txHash);
+              return _context22.a(2, txHash);
           }
-        }, _callee23, this);
+        }, _callee22, this);
       }));
-      function distributeRoyaltyTokens(_x21) {
+      function distributeRoyaltyTokens(_x20) {
         return _distributeRoyaltyTokens.apply(this, arguments);
       }
       return distributeRoyaltyTokens;
@@ -10112,20 +10064,20 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "isRegistered",
     value: function () {
-      var _isRegistered = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee24(ipId) {
-        return _regenerator().w(function (_context24) {
-          while (1) switch (_context24.n) {
+      var _isRegistered = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee23(ipId) {
+        return _regenerator().w(function (_context23) {
+          while (1) switch (_context23.n) {
             case 0:
-              _context24.n = 1;
+              _context23.n = 1;
               return this.ipAssetRegistryClient.isRegistered({
                 id: validateAddress(ipId)
               });
             case 1:
-              return _context24.a(2, _context24.v);
+              return _context23.a(2, _context23.v);
           }
-        }, _callee24, this);
+        }, _callee23, this);
       }));
-      function isRegistered(_x22) {
+      function isRegistered(_x21) {
         return _isRegistered.apply(this, arguments);
       }
       return isRegistered;
@@ -10169,24 +10121,24 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "batchRegisterIpAssetsWithOptimizedWorkflows",
     value: (function () {
-      var _batchRegisterIpAssetsWithOptimizedWorkflows = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee25(request) {
-        var _request$options0, _request$options10, transferWorkflowRequests, _iterator6, _step6, req, res, royaltyDistributionRequests, _yield$handleMultical, txResponses, aggregateRegistrationRequest, responses, royaltyTokensDistributionRequests, _iterator7, _step7, _step7$value, txHash, receipt, iPRegisteredLog, ipRoyaltyVaultEvent, response, distributeRoyaltyTokensTxHashes, _request$options1, _yield$handleMultical2, txResponse, registrationResults, _t29, _t30, _t31;
-        return _regenerator().w(function (_context25) {
-          while (1) switch (_context25.p = _context25.n) {
+      var _batchRegisterIpAssetsWithOptimizedWorkflows = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee24(request) {
+        var _request$options0, _request$options10, transferWorkflowRequests, _iterator6, _step6, req, res, royaltyDistributionRequests, _yield$handleMultical, txResponses, aggregateRegistrationRequest, responses, royaltyTokensDistributionRequests, _iterator7, _step7, _step7$value, txHash, receipt, iPRegisteredLog, ipRoyaltyVaultEvent, response, distributeRoyaltyTokensTxHashes, _request$options1, _yield$handleMultical2, txResponse, registrationResults, _t28, _t29, _t30;
+        return _regenerator().w(function (_context24) {
+          while (1) switch (_context24.p = _context24.n) {
             case 0:
-              _context25.p = 0;
+              _context24.p = 0;
               // Transform requests into workflow format
               transferWorkflowRequests = [];
               _iterator6 = _createForOfIteratorHelper(request.requests);
-              _context25.p = 1;
+              _context24.p = 1;
               _iterator6.s();
             case 2:
               if ((_step6 = _iterator6.n()).done) {
-                _context25.n = 5;
+                _context24.n = 5;
                 break;
               }
               req = _step6.value;
-              _context25.n = 3;
+              _context24.n = 3;
               return transformRegistrationRequest({
                 request: req,
                 rpcClient: this.rpcClient,
@@ -10194,22 +10146,22 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 3:
-              res = _context25.v;
+              res = _context24.v;
               transferWorkflowRequests.push(res);
             case 4:
-              _context25.n = 2;
+              _context24.n = 2;
               break;
             case 5:
-              _context25.n = 7;
+              _context24.n = 7;
               break;
             case 6:
-              _context25.p = 6;
-              _t29 = _context25.v;
-              _iterator6.e(_t29);
+              _context24.p = 6;
+              _t28 = _context24.v;
+              _iterator6.e(_t28);
             case 7:
-              _context25.p = 7;
+              _context24.p = 7;
               _iterator6.f();
-              return _context25.f(7);
+              return _context24.f(7);
             case 8:
               /**
                * Extract royalty distribution requests from workflow responses that contain royalty shares
@@ -10227,7 +10179,7 @@ var IPAssetClient = /*#__PURE__*/function () {
                   deadline: res.extraData.deadline
                 };
               }); // Process initial registration transactions
-              _context25.n = 9;
+              _context24.n = 9;
               return handleMulticall({
                 transferWorkflowRequests: transferWorkflowRequests,
                 multicall3Address: this.multicall3Client.address,
@@ -10238,23 +10190,23 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 9:
-              _yield$handleMultical = _context25.v;
+              _yield$handleMultical = _context24.v;
               txResponses = _yield$handleMultical.response;
               aggregateRegistrationRequest = _yield$handleMultical.aggregateRegistrationRequest;
               responses = [];
               royaltyTokensDistributionRequests = []; // Process each transaction response
               _iterator7 = _createForOfIteratorHelper(txResponses);
-              _context25.p = 10;
+              _context24.p = 10;
               _iterator7.s();
             case 11:
               if ((_step7 = _iterator7.n()).done) {
-                _context25.n = 14;
+                _context24.n = 14;
                 break;
               }
               _step7$value = _step7.value, txHash = _step7$value.txHash, receipt = _step7$value.receipt;
               iPRegisteredLog = this.ipAssetRegistryClient.parseTxIpRegisteredEvent(receipt);
               ipRoyaltyVaultEvent = this.royaltyModuleEventClient.parseTxIpRoyaltyVaultDeployedEvent(receipt); // Prepare royalty distribution if needed
-              _context25.n = 12;
+              _context24.n = 12;
               return prepareRoyaltyTokensDistributionRequests({
                 royaltyDistributionRequests: royaltyDistributionRequests,
                 ipRegisteredLog: iPRegisteredLog,
@@ -10264,7 +10216,7 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 12:
-              response = _context25.v;
+              response = _context24.v;
               royaltyTokensDistributionRequests.push.apply(royaltyTokensDistributionRequests, _toConsumableArray(response));
               responses.push({
                 txHash: txHash,
@@ -10277,25 +10229,25 @@ var IPAssetClient = /*#__PURE__*/function () {
                 })
               });
             case 13:
-              _context25.n = 11;
+              _context24.n = 11;
               break;
             case 14:
-              _context25.n = 16;
+              _context24.n = 16;
               break;
             case 15:
-              _context25.p = 15;
-              _t30 = _context25.v;
-              _iterator7.e(_t30);
+              _context24.p = 15;
+              _t29 = _context24.v;
+              _iterator7.e(_t29);
             case 16:
-              _context25.p = 16;
+              _context24.p = 16;
               _iterator7.f();
-              return _context25.f(16);
+              return _context24.f(16);
             case 17:
               if (!(royaltyTokensDistributionRequests.length > 0)) {
-                _context25.n = 19;
+                _context24.n = 19;
                 break;
               }
-              _context25.n = 18;
+              _context24.n = 18;
               return handleMulticall({
                 transferWorkflowRequests: royaltyTokensDistributionRequests,
                 multicall3Address: this.multicall3Client.address,
@@ -10306,315 +10258,776 @@ var IPAssetClient = /*#__PURE__*/function () {
                 chainId: this.chainId
               });
             case 18:
-              _yield$handleMultical2 = _context25.v;
+              _yield$handleMultical2 = _context24.v;
               txResponse = _yield$handleMultical2.response;
               distributeRoyaltyTokensTxHashes = txResponse.map(function (tx) {
                 return tx.txHash;
               });
             case 19:
-              _context25.n = 20;
+              _context24.n = 20;
               return this.processResponses(responses, aggregateRegistrationRequest, ((_request$options10 = request.options) === null || _request$options10 === void 0 || (_request$options10 = _request$options10.wipOptions) === null || _request$options10 === void 0 ? void 0 : _request$options10.useMulticallWhenPossible) !== false);
             case 20:
-              registrationResults = _context25.v;
-              return _context25.a(2, _objectSpread2({
+              registrationResults = _context24.v;
+              return _context24.a(2, _objectSpread2({
                 registrationResults: registrationResults
               }, distributeRoyaltyTokensTxHashes && {
                 distributeRoyaltyTokensTxHashes: distributeRoyaltyTokensTxHashes
               }));
             case 21:
-              _context25.p = 21;
-              _t31 = _context25.v;
-              return _context25.a(2, handleError(_t31, "Failed to batch register IP assets with optimized workflows"));
+              _context24.p = 21;
+              _t30 = _context24.v;
+              return _context24.a(2, handleError(_t30, "Failed to batch register IP assets with optimized workflows"));
           }
-        }, _callee25, this, [[10, 15, 16, 17], [1, 6, 7, 8], [0, 21]]);
+        }, _callee24, this, [[10, 15, 16, 17], [1, 6, 7, 8], [0, 21]]);
       }));
-      function batchRegisterIpAssetsWithOptimizedWorkflows(_x23) {
+      function batchRegisterIpAssetsWithOptimizedWorkflows(_x22) {
         return _batchRegisterIpAssetsWithOptimizedWorkflows.apply(this, arguments);
       }
       return batchRegisterIpAssetsWithOptimizedWorkflows;
-    }())
+    }()
+    /**
+     * Register an IP asset, supporting both minted and mint-on-demand NFTs, with optional `licenseTermsData` and `royaltyShares`.
+     *
+     * This method automatically selects and calls the appropriate workflow from 6 available methods based on your input parameters.
+     * Here are three common usage patterns:
+     *
+     * **1. Minted NFT with License Terms and Royalty Distribution:**
+     * ```typescript
+     * const result = await client.ipAsset.registerIpAsset({
+     *   nft: { type: "minted", nftContract: "0x...", tokenId: 1n },
+     *   licenseTermsData: [
+     *     {
+     *       terms: PILFlavor.commercialRemix({
+     *         defaultMintingFee: 10000n,
+     *         commercialRevShare: 100,
+     *         currency: "0x..."
+     *       })
+     *     }
+     *   ],
+     *   royaltyShares: [
+     *     { recipient: "0x...", percentage: 100 }
+     *   ]
+     * });
+     * ```
+     *
+     * **2. Minted NFT with Basic License Terms:**
+     * ```typescript
+     * const result = await client.ipAsset.registerIpAsset({
+     *   nft: { type: "minted", nftContract: "0x...", tokenId: 1n },
+     *   licenseTermsData: [
+     *     {
+     *       terms: PILFlavor.nonCommercialSocialRemixing()
+     *     }
+     *   ]
+     * });
+     * ```
+     *
+     * **3. Mint NFT with IP Asset:**
+     * ```typescript
+     * const result = await client.ipAsset.registerIpAsset({
+     *   nft: { type: "mint", spgNftContract: "0x...", recipient: "0x...", allowDuplicates: false },
+     * });
+     * ```
+     *
+     * **Supported Workflows (6 methods automatically selected based on parameters):**
+     * - {@link registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens} - Register IP with license terms and royalty distribution
+     * - {@link registerIpAndAttachPilTerms} - Register IP with license terms
+     * - {@link register} - Register basic IP asset
+     * - {@link mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens} - Mint NFT and register IP with license terms and royalty distribution
+     * - {@link mintAndRegisterIpAssetWithPilTerms} - Mint NFT and register IP with license terms
+     * - {@link mintAndRegisterIp} - Mint NFT and register basic IP asset
+     *
+     * **Automatic Token Handling:**
+     * - If the wallet's IP token balance is insufficient to cover minting fees, it automatically wraps native IP tokens into WIP tokens.
+     * - It checks allowances for all required spenders and automatically approves them if their current allowance is lower than needed.
+     * - These automatic processes can be configured through the `wipOptions` parameter to control behavior like multicall usage and approval settings.
+     *
+     * @throws {Error} If the NFT type is invalid.
+     * @throws {Error} If `licenseTermsData` is not provided when `royaltyShares` are specified.
+     *
+     */
+    )
   }, {
-    key: "getLicenseTermsId",
-    value: function () {
-      var _getLicenseTermsId = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee26(licenseTerms) {
-        var licenseTermsIds, _iterator8, _step8, licenseTerm, licenseRes, _t32;
-        return _regenerator().w(function (_context26) {
-          while (1) switch (_context26.p = _context26.n) {
+    key: "registerIpAsset",
+    value: (function () {
+      var _registerIpAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee25(request) {
+        var nft, licenseTermsData, royaltyShares, _t31;
+        return _regenerator().w(function (_context25) {
+          while (1) switch (_context25.p = _context25.n) {
             case 0:
-              licenseTermsIds = [];
-              _iterator8 = _createForOfIteratorHelper(licenseTerms);
-              _context26.p = 1;
-              _iterator8.s();
-            case 2:
-              if ((_step8 = _iterator8.n()).done) {
-                _context26.n = 5;
+              _context25.p = 0;
+              nft = request.nft, licenseTermsData = request.licenseTermsData, royaltyShares = request.royaltyShares; // Validate royalty shares without license terms
+              if (!(royaltyShares && !licenseTermsData)) {
+                _context25.n = 1;
                 break;
               }
-              licenseTerm = _step8.value;
-              _context26.n = 3;
-              return this.licenseTemplateClient.getLicenseTermsId({
-                terms: licenseTerm
-              });
+              throw new Error("License terms data must be provided when royalty shares are specified.");
+            case 1:
+              if (!(nft.type === "minted")) {
+                _context25.n = 3;
+                break;
+              }
+              _context25.n = 2;
+              return this.handleMintedNftRegistration(request);
+            case 2:
+              return _context25.a(2, _context25.v);
             case 3:
-              licenseRes = _context26.v;
-              licenseTermsIds.push(licenseRes.selectedLicenseTermsId);
+              if (!(nft.type === "mint")) {
+                _context25.n = 5;
+                break;
+              }
+              _context25.n = 4;
+              return this.handleMintNftRegistration(request);
             case 4:
-              _context26.n = 2;
-              break;
+              return _context25.a(2, _context25.v);
             case 5:
-              _context26.n = 7;
-              break;
+              throw new Error("Invalid NFT type");
             case 6:
-              _context26.p = 6;
-              _t32 = _context26.v;
-              _iterator8.e(_t32);
+              _context25.n = 8;
+              break;
             case 7:
-              _context26.p = 7;
-              _iterator8.f();
-              return _context26.f(7);
+              _context25.p = 7;
+              _t31 = _context25.v;
+              return _context25.a(2, handleError(_t31, "Failed to register IP Asset"));
             case 8:
-              return _context26.a(2, licenseTermsIds);
+              return _context25.a(2);
           }
-        }, _callee26, this, [[1, 6, 7, 8]]);
+        }, _callee25, this, [[0, 7]]);
       }));
-      function getLicenseTermsId(_x24) {
-        return _getLicenseTermsId.apply(this, arguments);
+      function registerIpAsset(_x23) {
+        return _registerIpAsset.apply(this, arguments);
       }
-      return getLicenseTermsId;
+      return registerIpAsset;
     }()
+    /**
+     * Register a derivative IP asset, supporting both minted and mint-on-demand NFTs, with optional `derivData`, `royaltyShares` and `licenseTokenIds`.
+     *
+     * This method automatically selects and calls the appropriate workflow from 6 available methods based on your input parameters.
+     * Here are three common usage patterns:
+     *
+     * **1. Minted NFT with License Terms and Royalty Distribution:**
+     * ```typescript
+     * const result = await client.ipAsset.registerDerivativeIpAsset({
+     *   nft: { type: "minted", nftContract: "0x...", tokenId: 1n },
+     *   derivData: {
+     *     parentIpIds: ["0x..."],
+     *     licenseTermsIds: [1n],
+     *     maxMintingFee: 10000n,
+     *     maxRevenueShare: 100
+     *   },
+     *   royaltyShares: [
+     *     { recipient: "0x...", percentage: 100 }
+     *   ]
+     * });
+     * ```
+     *
+     * **2. Minted NFT with Basic Derivative Registration:**
+     * ```typescript
+     * const result = await client.ipAsset.registerDerivativeIpAsset({
+     *   nft: { type: "minted", nftContract: "0x...", tokenId: 1n },
+     *   derivData: {
+     *     parentIpIds: ["0x..."],
+     *     licenseTermsIds: [1n],
+     *     maxMintingFee: 10000n,
+     *     maxRevenueShare: 100
+     *   }
+     * });
+     * ```
+     *
+     * **3. Mint NFT with License Token IDs:**
+     * ```typescript
+     * const result = await client.ipAsset.registerDerivativeIpAsset({
+     *   nft: { type: "mint", spgNftContract: "0x...", recipient: "0x...", allowDuplicates: false },
+     *   licenseTokenIds: [1, 2, 3],
+     * });
+     * ```
+     *
+     * **Supported Workflows (6 methods automatically selected based on parameters):**
+     * - {@link registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens} - Register derivative with license terms and royalty distribution
+     * - {@link registerDerivativeIp} - Register derivative with basic derivative data
+     * - {@link registerIpAndMakeDerivativeWithLicenseTokens} - Register derivative using existing license tokens
+     * - {@link mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens} - Mint NFT and register as derivative with royalty distribution
+     * - {@link mintAndRegisterIpAndMakeDerivative} - Mint NFT and register as derivative
+     * - {@link mintAndRegisterIpAndMakeDerivativeWithLicenseTokens} - Mint NFT and register as derivative using license tokens
+     *
+     * **Automatic Token Handling:**
+     * - If the wallet's IP token balance is insufficient to cover minting fees, it automatically wraps native IP tokens into WIP tokens.
+     * - It checks allowances for all required spenders and automatically approves them if their current allowance is lower than needed.
+     * - These automatic processes can be configured through the `wipOptions` parameter to control behavior like multicall usage and approval settings.
+     *
+     * @throws {Error} If `derivData` is not provided when `royaltyShares` are provided.
+     * @throws {Error} If neither `derivData` nor `licenseTokenIds` are provided.
+     * @throws {Error} If the NFT type is invalid.
+     */
+    )
   }, {
-    key: "validateLicenseTokenIds",
-    value: function () {
-      var _validateLicenseTokenIds = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee27(licenseTokenIds) {
-        var newLicenseTokenIds, _iterator9, _step9, licenseTokenId, tokenOwnerAddress, _t33;
-        return _regenerator().w(function (_context27) {
-          while (1) switch (_context27.p = _context27.n) {
+    key: "registerDerivativeIpAsset",
+    value: (function () {
+      var _registerDerivativeIpAsset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee26(request) {
+        var nft, licenseTokenIds, royaltyShares, derivData, hasDerivData, hasLicenseTokens, _t32;
+        return _regenerator().w(function (_context26) {
+          while (1) switch (_context26.p = _context26.n) {
             case 0:
-              if (!(licenseTokenIds.length === 0)) {
-                _context27.n = 1;
+              _context26.p = 0;
+              nft = request.nft, licenseTokenIds = request.licenseTokenIds, royaltyShares = request.royaltyShares, derivData = request.derivData;
+              if (!(royaltyShares && !derivData)) {
+                _context26.n = 1;
                 break;
               }
-              throw new Error("License token IDs must be provided.");
+              throw new Error("derivData must be provided when royaltyShares are provided.");
             case 1:
-              newLicenseTokenIds = licenseTokenIds.map(function (id) {
-                return BigInt(id);
-              });
-              _iterator9 = _createForOfIteratorHelper(newLicenseTokenIds);
-              _context27.p = 2;
-              _iterator9.s();
-            case 3:
-              if ((_step9 = _iterator9.n()).done) {
-                _context27.n = 6;
+              // Validate that at least one valid combination is provided
+              hasDerivData = !!derivData;
+              hasLicenseTokens = !!(licenseTokenIds && licenseTokenIds.length > 0);
+              if (!(!hasDerivData && !hasLicenseTokens)) {
+                _context26.n = 2;
                 break;
               }
-              licenseTokenId = _step9.value;
-              _context27.n = 4;
-              return this.licenseTokenReadOnlyClient.ownerOf({
-                tokenId: licenseTokenId
-              });
+              throw new Error("Either derivData or licenseTokenIds must be provided.");
+            case 2:
+              if (!(nft.type === "minted")) {
+                _context26.n = 4;
+                break;
+              }
+              _context26.n = 3;
+              return this.handleMintedNftDerivativeRegistration(request);
+            case 3:
+              return _context26.a(2, _context26.v);
             case 4:
-              tokenOwnerAddress = _context27.v;
-              if (tokenOwnerAddress) {
-                _context27.n = 5;
+              if (!(nft.type === "mint")) {
+                _context26.n = 6;
                 break;
               }
-              throw new Error("License token id ".concat(licenseTokenId, " must be owned by the caller."));
+              _context26.n = 5;
+              return this.handleMintNftDerivativeRegistration(request);
             case 5:
-              _context27.n = 3;
-              break;
+              return _context26.a(2, _context26.v);
             case 6:
-              _context27.n = 8;
-              break;
+              throw new Error("Invalid NFT type.");
             case 7:
-              _context27.p = 7;
-              _t33 = _context27.v;
-              _iterator9.e(_t33);
+              _context26.n = 9;
+              break;
             case 8:
-              _context27.p = 8;
-              _iterator9.f();
-              return _context27.f(8);
+              _context26.p = 8;
+              _t32 = _context26.v;
+              return _context26.a(2, handleError(_t32, "Failed to register derivative IP Asset"));
             case 9:
-              return _context27.a(2, newLicenseTokenIds);
+              return _context26.a(2);
           }
-        }, _callee27, this, [[2, 7, 8, 9]]);
+        }, _callee26, this, [[0, 8]]);
       }));
-      function validateLicenseTokenIds(_x25) {
-        return _validateLicenseTokenIds.apply(this, arguments);
+      function registerDerivativeIpAsset(_x24) {
+        return _registerDerivativeIpAsset.apply(this, arguments);
       }
-      return validateLicenseTokenIds;
+      return registerDerivativeIpAsset;
     }()
+    /**
+     * Handles derivative registration for already minted NFTs with optional `derivData`, `royaltyShares` and `licenseTokenIds`.
+     *
+     * Supports the following workflows:
+     * - {@link registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens}
+     * - {@link registerDerivativeIp}
+     * - {@link registerIpAndMakeDerivativeWithLicenseTokens}
+     */
+    )
   }, {
-    key: "getIpIdAndTokenIdsFromEvent",
-    value: function getIpIdAndTokenIdsFromEvent(txReceipt, key) {
-      var ipRegisteredLog = this.ipAssetRegistryClient.parseTxIpRegisteredEvent(txReceipt);
-      return ipRegisteredLog.map(function (log) {
-        var baseResult = {
-          ipId: log.ipId,
-          tokenId: log.tokenId
-        };
-        if (key) {
-          return _objectSpread2(_objectSpread2({}, baseResult), {}, _defineProperty({}, key, log.tokenContract));
-        }
-        return baseResult;
-      });
-    }
-  }, {
-    key: "handleRegistrationWithFees",
-    value: function () {
-      var _handleRegistrationWithFees = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee28(_ref5) {
-        var _wipOptions$useMultic, _this$getIpIdAndToken, _event$ipId, _event$tokenId;
-        var sender, derivData, spgNftContract, spgSpenderAddress, txOptions, wipOptions, encodedTxs, contractCall, totalFees, wipSpenders, useMulticallWhenPossible, nftMintFee, publicMinting, totalDerivativeMintingFee, _yield$contractCallWi, txHash, receipt, event;
-        return _regenerator().w(function (_context28) {
-          while (1) switch (_context28.n) {
+    key: "handleMintedNftDerivativeRegistration",
+    value: (function () {
+      var _handleMintedNftDerivativeRegistration = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee27(request) {
+        var nft, royaltyShares, derivData, maxRts, licenseTokenIds, deadline, txOptions, options, ipMetadata, baseParams;
+        return _regenerator().w(function (_context27) {
+          while (1) switch (_context27.n) {
             case 0:
-              sender = _ref5.sender, derivData = _ref5.derivData, spgNftContract = _ref5.spgNftContract, spgSpenderAddress = _ref5.spgSpenderAddress, txOptions = _ref5.txOptions, wipOptions = _ref5.wipOptions, encodedTxs = _ref5.encodedTxs, contractCall = _ref5.contractCall;
-              totalFees = 0n;
-              wipSpenders = [];
-              useMulticallWhenPossible = (_wipOptions$useMultic = wipOptions === null || wipOptions === void 0 ? void 0 : wipOptions.useMulticallWhenPossible) !== null && _wipOptions$useMultic !== void 0 ? _wipOptions$useMultic : true; // get spg minting fee
-              if (!spgNftContract) {
-                _context28.n = 3;
+              nft = request.nft, royaltyShares = request.royaltyShares, derivData = request.derivData, maxRts = request.maxRts, licenseTokenIds = request.licenseTokenIds, deadline = request.deadline, txOptions = request.txOptions, options = request.options, ipMetadata = request.ipMetadata;
+              baseParams = {
+                nftContract: nft.nftContract,
+                tokenId: nft.tokenId,
+                ipMetadata: ipMetadata,
+                deadline: deadline,
+                txOptions: txOptions,
+                options: options
+              };
+              if (!(royaltyShares && derivData)) {
+                _context27.n = 1;
                 break;
               }
-              _context28.n = 1;
-              return calculateSPGWipMintFee(new SpgnftImplReadOnlyClient(this.rpcClient, spgNftContract));
+              return _context27.a(2, this.registerDerivativeIpAndAttachLicenseTermsAndDistributeRoyaltyTokens(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                royaltyShares: royaltyShares,
+                derivData: derivData
+              })));
             case 1:
-              nftMintFee = _context28.v;
-              _context28.n = 2;
-              return getPublicMinting(spgNftContract, this.rpcClient);
-            case 2:
-              publicMinting = _context28.v;
-              /**
-               * If the SPG NFT contract's public minting is disabled, we need to check if the caller has the `minter role`.
-               * When public minting is disabled, we can't use multicall because we need to perform additional role checks
-               * that aren't compatible with batched transactions.
-               *
-               * This is because role-based access control requires the transaction's msg.sender to be verified directly,
-               * which is not preserved when using multicall (where the multicall contract becomes the sender).
-               */
-              if (!publicMinting) {
-                useMulticallWhenPossible = false;
-              }
-              totalFees += nftMintFee;
-              wipSpenders.push({
-                address: spgNftContract,
-                amount: nftMintFee
-              });
-            case 3:
               if (!derivData) {
-                _context28.n = 5;
-                break;
-              }
-              _context28.n = 4;
-              return calculateDerivativeMintingFee({
-                derivData: derivData,
-                rpcClient: this.rpcClient,
-                wallet: this.wallet,
-                chainId: this.chainId,
-                sender: sender
-              });
-            case 4:
-              totalDerivativeMintingFee = _context28.v;
-              totalFees += totalDerivativeMintingFee;
-              if (totalDerivativeMintingFee > 0) {
-                wipSpenders.push({
-                  address: spgSpenderAddress,
-                  amount: totalDerivativeMintingFee
-                });
-              }
-            case 5:
-              if (!(totalFees < 0)) {
-                _context28.n = 6;
+                _context27.n = 2;
                 break;
               }
-              throw new Error("Total fees for registering derivative should never be negative: ".concat(totalFees));
-            case 6:
-              _context28.n = 7;
-              return contractCallWithFees({
-                totalFees: totalFees,
-                options: {
-                  wipOptions: _objectSpread2(_objectSpread2({}, wipOptions), {}, {
-                    useMulticallWhenPossible: useMulticallWhenPossible
-                  })
-                },
-                multicall3Address: this.multicall3Client.address,
-                rpcClient: this.rpcClient,
-                tokenSpenders: wipSpenders,
-                contractCall: contractCall,
-                sender: sender,
-                wallet: this.wallet,
-                txOptions: txOptions,
-                encodedTxs: encodedTxs
-              });
-            case 7:
-              _yield$contractCallWi = _context28.v;
-              txHash = _yield$contractCallWi.txHash;
-              receipt = _yield$contractCallWi.receipt;
-              event = (_this$getIpIdAndToken = this.getIpIdAndTokenIdsFromEvent(receipt)) === null || _this$getIpIdAndToken === void 0 ? void 0 : _this$getIpIdAndToken[0];
-              return _context28.a(2, _objectSpread2({
-                txHash: txHash,
-                receipt: receipt
-              }, event && {
-                ipId: (_event$ipId = event.ipId) !== null && _event$ipId !== void 0 ? _event$ipId : undefined,
-                tokenId: (_event$tokenId = event.tokenId) !== null && _event$tokenId !== void 0 ? _event$tokenId : undefined
-              }));
+              return _context27.a(2, this.registerDerivativeIp(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                derivData: derivData
+              })));
+            case 2:
+              return _context27.a(2, this.registerIpAndMakeDerivativeWithLicenseTokens(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                licenseTokenIds: licenseTokenIds,
+                maxRts: maxRts
+              })));
           }
-        }, _callee28, this);
+        }, _callee27, this);
       }));
-      function handleRegistrationWithFees(_x26) {
-        return _handleRegistrationWithFees.apply(this, arguments);
+      function handleMintedNftDerivativeRegistration(_x25) {
+        return _handleMintedNftDerivativeRegistration.apply(this, arguments);
       }
-      return handleRegistrationWithFees;
+      return handleMintedNftDerivativeRegistration;
     }()
-  }, {
-    key: "setMaxLicenseTokens",
-    value: function () {
-      var _setMaxLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee29(_ref6) {
-        var maxLicenseTokensData, licensorIpId, licenseTermsIds, licenseTermsMaxLimitTxHashes, i, maxLicenseTokens, txHash;
-        return _regenerator().w(function (_context29) {
-          while (1) switch (_context29.n) {
+    /**
+     * Handles derivative registration for minted NFTs with optional `derivData`, `royaltyShares` and `licenseTokenIds`.
+     *
+     * Supports the following workflows:
+     * - {@link mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens}
+     * - {@link mintAndRegisterIpAndMakeDerivative}
+     * - {@link mintAndRegisterIpAndMakeDerivativeWithLicenseTokens}
+     */
+    )
+  }, {
+    key: "handleMintNftDerivativeRegistration",
+    value: (function () {
+      var _handleMintNftDerivativeRegistration = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee28(request) {
+        var nft, royaltyShares, derivData, maxRts, licenseTokenIds, txOptions, options, ipMetadata, baseParams;
+        return _regenerator().w(function (_context28) {
+          while (1) switch (_context28.n) {
             case 0:
-              maxLicenseTokensData = _ref6.maxLicenseTokensData, licensorIpId = _ref6.licensorIpId, licenseTermsIds = _ref6.licenseTermsIds;
-              licenseTermsMaxLimitTxHashes = [];
-              i = 0;
+              nft = request.nft, royaltyShares = request.royaltyShares, derivData = request.derivData, maxRts = request.maxRts, licenseTokenIds = request.licenseTokenIds, txOptions = request.txOptions, options = request.options, ipMetadata = request.ipMetadata;
+              baseParams = {
+                spgNftContract: nft.spgNftContract,
+                recipient: nft.recipient,
+                allowDuplicates: nft.allowDuplicates,
+                ipMetadata: ipMetadata,
+                txOptions: txOptions,
+                options: options
+              };
+              if (!(royaltyShares && derivData)) {
+                _context28.n = 1;
+                break;
+              }
+              return _context28.a(2, this.mintAndRegisterIpAndMakeDerivativeAndDistributeRoyaltyTokens(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                royaltyShares: royaltyShares,
+                derivData: derivData
+              })));
             case 1:
-              if (!(i < maxLicenseTokensData.length)) {
-                _context29.n = 5;
+              if (!derivData) {
+                _context28.n = 2;
                 break;
               }
-              maxLicenseTokens = maxLicenseTokensData[i].maxLicenseTokens;
-              if (!(maxLicenseTokens === undefined || maxLicenseTokens < 0n)) {
-                _context29.n = 2;
+              return _context28.a(2, this.mintAndRegisterIpAndMakeDerivative(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                derivData: derivData
+              })));
+            case 2:
+              return _context28.a(2, this.mintAndRegisterIpAndMakeDerivativeWithLicenseTokens(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                licenseTokenIds: licenseTokenIds,
+                maxRts: maxRts
+              })));
+          }
+        }, _callee28, this);
+      }));
+      function handleMintNftDerivativeRegistration(_x26) {
+        return _handleMintNftDerivativeRegistration.apply(this, arguments);
+      }
+      return handleMintNftDerivativeRegistration;
+    }()
+    /**
+     * Link a derivative IP asset using parent IP's license terms or license tokens.
+     *
+     * Supports the following workflows:
+     * - {@link registerDerivative}
+     * - {@link registerDerivativeWithLicenseTokens}
+     *
+     * @example
+     * ```typescript
+     * const result = await client.ipAsset.linkDerivative({
+     *   licenseTokenIds: [1, 2, 3],
+     *   childIpId: "0x...",
+     * });
+     * ```
+     *
+     * @example
+     * ```typescript
+     * const result = await client.ipAsset.linkDerivative({
+     *   parentIpIds: ["0x..."],
+     *   licenseTermsIds: [1],
+     *   childIpId: "0x...",
+     * });
+     * ```
+     *
+     * **Automatic Token Handling:**
+     * - If the wallet's IP token balance is insufficient to cover minting fees, it automatically wraps native IP tokens into WIP tokens.
+     * - It checks allowances for all required spenders and automatically approves them if their current allowance is lower than needed.
+     * - These automatic processes can be configured through the `wipOptions` parameter to control behavior like multicall usage and approval settings.
+     */
+    )
+  }, {
+    key: "linkDerivative",
+    value: (function () {
+      var _linkDerivative = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee29(request) {
+        var _t33;
+        return _regenerator().w(function (_context29) {
+          while (1) switch (_context29.p = _context29.n) {
+            case 0:
+              _context29.p = 0;
+              if (!("parentIpIds" in request)) {
+                _context29.n = 1;
                 break;
               }
-              return _context29.a(3, 4);
+              return _context29.a(2, this.registerDerivative(request));
+            case 1:
+              return _context29.a(2, this.registerDerivativeWithLicenseTokens(request));
             case 2:
-              _context29.n = 3;
-              return this.totalLicenseTokenLimitHookClient.setTotalLicenseTokenLimit({
-                licensorIpId: licensorIpId,
-                // The contract now directly writes the `licenseTemplate` address internally,
-                // so we no longer need to pass it as a parameter
-                licenseTemplate: this.licenseTemplateClient.address,
-                licenseTermsId: licenseTermsIds[i],
-                limit: BigInt(maxLicenseTokens)
+              _context29.n = 4;
+              break;
+            case 3:
+              _context29.p = 3;
+              _t33 = _context29.v;
+              return _context29.a(2, handleError(_t33, "Failed to link derivative"));
+            case 4:
+              return _context29.a(2);
+          }
+        }, _callee29, this, [[0, 3]]);
+      }));
+      function linkDerivative(_x27) {
+        return _linkDerivative.apply(this, arguments);
+      }
+      return linkDerivative;
+    }()
+    /**
+     * Handles registration for already minted NFTs with optional license terms and royalty shares.
+     *
+     * Supports the following workflows:
+     * - {@link registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens}
+     * - {@link registerIpAndAttachPilTerms}
+     * - {@link register}
+     */
+    )
+  }, {
+    key: "handleMintedNftRegistration",
+    value: (function () {
+      var _handleMintedNftRegistration = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee30(request) {
+        var nft, ipMetadata, txOptions, licenseTermsData, royaltyShares, deadline, baseParams;
+        return _regenerator().w(function (_context30) {
+          while (1) switch (_context30.n) {
+            case 0:
+              nft = request.nft, ipMetadata = request.ipMetadata, txOptions = request.txOptions, licenseTermsData = request.licenseTermsData, royaltyShares = request.royaltyShares, deadline = request.deadline;
+              baseParams = {
+                nftContract: nft.nftContract,
+                tokenId: nft.tokenId,
+                ipMetadata: ipMetadata,
+                deadline: deadline,
+                txOptions: txOptions
+              };
+              if (!(licenseTermsData && royaltyShares)) {
+                _context30.n = 1;
+                break;
+              }
+              return _context30.a(2, this.registerIPAndAttachLicenseTermsAndDistributeRoyaltyTokens(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                licenseTermsData: licenseTermsData,
+                royaltyShares: royaltyShares
+              })));
+            case 1:
+              if (!licenseTermsData) {
+                _context30.n = 2;
+                break;
+              }
+              return _context30.a(2, this.registerIpAndAttachPilTerms(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                licenseTermsData: licenseTermsData
+              })));
+            case 2:
+              return _context30.a(2, this.register(_objectSpread2({}, baseParams)));
+          }
+        }, _callee30, this);
+      }));
+      function handleMintedNftRegistration(_x28) {
+        return _handleMintedNftRegistration.apply(this, arguments);
+      }
+      return handleMintedNftRegistration;
+    }()
+    /**
+     * Handles minting and registration of new NFTs with optional license terms and royalty shares.
+     *
+     * Supports the following workflows:
+     * - {@link mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens}
+     * - {@link mintAndRegisterIpAssetWithPilTerms}
+     * - {@link mintAndRegisterIp}
+     */
+    )
+  }, {
+    key: "handleMintNftRegistration",
+    value: (function () {
+      var _handleMintNftRegistration = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31(request) {
+        var nft, ipMetadata, txOptions, options, licenseTermsData, royaltyShares, baseParams;
+        return _regenerator().w(function (_context31) {
+          while (1) switch (_context31.n) {
+            case 0:
+              nft = request.nft, ipMetadata = request.ipMetadata, txOptions = request.txOptions, options = request.options, licenseTermsData = request.licenseTermsData, royaltyShares = request.royaltyShares;
+              baseParams = {
+                spgNftContract: nft.spgNftContract,
+                recipient: nft.recipient,
+                allowDuplicates: nft.allowDuplicates,
+                ipMetadata: ipMetadata,
+                txOptions: txOptions,
+                options: options
+              };
+              if (!(licenseTermsData && royaltyShares)) {
+                _context31.n = 1;
+                break;
+              }
+              return _context31.a(2, this.mintAndRegisterIpAndAttachPilTermsAndDistributeRoyaltyTokens(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                licenseTermsData: licenseTermsData,
+                royaltyShares: royaltyShares
+              })));
+            case 1:
+              if (!licenseTermsData) {
+                _context31.n = 2;
+                break;
+              }
+              return _context31.a(2, this.mintAndRegisterIpAssetWithPilTerms(_objectSpread2(_objectSpread2({}, baseParams), {}, {
+                licenseTermsData: licenseTermsData
+              })));
+            case 2:
+              return _context31.a(2, this.mintAndRegisterIp(_objectSpread2({}, baseParams)));
+          }
+        }, _callee31, this);
+      }));
+      function handleMintNftRegistration(_x29) {
+        return _handleMintNftRegistration.apply(this, arguments);
+      }
+      return handleMintNftRegistration;
+    }())
+  }, {
+    key: "getLicenseTermsId",
+    value: function () {
+      var _getLicenseTermsId = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee32(licenseTerms) {
+        var licenseTermsIds, _iterator8, _step8, licenseTerm, licenseRes, _t34;
+        return _regenerator().w(function (_context32) {
+          while (1) switch (_context32.p = _context32.n) {
+            case 0:
+              licenseTermsIds = [];
+              _iterator8 = _createForOfIteratorHelper(licenseTerms);
+              _context32.p = 1;
+              _iterator8.s();
+            case 2:
+              if ((_step8 = _iterator8.n()).done) {
+                _context32.n = 5;
+                break;
+              }
+              licenseTerm = _step8.value;
+              _context32.n = 3;
+              return this.licenseTemplateClient.getLicenseTermsId({
+                terms: licenseTerm
               });
             case 3:
-              txHash = _context29.v;
-              if (txHash) {
-                licenseTermsMaxLimitTxHashes.push(txHash);
+              licenseRes = _context32.v;
+              licenseTermsIds.push(licenseRes.selectedLicenseTermsId);
+            case 4:
+              _context32.n = 2;
+              break;
+            case 5:
+              _context32.n = 7;
+              break;
+            case 6:
+              _context32.p = 6;
+              _t34 = _context32.v;
+              _iterator8.e(_t34);
+            case 7:
+              _context32.p = 7;
+              _iterator8.f();
+              return _context32.f(7);
+            case 8:
+              return _context32.a(2, licenseTermsIds);
+          }
+        }, _callee32, this, [[1, 6, 7, 8]]);
+      }));
+      function getLicenseTermsId(_x30) {
+        return _getLicenseTermsId.apply(this, arguments);
+      }
+      return getLicenseTermsId;
+    }()
+  }, {
+    key: "validateLicenseTokenIds",
+    value: function () {
+      var _validateLicenseTokenIds = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee33(licenseTokenIds) {
+        var newLicenseTokenIds, _iterator9, _step9, licenseTokenId, tokenOwnerAddress, _t35;
+        return _regenerator().w(function (_context33) {
+          while (1) switch (_context33.p = _context33.n) {
+            case 0:
+              if (!(licenseTokenIds.length === 0)) {
+                _context33.n = 1;
+                break;
               }
+              throw new Error("License token IDs must be provided.");
+            case 1:
+              newLicenseTokenIds = licenseTokenIds.map(function (id) {
+                return BigInt(id);
+              });
+              _iterator9 = _createForOfIteratorHelper(newLicenseTokenIds);
+              _context33.p = 2;
+              _iterator9.s();
+            case 3:
+              if ((_step9 = _iterator9.n()).done) {
+                _context33.n = 6;
+                break;
+              }
+              licenseTokenId = _step9.value;
+              _context33.n = 4;
+              return this.licenseTokenReadOnlyClient.ownerOf({
+                tokenId: licenseTokenId
+              });
             case 4:
-              i++;
-              _context29.n = 1;
+              tokenOwnerAddress = _context33.v;
+              if (tokenOwnerAddress) {
+                _context33.n = 5;
+                break;
+              }
+              throw new Error("License token id ".concat(licenseTokenId, " must be owned by the caller."));
+            case 5:
+              _context33.n = 3;
               break;
+            case 6:
+              _context33.n = 8;
+              break;
+            case 7:
+              _context33.p = 7;
+              _t35 = _context33.v;
+              _iterator9.e(_t35);
+            case 8:
+              _context33.p = 8;
+              _iterator9.f();
+              return _context33.f(8);
+            case 9:
+              return _context33.a(2, newLicenseTokenIds);
+          }
+        }, _callee33, this, [[2, 7, 8, 9]]);
+      }));
+      function validateLicenseTokenIds(_x31) {
+        return _validateLicenseTokenIds.apply(this, arguments);
+      }
+      return validateLicenseTokenIds;
+    }()
+  }, {
+    key: "getIpIdAndTokenIdsFromEvent",
+    value: function getIpIdAndTokenIdsFromEvent(txReceipt, key) {
+      var ipRegisteredLog = this.ipAssetRegistryClient.parseTxIpRegisteredEvent(txReceipt);
+      return ipRegisteredLog.map(function (log) {
+        var baseResult = {
+          ipId: log.ipId,
+          tokenId: log.tokenId
+        };
+        if (key) {
+          return _objectSpread2(_objectSpread2({}, baseResult), {}, _defineProperty({}, key, log.tokenContract));
+        }
+        return baseResult;
+      });
+    }
+  }, {
+    key: "handleRegistrationWithFees",
+    value: function () {
+      var _handleRegistrationWithFees = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee34(_ref5) {
+        var _wipOptions$useMultic, _this$getIpIdAndToken, _event$ipId, _event$tokenId;
+        var sender, derivData, spgNftContract, spgSpenderAddress, txOptions, wipOptions, encodedTxs, contractCall, totalFees, wipSpenders, useMulticallWhenPossible, nftMintFee, publicMinting, totalDerivativeMintingFee, _yield$contractCallWi, txHash, receipt, event;
+        return _regenerator().w(function (_context34) {
+          while (1) switch (_context34.n) {
+            case 0:
+              sender = _ref5.sender, derivData = _ref5.derivData, spgNftContract = _ref5.spgNftContract, spgSpenderAddress = _ref5.spgSpenderAddress, txOptions = _ref5.txOptions, wipOptions = _ref5.wipOptions, encodedTxs = _ref5.encodedTxs, contractCall = _ref5.contractCall;
+              totalFees = 0n;
+              wipSpenders = [];
+              useMulticallWhenPossible = (_wipOptions$useMultic = wipOptions === null || wipOptions === void 0 ? void 0 : wipOptions.useMulticallWhenPossible) !== null && _wipOptions$useMultic !== void 0 ? _wipOptions$useMultic : true; // get spg minting fee
+              if (!spgNftContract) {
+                _context34.n = 3;
+                break;
+              }
+              _context34.n = 1;
+              return calculateSPGWipMintFee(new SpgnftImplReadOnlyClient(this.rpcClient, spgNftContract));
+            case 1:
+              nftMintFee = _context34.v;
+              _context34.n = 2;
+              return getPublicMinting(spgNftContract, this.rpcClient);
+            case 2:
+              publicMinting = _context34.v;
+              /**
+               * If the SPG NFT contract's public minting is disabled, we need to check if the caller has the `minter role`.
+               * When public minting is disabled, we can't use multicall because we need to perform additional role checks
+               * that aren't compatible with batched transactions.
+               *
+               * This is because role-based access control requires the transaction's msg.sender to be verified directly,
+               * which is not preserved when using multicall (where the multicall contract becomes the sender).
+               */
+              if (!publicMinting) {
+                useMulticallWhenPossible = false;
+              }
+              totalFees += nftMintFee;
+              wipSpenders.push({
+                address: spgNftContract,
+                amount: nftMintFee
+              });
+            case 3:
+              if (!derivData) {
+                _context34.n = 5;
+                break;
+              }
+              _context34.n = 4;
+              return calculateDerivativeMintingFee({
+                derivData: derivData,
+                rpcClient: this.rpcClient,
+                wallet: this.wallet,
+                chainId: this.chainId,
+                sender: sender
+              });
+            case 4:
+              totalDerivativeMintingFee = _context34.v;
+              totalFees += totalDerivativeMintingFee;
+              if (totalDerivativeMintingFee > 0) {
+                wipSpenders.push({
+                  address: spgSpenderAddress,
+                  amount: totalDerivativeMintingFee
+                });
+              }
             case 5:
-              return _context29.a(2, licenseTermsMaxLimitTxHashes);
+              if (!(totalFees < 0)) {
+                _context34.n = 6;
+                break;
+              }
+              throw new Error("Total fees for registering derivative should never be negative: ".concat(totalFees));
+            case 6:
+              _context34.n = 7;
+              return contractCallWithFees({
+                totalFees: totalFees,
+                options: {
+                  wipOptions: _objectSpread2(_objectSpread2({}, wipOptions), {}, {
+                    useMulticallWhenPossible: useMulticallWhenPossible
+                  })
+                },
+                multicall3Address: this.multicall3Client.address,
+                rpcClient: this.rpcClient,
+                tokenSpenders: wipSpenders,
+                contractCall: contractCall,
+                sender: sender,
+                wallet: this.wallet,
+                txOptions: txOptions,
+                encodedTxs: encodedTxs
+              });
+            case 7:
+              _yield$contractCallWi = _context34.v;
+              txHash = _yield$contractCallWi.txHash;
+              receipt = _yield$contractCallWi.receipt;
+              event = (_this$getIpIdAndToken = this.getIpIdAndTokenIdsFromEvent(receipt)) === null || _this$getIpIdAndToken === void 0 ? void 0 : _this$getIpIdAndToken[0];
+              return _context34.a(2, _objectSpread2({
+                txHash: txHash,
+                receipt: receipt
+              }, event && {
+                ipId: (_event$ipId = event.ipId) !== null && _event$ipId !== void 0 ? _event$ipId : undefined,
+                tokenId: (_event$tokenId = event.tokenId) !== null && _event$tokenId !== void 0 ? _event$tokenId : undefined
+              }));
           }
-        }, _callee29, this);
+        }, _callee34, this);
       }));
-      function setMaxLicenseTokens(_x27) {
-        return _setMaxLicenseTokens.apply(this, arguments);
+      function handleRegistrationWithFees(_x32) {
+        return _handleRegistrationWithFees.apply(this, arguments);
       }
-      return setMaxLicenseTokens;
+      return handleRegistrationWithFees;
     }()
     /**
      * Process the `LicenseTermsIds` and `maxLicenseTokensTxHashes` for each IP asset.
@@ -10622,69 +11035,69 @@ var IPAssetClient = /*#__PURE__*/function () {
   }, {
     key: "processResponses",
     value: (function () {
-      var _processResponses = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee30(responses, aggregateRegistrationRequest, useMulticall) {
-        var _iterator0, _step0, _step0$value, responseIndex, response, _iterator1, _step1, _Object$values$respon, _step1$value, assetIndex, ipAsset, extraData, result, _extraData, i, _response, extraDataItem, _ipAsset, _t34, _t35;
-        return _regenerator().w(function (_context30) {
-          while (1) switch (_context30.p = _context30.n) {
+      var _processResponses = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee35(responses, aggregateRegistrationRequest, useMulticall) {
+        var _iterator0, _step0, _step0$value, responseIndex, response, _iterator1, _step1, _Object$values$respon, _step1$value, assetIndex, ipAsset, extraData, result, _extraData, i, _response, extraDataItem, _ipAsset, _t36, _t37;
+        return _regenerator().w(function (_context35) {
+          while (1) switch (_context35.p = _context35.n) {
             case 0:
               if (!useMulticall) {
-                _context30.n = 15;
+                _context35.n = 15;
                 break;
               }
               _iterator0 = _createForOfIteratorHelper(responses.entries());
-              _context30.p = 1;
+              _context35.p = 1;
               _iterator0.s();
             case 2:
               if ((_step0 = _iterator0.n()).done) {
-                _context30.n = 11;
+                _context35.n = 11;
                 break;
               }
               _step0$value = _slicedToArray(_step0.value, 2), responseIndex = _step0$value[0], response = _step0$value[1];
               _iterator1 = _createForOfIteratorHelper(response.ipAssetsWithLicenseTerms.entries());
-              _context30.p = 3;
+              _context35.p = 3;
               _iterator1.s();
             case 4:
               if ((_step1 = _iterator1.n()).done) {
-                _context30.n = 7;
+                _context35.n = 7;
                 break;
               }
               _step1$value = _slicedToArray(_step1.value, 2), assetIndex = _step1$value[0], ipAsset = _step1$value[1];
               extraData = (_Object$values$respon = Object.values(aggregateRegistrationRequest)[responseIndex]) === null || _Object$values$respon === void 0 || (_Object$values$respon = _Object$values$respon.extraData) === null || _Object$values$respon === void 0 ? void 0 : _Object$values$respon[assetIndex];
-              _context30.n = 5;
+              _context35.n = 5;
               return this.processIpAssetLicenseTerms(ipAsset, extraData);
             case 5:
-              result = _context30.v;
+              result = _context35.v;
               responses[responseIndex].ipAssetsWithLicenseTerms[assetIndex] = result;
             case 6:
-              _context30.n = 4;
+              _context35.n = 4;
               break;
             case 7:
-              _context30.n = 9;
+              _context35.n = 9;
               break;
             case 8:
-              _context30.p = 8;
-              _t34 = _context30.v;
-              _iterator1.e(_t34);
+              _context35.p = 8;
+              _t36 = _context35.v;
+              _iterator1.e(_t36);
             case 9:
-              _context30.p = 9;
+              _context35.p = 9;
               _iterator1.f();
-              return _context30.f(9);
+              return _context35.f(9);
             case 10:
-              _context30.n = 2;
+              _context35.n = 2;
               break;
             case 11:
-              _context30.n = 13;
+              _context35.n = 13;
               break;
             case 12:
-              _context30.p = 12;
-              _t35 = _context30.v;
-              _iterator0.e(_t35);
+              _context35.p = 12;
+              _t37 = _context35.v;
+              _iterator0.e(_t37);
             case 13:
-              _context30.p = 13;
+              _context35.p = 13;
               _iterator0.f();
-              return _context30.f(13);
+              return _context35.f(13);
             case 14:
-              _context30.n = 19;
+              _context35.n = 19;
               break;
             case 15:
               _extraData = [];
@@ -10695,299 +11108,140 @@ var IPAssetClient = /*#__PURE__*/function () {
               i = 0;
             case 16:
               if (!(i < responses.length)) {
-                _context30.n = 19;
+                _context35.n = 19;
                 break;
               }
               _response = responses[i];
               extraDataItem = _extraData[i];
-              _context30.n = 17;
+              _context35.n = 17;
               return this.processIpAssetLicenseTerms(_response.ipAssetsWithLicenseTerms[0], extraDataItem);
             case 17:
-              _ipAsset = _context30.v;
+              _ipAsset = _context35.v;
               responses[i].ipAssetsWithLicenseTerms[0] = _ipAsset;
             case 18:
               i++;
-              _context30.n = 16;
+              _context35.n = 16;
               break;
             case 19:
-              return _context30.a(2, responses);
+              return _context35.a(2, responses);
           }
-        }, _callee30, this, [[3, 8, 9, 10], [1, 12, 13, 14]]);
+        }, _callee35, this, [[3, 8, 9, 10], [1, 12, 13, 14]]);
       }));
-      function processResponses(_x28, _x29, _x30) {
+      function processResponses(_x33, _x34, _x35) {
         return _processResponses.apply(this, arguments);
       }
       return processResponses;
     }())
-  }, {
-    key: "processIpAssetLicenseTerms",
-    value: function () {
-      var _processIpAssetLicenseTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31(ipAsset, extraData) {
-        var _extraData$licenseTer;
-        var licenseTermsIds, maxLicenseTokens, maxLicenseTokensData, maxLicenseTokensTxHashes;
-        return _regenerator().w(function (_context31) {
-          while (1) switch (_context31.n) {
-            case 0:
-              if (extraData !== null && extraData !== void 0 && (_extraData$licenseTer = extraData.licenseTermsData) !== null && _extraData$licenseTer !== void 0 && _extraData$licenseTer.length) {
-                _context31.n = 1;
-                break;
-              }
-              return _context31.a(2, ipAsset);
-            case 1:
-              _context31.n = 2;
-              return this.getLicenseTermsId(extraData.licenseTermsData.map(function (item) {
-                return item.terms;
-              }));
-            case 2:
-              licenseTermsIds = _context31.v;
-              ipAsset.licenseTermsIds = licenseTermsIds;
-              maxLicenseTokens = extraData.maxLicenseTokens;
-              if (maxLicenseTokens !== null && maxLicenseTokens !== void 0 && maxLicenseTokens.length) {
-                _context31.n = 3;
-                break;
-              }
-              return _context31.a(2, ipAsset);
-            case 3:
-              maxLicenseTokensData = maxLicenseTokens.filter(function (maxLicenseToken) {
-                return maxLicenseToken !== undefined;
-              }).map(function (maxLicenseToken) {
-                return {
-                  maxLicenseTokens: maxLicenseToken
-                };
-              });
-              _context31.n = 4;
-              return this.setMaxLicenseTokens({
-                maxLicenseTokensData: maxLicenseTokensData,
-                licensorIpId: ipAsset.ipId,
-                licenseTermsIds: licenseTermsIds
-              });
-            case 4:
-              maxLicenseTokensTxHashes = _context31.v;
-              if (maxLicenseTokensTxHashes !== null && maxLicenseTokensTxHashes !== void 0 && maxLicenseTokensTxHashes.length) {
-                ipAsset.maxLicenseTokensTxHashes = maxLicenseTokensTxHashes;
-              }
-              return _context31.a(2, ipAsset);
-          }
-        }, _callee31, this);
-      }));
-      function processIpAssetLicenseTerms(_x31, _x32) {
-        return _processIpAssetLicenseTerms.apply(this, arguments);
-      }
-      return processIpAssetLicenseTerms;
-    }()
-  }]);
-}();
-
-var LicenseClient = /*#__PURE__*/function () {
-  function LicenseClient(rpcClient, wallet, chainId) {
-    _classCallCheck(this, LicenseClient);
-    this.licensingModuleClient = new LicensingModuleClient(rpcClient, wallet);
-    this.piLicenseTemplateReadOnlyClient = new PiLicenseTemplateReadOnlyClient(rpcClient);
-    this.licenseTemplateClient = new PiLicenseTemplateClient(rpcClient, wallet);
-    this.licenseRegistryReadOnlyClient = new LicenseRegistryReadOnlyClient(rpcClient);
-    this.ipAssetRegistryClient = new IpAssetRegistryClient(rpcClient, wallet);
-    this.moduleRegistryReadOnlyClient = new ModuleRegistryReadOnlyClient(rpcClient);
-    this.multicall3Client = new Multicall3Client(rpcClient, wallet);
-    this.wipClient = new WrappedIpClient(rpcClient, wallet);
-    this.totalLicenseTokenLimitHookClient = new TotalLicenseTokenLimitHookClient(rpcClient, wallet);
-    this.rpcClient = rpcClient;
-    this.wallet = wallet;
-    this.chainId = chainId;
-    this.walletAddress = wallet.account.address;
-  }
-
-  /**
-   * Registers new license terms and return the ID of the newly registered license terms.
-   *
-   * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
-   */
-  return _createClass(LicenseClient, [{
-    key: "registerPILTerms",
-    value: (function () {
-      var _registerPILTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(request) {
-        var object, _t;
-        return _regenerator().w(function (_context) {
-          while (1) switch (_context.p = _context.n) {
-            case 0:
-              _context.p = 0;
-              object = PILFlavor.validateLicenseTerms(request, this.chainId);
-              _context.n = 1;
-              return this.registerPILTermsHelper(object, request.txOptions);
-            case 1:
-              return _context.a(2, _context.v);
-            case 2:
-              _context.p = 2;
-              _t = _context.v;
-              return _context.a(2, handleError(_t, "Failed to register license terms"));
-          }
-        }, _callee, this, [[0, 2]]);
-      }));
-      function registerPILTerms(_x) {
-        return _registerPILTerms.apply(this, arguments);
-      }
-      return registerPILTerms;
-    }()
-    /**
-     * @deprecated Use {@link PILFlavor.nonCommercialSocialRemixing} with {@link LicenseClient.registerPILTerms} instead.
-     *  The method will be removed in the `v1.4.0`.
-     *
-     * Convenient function to register a PIL non commercial social remix license to the registry
-     *
-     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%231%3A-non-commercial-social-remixing | Non Commercial Social Remixing}.
-     *
-     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
-     */
-    )
-  }, {
-    key: "registerNonComSocialRemixingPIL",
-    value: (function () {
-      var _registerNonComSocialRemixingPIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(request) {
-        var licenseTerms, _t2;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.p = _context2.n) {
-            case 0:
-              _context2.p = 0;
-              licenseTerms = PILFlavor.nonCommercialSocialRemixing();
-              _context2.n = 1;
-              return this.registerPILTermsHelper(licenseTerms, request === null || request === void 0 ? void 0 : request.txOptions);
-            case 1:
-              return _context2.a(2, _context2.v);
-            case 2:
-              _context2.p = 2;
-              _t2 = _context2.v;
-              return _context2.a(2, handleError(_t2, "Failed to register non commercial social remixing PIL"));
-          }
-        }, _callee2, this, [[0, 2]]);
-      }));
-      function registerNonComSocialRemixingPIL(_x2) {
-        return _registerNonComSocialRemixingPIL.apply(this, arguments);
-      }
-      return registerNonComSocialRemixingPIL;
-    }()
-    /**
-     * @deprecated Use {@link PILFlavor.commercialUse} with {@link LicenseClient.registerPILTerms} instead.
-     *  The method will be removed in the `v1.4.0`.
-     *
-     * Convenient function to register a PIL commercial use license to the registry.
-     *
-     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%232%3A-commercial-use | Commercial Use}.
-     *
-     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
-     */
-    )
-  }, {
-    key: "registerCommercialUsePIL",
-    value: (function () {
-      var _registerCommercialUsePIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(request) {
-        var licenseTerms, _t3;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.p = _context3.n) {
-            case 0:
-              _context3.p = 0;
-              licenseTerms = PILFlavor.commercialUse({
-                defaultMintingFee: Number(request.defaultMintingFee),
-                currency: request.currency,
-                royaltyPolicy: request.royaltyPolicyAddress
-              });
-              _context3.n = 1;
-              return this.registerPILTermsHelper(licenseTerms, request.txOptions);
-            case 1:
-              return _context3.a(2, _context3.v);
-            case 2:
-              _context3.p = 2;
-              _t3 = _context3.v;
-              return _context3.a(2, handleError(_t3, "Failed to register commercial use PIL"));
-          }
-        }, _callee3, this, [[0, 2]]);
-      }));
-      function registerCommercialUsePIL(_x3) {
-        return _registerCommercialUsePIL.apply(this, arguments);
-      }
-      return registerCommercialUsePIL;
-    }()
-    /**
-     * @deprecated Use {@link PILFlavor.commercialRemix} with {@link LicenseClient.registerPILTerms} instead.
-     *  The method will be removed in the v1.4.0.
-     *
-     * Convenient function to register a PIL commercial Remix license to the registry.
-     *
-     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%233%3A-commercial-remix | Commercial Remix }.
-     *
-     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
-     */
-    )
-  }, {
-    key: "registerCommercialRemixPIL",
-    value: (function () {
-      var _registerCommercialRemixPIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(_ref) {
-        var defaultMintingFee, currency, royaltyPolicyAddress, commercialRevShare, txOptions, licenseTerms, _t4;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.p = _context4.n) {
+  }, {
+    key: "processIpAssetLicenseTerms",
+    value: function () {
+      var _processIpAssetLicenseTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee36(ipAsset, extraData) {
+        var _extraData$licenseTer;
+        var licenseTermsIds, maxLicenseTokens, maxLicenseTokensData, maxLicenseTokensTxHashes;
+        return _regenerator().w(function (_context36) {
+          while (1) switch (_context36.n) {
             case 0:
-              defaultMintingFee = _ref.defaultMintingFee, currency = _ref.currency, royaltyPolicyAddress = _ref.royaltyPolicyAddress, commercialRevShare = _ref.commercialRevShare, txOptions = _ref.txOptions;
-              _context4.p = 1;
-              licenseTerms = PILFlavor.commercialRemix({
-                defaultMintingFee: Number(defaultMintingFee),
-                currency: currency,
-                royaltyPolicy: royaltyPolicyAddress,
-                commercialRevShare: commercialRevShare
-              });
-              _context4.n = 2;
-              return this.registerPILTermsHelper(licenseTerms, txOptions);
+              if (extraData !== null && extraData !== void 0 && (_extraData$licenseTer = extraData.licenseTermsData) !== null && _extraData$licenseTer !== void 0 && _extraData$licenseTer.length) {
+                _context36.n = 1;
+                break;
+              }
+              return _context36.a(2, ipAsset);
+            case 1:
+              _context36.n = 2;
+              return this.getLicenseTermsId(extraData.licenseTermsData.map(function (item) {
+                return item.terms;
+              }));
             case 2:
-              return _context4.a(2, _context4.v);
+              licenseTermsIds = _context36.v;
+              ipAsset.licenseTermsIds = licenseTermsIds;
+              maxLicenseTokens = extraData.maxLicenseTokens;
+              if (maxLicenseTokens !== null && maxLicenseTokens !== void 0 && maxLicenseTokens.length) {
+                _context36.n = 3;
+                break;
+              }
+              return _context36.a(2, ipAsset);
             case 3:
-              _context4.p = 3;
-              _t4 = _context4.v;
-              return _context4.a(2, handleError(_t4, "Failed to register commercial remix PIL"));
+              maxLicenseTokensData = maxLicenseTokens.filter(function (maxLicenseToken) {
+                return maxLicenseToken !== undefined;
+              }).map(function (maxLicenseToken) {
+                return {
+                  maxLicenseTokens: maxLicenseToken
+                };
+              });
+              _context36.n = 4;
+              return setMaxLicenseTokens({
+                maxLicenseTokensData: maxLicenseTokensData,
+                licensorIpId: ipAsset.ipId,
+                licenseTermsIds: licenseTermsIds,
+                totalLicenseTokenLimitHookClient: this.totalLicenseTokenLimitHookClient,
+                templateAddress: this.licenseTemplateAddress
+              });
+            case 4:
+              maxLicenseTokensTxHashes = _context36.v;
+              if (maxLicenseTokensTxHashes !== null && maxLicenseTokensTxHashes !== void 0 && maxLicenseTokensTxHashes.length) {
+                ipAsset.maxLicenseTokensTxHashes = maxLicenseTokensTxHashes;
+              }
+              return _context36.a(2, ipAsset);
           }
-        }, _callee4, this, [[1, 3]]);
+        }, _callee36, this);
       }));
-      function registerCommercialRemixPIL(_x4) {
-        return _registerCommercialRemixPIL.apply(this, arguments);
+      function processIpAssetLicenseTerms(_x36, _x37) {
+        return _processIpAssetLicenseTerms.apply(this, arguments);
       }
-      return registerCommercialRemixPIL;
+      return processIpAssetLicenseTerms;
     }()
-    /**
-     * @deprecated Use {@link PILFlavor.creativeCommonsAttribution} with {@link LicenseClient.registerPILTerms} instead.
-     *  The method will be removed in the `v1.4.0`.
-     *
-     * Convenient function to register a PIL creative commons attribution license to the registry.
-     * Creates a Creative Commons Attribution (CC-BY) license terms flavor.
-     *
-     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%234%3A-creative-commons-attribution | Creative Commons Attribution}.
-     *
-     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
-     */
-    )
-  }, {
-    key: "registerCreativeCommonsAttributionPIL",
+  }]);
+}();
+
+var LicenseClient = /*#__PURE__*/function () {
+  function LicenseClient(rpcClient, wallet, chainId) {
+    _classCallCheck(this, LicenseClient);
+    this.licensingModuleClient = new LicensingModuleClient(rpcClient, wallet);
+    this.piLicenseTemplateReadOnlyClient = new PiLicenseTemplateReadOnlyClient(rpcClient);
+    this.licenseTemplateClient = new PiLicenseTemplateClient(rpcClient, wallet);
+    this.licenseRegistryReadOnlyClient = new LicenseRegistryReadOnlyClient(rpcClient);
+    this.ipAssetRegistryClient = new IpAssetRegistryClient(rpcClient, wallet);
+    this.moduleRegistryReadOnlyClient = new ModuleRegistryReadOnlyClient(rpcClient);
+    this.multicall3Client = new Multicall3Client(rpcClient, wallet);
+    this.wipClient = new WrappedIpClient(rpcClient, wallet);
+    this.totalLicenseTokenLimitHookClient = new TotalLicenseTokenLimitHookClient(rpcClient, wallet);
+    this.licenseAttachmentWorkflowsClient = new LicenseAttachmentWorkflowsClient(rpcClient, wallet);
+    this.rpcClient = rpcClient;
+    this.wallet = wallet;
+    this.chainId = chainId;
+    this.walletAddress = wallet.account.address;
+  }
+
+  /**
+   * Registers new license terms and return the ID of the newly registered license terms.
+   *
+   * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
+   */
+  return _createClass(LicenseClient, [{
+    key: "registerPILTerms",
     value: (function () {
-      var _registerCreativeCommonsAttributionPIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(_ref2) {
-        var currency, royaltyPolicyAddress, txOptions, _t5;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.p = _context5.n) {
+      var _registerPILTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(request) {
+        var object, _t;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.p = _context.n) {
             case 0:
-              currency = _ref2.currency, royaltyPolicyAddress = _ref2.royaltyPolicyAddress, txOptions = _ref2.txOptions;
-              _context5.p = 1;
-              _context5.n = 2;
-              return this.registerPILTermsHelper(PILFlavor.creativeCommonsAttribution({
-                currency: currency,
-                royaltyPolicy: royaltyPolicyAddress
-              }), txOptions);
+              _context.p = 0;
+              object = PILFlavor.validateLicenseTerms(request, this.chainId);
+              _context.n = 1;
+              return this.registerPILTermsHelper(object, request.txOptions);
+            case 1:
+              return _context.a(2, _context.v);
             case 2:
-              return _context5.a(2, _context5.v);
-            case 3:
-              _context5.p = 3;
-              _t5 = _context5.v;
-              return _context5.a(2, handleError(_t5, "Failed to register creative commons attribution PIL"));
+              _context.p = 2;
+              _t = _context.v;
+              return _context.a(2, handleError(_t, "Failed to register license terms"));
           }
-        }, _callee5, this, [[1, 3]]);
+        }, _callee, this, [[0, 2]]);
       }));
-      function registerCreativeCommonsAttributionPIL(_x5) {
-        return _registerCreativeCommonsAttributionPIL.apply(this, arguments);
+      function registerPILTerms(_x) {
+        return _registerPILTerms.apply(this, arguments);
       }
-      return registerCreativeCommonsAttributionPIL;
+      return registerPILTerms;
     }()
     /**
      * Attaches license terms to an IP.
@@ -10996,50 +11250,50 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "attachLicenseTerms",
     value: (function () {
-      var _attachLicenseTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(request) {
-        var _request$txOptions, isRegistered, isExisted, isAttachedLicenseTerms, req, txHash, _t6;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.p = _context6.n) {
+      var _attachLicenseTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(request) {
+        var _request$txOptions, isRegistered, isExisted, isAttachedLicenseTerms, req, txHash, _t2;
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.p = _context2.n) {
             case 0:
-              _context6.p = 0;
+              _context2.p = 0;
               request.licenseTermsId = BigInt(request.licenseTermsId);
-              _context6.n = 1;
+              _context2.n = 1;
               return this.ipAssetRegistryClient.isRegistered({
                 id: validateAddress(request.ipId)
               });
             case 1:
-              isRegistered = _context6.v;
+              isRegistered = _context2.v;
               if (isRegistered) {
-                _context6.n = 2;
+                _context2.n = 2;
                 break;
               }
               throw new Error("The IP with id ".concat(request.ipId, " is not registered."));
             case 2:
-              _context6.n = 3;
+              _context2.n = 3;
               return this.piLicenseTemplateReadOnlyClient.exists({
                 licenseTermsId: request.licenseTermsId
               });
             case 3:
-              isExisted = _context6.v;
+              isExisted = _context2.v;
               if (isExisted) {
-                _context6.n = 4;
+                _context2.n = 4;
                 break;
               }
               throw new Error("License terms id ".concat(request.licenseTermsId, " do not exist."));
             case 4:
-              _context6.n = 5;
+              _context2.n = 5;
               return this.licenseRegistryReadOnlyClient.hasIpAttachedLicenseTerms({
                 ipId: request.ipId,
                 licenseTemplate: validateAddress(request.licenseTemplate || this.licenseTemplateClient.address),
                 licenseTermsId: request.licenseTermsId
               });
             case 5:
-              isAttachedLicenseTerms = _context6.v;
+              isAttachedLicenseTerms = _context2.v;
               if (!isAttachedLicenseTerms) {
-                _context6.n = 6;
+                _context2.n = 6;
                 break;
               }
-              return _context6.a(2, {
+              return _context2.a(2, {
                 success: false
               });
             case 6:
@@ -11049,39 +11303,39 @@ var LicenseClient = /*#__PURE__*/function () {
                 licenseTermsId: request.licenseTermsId
               };
               if (!((_request$txOptions = request.txOptions) !== null && _request$txOptions !== void 0 && _request$txOptions.encodedTxDataOnly)) {
-                _context6.n = 7;
+                _context2.n = 7;
                 break;
               }
-              return _context6.a(2, {
+              return _context2.a(2, {
                 encodedTxData: this.licensingModuleClient.attachLicenseTermsEncode(req)
               });
             case 7:
-              _context6.n = 8;
+              _context2.n = 8;
               return this.licensingModuleClient.attachLicenseTerms(req);
             case 8:
-              txHash = _context6.v;
-              _context6.n = 9;
+              txHash = _context2.v;
+              _context2.n = 9;
               return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
                 hash: txHash
               }));
             case 9:
-              return _context6.a(2, {
+              return _context2.a(2, {
                 txHash: txHash,
                 success: true
               });
             case 10:
-              _context6.n = 12;
+              _context2.n = 12;
               break;
             case 11:
-              _context6.p = 11;
-              _t6 = _context6.v;
-              return _context6.a(2, handleError(_t6, "Failed to attach license terms"));
+              _context2.p = 11;
+              _t2 = _context2.v;
+              return _context2.a(2, handleError(_t2, "Failed to attach license terms"));
             case 12:
-              return _context6.a(2);
+              return _context2.a(2);
           }
-        }, _callee6, this, [[0, 11]]);
+        }, _callee2, this, [[0, 11]]);
       }));
-      function attachLicenseTerms(_x6) {
+      function attachLicenseTerms(_x2) {
         return _attachLicenseTerms.apply(this, arguments);
       }
       return attachLicenseTerms;
@@ -11105,13 +11359,13 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "mintLicenseTokens",
     value: (function () {
-      var _mintLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(request) {
+      var _mintLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(request) {
         var _this = this;
-        var _request$txOptions2, _request$options, receiver, req, isLicenseIpIdRegistered, isExisted, ipAccount, ipOwner, isAttachedLicenseTerms, encodedTxData, licenseMintingFee, wipSpenders, _yield$contractCallWi, txHash, receipt, targetLogs, startLicenseTokenId, licenseTokenIds, i, _t7;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.p = _context7.n) {
+        var _request$maxMintingFe, _request$maxRevenueSh, _request$txOptions2, _request$options, receiver, req, isLicenseIpIdRegistered, isExisted, ipAccount, ipOwner, isAttachedLicenseTerms, encodedTxData, licenseMintingFee, wipSpenders, _yield$contractCallWi, txHash, receipt, targetLogs, startLicenseTokenId, licenseTokenIds, i, _t3;
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.p = _context3.n) {
             case 0:
-              _context7.p = 0;
+              _context3.p = 0;
               receiver = validateAddress(request.receiver || this.walletAddress);
               req = {
                 licensorIpId: validateAddress(request.licensorIpId),
@@ -11120,72 +11374,72 @@ var LicenseClient = /*#__PURE__*/function () {
                 amount: BigInt(request.amount === undefined ? 1 : request.amount),
                 receiver: receiver,
                 royaltyContext: zeroAddress,
-                maxMintingFee: BigInt(request.maxMintingFee),
-                maxRevenueShare: getRevenueShare(request.maxRevenueShare, RevShareType.MAX_REVENUE_SHARE)
+                maxMintingFee: BigInt((_request$maxMintingFe = request.maxMintingFee) !== null && _request$maxMintingFe !== void 0 ? _request$maxMintingFe : 0),
+                maxRevenueShare: getRevenueShare((_request$maxRevenueSh = request.maxRevenueShare) !== null && _request$maxRevenueSh !== void 0 ? _request$maxRevenueSh : 100, RevShareType.MAX_REVENUE_SHARE)
               };
               if (!(req.maxMintingFee < 0)) {
-                _context7.n = 1;
+                _context3.n = 1;
                 break;
               }
               throw new Error("The maxMintingFee must be greater than 0.");
             case 1:
-              _context7.n = 2;
+              _context3.n = 2;
               return this.ipAssetRegistryClient.isRegistered({
                 id: validateAddress(request.licensorIpId)
               });
             case 2:
-              isLicenseIpIdRegistered = _context7.v;
+              isLicenseIpIdRegistered = _context3.v;
               if (isLicenseIpIdRegistered) {
-                _context7.n = 3;
+                _context3.n = 3;
                 break;
               }
               throw new Error("The licensor IP with id ".concat(request.licensorIpId, " is not registered."));
             case 3:
-              _context7.n = 4;
+              _context3.n = 4;
               return this.piLicenseTemplateReadOnlyClient.exists({
                 licenseTermsId: req.licenseTermsId
               });
             case 4:
-              isExisted = _context7.v;
+              isExisted = _context3.v;
               if (isExisted) {
-                _context7.n = 5;
+                _context3.n = 5;
                 break;
               }
               throw new Error("License terms id ".concat(request.licenseTermsId, " do not exist."));
             case 5:
               ipAccount = new IpAccountImplClient(this.rpcClient, this.wallet, req.licensorIpId);
-              _context7.n = 6;
+              _context3.n = 6;
               return ipAccount.owner();
             case 6:
-              ipOwner = _context7.v;
+              ipOwner = _context3.v;
               if (!(ipOwner !== this.walletAddress)) {
-                _context7.n = 8;
+                _context3.n = 8;
                 break;
               }
-              _context7.n = 7;
+              _context3.n = 7;
               return this.licenseRegistryReadOnlyClient.hasIpAttachedLicenseTerms({
                 ipId: req.licensorIpId,
                 licenseTemplate: req.licenseTemplate,
                 licenseTermsId: req.licenseTermsId
               });
             case 7:
-              isAttachedLicenseTerms = _context7.v;
+              isAttachedLicenseTerms = _context3.v;
               if (isAttachedLicenseTerms) {
-                _context7.n = 8;
+                _context3.n = 8;
                 break;
               }
               throw new Error("License terms id ".concat(req.licenseTermsId, " is not attached to the IP with id ").concat(req.licensorIpId, "."));
             case 8:
               encodedTxData = this.licensingModuleClient.mintLicenseTokensEncode(req);
               if (!((_request$txOptions2 = request.txOptions) !== null && _request$txOptions2 !== void 0 && _request$txOptions2.encodedTxDataOnly)) {
-                _context7.n = 9;
+                _context3.n = 9;
                 break;
               }
-              return _context7.a(2, {
+              return _context3.a(2, {
                 encodedTxData: encodedTxData
               });
             case 9:
-              _context7.n = 10;
+              _context3.n = 10;
               return calculateLicenseWipMintFee({
                 predictMintingFeeRequest: req,
                 rpcClient: this.rpcClient,
@@ -11193,7 +11447,7 @@ var LicenseClient = /*#__PURE__*/function () {
                 walletAddress: this.walletAddress
               });
             case 10:
-              licenseMintingFee = _context7.v;
+              licenseMintingFee = _context3.v;
               wipSpenders = [];
               if (licenseMintingFee > 0n) {
                 wipSpenders.push({
@@ -11201,7 +11455,7 @@ var LicenseClient = /*#__PURE__*/function () {
                   amount: licenseMintingFee
                 });
               }
-              _context7.n = 11;
+              _context3.n = 11;
               return contractCallWithFees({
                 totalFees: licenseMintingFee,
                 options: {
@@ -11219,7 +11473,7 @@ var LicenseClient = /*#__PURE__*/function () {
                 encodedTxs: [encodedTxData]
               });
             case 11:
-              _yield$contractCallWi = _context7.v;
+              _yield$contractCallWi = _context3.v;
               txHash = _yield$contractCallWi.txHash;
               receipt = _yield$contractCallWi.receipt;
               targetLogs = this.licensingModuleClient.parseTxLicenseTokensMintedEvent(receipt);
@@ -11228,19 +11482,19 @@ var LicenseClient = /*#__PURE__*/function () {
               for (i = 0; i < req.amount; i++) {
                 licenseTokenIds.push(startLicenseTokenId + BigInt(i));
               }
-              return _context7.a(2, {
+              return _context3.a(2, {
                 txHash: txHash,
                 licenseTokenIds: licenseTokenIds,
                 receipt: receipt
               });
             case 12:
-              _context7.p = 12;
-              _t7 = _context7.v;
-              return _context7.a(2, handleError(_t7, "Failed to mint license tokens"));
+              _context3.p = 12;
+              _t3 = _context3.v;
+              return _context3.a(2, handleError(_t3, "Failed to mint license tokens"));
           }
-        }, _callee7, this, [[0, 12]]);
+        }, _callee3, this, [[0, 12]]);
       }));
-      function mintLicenseTokens(_x7) {
+      function mintLicenseTokens(_x3) {
         return _mintLicenseTokens.apply(this, arguments);
       }
       return mintLicenseTokens;
@@ -11252,26 +11506,26 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "getLicenseTerms",
     value: (function () {
-      var _getLicenseTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(selectedLicenseTermsId) {
-        var _t8;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.p = _context8.n) {
+      var _getLicenseTerms = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(selectedLicenseTermsId) {
+        var _t4;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.p = _context4.n) {
             case 0:
-              _context8.p = 0;
-              _context8.n = 1;
+              _context4.p = 0;
+              _context4.n = 1;
               return this.piLicenseTemplateReadOnlyClient.getLicenseTerms({
                 selectedLicenseTermsId: BigInt(selectedLicenseTermsId)
               });
             case 1:
-              return _context8.a(2, _context8.v);
+              return _context4.a(2, _context4.v);
             case 2:
-              _context8.p = 2;
-              _t8 = _context8.v;
-              return _context8.a(2, handleError(_t8, "Failed to get license terms"));
+              _context4.p = 2;
+              _t4 = _context4.v;
+              return _context4.a(2, handleError(_t4, "Failed to get license terms"));
           }
-        }, _callee8, this, [[0, 2]]);
+        }, _callee4, this, [[0, 2]]);
       }));
-      function getLicenseTerms(_x8) {
+      function getLicenseTerms(_x4) {
         return _getLicenseTerms.apply(this, arguments);
       }
       return getLicenseTerms;
@@ -11283,33 +11537,33 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "predictMintingLicenseFee",
     value: (function () {
-      var _predictMintingLicenseFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(request) {
-        var isLicenseIpIdRegistered, licenseTermsId, isExisted, object, _t9;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.p = _context9.n) {
+      var _predictMintingLicenseFee2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(request) {
+        var isLicenseIpIdRegistered, licenseTermsId, isExisted, object, _t5;
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.p = _context5.n) {
             case 0:
-              _context9.p = 0;
-              _context9.n = 1;
+              _context5.p = 0;
+              _context5.n = 1;
               return this.ipAssetRegistryClient.isRegistered({
                 id: validateAddress(request.licensorIpId)
               });
             case 1:
-              isLicenseIpIdRegistered = _context9.v;
+              isLicenseIpIdRegistered = _context5.v;
               if (isLicenseIpIdRegistered) {
-                _context9.n = 2;
+                _context5.n = 2;
                 break;
               }
               throw new Error("The licensor IP with id ".concat(request.licensorIpId, " is not registered."));
             case 2:
               licenseTermsId = BigInt(request.licenseTermsId);
-              _context9.n = 3;
+              _context5.n = 3;
               return this.piLicenseTemplateReadOnlyClient.exists({
                 licenseTermsId: licenseTermsId
               });
             case 3:
-              isExisted = _context9.v;
+              isExisted = _context5.v;
               if (isExisted) {
-                _context9.n = 4;
+                _context5.n = 4;
                 break;
               }
               throw new Error("License terms id ".concat(request.licenseTermsId, " do not exist."));
@@ -11321,7 +11575,7 @@ var LicenseClient = /*#__PURE__*/function () {
                 licenseTemplate: validateAddress(request.licenseTemplate || this.licenseTemplateClient.address),
                 licenseTermsId: licenseTermsId
               });
-              _context9.n = 5;
+              _context5.n = 5;
               return predictMintingLicenseFee({
                 predictMintingFeeRequest: object,
                 rpcClient: this.rpcClient,
@@ -11329,15 +11583,15 @@ var LicenseClient = /*#__PURE__*/function () {
                 walletAddress: this.walletAddress
               });
             case 5:
-              return _context9.a(2, _context9.v);
+              return _context5.a(2, _context5.v);
             case 6:
-              _context9.p = 6;
-              _t9 = _context9.v;
-              return _context9.a(2, handleError(_t9, "Failed to predict minting license fee"));
+              _context5.p = 6;
+              _t5 = _context5.v;
+              return _context5.a(2, handleError(_t5, "Failed to predict minting license fee"));
           }
-        }, _callee9, this, [[0, 6]]);
+        }, _callee5, this, [[0, 6]]);
       }));
-      function predictMintingLicenseFee$1(_x9) {
+      function predictMintingLicenseFee$1(_x5) {
         return _predictMintingLicenseFee2.apply(this, arguments);
       }
       return predictMintingLicenseFee$1;
@@ -11349,12 +11603,12 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "setLicensingConfig",
     value: (function () {
-      var _setLicensingConfig = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(request) {
-        var _request$txOptions3, req, isLicenseIpIdRegistered, isExisted, isRegistered, txHash, _t0;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.p = _context0.n) {
+      var _setLicensingConfig = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(request) {
+        var _request$txOptions3, req, isLicenseIpIdRegistered, isExisted, isRegistered, txHash, _t6;
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.p = _context6.n) {
             case 0:
-              _context0.p = 0;
+              _context6.p = 0;
               req = {
                 ipId: request.ipId,
                 licenseTemplate: validateAddress(request.licenseTemplate || this.licenseTemplateClient.address),
@@ -11362,91 +11616,91 @@ var LicenseClient = /*#__PURE__*/function () {
                 licensingConfig: validateLicenseConfig(request.licensingConfig)
               };
               if (!(req.licenseTemplate === zeroAddress && req.licensingConfig.commercialRevShare !== 0)) {
-                _context0.n = 1;
+                _context6.n = 1;
                 break;
               }
               throw new Error("The license template cannot be zero address if commercial revenue share is not zero.");
             case 1:
-              _context0.n = 2;
+              _context6.n = 2;
               return this.ipAssetRegistryClient.isRegistered({
                 id: validateAddress(req.ipId)
               });
             case 2:
-              isLicenseIpIdRegistered = _context0.v;
+              isLicenseIpIdRegistered = _context6.v;
               if (isLicenseIpIdRegistered) {
-                _context0.n = 3;
+                _context6.n = 3;
                 break;
               }
               throw new Error("The licensor IP with id ".concat(req.ipId, " is not registered."));
             case 3:
-              _context0.n = 4;
+              _context6.n = 4;
               return this.piLicenseTemplateReadOnlyClient.exists({
                 licenseTermsId: req.licenseTermsId
               });
             case 4:
-              isExisted = _context0.v;
+              isExisted = _context6.v;
               if (isExisted) {
-                _context0.n = 5;
+                _context6.n = 5;
                 break;
               }
               throw new Error("License terms id ".concat(req.licenseTermsId, " do not exist."));
             case 5:
               if (!(req.licensingConfig.licensingHook !== zeroAddress)) {
-                _context0.n = 7;
+                _context6.n = 7;
                 break;
               }
-              _context0.n = 6;
+              _context6.n = 6;
               return this.moduleRegistryReadOnlyClient.isRegistered({
                 moduleAddress: req.licensingConfig.licensingHook
               });
             case 6:
-              isRegistered = _context0.v;
+              isRegistered = _context6.v;
               if (isRegistered) {
-                _context0.n = 7;
+                _context6.n = 7;
                 break;
               }
               throw new Error("The licensing hook is not registered.");
             case 7:
               if (!(req.licenseTemplate === zeroAddress && req.licenseTermsId !== 0n)) {
-                _context0.n = 8;
+                _context6.n = 8;
                 break;
               }
               throw new Error("The license template is zero address but license terms id is not zero.");
             case 8:
               if (!((_request$txOptions3 = request.txOptions) !== null && _request$txOptions3 !== void 0 && _request$txOptions3.encodedTxDataOnly)) {
-                _context0.n = 9;
+                _context6.n = 9;
                 break;
               }
-              return _context0.a(2, {
+              return _context6.a(2, {
                 encodedTxData: this.licensingModuleClient.setLicensingConfigEncode(req)
               });
             case 9:
-              _context0.n = 10;
+              _context6.n = 10;
               return this.licensingModuleClient.setLicensingConfig(req);
             case 10:
-              txHash = _context0.v;
-              _context0.n = 11;
+              txHash = _context6.v;
+              _context6.n = 11;
               return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
                 hash: txHash
               }));
             case 11:
-              return _context0.a(2, {
+              return _context6.a(2, {
                 txHash: txHash,
                 success: true
               });
             case 12:
-              _context0.n = 14;
+              _context6.n = 14;
               break;
             case 13:
-              _context0.p = 13;
-              _t0 = _context0.v;
-              return _context0.a(2, handleError(_t0, "Failed to set licensing config"));
+              _context6.p = 13;
+              _t6 = _context6.v;
+              return _context6.a(2, handleError(_t6, "Failed to set licensing config"));
             case 14:
-              return _context0.a(2);
+              return _context6.a(2);
           }
-        }, _callee0, this, [[0, 13]]);
+        }, _callee6, this, [[0, 13]]);
       }));
-      function setLicensingConfig(_x0) {
+      function setLicensingConfig(_x6) {
         return _setLicensingConfig.apply(this, arguments);
       }
       return setLicensingConfig;
@@ -11464,34 +11718,34 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "setMaxLicenseTokens",
     value: (function () {
-      var _setMaxLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(_ref3) {
-        var ipId, licenseTermsId, maxLicenseTokens, licenseTemplate, txOptions, newLicenseTermsId, newLicenseTemplate, licensingConfig, txHash, _t1;
-        return _regenerator().w(function (_context1) {
-          while (1) switch (_context1.p = _context1.n) {
+      var _setMaxLicenseTokens = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(_ref) {
+        var ipId, licenseTermsId, maxLicenseTokens, licenseTemplate, txOptions, newLicenseTermsId, newLicenseTemplate, licensingConfig, txHash, _t7;
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.p = _context7.n) {
             case 0:
-              ipId = _ref3.ipId, licenseTermsId = _ref3.licenseTermsId, maxLicenseTokens = _ref3.maxLicenseTokens, licenseTemplate = _ref3.licenseTemplate, txOptions = _ref3.txOptions;
-              _context1.p = 1;
+              ipId = _ref.ipId, licenseTermsId = _ref.licenseTermsId, maxLicenseTokens = _ref.maxLicenseTokens, licenseTemplate = _ref.licenseTemplate, txOptions = _ref.txOptions;
+              _context7.p = 1;
               if (!(maxLicenseTokens < 0)) {
-                _context1.n = 2;
+                _context7.n = 2;
                 break;
               }
               throw new Error("The max license tokens must be greater than 0.");
             case 2:
               newLicenseTermsId = BigInt(licenseTermsId);
               newLicenseTemplate = validateAddress(licenseTemplate || this.licenseTemplateClient.address);
-              _context1.n = 3;
+              _context7.n = 3;
               return this.getLicensingConfig({
                 ipId: ipId,
                 licenseTermsId: newLicenseTermsId,
                 licenseTemplate: newLicenseTemplate
               });
             case 3:
-              licensingConfig = _context1.v;
+              licensingConfig = _context7.v;
               if (!(licensingConfig.licensingHook !== this.totalLicenseTokenLimitHookClient.address)) {
-                _context1.n = 4;
+                _context7.n = 4;
                 break;
               }
-              _context1.n = 4;
+              _context7.n = 4;
               return this.setLicensingConfig({
                 ipId: ipId,
                 licenseTermsId: newLicenseTermsId,
@@ -11502,7 +11756,7 @@ var LicenseClient = /*#__PURE__*/function () {
                 })
               });
             case 4:
-              _context1.n = 5;
+              _context7.n = 5;
               return this.totalLicenseTokenLimitHookClient.setTotalLicenseTokenLimit({
                 licensorIpId: ipId,
                 licenseTemplate: newLicenseTemplate,
@@ -11510,20 +11764,20 @@ var LicenseClient = /*#__PURE__*/function () {
                 limit: BigInt(maxLicenseTokens)
               });
             case 5:
-              txHash = _context1.v;
-              return _context1.a(2, waitForTxReceipt({
+              txHash = _context7.v;
+              return _context7.a(2, waitForTxReceipt({
                 txHash: txHash,
                 txOptions: txOptions,
                 rpcClient: this.rpcClient
               }));
             case 6:
-              _context1.p = 6;
-              _t1 = _context1.v;
-              return _context1.a(2, handleError(_t1, "Failed to set max license tokens"));
+              _context7.p = 6;
+              _t7 = _context7.v;
+              return _context7.a(2, handleError(_t7, "Failed to set max license tokens"));
           }
-        }, _callee1, this, [[1, 6]]);
+        }, _callee7, this, [[1, 6]]);
       }));
-      function setMaxLicenseTokens(_x1) {
+      function setMaxLicenseTokens(_x7) {
         return _setMaxLicenseTokens.apply(this, arguments);
       }
       return setMaxLicenseTokens;
@@ -11531,52 +11785,344 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "getLicensingConfig",
     value: function () {
-      var _getLicensingConfig = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(request) {
-        var licensingConfigParam, _t10;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.p = _context10.n) {
+      var _getLicensingConfig = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(request) {
+        var licensingConfigParam, _t8;
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.p = _context8.n) {
             case 0:
-              _context10.p = 0;
+              _context8.p = 0;
               licensingConfigParam = {
                 ipId: validateAddress(request.ipId),
                 licenseTemplate: validateAddress(request.licenseTemplate || this.licenseTemplateClient.address),
                 licenseTermsId: BigInt(request.licenseTermsId)
               };
-              _context10.n = 1;
+              _context8.n = 1;
               return this.licenseRegistryReadOnlyClient.getLicensingConfig(licensingConfigParam);
             case 1:
-              return _context10.a(2, _context10.v);
+              return _context8.a(2, _context8.v);
             case 2:
-              _context10.p = 2;
-              _t10 = _context10.v;
-              return _context10.a(2, handleError(_t10, "Failed to get licensing config"));
+              _context8.p = 2;
+              _t8 = _context8.v;
+              return _context8.a(2, handleError(_t8, "Failed to get licensing config"));
           }
-        }, _callee10, this, [[0, 2]]);
+        }, _callee8, this, [[0, 2]]);
       }));
-      function getLicensingConfig(_x10) {
+      function getLicensingConfig(_x8) {
         return _getLicensingConfig.apply(this, arguments);
       }
       return getLicensingConfig;
     }()
+    /**
+     * Register Programmable IP License Terms (if unregistered) and attach it to IP.
+     *
+     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicensingModule.sol#L19 | `LicenseTermsAttached`} event.
+     */
+  }, {
+    key: "registerPilTermsAndAttach",
+    value: (function () {
+      var _registerPilTermsAndAttach = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(request) {
+        var _request$txOptions4, ipId, isRegistered, _yield$validateLicens, licenseTerms, licenseTermsData, calculatedDeadline, ipAccount, _yield$ipAccount$stat, state, signature, object, txHash, licenseTermsIds, i, maxLicenseTokensTxHashes, _t9, _t0;
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.p = _context9.n) {
+            case 0:
+              _context9.p = 0;
+              ipId = request.ipId;
+              _context9.n = 1;
+              return this.ipAssetRegistryClient.isRegistered({
+                id: validateAddress(ipId)
+              });
+            case 1:
+              isRegistered = _context9.v;
+              if (isRegistered) {
+                _context9.n = 2;
+                break;
+              }
+              throw new Error("The IP with id ".concat(ipId, " is not registered."));
+            case 2:
+              _context9.n = 3;
+              return validateLicenseTermsData(request.licenseTermsData, this.rpcClient, this.chainId);
+            case 3:
+              _yield$validateLicens = _context9.v;
+              licenseTerms = _yield$validateLicens.licenseTerms;
+              licenseTermsData = _yield$validateLicens.licenseTermsData;
+              _context9.n = 4;
+              return getCalculatedDeadline(this.rpcClient, request.deadline);
+            case 4:
+              calculatedDeadline = _context9.v;
+              ipAccount = new IpAccountImplClient(this.rpcClient, this.wallet, ipId);
+              _context9.n = 5;
+              return ipAccount.state();
+            case 5:
+              _yield$ipAccount$stat = _context9.v;
+              state = _yield$ipAccount$stat.result;
+              _context9.n = 6;
+              return generateOperationSignature({
+                ipIdAddress: ipId,
+                methodType: SignatureMethodType.REGISTER_PIL_TERMS_AND_ATTACH,
+                deadline: calculatedDeadline,
+                state: state,
+                wallet: this.wallet,
+                chainId: this.chainId
+              });
+            case 6:
+              signature = _context9.v;
+              object = {
+                ipId: ipId,
+                licenseTermsData: licenseTermsData,
+                sigAttachAndConfig: {
+                  signer: validateAddress(this.walletAddress),
+                  deadline: calculatedDeadline,
+                  signature: signature
+                }
+              };
+              if (!((_request$txOptions4 = request.txOptions) !== null && _request$txOptions4 !== void 0 && _request$txOptions4.encodedTxDataOnly)) {
+                _context9.n = 7;
+                break;
+              }
+              return _context9.a(2, {
+                encodedTxData: this.licenseAttachmentWorkflowsClient.registerPilTermsAndAttachEncode(object)
+              });
+            case 7:
+              _context9.n = 8;
+              return this.licenseAttachmentWorkflowsClient.registerPilTermsAndAttach(object);
+            case 8:
+              txHash = _context9.v;
+              _context9.n = 9;
+              return this.rpcClient.waitForTransactionReceipt(_objectSpread2(_objectSpread2({}, request.txOptions), {}, {
+                hash: txHash
+              }));
+            case 9:
+              licenseTermsIds = [];
+              i = 0;
+            case 10:
+              if (!(i < licenseTerms.length)) {
+                _context9.n = 13;
+                break;
+              }
+              _t9 = licenseTermsIds;
+              _context9.n = 11;
+              return this.getLicenseTermsId(licenseTerms[i]);
+            case 11:
+              _t9.push.call(_t9, _context9.v);
+            case 12:
+              i++;
+              _context9.n = 10;
+              break;
+            case 13:
+              _context9.n = 14;
+              return setMaxLicenseTokens({
+                maxLicenseTokensData: request.licenseTermsData,
+                licensorIpId: ipId,
+                licenseTermsIds: licenseTermsIds,
+                totalLicenseTokenLimitHookClient: this.totalLicenseTokenLimitHookClient,
+                templateAddress: this.licenseTemplateClient.address
+              });
+            case 14:
+              maxLicenseTokensTxHashes = _context9.v;
+              return _context9.a(2, _objectSpread2({
+                txHash: txHash,
+                licenseTermsIds: licenseTermsIds
+              }, maxLicenseTokensTxHashes.length > 0 && {
+                maxLicenseTokensTxHashes: maxLicenseTokensTxHashes
+              }));
+            case 15:
+              _context9.n = 17;
+              break;
+            case 16:
+              _context9.p = 16;
+              _t0 = _context9.v;
+              return _context9.a(2, handleError(_t0, "Failed to register PIL terms and attach"));
+            case 17:
+              return _context9.a(2);
+          }
+        }, _callee9, this, [[0, 16]]);
+      }));
+      function registerPilTermsAndAttach(_x9) {
+        return _registerPilTermsAndAttach.apply(this, arguments);
+      }
+      return registerPilTermsAndAttach;
+    }()
+    /**
+     * @deprecated Use {@link PILFlavor.nonCommercialSocialRemixing} with {@link LicenseClient.registerPILTerms} instead.
+     *  This method will be removed soon.
+     *
+     * Convenient function to register a PIL non commercial social remix license to the registry
+     *
+     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%231%3A-non-commercial-social-remixing | Non Commercial Social Remixing}.
+     *
+     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
+     */
+    )
+  }, {
+    key: "registerNonComSocialRemixingPIL",
+    value: (function () {
+      var _registerNonComSocialRemixingPIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(request) {
+        var licenseTerms, _t1;
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.p = _context0.n) {
+            case 0:
+              _context0.p = 0;
+              licenseTerms = PILFlavor.nonCommercialSocialRemixing();
+              _context0.n = 1;
+              return this.registerPILTermsHelper(licenseTerms, request === null || request === void 0 ? void 0 : request.txOptions);
+            case 1:
+              return _context0.a(2, _context0.v);
+            case 2:
+              _context0.p = 2;
+              _t1 = _context0.v;
+              return _context0.a(2, handleError(_t1, "Failed to register non commercial social remixing PIL"));
+          }
+        }, _callee0, this, [[0, 2]]);
+      }));
+      function registerNonComSocialRemixingPIL(_x0) {
+        return _registerNonComSocialRemixingPIL.apply(this, arguments);
+      }
+      return registerNonComSocialRemixingPIL;
+    }()
+    /**
+     * @deprecated Use {@link PILFlavor.commercialUse} with {@link LicenseClient.registerPILTerms} instead.
+     *  This method will be removed soon.
+     *
+     * Convenient function to register a PIL commercial use license to the registry.
+     *
+     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%232%3A-commercial-use | Commercial Use}.
+     *
+     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
+     */
+    )
+  }, {
+    key: "registerCommercialUsePIL",
+    value: (function () {
+      var _registerCommercialUsePIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(request) {
+        var licenseTerms, _t10;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.p = _context1.n) {
+            case 0:
+              _context1.p = 0;
+              licenseTerms = PILFlavor.commercialUse({
+                defaultMintingFee: Number(request.defaultMintingFee),
+                currency: request.currency,
+                royaltyPolicy: request.royaltyPolicyAddress
+              });
+              _context1.n = 1;
+              return this.registerPILTermsHelper(licenseTerms, request.txOptions);
+            case 1:
+              return _context1.a(2, _context1.v);
+            case 2:
+              _context1.p = 2;
+              _t10 = _context1.v;
+              return _context1.a(2, handleError(_t10, "Failed to register commercial use PIL"));
+          }
+        }, _callee1, this, [[0, 2]]);
+      }));
+      function registerCommercialUsePIL(_x1) {
+        return _registerCommercialUsePIL.apply(this, arguments);
+      }
+      return registerCommercialUsePIL;
+    }()
+    /**
+     * @deprecated Use {@link PILFlavor.commercialRemix} with {@link LicenseClient.registerPILTerms} instead.
+     *  This method will be removed soon.
+     *
+     * Convenient function to register a PIL commercial Remix license to the registry.
+     *
+     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%233%3A-commercial-remix | Commercial Remix }.
+     *
+     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
+     */
+    )
+  }, {
+    key: "registerCommercialRemixPIL",
+    value: (function () {
+      var _registerCommercialRemixPIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(_ref2) {
+        var defaultMintingFee, currency, royaltyPolicyAddress, commercialRevShare, txOptions, licenseTerms, _t11;
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.p = _context10.n) {
+            case 0:
+              defaultMintingFee = _ref2.defaultMintingFee, currency = _ref2.currency, royaltyPolicyAddress = _ref2.royaltyPolicyAddress, commercialRevShare = _ref2.commercialRevShare, txOptions = _ref2.txOptions;
+              _context10.p = 1;
+              licenseTerms = PILFlavor.commercialRemix({
+                defaultMintingFee: Number(defaultMintingFee),
+                currency: currency,
+                royaltyPolicy: royaltyPolicyAddress,
+                commercialRevShare: commercialRevShare
+              });
+              _context10.n = 2;
+              return this.registerPILTermsHelper(licenseTerms, txOptions);
+            case 2:
+              return _context10.a(2, _context10.v);
+            case 3:
+              _context10.p = 3;
+              _t11 = _context10.v;
+              return _context10.a(2, handleError(_t11, "Failed to register commercial remix PIL"));
+          }
+        }, _callee10, this, [[1, 3]]);
+      }));
+      function registerCommercialRemixPIL(_x10) {
+        return _registerCommercialRemixPIL.apply(this, arguments);
+      }
+      return registerCommercialRemixPIL;
+    }()
+    /**
+     * @deprecated Use {@link PILFlavor.creativeCommonsAttribution} with {@link LicenseClient.registerPILTerms} instead.
+     *  This method will be removed soon.
+     *
+     * Convenient function to register a PIL creative commons attribution license to the registry.
+     * Creates a Creative Commons Attribution (CC-BY) license terms flavor.
+     *
+     * For more details, see {@link https://docs.story.foundation/concepts/programmable-ip-license/pil-flavors#flavor-%234%3A-creative-commons-attribution | Creative Commons Attribution}.
+     *
+     * Emits an on-chain {@link https://github.com/storyprotocol/protocol-core-v1/blob/v1.3.1/contracts/interfaces/modules/licensing/ILicenseTemplate.sol#L19 | `LicenseTermsRegistered`} event.
+     */
+    )
+  }, {
+    key: "registerCreativeCommonsAttributionPIL",
+    value: (function () {
+      var _registerCreativeCommonsAttributionPIL = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(_ref3) {
+        var currency, royaltyPolicyAddress, txOptions, _t12;
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.p = _context11.n) {
+            case 0:
+              currency = _ref3.currency, royaltyPolicyAddress = _ref3.royaltyPolicyAddress, txOptions = _ref3.txOptions;
+              _context11.p = 1;
+              _context11.n = 2;
+              return this.registerPILTermsHelper(PILFlavor.creativeCommonsAttribution({
+                currency: currency,
+                royaltyPolicy: royaltyPolicyAddress
+              }), txOptions);
+            case 2:
+              return _context11.a(2, _context11.v);
+            case 3:
+              _context11.p = 3;
+              _t12 = _context11.v;
+              return _context11.a(2, handleError(_t12, "Failed to register creative commons attribution PIL"));
+          }
+        }, _callee11, this, [[1, 3]]);
+      }));
+      function registerCreativeCommonsAttributionPIL(_x11) {
+        return _registerCreativeCommonsAttributionPIL.apply(this, arguments);
+      }
+      return registerCreativeCommonsAttributionPIL;
+    }())
   }, {
     key: "getLicenseTermsId",
     value: function () {
-      var _getLicenseTermsId = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(request) {
+      var _getLicenseTermsId = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(licenseTerms) {
         var licenseRes;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _context11.n = 1;
+              _context12.n = 1;
               return this.licenseTemplateClient.getLicenseTermsId({
-                terms: request
+                terms: licenseTerms
               });
             case 1:
-              licenseRes = _context11.v;
-              return _context11.a(2, licenseRes.selectedLicenseTermsId);
+              licenseRes = _context12.v;
+              return _context12.a(2, licenseRes.selectedLicenseTermsId);
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
-      function getLicenseTermsId(_x11) {
+      function getLicenseTermsId(_x12) {
         return _getLicenseTermsId.apply(this, arguments);
       }
       return getLicenseTermsId;
@@ -11584,59 +12130,60 @@ var LicenseClient = /*#__PURE__*/function () {
   }, {
     key: "registerPILTermsHelper",
     value: function () {
-      var _registerPILTermsHelper = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(licenseTerms, txOptions) {
+      var _registerPILTermsHelper = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(licenseTerms, txOptions) {
         var licenseTermsId, txHash, _yield$waitForTxRecei, receipt, targetLogs;
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.n) {
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
             case 0:
+              licenseTerms.commercialRevShare = getRevenueShare(licenseTerms.commercialRevShare);
               if (!(txOptions !== null && txOptions !== void 0 && txOptions.encodedTxDataOnly)) {
-                _context12.n = 1;
+                _context13.n = 1;
                 break;
               }
-              return _context12.a(2, {
+              return _context13.a(2, {
                 encodedTxData: this.licenseTemplateClient.registerLicenseTermsEncode({
                   terms: licenseTerms
                 })
               });
             case 1:
-              _context12.n = 2;
+              _context13.n = 2;
               return this.getLicenseTermsId(licenseTerms);
             case 2:
-              licenseTermsId = _context12.v;
+              licenseTermsId = _context13.v;
               if (!(licenseTermsId !== 0n)) {
-                _context12.n = 3;
+                _context13.n = 3;
                 break;
               }
-              return _context12.a(2, {
+              return _context13.a(2, {
                 licenseTermsId: licenseTermsId
               });
             case 3:
-              _context12.n = 4;
+              _context13.n = 4;
               return this.licenseTemplateClient.registerLicenseTerms({
                 terms: licenseTerms
               });
             case 4:
-              txHash = _context12.v;
-              _context12.n = 5;
+              txHash = _context13.v;
+              _context13.n = 5;
               return waitForTxReceipt({
                 txOptions: txOptions,
                 rpcClient: this.rpcClient,
                 txHash: txHash
               });
             case 5:
-              _yield$waitForTxRecei = _context12.v;
+              _yield$waitForTxRecei = _context13.v;
               receipt = _yield$waitForTxRecei.receipt;
               targetLogs = this.licenseTemplateClient.parseTxLicenseTermsRegisteredEvent(receipt);
-              return _context12.a(2, {
+              return _context13.a(2, {
                 txHash: txHash,
                 licenseTermsId: targetLogs[0].licenseTermsId
               });
             case 6:
-              return _context12.a(2);
+              return _context13.a(2);
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
-      function registerPILTermsHelper(_x12, _x13) {
+      function registerPILTermsHelper(_x13, _x14) {
         return _registerPILTermsHelper.apply(this, arguments);
       }
       return registerPILTermsHelper;
@@ -11679,7 +12226,7 @@ var NftClient = /*#__PURE__*/function () {
                   symbol: request.symbol,
                   baseURI: (_request$baseURI = request.baseURI) !== null && _request$baseURI !== void 0 ? _request$baseURI : "",
                   maxSupply: (_request$maxSupply = request.maxSupply) !== null && _request$maxSupply !== void 0 ? _request$maxSupply : Number(maxUint32),
-                  mintFee: (_request$mintFee = request.mintFee) !== null && _request$mintFee !== void 0 ? _request$mintFee : 0n,
+                  mintFee: BigInt((_request$mintFee = request.mintFee) !== null && _request$mintFee !== void 0 ? _request$mintFee : 0),
                   mintFeeToken: (_request$mintFeeToken = request.mintFeeToken) !== null && _request$mintFeeToken !== void 0 ? _request$mintFeeToken : zeroAddress,
                   owner: validateAddress(request.owner || this.wallet.account.address),
                   mintFeeRecipient: validateAddress(request.mintFeeRecipient),