bitbadgesjs-sdk 0.2.1 → 0.3.0

package/dist/core/approvals.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expandCollectionApprovals = exports.validateCollectionApprovalsUpdate = exports.getFirstMatchOnlyWithApprovalCriteria = exports.CollectionApprovalWithDetails = exports.ApprovalInfoDetails = exports.ChallengeDetails = exports.UserIncomingApprovalWithDetails = exports.UserOutgoingApprovalWithDetails = exports.ApprovalCriteria = exports.CollectionApproval = exports.IncomingApprovalCriteria = exports.UserIncomingApproval = exports.MaxNumTransfers = exports.ApprovalAmounts = exports.PredeterminedOrderCalculationMethod = exports.IncrementedBalances = exports.ManualBalances = exports.PredeterminedBalances = exports.OutgoingApprovalCriteria = exports.UserOutgoingApproval = void 0;
+exports.expandCollectionApprovals = exports.validateCollectionApprovalsUpdate = exports.getFirstMatchOnlyWithApprovalCriteria = exports.CollectionApprovalWithDetails = exports.OutgoingApprovalCriteriaWithDetails = exports.IncomingApprovalCriteriaWithDetails = exports.ApprovalCriteriaWithDetails = exports.MerkleChallengeWithDetails = exports.ApprovalInfoDetails = exports.ChallengeInfoDetails = exports.ChallengeDetails = exports.UserIncomingApprovalWithDetails = exports.UserOutgoingApprovalWithDetails = exports.ApprovalCriteria = exports.CollectionApproval = exports.IncomingApprovalCriteria = exports.UserIncomingApproval = exports.MaxNumTransfers = exports.ApprovalAmounts = exports.PredeterminedOrderCalculationMethod = exports.IncrementedBalances = exports.ManualBalances = exports.PredeterminedBalances = exports.OutgoingApprovalCriteria = exports.UserOutgoingApproval = void 0;
 const base_1 = require("../common/base");
 const proto = __importStar(require("../proto"));
 const string_numbers_1 = require("../common/string-numbers");
@@ -42,8 +42,6 @@ class UserOutgoingApproval extends base_1.BaseNumberTypeClass {
     badgeIds;
     ownershipTimes;
     approvalId;
-    amountTrackerId;
-    challengeTrackerId;
     uri;
     customData;
     approvalCriteria;
@@ -55,8 +53,6 @@ class UserOutgoingApproval extends base_1.BaseNumberTypeClass {
         this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
         this.ownershipTimes = uintRanges_1.UintRangeArray.From(msg.ownershipTimes);
         this.approvalId = msg.approvalId;
-        this.amountTrackerId = msg.amountTrackerId;
-        this.challengeTrackerId = msg.challengeTrackerId;
         this.uri = msg.uri;
         this.customData = msg.customData;
         this.approvalCriteria = msg.approvalCriteria ? new OutgoingApprovalCriteria(msg.approvalCriteria) : undefined;
@@ -81,8 +77,6 @@ class UserOutgoingApproval extends base_1.BaseNumberTypeClass {
             badgeIds: item.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
             ownershipTimes: item.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
             approvalId: item.approvalId,
-            amountTrackerId: item.amountTrackerId,
-            challengeTrackerId: item.challengeTrackerId,
             uri: item.uri,
             customData: item.customData,
             approvalCriteria: item.approvalCriteria ? OutgoingApprovalCriteria.fromProto(item.approvalCriteria, convertFunction) : undefined
@@ -92,31 +86,37 @@ class UserOutgoingApproval extends base_1.BaseNumberTypeClass {
 exports.UserOutgoingApproval = UserOutgoingApproval;
 class OutgoingApprovalCriteria extends base_1.BaseNumberTypeClass {
     mustOwnBadges;
-    merkleChallenge;
+    merkleChallenges;
     predeterminedBalances;
     approvalAmounts;
     maxNumTransfers;
     requireToEqualsInitiatedBy;
     requireToDoesNotEqualInitiatedBy;
+    zkProofs;
+    coinTransfers;
     constructor(msg) {
         super();
         this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new misc_1.MustOwnBadges(x));
-        this.merkleChallenge = msg.merkleChallenge ? new misc_1.MerkleChallenge(msg.merkleChallenge) : undefined;
+        this.merkleChallenges = msg.merkleChallenges?.map((x) => new misc_1.MerkleChallenge(x));
         this.predeterminedBalances = msg.predeterminedBalances ? new PredeterminedBalances(msg.predeterminedBalances) : undefined;
         this.approvalAmounts = msg.approvalAmounts ? new ApprovalAmounts(msg.approvalAmounts) : undefined;
         this.maxNumTransfers = msg.maxNumTransfers ? new MaxNumTransfers(msg.maxNumTransfers) : undefined;
         this.requireToEqualsInitiatedBy = msg.requireToEqualsInitiatedBy;
         this.requireToDoesNotEqualInitiatedBy = msg.requireToDoesNotEqualInitiatedBy;
+        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new misc_1.CoinTransfer(x)) : undefined;
+        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new misc_1.ZkProof(x)) : undefined;
     }
     convert(convertFunction) {
         return new OutgoingApprovalCriteria((0, base_1.deepCopyPrimitives)({
             mustOwnBadges: this.mustOwnBadges?.map((x) => x.convert(convertFunction)),
-            merkleChallenge: this.merkleChallenge?.convert(convertFunction),
+            merkleChallenges: this.merkleChallenges?.map((x) => x.convert(convertFunction)),
             predeterminedBalances: this.predeterminedBalances?.convert(convertFunction),
             approvalAmounts: this.approvalAmounts?.convert(convertFunction),
             maxNumTransfers: this.maxNumTransfers?.convert(convertFunction),
             requireToEqualsInitiatedBy: this.requireToEqualsInitiatedBy,
-            requireToDoesNotEqualInitiatedBy: this.requireToDoesNotEqualInitiatedBy
+            requireToDoesNotEqualInitiatedBy: this.requireToDoesNotEqualInitiatedBy,
+            zkProofs: this.zkProofs?.map((x) => x),
+            coinTransfers: this.coinTransfers?.map((x) => x.convert(convertFunction))
         }));
     }
     toProto() {
@@ -131,12 +131,14 @@ class OutgoingApprovalCriteria extends base_1.BaseNumberTypeClass {
     static fromProto(item, convertFunction) {
         return new OutgoingApprovalCriteria({
             mustOwnBadges: item.mustOwnBadges.map((x) => misc_1.MustOwnBadges.fromProto(x, convertFunction)),
-            merkleChallenge: item.merkleChallenge ? misc_1.MerkleChallenge.fromProto(item.merkleChallenge, convertFunction) : undefined,
+            merkleChallenges: item.merkleChallenges.map((x) => misc_1.MerkleChallenge.fromProto(x, convertFunction)),
             predeterminedBalances: item.predeterminedBalances ? PredeterminedBalances.fromProto(item.predeterminedBalances, convertFunction) : undefined,
             approvalAmounts: item.approvalAmounts ? ApprovalAmounts.fromProto(item.approvalAmounts, convertFunction) : undefined,
             maxNumTransfers: item.maxNumTransfers ? MaxNumTransfers.fromProto(item.maxNumTransfers, convertFunction) : undefined,
             requireToEqualsInitiatedBy: item.requireToEqualsInitiatedBy,
-            requireToDoesNotEqualInitiatedBy: item.requireToDoesNotEqualInitiatedBy
+            requireToDoesNotEqualInitiatedBy: item.requireToDoesNotEqualInitiatedBy,
+            zkProofs: item.zkProofs,
+            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => misc_1.CoinTransfer.fromProto(x, convertFunction)) : undefined
         });
     }
     castToCollectionApprovalCriteria() {
@@ -147,7 +149,9 @@ class OutgoingApprovalCriteria extends base_1.BaseNumberTypeClass {
             requireToDoesNotEqualInitiatedBy: this.requireToDoesNotEqualInitiatedBy,
             predeterminedBalances: this.predeterminedBalances,
             mustOwnBadges: this.mustOwnBadges,
-            merkleChallenge: this.merkleChallenge,
+            merkleChallenges: this.merkleChallenges,
+            zkProofs: this.zkProofs,
+            coinTransfers: this.coinTransfers,
             requireFromEqualsInitiatedBy: false,
             requireFromDoesNotEqualInitiatedBy: false,
             overridesFromOutgoingApprovals: false,
@@ -199,7 +203,8 @@ class PredeterminedBalances extends base_1.BaseNumberTypeClass {
                     usePerFromAddressNumTransfers: false,
                     usePerToAddressNumTransfers: false,
                     usePerInitiatedByAddressNumTransfers: false,
-                    useMerkleChallengeLeafIndex: false
+                    useMerkleChallengeLeafIndex: false,
+                    challengeTrackerId: ''
                 })
         });
     }
@@ -276,6 +281,7 @@ class PredeterminedOrderCalculationMethod extends base_1.CustomTypeClass {
     usePerFromAddressNumTransfers;
     usePerInitiatedByAddressNumTransfers;
     useMerkleChallengeLeafIndex;
+    challengeTrackerId;
     constructor(msg) {
         super();
         this.useOverallNumTransfers = msg.useOverallNumTransfers;
@@ -283,6 +289,7 @@ class PredeterminedOrderCalculationMethod extends base_1.CustomTypeClass {
         this.usePerFromAddressNumTransfers = msg.usePerFromAddressNumTransfers;
         this.usePerInitiatedByAddressNumTransfers = msg.usePerInitiatedByAddressNumTransfers;
         this.useMerkleChallengeLeafIndex = msg.useMerkleChallengeLeafIndex;
+        this.challengeTrackerId = msg.challengeTrackerId;
     }
     toProto() {
         return new proto.badges.PredeterminedOrderCalculationMethod(this.toJson());
@@ -299,7 +306,8 @@ class PredeterminedOrderCalculationMethod extends base_1.CustomTypeClass {
             usePerToAddressNumTransfers: item.usePerToAddressNumTransfers,
             usePerFromAddressNumTransfers: item.usePerFromAddressNumTransfers,
             usePerInitiatedByAddressNumTransfers: item.usePerInitiatedByAddressNumTransfers,
-            useMerkleChallengeLeafIndex: item.useMerkleChallengeLeafIndex
+            useMerkleChallengeLeafIndex: item.useMerkleChallengeLeafIndex,
+            challengeTrackerId: item.challengeTrackerId
         });
     }
 }
@@ -309,12 +317,14 @@ class ApprovalAmounts extends base_1.BaseNumberTypeClass {
     perToAddressApprovalAmount;
     perFromAddressApprovalAmount;
     perInitiatedByAddressApprovalAmount;
+    amountTrackerId;
     constructor(msg) {
         super();
         this.overallApprovalAmount = msg.overallApprovalAmount;
         this.perToAddressApprovalAmount = msg.perToAddressApprovalAmount;
         this.perFromAddressApprovalAmount = msg.perFromAddressApprovalAmount;
         this.perInitiatedByAddressApprovalAmount = msg.perInitiatedByAddressApprovalAmount;
+        this.amountTrackerId = msg.amountTrackerId;
     }
     getNumberFieldNames() {
         return ['overallApprovalAmount', 'perToAddressApprovalAmount', 'perFromAddressApprovalAmount', 'perInitiatedByAddressApprovalAmount'];
@@ -324,7 +334,8 @@ class ApprovalAmounts extends base_1.BaseNumberTypeClass {
             overallApprovalAmount: convertFunction(this.overallApprovalAmount),
             perToAddressApprovalAmount: convertFunction(this.perToAddressApprovalAmount),
             perFromAddressApprovalAmount: convertFunction(this.perFromAddressApprovalAmount),
-            perInitiatedByAddressApprovalAmount: convertFunction(this.perInitiatedByAddressApprovalAmount)
+            perInitiatedByAddressApprovalAmount: convertFunction(this.perInitiatedByAddressApprovalAmount),
+            amountTrackerId: this.amountTrackerId
         }));
     }
     toProto() {
@@ -341,7 +352,8 @@ class ApprovalAmounts extends base_1.BaseNumberTypeClass {
             overallApprovalAmount: convertFunction(item.overallApprovalAmount),
             perToAddressApprovalAmount: convertFunction(item.perToAddressApprovalAmount),
             perFromAddressApprovalAmount: convertFunction(item.perFromAddressApprovalAmount),
-            perInitiatedByAddressApprovalAmount: convertFunction(item.perInitiatedByAddressApprovalAmount)
+            perInitiatedByAddressApprovalAmount: convertFunction(item.perInitiatedByAddressApprovalAmount),
+            amountTrackerId: item.amountTrackerId
         });
     }
 }
@@ -351,12 +363,14 @@ class MaxNumTransfers extends base_1.BaseNumberTypeClass {
     perToAddressMaxNumTransfers;
     perFromAddressMaxNumTransfers;
     perInitiatedByAddressMaxNumTransfers;
+    amountTrackerId;
     constructor(msg) {
         super();
         this.overallMaxNumTransfers = msg.overallMaxNumTransfers;
         this.perToAddressMaxNumTransfers = msg.perToAddressMaxNumTransfers;
         this.perFromAddressMaxNumTransfers = msg.perFromAddressMaxNumTransfers;
         this.perInitiatedByAddressMaxNumTransfers = msg.perInitiatedByAddressMaxNumTransfers;
+        this.amountTrackerId = msg.amountTrackerId;
     }
     getNumberFieldNames() {
         return ['overallMaxNumTransfers', 'perToAddressMaxNumTransfers', 'perFromAddressMaxNumTransfers', 'perInitiatedByAddressMaxNumTransfers'];
@@ -366,7 +380,8 @@ class MaxNumTransfers extends base_1.BaseNumberTypeClass {
             overallMaxNumTransfers: convertFunction(this.overallMaxNumTransfers),
             perToAddressMaxNumTransfers: convertFunction(this.perToAddressMaxNumTransfers),
             perFromAddressMaxNumTransfers: convertFunction(this.perFromAddressMaxNumTransfers),
-            perInitiatedByAddressMaxNumTransfers: convertFunction(this.perInitiatedByAddressMaxNumTransfers)
+            perInitiatedByAddressMaxNumTransfers: convertFunction(this.perInitiatedByAddressMaxNumTransfers),
+            amountTrackerId: this.amountTrackerId
         }));
     }
     toProto() {
@@ -383,7 +398,8 @@ class MaxNumTransfers extends base_1.BaseNumberTypeClass {
             overallMaxNumTransfers: convertFunction(item.overallMaxNumTransfers),
             perToAddressMaxNumTransfers: convertFunction(item.perToAddressMaxNumTransfers),
             perFromAddressMaxNumTransfers: convertFunction(item.perFromAddressMaxNumTransfers),
-            perInitiatedByAddressMaxNumTransfers: convertFunction(item.perInitiatedByAddressMaxNumTransfers)
+            perInitiatedByAddressMaxNumTransfers: convertFunction(item.perInitiatedByAddressMaxNumTransfers),
+            amountTrackerId: item.amountTrackerId
         });
     }
 }
@@ -395,8 +411,6 @@ class UserIncomingApproval extends base_1.BaseNumberTypeClass {
     badgeIds;
     ownershipTimes;
     approvalId;
-    amountTrackerId;
-    challengeTrackerId;
     uri;
     customData;
     approvalCriteria;
@@ -408,8 +422,6 @@ class UserIncomingApproval extends base_1.BaseNumberTypeClass {
         this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
         this.ownershipTimes = uintRanges_1.UintRangeArray.From(msg.ownershipTimes);
         this.approvalId = msg.approvalId;
-        this.amountTrackerId = msg.amountTrackerId;
-        this.challengeTrackerId = msg.challengeTrackerId;
         this.uri = msg.uri;
         this.customData = msg.customData;
         this.approvalCriteria = msg.approvalCriteria ? new IncomingApprovalCriteria(msg.approvalCriteria) : undefined;
@@ -434,20 +446,11 @@ class UserIncomingApproval extends base_1.BaseNumberTypeClass {
             badgeIds: item.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
             ownershipTimes: item.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
             approvalId: item.approvalId,
-            amountTrackerId: item.amountTrackerId,
-            challengeTrackerId: item.challengeTrackerId,
             uri: item.uri,
             customData: item.customData,
             approvalCriteria: item.approvalCriteria ? IncomingApprovalCriteria.fromProto(item.approvalCriteria, convertFunction) : undefined
         });
     }
-    toWithDetails(fromList, initiatedByList) {
-        return new UserIncomingApprovalWithDetails({
-            ...this,
-            fromList,
-            initiatedByList
-        });
-    }
     castToCollectionTransfer(toAddress) {
         return new CollectionApproval({
             ...this,
@@ -459,31 +462,37 @@ class UserIncomingApproval extends base_1.BaseNumberTypeClass {
 exports.UserIncomingApproval = UserIncomingApproval;
 class IncomingApprovalCriteria extends base_1.BaseNumberTypeClass {
     mustOwnBadges;
-    merkleChallenge;
+    merkleChallenges;
     predeterminedBalances;
     approvalAmounts;
     maxNumTransfers;
     requireFromEqualsInitiatedBy;
     requireFromDoesNotEqualInitiatedBy;
+    zkProofs;
+    coinTransfers;
     constructor(msg) {
         super();
         this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new misc_1.MustOwnBadges(x));
-        this.merkleChallenge = msg.merkleChallenge ? new misc_1.MerkleChallenge(msg.merkleChallenge) : undefined;
+        this.merkleChallenges = msg.merkleChallenges?.map((x) => new misc_1.MerkleChallenge(x));
         this.predeterminedBalances = msg.predeterminedBalances ? new PredeterminedBalances(msg.predeterminedBalances) : undefined;
         this.approvalAmounts = msg.approvalAmounts ? new ApprovalAmounts(msg.approvalAmounts) : undefined;
         this.maxNumTransfers = msg.maxNumTransfers ? new MaxNumTransfers(msg.maxNumTransfers) : undefined;
         this.requireFromEqualsInitiatedBy = msg.requireFromEqualsInitiatedBy;
         this.requireFromDoesNotEqualInitiatedBy = msg.requireFromDoesNotEqualInitiatedBy;
+        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new misc_1.ZkProof(x)) : undefined;
+        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new misc_1.CoinTransfer(x)) : undefined;
     }
     convert(convertFunction) {
         return new IncomingApprovalCriteria((0, base_1.deepCopyPrimitives)({
             mustOwnBadges: this.mustOwnBadges?.map((x) => x.convert(convertFunction)),
-            merkleChallenge: this.merkleChallenge ? this.merkleChallenge.convert(convertFunction) : undefined,
+            merkleChallenge: this.merkleChallenges?.map((x) => x.convert(convertFunction)),
             predeterminedBalances: this.predeterminedBalances ? this.predeterminedBalances.convert(convertFunction) : undefined,
             approvalAmounts: this.approvalAmounts ? this.approvalAmounts.convert(convertFunction) : undefined,
             maxNumTransfers: this.maxNumTransfers ? this.maxNumTransfers.convert(convertFunction) : undefined,
             requireFromEqualsInitiatedBy: this.requireFromEqualsInitiatedBy,
-            requireFromDoesNotEqualInitiatedBy: this.requireFromDoesNotEqualInitiatedBy
+            requireFromDoesNotEqualInitiatedBy: this.requireFromDoesNotEqualInitiatedBy,
+            zkProofs: this.zkProofs?.map((x) => x),
+            coinTransfers: this.coinTransfers?.map((x) => x.convert(convertFunction))
         }));
     }
     toProto() {
@@ -498,12 +507,14 @@ class IncomingApprovalCriteria extends base_1.BaseNumberTypeClass {
     static fromProto(item, convertFunction) {
         return new IncomingApprovalCriteria({
             mustOwnBadges: item.mustOwnBadges.map((x) => misc_1.MustOwnBadges.fromProto(x, convertFunction)),
-            merkleChallenge: item.merkleChallenge ? misc_1.MerkleChallenge.fromProto(item.merkleChallenge, convertFunction) : undefined,
+            merkleChallenges: item.merkleChallenges.map((x) => misc_1.MerkleChallenge.fromProto(x, convertFunction)),
             predeterminedBalances: item.predeterminedBalances ? PredeterminedBalances.fromProto(item.predeterminedBalances, convertFunction) : undefined,
             approvalAmounts: item.approvalAmounts ? ApprovalAmounts.fromProto(item.approvalAmounts, convertFunction) : undefined,
             maxNumTransfers: item.maxNumTransfers ? MaxNumTransfers.fromProto(item.maxNumTransfers, convertFunction) : undefined,
             requireFromEqualsInitiatedBy: item.requireFromEqualsInitiatedBy,
-            requireFromDoesNotEqualInitiatedBy: item.requireFromDoesNotEqualInitiatedBy
+            requireFromDoesNotEqualInitiatedBy: item.requireFromDoesNotEqualInitiatedBy,
+            zkProofs: item.zkProofs?.map((x) => misc_1.ZkProof.fromProto(x)),
+            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => misc_1.CoinTransfer.fromProto(x, convertFunction)) : undefined
         });
     }
     castToCollectionApprovalCriteria() {
@@ -514,7 +525,9 @@ class IncomingApprovalCriteria extends base_1.BaseNumberTypeClass {
             requireFromDoesNotEqualInitiatedBy: this.requireFromDoesNotEqualInitiatedBy,
             predeterminedBalances: this.predeterminedBalances,
             mustOwnBadges: this.mustOwnBadges,
-            merkleChallenge: this.merkleChallenge,
+            zkProofs: this.zkProofs,
+            merkleChallenges: this.merkleChallenges,
+            coinTransfers: this.coinTransfers,
             requireToEqualsInitiatedBy: false,
             requireToDoesNotEqualInitiatedBy: false,
             overridesFromOutgoingApprovals: false,
@@ -531,8 +544,6 @@ class CollectionApproval extends base_1.BaseNumberTypeClass {
     badgeIds;
     ownershipTimes;
     approvalId;
-    amountTrackerId;
-    challengeTrackerId;
     uri;
     customData;
     approvalCriteria;
@@ -545,8 +556,6 @@ class CollectionApproval extends base_1.BaseNumberTypeClass {
         this.badgeIds = uintRanges_1.UintRangeArray.From(msg.badgeIds);
         this.ownershipTimes = uintRanges_1.UintRangeArray.From(msg.ownershipTimes);
         this.approvalId = msg.approvalId;
-        this.amountTrackerId = msg.amountTrackerId;
-        this.challengeTrackerId = msg.challengeTrackerId;
         this.uri = msg.uri;
         this.customData = msg.customData;
         this.approvalCriteria = msg.approvalCriteria ? new ApprovalCriteria(msg.approvalCriteria) : undefined;
@@ -575,21 +584,11 @@ class CollectionApproval extends base_1.BaseNumberTypeClass {
             badgeIds: item.badgeIds.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
             ownershipTimes: item.ownershipTimes.map((x) => uintRanges_1.UintRange.fromProto(x, convertFunction)),
             approvalId: item.approvalId,
-            amountTrackerId: item.amountTrackerId,
-            challengeTrackerId: item.challengeTrackerId,
             uri: item.uri,
             customData: item.customData,
             approvalCriteria: item.approvalCriteria ? ApprovalCriteria.fromProto(item.approvalCriteria, convertFunction) : undefined
         });
     }
-    toWithDetails(toList, fromList, initiatedByList) {
-        return new CollectionApprovalWithDetails({
-            ...this,
-            toList,
-            fromList,
-            initiatedByList
-        });
-    }
     castToOutgoingApproval() {
         return new UserOutgoingApproval({
             ...this,
@@ -616,7 +615,7 @@ class CollectionApproval extends base_1.BaseNumberTypeClass {
 exports.CollectionApproval = CollectionApproval;
 class ApprovalCriteria extends base_1.BaseNumberTypeClass {
     mustOwnBadges;
-    merkleChallenge;
+    merkleChallenges;
     predeterminedBalances;
     approvalAmounts;
     maxNumTransfers;
@@ -626,10 +625,12 @@ class ApprovalCriteria extends base_1.BaseNumberTypeClass {
     requireFromDoesNotEqualInitiatedBy;
     overridesFromOutgoingApprovals;
     overridesToIncomingApprovals;
+    zkProofs;
+    coinTransfers;
     constructor(msg) {
         super();
         this.mustOwnBadges = msg.mustOwnBadges?.map((x) => new misc_1.MustOwnBadges(x));
-        this.merkleChallenge = msg.merkleChallenge ? new misc_1.MerkleChallenge(msg.merkleChallenge) : undefined;
+        this.merkleChallenges = msg.merkleChallenges?.map((x) => new misc_1.MerkleChallenge(x));
         this.predeterminedBalances = msg.predeterminedBalances ? new PredeterminedBalances(msg.predeterminedBalances) : undefined;
         this.approvalAmounts = msg.approvalAmounts ? new ApprovalAmounts(msg.approvalAmounts) : undefined;
         this.maxNumTransfers = msg.maxNumTransfers ? new MaxNumTransfers(msg.maxNumTransfers) : undefined;
@@ -639,6 +640,8 @@ class ApprovalCriteria extends base_1.BaseNumberTypeClass {
         this.requireFromDoesNotEqualInitiatedBy = msg.requireFromDoesNotEqualInitiatedBy;
         this.overridesFromOutgoingApprovals = msg.overridesFromOutgoingApprovals;
         this.overridesToIncomingApprovals = msg.overridesToIncomingApprovals;
+        this.zkProofs = msg.zkProofs ? msg.zkProofs.map((x) => new misc_1.ZkProof(x)) : undefined;
+        this.coinTransfers = msg.coinTransfers ? msg.coinTransfers.map((x) => new misc_1.CoinTransfer(x)) : undefined;
     }
     convert(convertFunction) {
         return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
@@ -655,10 +658,12 @@ class ApprovalCriteria extends base_1.BaseNumberTypeClass {
     static fromProto(item, convertFunction) {
         return new ApprovalCriteria({
             mustOwnBadges: item.mustOwnBadges.map((x) => misc_1.MustOwnBadges.fromProto(x, convertFunction)),
-            merkleChallenge: item.merkleChallenge ? misc_1.MerkleChallenge.fromProto(item.merkleChallenge, convertFunction) : undefined,
+            merkleChallenges: item.merkleChallenges.map((x) => misc_1.MerkleChallenge.fromProto(x, convertFunction)),
             predeterminedBalances: item.predeterminedBalances ? PredeterminedBalances.fromProto(item.predeterminedBalances, convertFunction) : undefined,
             approvalAmounts: item.approvalAmounts ? ApprovalAmounts.fromProto(item.approvalAmounts, convertFunction) : undefined,
             maxNumTransfers: item.maxNumTransfers ? MaxNumTransfers.fromProto(item.maxNumTransfers, convertFunction) : undefined,
+            zkProofs: item.zkProofs.map((x) => misc_1.ZkProof.fromProto(x)),
+            coinTransfers: item.coinTransfers ? item.coinTransfers.map((x) => misc_1.CoinTransfer.fromProto(x, convertFunction)) : undefined,
             requireToEqualsInitiatedBy: item.requireToEqualsInitiatedBy,
             requireFromEqualsInitiatedBy: item.requireFromEqualsInitiatedBy,
             requireToDoesNotEqualInitiatedBy: item.requireToDoesNotEqualInitiatedBy,
@@ -672,10 +677,12 @@ exports.ApprovalCriteria = ApprovalCriteria;
 class UserOutgoingApprovalWithDetails extends UserOutgoingApproval {
     toList;
     initiatedByList;
+    approvalCriteria;
     constructor(data) {
         super(data);
         this.toList = new addressLists_1.AddressList(data.toList);
         this.initiatedByList = new addressLists_1.AddressList(data.initiatedByList);
+        this.approvalCriteria = data.approvalCriteria ? new OutgoingApprovalCriteriaWithDetails(data.approvalCriteria) : undefined;
     }
     convert(convertFunction) {
         return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
@@ -696,10 +703,12 @@ exports.UserOutgoingApprovalWithDetails = UserOutgoingApprovalWithDetails;
 class UserIncomingApprovalWithDetails extends UserIncomingApproval {
     fromList;
     initiatedByList;
+    approvalCriteria;
     constructor(data) {
         super(data);
         this.fromList = new addressLists_1.AddressList(data.fromList);
         this.initiatedByList = new addressLists_1.AddressList(data.initiatedByList);
+        this.approvalCriteria = data.approvalCriteria ? new IncomingApprovalCriteriaWithDetails(data.approvalCriteria) : undefined;
     }
     clone() {
         return super.clone();
@@ -721,58 +730,161 @@ class UserIncomingApprovalWithDetails extends UserIncomingApproval {
 }
 exports.UserIncomingApprovalWithDetails = UserIncomingApprovalWithDetails;
 class ChallengeDetails extends base_1.BaseNumberTypeClass {
-    leavesDetails;
-    tree;
     treeOptions;
     numLeaves;
-    currCode;
+    leaves;
+    isHashed;
+    preimages;
+    seedCode;
+    tree;
     constructor(data) {
         super();
-        this.leavesDetails = data.leavesDetails;
-        this.tree = data.tree;
         this.treeOptions = data.treeOptions;
         this.numLeaves = data.numLeaves;
-        this.currCode = data.currCode;
+        this.leaves = data.leaves;
+        this.isHashed = data.isHashed;
+        this.preimages = data.preimages;
+        this.seedCode = data.seedCode;
     }
     getNumberFieldNames() {
-        return ['numLeaves', 'currCode'];
+        return ['numLeaves'];
     }
     convert(convertFunction) {
         return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
     }
 }
 exports.ChallengeDetails = ChallengeDetails;
+class ChallengeInfoDetails extends base_1.BaseNumberTypeClass {
+    challengeDetails;
+    claim;
+    constructor(data) {
+        super();
+        this.challengeDetails = new ChallengeDetails(data.challengeDetails);
+        this.claim = data.claim;
+    }
+    convert(convertFunction) {
+        return new ChallengeInfoDetails((0, base_1.deepCopyPrimitives)({
+            ...this,
+            challengeDetails: this.challengeDetails.convert(convertFunction)
+        }));
+    }
+}
+exports.ChallengeInfoDetails = ChallengeInfoDetails;
 class ApprovalInfoDetails extends base_1.BaseNumberTypeClass {
     name;
     description;
-    challengeDetails;
-    offChainClaims;
     constructor(data) {
         super();
         this.name = data.name;
         this.description = data.description;
-        this.challengeDetails = data.challengeDetails ? new ChallengeDetails(data.challengeDetails) : undefined;
-        this.offChainClaims = data.offChainClaims;
     }
     convert(convertFunction) {
-        return new ApprovalInfoDetails((0, base_1.deepCopyPrimitives)({
-            ...this,
-            challengeDetails: this.challengeDetails ? this.challengeDetails.convert(convertFunction) : undefined
-        }));
+        return new ApprovalInfoDetails((0, base_1.deepCopyPrimitives)({ ...this }));
     }
 }
 exports.ApprovalInfoDetails = ApprovalInfoDetails;
+class MerkleChallengeWithDetails extends misc_1.MerkleChallenge {
+    challengeInfoDetails;
+    constructor(data) {
+        super(data);
+        this.challengeInfoDetails = new ChallengeInfoDetails(data.challengeInfoDetails);
+    }
+    getNumberFieldNames() {
+        return super.getNumberFieldNames().concat(this.challengeInfoDetails.challengeDetails.getNumberFieldNames());
+    }
+    convert(convertFunction) {
+        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+    }
+    clone() {
+        return super.clone();
+    }
+}
+exports.MerkleChallengeWithDetails = MerkleChallengeWithDetails;
+class ApprovalCriteriaWithDetails extends ApprovalCriteria {
+    merkleChallenges;
+    constructor(data) {
+        super(data);
+        this.merkleChallenges = data.merkleChallenges?.map((x) => new MerkleChallengeWithDetails(x));
+    }
+    convert(convertFunction) {
+        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+    }
+    clone() {
+        return super.clone();
+    }
+}
+exports.ApprovalCriteriaWithDetails = ApprovalCriteriaWithDetails;
+class IncomingApprovalCriteriaWithDetails extends IncomingApprovalCriteria {
+    merkleChallenges;
+    constructor(data) {
+        super(data);
+        this.merkleChallenges = data.merkleChallenges?.map((x) => new MerkleChallengeWithDetails(x));
+    }
+    convert(convertFunction) {
+        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+    }
+    clone() {
+        return super.clone();
+    }
+    castToCollectionApprovalCriteria() {
+        return new ApprovalCriteriaWithDetails({
+            approvalAmounts: this.approvalAmounts,
+            maxNumTransfers: this.maxNumTransfers,
+            predeterminedBalances: this.predeterminedBalances,
+            mustOwnBadges: this.mustOwnBadges,
+            zkProofs: this.zkProofs,
+            merkleChallenges: this.merkleChallenges,
+            coinTransfers: this.coinTransfers,
+            requireFromEqualsInitiatedBy: false,
+            requireFromDoesNotEqualInitiatedBy: false,
+            overridesFromOutgoingApprovals: false,
+            overridesToIncomingApprovals: false
+        });
+    }
+}
+exports.IncomingApprovalCriteriaWithDetails = IncomingApprovalCriteriaWithDetails;
+class OutgoingApprovalCriteriaWithDetails extends OutgoingApprovalCriteria {
+    merkleChallenges;
+    constructor(data) {
+        super(data);
+        this.merkleChallenges = data.merkleChallenges?.map((x) => new MerkleChallengeWithDetails(x));
+    }
+    convert(convertFunction) {
+        return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
+    }
+    clone() {
+        return super.clone();
+    }
+    castToCollectionApprovalCriteria() {
+        return new ApprovalCriteriaWithDetails({
+            approvalAmounts: this.approvalAmounts,
+            maxNumTransfers: this.maxNumTransfers,
+            predeterminedBalances: this.predeterminedBalances,
+            mustOwnBadges: this.mustOwnBadges,
+            zkProofs: this.zkProofs,
+            merkleChallenges: this.merkleChallenges,
+            coinTransfers: this.coinTransfers,
+            requireToEqualsInitiatedBy: false,
+            requireToDoesNotEqualInitiatedBy: false,
+            overridesFromOutgoingApprovals: false,
+            overridesToIncomingApprovals: false
+        });
+    }
+}
+exports.OutgoingApprovalCriteriaWithDetails = OutgoingApprovalCriteriaWithDetails;
 class CollectionApprovalWithDetails extends CollectionApproval {
     details;
     toList;
     fromList;
     initiatedByList;
+    approvalCriteria;
     constructor(data) {
         super(data);
         this.details = data.details ? new ApprovalInfoDetails(data.details) : undefined;
         this.toList = new addressLists_1.AddressList(data.toList);
         this.fromList = new addressLists_1.AddressList(data.fromList);
         this.initiatedByList = new addressLists_1.AddressList(data.initiatedByList);
+        this.approvalCriteria = data.approvalCriteria ? new ApprovalCriteriaWithDetails(data.approvalCriteria) : undefined;
     }
     convert(convertFunction) {
         return (0, base_1.convertClassPropertiesAndMaintainNumberTypes)(this, convertFunction);
@@ -790,10 +902,6 @@ class CollectionApprovalWithDetails extends CollectionApproval {
             toList: this.toList,
             initiatedByList: this.initiatedByList,
             approvalIdList: getReservedTrackerList(this.approvalId),
-            amountTrackerIdList: getReservedTrackerList(this.amountTrackerId),
-            challengeTrackerIdList: getReservedTrackerList(this.challengeTrackerId),
-            usesAmountTrackerIdList: true,
-            usesChallengeTrackerIdList: true,
             usesApprovalIdList: true,
             usesBadgeIds: true,
             usesTransferTimes: true,
@@ -803,8 +911,6 @@ class CollectionApprovalWithDetails extends CollectionApproval {
             usesOwnershipTimes: true,
             arbitraryValue: {
                 approvalId: this.approvalId,
-                amountTrackerId: this.amountTrackerId,
-                challengeTrackerId: this.challengeTrackerId,
                 approvalCriteria: this.approvalCriteria
             }
         };
@@ -868,8 +974,6 @@ function getFirstMatchOnlyWithApprovalCriteria(permissions) {
                                 fromList: permission.fromList,
                                 initiatedByList: permission.initiatedByList,
                                 approvalIdList: permission.approvalIdList,
-                                amountTrackerIdList: permission.amountTrackerIdList,
-                                challengeTrackerIdList: permission.challengeTrackerIdList,
                                 permanentlyPermittedTimes: permanentlyPermittedTimes,
                                 permanentlyForbiddenTimes: permanentlyForbiddenTimes,
                                 arbitraryValue: arbValue
@@ -897,8 +1001,6 @@ function getFirstMatchOnlyWithApprovalCriteria(permissions) {
                                 fromList: overlap.overlap.fromList,
                                 initiatedByList: overlap.overlap.initiatedByList,
                                 approvalIdList: overlap.overlap.approvalIdList,
-                                amountTrackerIdList: overlap.overlap.amountTrackerIdList,
-                                challengeTrackerIdList: overlap.overlap.challengeTrackerIdList,
                                 permanentlyPermittedTimes: permanentlyPermittedTimes,
                                 permanentlyForbiddenTimes: permanentlyForbiddenTimes,
                                 arbitraryValue: newArbValue
@@ -986,9 +1088,7 @@ function validateCollectionApprovalsUpdate(oldApprovals, newApprovals, canUpdate
             toList: x.toList,
             fromList: x.fromList,
             initiatedByList: x.initiatedByList,
-            approvalIdList: x.approvalIdList,
-            amountTrackerIdList: x.amountTrackerIdList,
-            challengeTrackerIdList: x.challengeTrackerIdList
+            approvalIdList: x.approvalIdList
         };
         return result;
     });
@@ -1023,9 +1123,7 @@ function expandCollectionApprovals(approvals) {
             fromList: fromList,
             initiatedByList: initiatedByList,
             approvalCriteria: approval.approvalCriteria,
-            approvalId: approval.approvalId,
-            amountTrackerId: approval.amountTrackerId,
-            challengeTrackerId: approval.challengeTrackerId
+            approvalId: approval.approvalId
         }));
     }
     return newCurrApprovals;