@nucypher/taco 0.4.0 → 0.5.0

package/README.md

@@ -60,7 +60,6 @@ const decryptedMessage = await decrypt(
   web3Provider,
   domains.TESTNET,
   messageKit,
-  getPorterUri(domains.TESTNET),
   web3Provider.getSigner(),
 );
 ```

package/dist/cjs/conditions/base/contract.d.ts

@@ -142,25 +142,21 @@ declare const functionAbiSchema: z.ZodEffects<z.ZodEffects<z.ZodObject<{
 }>;
 export type FunctionAbiProps = z.infer<typeof functionAbiSchema>;
 export declare const ContractConditionType = "contract";
-export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<z.objectUtil.extendShape<{
-    conditionType: z.ZodDefault<z.ZodLiteral<"rpc">>;
+export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<{
     chain: z.ZodNever | z.ZodLiteral<z.Primitive> | z.ZodUnion<[z.ZodLiteral<z.Primitive>, z.ZodLiteral<z.Primitive>, ...z.ZodLiteral<z.Primitive>[]]>;
-    method: z.ZodEnum<["eth_getBalance"]>;
-    parameters: z.ZodUnion<[z.ZodArray<z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEnum<[":userAddress", ":userAddressExternalEIP4361"]>]>, "atleastone">, z.ZodTuple<[z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEnum<[":userAddress", ":userAddressExternalEIP4361"]>]>, z.ZodType<any, z.ZodTypeDef, any>], null>]>;
     returnValueTest: z.ZodObject<{
         index: z.ZodOptional<z.ZodNumber>;
         comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
         value: z.ZodType<any, z.ZodTypeDef, any>;
     }, "strip", z.ZodTypeAny, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     }, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     }>;
-}, {
     conditionType: z.ZodDefault<z.ZodLiteral<"contract">>;
     contractAddress: z.ZodString;
     standardContractType: z.ZodOptional<z.ZodEnum<["ERC20", "ERC721"]>>;
@@ -305,17 +301,18 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<z.objectU
         stateMutability: "view" | "pure";
     }>>;
     parameters: z.ZodArray<z.ZodType<any, z.ZodTypeDef, any>, "many">;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     conditionType: "contract";
     method: string;
     parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     contractAddress: string;
     chain?: z.Primitive;
+    standardContractType?: "ERC20" | "ERC721" | undefined;
     functionAbi?: {
         type: "function";
         name: string;
@@ -335,18 +332,18 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<z.objectU
         }[]];
         stateMutability: "view" | "pure";
     } | undefined;
-    standardContractType?: "ERC20" | "ERC721" | undefined;
 }, {
     method: string;
     parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     contractAddress: string;
-    conditionType?: "contract" | undefined;
     chain?: z.Primitive;
+    conditionType?: "contract" | undefined;
+    standardContractType?: "ERC20" | "ERC721" | undefined;
     functionAbi?: {
         type: "function";
         name: string;
@@ -366,18 +363,18 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<z.objectU
         }[]];
         stateMutability: "view" | "pure";
     } | undefined;
-    standardContractType?: "ERC20" | "ERC721" | undefined;
 }>, {
     conditionType: "contract";
     method: string;
     parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     contractAddress: string;
     chain?: z.Primitive;
+    standardContractType?: "ERC20" | "ERC721" | undefined;
     functionAbi?: {
         type: "function";
         name: string;
@@ -397,18 +394,18 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<z.objectU
         }[]];
         stateMutability: "view" | "pure";
     } | undefined;
-    standardContractType?: "ERC20" | "ERC721" | undefined;
 }, {
     method: string;
     parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     contractAddress: string;
-    conditionType?: "contract" | undefined;
     chain?: z.Primitive;
+    conditionType?: "contract" | undefined;
+    standardContractType?: "ERC20" | "ERC721" | undefined;
     functionAbi?: {
         type: "function";
         name: string;
@@ -428,7 +425,6 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<z.objectU
         }[]];
         stateMutability: "view" | "pure";
     } | undefined;
-    standardContractType?: "ERC20" | "ERC721" | undefined;
 }>;
 export type ContractConditionProps = z.infer<typeof contractConditionSchema>;
 export declare class ContractCondition extends Condition {

package/dist/cjs/conditions/base/rpc.d.ts

@@ -13,30 +13,30 @@ export declare const rpcConditionSchema: z.ZodObject<{
         value: z.ZodType<any, z.ZodTypeDef, any>;
     }, "strip", z.ZodTypeAny, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     }, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     }>;
 }, "strip", z.ZodTypeAny, {
     conditionType: "rpc";
     method: "eth_getBalance";
-    parameters: [string, ...string[]] | [string, any];
+    parameters: ([string, ...string[]] | [string, any]) & ([string, ...string[]] | [string, any] | undefined);
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     chain?: z.Primitive;
 }, {
     method: "eth_getBalance";
-    parameters: [string, ...string[]] | [string, any];
+    parameters: ([string, ...string[]] | [string, any]) & ([string, ...string[]] | [string, any] | undefined);
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     conditionType?: "rpc" | undefined;
     chain?: z.Primitive;

package/dist/cjs/conditions/base/time.d.ts

@@ -13,31 +13,31 @@ export declare const timeConditionSchema: z.ZodObject<{
         value: z.ZodType<any, z.ZodTypeDef, any>;
     }, "strip", z.ZodTypeAny, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     }, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     }>;
 }, "strip", z.ZodTypeAny, {
     conditionType: "time";
     method: "blocktime";
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     chain?: z.Primitive;
 }, {
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-        value?: any;
         index?: number | undefined;
+        value?: any;
     };
     conditionType?: "time" | undefined;
-    chain?: z.Primitive;
     method?: "blocktime" | undefined;
+    chain?: z.Primitive;
 }>;
 export type TimeConditionProps = z.infer<typeof timeConditionSchema>;
 export declare class TimeCondition extends Condition {

package/dist/cjs/conditions/condition-expr.d.ts

@@ -1,7 +1,5 @@
 import { Conditions as CoreConditions } from '@nucypher/nucypher-core';
-import { AuthProviders } from '@nucypher/taco-auth';
 import { Condition } from './condition';
-import { ConditionContext, CustomContextParam } from './context';
 export type ConditionExpressionJSON = {
     version: string;
     condition: Record<string, unknown>;
@@ -17,6 +15,5 @@ export declare class ConditionExpression {
     static fromJSON(json: string): ConditionExpression;
     toCoreCondition(): CoreConditions;
     static fromCoreConditions(conditions: CoreConditions): ConditionExpression;
-    buildContext(customParameters?: Record<string, CustomContextParam>, authProviders?: AuthProviders): ConditionContext;
     equals(other: ConditionExpression): boolean;
 }

package/dist/cjs/conditions/condition-expr.js

@@ -5,7 +5,6 @@ const nucypher_core_1 = require("@nucypher/nucypher-core");
 const shared_1 = require("@nucypher/shared");
 const semver_1 = require("semver");
 const condition_factory_1 = require("./condition-factory");
-const context_1 = require("./context");
 const ERR_VERSION = (provided, current) => `Version provided, ${provided}, is incompatible with current version, ${current}`;
 const ERR_CONDITION = (condition) => `Invalid condition: unrecognized condition data ${JSON.stringify(condition)}`;
 class ConditionExpression {
@@ -47,9 +46,6 @@ class ConditionExpression {
     static fromCoreConditions(conditions) {
         return ConditionExpression.fromJSON(conditions.toString());
     }
-    buildContext(customParameters = {}, authProviders = {}) {
-        return new context_1.ConditionContext(this.condition, customParameters, authProviders);
-    }
     equals(other) {
         return [
             this.version === other.version,

package/dist/cjs/conditions/condition-expr.js.map

@@ -1 +1 @@
-{"version":3,"file":"condition-expr.js","sourceRoot":"","sources":["../../../src/conditions/condition-expr.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,6CAA0C;AAE1C,mCAAgC;AAGhC,2DAAuD;AACvD,uCAAiE;AAEjE,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,OAAe,EAAE,EAAE,CACxD,qBAAqB,QAAQ,2CAA2C,OAAO,EAAE,CAAC;AACpF,MAAM,aAAa,GAAG,CAAC,SAAkC,EAAE,EAAE,CAC3D,kDAAkD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;AAOhF,MAAa,mBAAmB;IAIZ;IACA;IAJX,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAEhC,YACkB,SAAoB,EACpB,UAAkB,mBAAmB,CAAC,OAAO;QAD7C,cAAS,GAAT,SAAS,CAAW;QACpB,YAAO,GAAP,OAAO,CAAsC;IAC5D,CAAC;IAEG,KAAK;QACV,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,GAA4B;QAChD,MAAM,eAAe,GAAG,IAAI,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,eAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,SAAS,GAAG,oCAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrE,OAAO,IAAI,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM;QACX,OAAO,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAY;QACjC,OAAO,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,0BAAc,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,UAA0B;QACzD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAEM,YAAY,CACjB,mBAAuD,EAAE,EACzD,gBAA+B,EAAE;QAEjC,OAAO,IAAI,0BAAgB,CACzB,IAAI,CAAC,SAAS,EACd,gBAAgB,EAChB,aAAa,CACd,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,KAA0B;QACtC,OAAO;YACL,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;YAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;SACvC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;;AA/DH,kDAgEC"}
+{"version":3,"file":"condition-expr.js","sourceRoot":"","sources":["../../../src/conditions/condition-expr.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,6CAA0C;AAC1C,mCAAgC;AAGhC,2DAAuD;AAEvD,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,OAAe,EAAE,EAAE,CACxD,qBAAqB,QAAQ,2CAA2C,OAAO,EAAE,CAAC;AACpF,MAAM,aAAa,GAAG,CAAC,SAAkC,EAAE,EAAE,CAC3D,kDAAkD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;AAOhF,MAAa,mBAAmB;IAIZ;IACA;IAJX,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAEhC,YACkB,SAAoB,EACpB,UAAkB,mBAAmB,CAAC,OAAO;QAD7C,cAAS,GAAT,SAAS,CAAW;QACpB,YAAO,GAAP,OAAO,CAAsC;IAC5D,CAAC;IAEG,KAAK;QACV,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS;SACV,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,GAA4B;QAChD,MAAM,eAAe,GAAG,IAAI,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,eAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,SAAS,GAAG,oCAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACrE,OAAO,IAAI,mBAAmB,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAEM,MAAM;QACX,OAAO,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAY;QACjC,OAAO,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,0BAAc,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,UAA0B;QACzD,OAAO,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAEM,MAAM,CAAC,KAA0B;QACtC,OAAO;YACL,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;YAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;SACvC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;;AApDH,kDAqDC"}

package/dist/cjs/conditions/const.d.ts

@@ -1,7 +1,5 @@
 import { ChainId } from '@nucypher/shared';
-export declare const USER_ADDRESS_PARAM_EXTERNAL_EIP4361 = ":userAddressExternalEIP4361";
 export declare const CONTEXT_PARAM_REGEXP: RegExp;
 export declare const CONTEXT_PARAM_PREFIX = ":";
 export declare const SUPPORTED_CHAIN_IDS: ChainId[];
 export declare const USER_ADDRESS_PARAMS: string[];
-export declare const RESERVED_CONTEXT_PARAMS: string[];

package/dist/cjs/conditions/const.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RESERVED_CONTEXT_PARAMS = exports.USER_ADDRESS_PARAMS = exports.SUPPORTED_CHAIN_IDS = exports.CONTEXT_PARAM_PREFIX = exports.CONTEXT_PARAM_REGEXP = exports.USER_ADDRESS_PARAM_EXTERNAL_EIP4361 = void 0;
+exports.USER_ADDRESS_PARAMS = exports.SUPPORTED_CHAIN_IDS = exports.CONTEXT_PARAM_PREFIX = exports.CONTEXT_PARAM_REGEXP = void 0;
 const shared_1 = require("@nucypher/shared");
 const taco_auth_1 = require("@nucypher/taco-auth");
-exports.USER_ADDRESS_PARAM_EXTERNAL_EIP4361 = ':userAddressExternalEIP4361';
 // Only allow alphanumeric characters and underscores
 exports.CONTEXT_PARAM_REGEXP = new RegExp('^:[a-zA-Z_][a-zA-Z0-9_]*$');
 exports.CONTEXT_PARAM_PREFIX = ':';
@@ -14,12 +13,8 @@ exports.SUPPORTED_CHAIN_IDS = [
     shared_1.ChainId.ETHEREUM_MAINNET,
 ];
 exports.USER_ADDRESS_PARAMS = [
-    exports.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
+    taco_auth_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
     // Ordering matters, this should always be last
     taco_auth_1.USER_ADDRESS_PARAM_DEFAULT,
 ];
-exports.RESERVED_CONTEXT_PARAMS = [
-    taco_auth_1.USER_ADDRESS_PARAM_DEFAULT,
-    // USER_ADDRESS_PARAM_EXTERNAL_EIP4361 is not reserved and can be used as a custom context parameter
-];
 //# sourceMappingURL=const.js.map

package/dist/cjs/conditions/const.js.map

@@ -1 +1 @@
-{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/conditions/const.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,mDAAiE;AAEpD,QAAA,mCAAmC,GAC9C,6BAA6B,CAAC;AAEhC,qDAAqD;AACxC,QAAA,oBAAoB,GAAG,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAE/D,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAE3B,QAAA,mBAAmB,GAAG;IACjC,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,IAAI;IACZ,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,gBAAgB;CACzB,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,2CAAmC;IACnC,+CAA+C;IAC/C,sCAA0B;CAC3B,CAAC;AAEW,QAAA,uBAAuB,GAAG;IACrC,sCAA0B;IAC1B,oGAAoG;CACrG,CAAC"}
+{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../src/conditions/const.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,mDAG6B;AAE7B,qDAAqD;AACxC,QAAA,oBAAoB,GAAG,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;AAE/D,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAE3B,QAAA,mBAAmB,GAAG;IACjC,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,IAAI;IACZ,gBAAO,CAAC,OAAO;IACf,gBAAO,CAAC,gBAAgB;CACzB,CAAC;AAEW,QAAA,mBAAmB,GAAG;IACjC,+CAAmC;IACnC,+CAA+C;IAC/C,sCAA0B;CAC3B,CAAC"}

package/dist/cjs/conditions/context/context.d.ts

@@ -1,25 +1,27 @@
 import { ThresholdMessageKit } from '@nucypher/nucypher-core';
-import { AuthProviders, AuthSignature } from '@nucypher/taco-auth';
-import { CoreConditions, CoreContext } from '../../types';
-import { Condition, ConditionProps } from '../condition';
-export type CustomContextParam = string | number | boolean | AuthSignature;
+import { AuthProvider, AuthSignature } from '@nucypher/taco-auth';
+import { CoreContext } from '../../types';
+import { Condition } from '../condition';
+export type CustomContextParam = string | number | boolean;
 export type ContextParam = CustomContextParam | AuthSignature;
+export declare const RESERVED_CONTEXT_PARAMS: string[];
 export declare class ConditionContext {
-    readonly customParameters: Record<string, CustomContextParam>;
-    private readonly authProviders;
-    requestedParameters: Set<string>;
-    constructor(condition: Condition, customParameters?: Record<string, CustomContextParam>, authProviders?: AuthProviders);
-    private validateContextParameters;
-    private validateCoreConditions;
+    requestedContextParameters: Set<string>;
+    private customContextParameters;
+    private authProviders;
+    constructor(condition: Condition);
+    private static validateCoreConditions;
     private validateNoMissingContextParameters;
     private fillContextParameters;
     private validateAuthProviders;
     private fillAuthContextParameters;
+    private validateCustomContextParameter;
     private static isContextParameter;
-    static findContextParameters(condition: ConditionProps): Set<string>;
+    private static findContextParameters;
+    addCustomContextParameterValues(customContextParameters: Record<string, CustomContextParam>): void;
+    addAuthProvider(contextParam: string, authProvider: AuthProvider): void;
     toJson(): Promise<string>;
     toCoreContext(): Promise<CoreContext>;
     toContextParameters: () => Promise<Record<string, ContextParam>>;
-    static fromConditions(conditions: CoreConditions, authProviders?: AuthProviders, customParameters?: Record<string, CustomContextParam>): ConditionContext;
-    static requestedContextParameters(messageKit: ThresholdMessageKit): Set<string>;
+    static fromMessageKit(messageKit: ThresholdMessageKit): ConditionContext;
 }

package/dist/cjs/conditions/context/context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConditionContext = void 0;
+exports.ConditionContext = exports.RESERVED_CONTEXT_PARAMS = void 0;
 const shared_1 = require("@nucypher/shared");
 const taco_auth_1 = require("@nucypher/taco-auth");
 const types_1 = require("../../types");
@@ -11,33 +11,28 @@ const ERR_RESERVED_PARAM = (key) => `Cannot use reserved parameter name ${key} a
 const ERR_INVALID_CUSTOM_PARAM = (key) => `Custom parameter ${key} must start with ${const_1.CONTEXT_PARAM_PREFIX}`;
 const ERR_AUTH_PROVIDER_REQUIRED = (key) => `No matching authentication provider to satisfy ${key} context variable in condition`;
 const ERR_MISSING_CONTEXT_PARAMS = (params) => `Missing custom context parameter(s): ${params.join(', ')}`;
-const ERR_UNKNOWN_CONTEXT_PARAMS = (params) => `Unknown custom context parameter(s): ${params.join(', ')}`;
-const ERR_NO_AUTH_PROVIDER_FOR_PARAM = (param) => `No custom parameter for requested context parameter: ${param}`;
+const ERR_UNKNOWN_CUSTOM_CONTEXT_PARAM = (param) => `Unknown custom context parameter: ${param}`;
+const ERR_INVALID_AUTH_PROVIDER_TYPE = (param, expected) => `Invalid AuthProvider type for ${param}; expected ${expected}`;
+const ERR_AUTH_PROVIDER_NOT_NEEDED_FOR_CONTEXT_PARAM = (param) => `AuthProvider not necessary for context parameter: ${param}`;
+const EXPECTED_AUTH_PROVIDER_TYPES = {
+    [taco_auth_1.USER_ADDRESS_PARAM_DEFAULT]: taco_auth_1.EIP4361AuthProvider,
+    [taco_auth_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361]: taco_auth_1.SingleSignOnEIP4361AuthProvider,
+};
+exports.RESERVED_CONTEXT_PARAMS = [
+    taco_auth_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
+    taco_auth_1.USER_ADDRESS_PARAM_DEFAULT,
+];
 class ConditionContext {
-    customParameters;
-    authProviders;
-    requestedParameters;
-    constructor(condition, customParameters = {}, authProviders = {}) {
-        this.customParameters = customParameters;
-        this.authProviders = authProviders;
+    requestedContextParameters;
+    customContextParameters = {};
+    authProviders = {};
+    constructor(condition) {
         const condProps = condition.toObj();
-        this.validateContextParameters();
-        this.validateCoreConditions(condProps);
-        this.requestedParameters =
+        ConditionContext.validateCoreConditions(condProps);
+        this.requestedContextParameters =
             ConditionContext.findContextParameters(condProps);
-        this.validateAuthProviders(this.requestedParameters);
     }
-    validateContextParameters() {
-        Object.keys(this.customParameters).forEach((key) => {
-            if (const_1.RESERVED_CONTEXT_PARAMS.includes(key)) {
-                throw new Error(ERR_RESERVED_PARAM(key));
-            }
-            if (!key.startsWith(const_1.CONTEXT_PARAM_PREFIX)) {
-                throw new Error(ERR_INVALID_CUSTOM_PARAM(key));
-            }
-        });
-    }
-    validateCoreConditions(condObject) {
+    static validateCoreConditions(condObject) {
         // Checking whether the condition is compatible with the current version of the library
         // Intentionally ignoring the return value of the function
         new types_1.CoreConditions((0, shared_1.toJSON)(condObject));
@@ -45,54 +40,52 @@ class ConditionContext {
     validateNoMissingContextParameters(parameters) {
         // Ok, so at this point we should have all the parameters we need
         // If we don't, we have a problem and we should throw
-        const missingParameters = Array.from(this.requestedParameters).filter((key) => parameters[key] === undefined);
+        const missingParameters = Array.from(this.requestedContextParameters).filter((key) => parameters[key] === undefined);
         if (missingParameters.length > 0) {
             throw new Error(ERR_MISSING_CONTEXT_PARAMS(missingParameters));
         }
-        // We may also have some parameters that are not used
-        const unknownParameters = Object.keys(parameters).filter((key) => !this.requestedParameters.has(key) &&
-            !const_1.RESERVED_CONTEXT_PARAMS.includes(key));
-        if (unknownParameters.length > 0) {
-            throw new Error(ERR_UNKNOWN_CONTEXT_PARAMS(unknownParameters));
-        }
     }
-    async fillContextParameters(requestedParameters) {
-        const parameters = await this.fillAuthContextParameters(requestedParameters);
-        for (const key in this.customParameters) {
-            parameters[key] = this.customParameters[key];
+    async fillContextParameters(requestedContextParameters) {
+        const parameters = await this.fillAuthContextParameters(requestedContextParameters);
+        for (const key in this.customContextParameters) {
+            parameters[key] = this.customContextParameters[key];
         }
         return parameters;
     }
-    validateAuthProviders(requestedParameters) {
-        for (const param of requestedParameters) {
+    validateAuthProviders() {
+        for (const param of this.requestedContextParameters) {
             // If it's not a user address parameter, we can skip
             if (!const_1.USER_ADDRESS_PARAMS.includes(param)) {
                 continue;
             }
-            // If it's a user address parameter, we need to check if we have an auth provider
-            const authMethod = taco_auth_1.AUTH_METHOD_FOR_PARAM[param];
-            if (!authMethod && !this.customParameters[param]) {
-                // If we don't have an auth method, and we don't have a custom parameter, we have a problem
-                throw new Error(ERR_NO_AUTH_PROVIDER_FOR_PARAM(param));
-            }
-            // If we have an auth method, but we don't have an auth provider, we have a problem
-            if (authMethod && !this.authProviders[authMethod]) {
+            // we don't have a corresponding auth provider, we have a problem
+            if (!this.authProviders[param]) {
                 throw new Error(ERR_AUTH_PROVIDER_REQUIRED(param));
             }
         }
     }
     async fillAuthContextParameters(requestedParameters) {
         const entries = await Promise.all([...requestedParameters]
-            .map((param) => [param, taco_auth_1.AUTH_METHOD_FOR_PARAM[param]])
-            .filter(([, authMethod]) => !!authMethod)
-            .map(async ([param, authMethod]) => {
-            const maybeAuthProvider = this.authProviders[authMethod];
+            .filter((param) => const_1.USER_ADDRESS_PARAMS.includes(param))
+            .map(async (param) => {
+            const maybeAuthProvider = this.authProviders[param];
             // TODO: Throw here instead of validating in the constructor?
             // TODO: Hide getOrCreateAuthSignature behind a more generic interface
             return [param, await maybeAuthProvider.getOrCreateAuthSignature()];
         }));
         return Object.fromEntries(entries);
     }
+    validateCustomContextParameter(customParam) {
+        if (!ConditionContext.isContextParameter(customParam)) {
+            throw new Error(ERR_INVALID_CUSTOM_PARAM(customParam));
+        }
+        if (exports.RESERVED_CONTEXT_PARAMS.includes(customParam)) {
+            throw new Error(ERR_RESERVED_PARAM(customParam));
+        }
+        if (!this.requestedContextParameters.has(customParam)) {
+            throw new Error(ERR_UNKNOWN_CUSTOM_CONTEXT_PARAM(customParam));
+        }
+    }
     static isContextParameter(param) {
         return !!String(param).match(const_1.CONTEXT_PARAM_REGEXP);
     }
@@ -134,6 +127,21 @@ class ConditionContext {
         }
         return requestedParameters;
     }
+    addCustomContextParameterValues(customContextParameters) {
+        Object.keys(customContextParameters).forEach((key) => {
+            this.validateCustomContextParameter(key);
+            this.customContextParameters[key] = customContextParameters[key];
+        });
+    }
+    addAuthProvider(contextParam, authProvider) {
+        if (!(contextParam in EXPECTED_AUTH_PROVIDER_TYPES)) {
+            throw new Error(ERR_AUTH_PROVIDER_NOT_NEEDED_FOR_CONTEXT_PARAM(contextParam));
+        }
+        if (!(authProvider instanceof EXPECTED_AUTH_PROVIDER_TYPES[contextParam])) {
+            throw new Error(ERR_INVALID_AUTH_PROVIDER_TYPE(contextParam, typeof authProvider));
+        }
+        this.authProviders[contextParam] = authProvider;
+    }
     async toJson() {
         const parameters = await this.toContextParameters();
         return (0, shared_1.toJSON)(parameters);
@@ -143,16 +151,14 @@ class ConditionContext {
         return new types_1.CoreContext(asJson);
     }
     toContextParameters = async () => {
-        const parameters = await this.fillContextParameters(this.requestedParameters);
+        this.validateAuthProviders();
+        const parameters = await this.fillContextParameters(this.requestedContextParameters);
         this.validateNoMissingContextParameters(parameters);
         return parameters;
     };
-    static fromConditions(conditions, authProviders, customParameters) {
-        return new ConditionContext(condition_expr_1.ConditionExpression.fromCoreConditions(conditions).condition, customParameters, authProviders);
-    }
-    static requestedContextParameters(messageKit) {
+    static fromMessageKit(messageKit) {
         const conditionExpr = condition_expr_1.ConditionExpression.fromCoreConditions(messageKit.acp.conditions);
-        return ConditionContext.findContextParameters(conditionExpr.condition.toObj());
+        return new ConditionContext(conditionExpr.condition);
     }
 }
 exports.ConditionContext = ConditionContext;

package/dist/cjs/conditions/context/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/conditions/context/context.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAC1C,mDAI6B;AAE7B,uCAA0D;AAC1D,8DAA8D;AAE9D,sDAAwD;AACxD,oCAKkB;AAKlB,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAE,EAAE,CACzC,sCAAsC,GAAG,sBAAsB,CAAC;AAClE,MAAM,wBAAwB,GAAG,CAAC,GAAW,EAAE,EAAE,CAC/C,oBAAoB,GAAG,oBAAoB,4BAAoB,EAAE,CAAC;AACpE,MAAM,0BAA0B,GAAG,CAAC,GAAW,EAAE,EAAE,CACjD,kDAAkD,GAAG,gCAAgC,CAAC;AACxF,MAAM,0BAA0B,GAAG,CAAC,MAAgB,EAAE,EAAE,CACtD,wCAAwC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAC9D,MAAM,0BAA0B,GAAG,CAAC,MAAgB,EAAE,EAAE,CACtD,wCAAwC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAC9D,MAAM,8BAA8B,GAAG,CAAC,KAAa,EAAE,EAAE,CACvD,wDAAwD,KAAK,EAAE,CAAC;AAElE,MAAa,gBAAgB;IAKT;IACC;IALZ,mBAAmB,CAAc;IAExC,YACE,SAAoB,EACJ,mBAAuD,EAAE,EACxD,gBAA+B,EAAE;QADlC,qBAAgB,GAAhB,gBAAgB,CAAyC;QACxD,kBAAa,GAAb,aAAa,CAAoB;QAElD,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACjC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,mBAAmB;YACtB,gBAAgB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvD,CAAC;IAEO,yBAAyB;QAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjD,IAAI,+BAAuB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3C,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,4BAAoB,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;YACjD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,sBAAsB,CAAC,UAA0B;QACvD,uFAAuF;QACvF,0DAA0D;QAC1D,IAAI,sBAAc,CAAC,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,CAAC;IACzC,CAAC;IAEO,kCAAkC,CACxC,UAAwC;QAExC,iEAAiE;QACjE,qDAAqD;QACrD,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,CACnE,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,CACvC,CAAC;QACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACjE,CAAC;QAED,qDAAqD;QACrD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CACtD,CAAC,GAAG,EAAE,EAAE,CACN,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC;YAClC,CAAC,+BAAuB,CAAC,QAAQ,CAAC,GAAG,CAAC,CACzC,CAAC;QACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,mBAAgC;QAEhC,MAAM,UAAU,GACd,MAAM,IAAI,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,CAAC;QAC5D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,qBAAqB,CAAC,mBAAgC;QAC5D,KAAK,MAAM,KAAK,IAAI,mBAAmB,EAAE,CAAC;YACxC,oDAAoD;YACpD,IAAI,CAAC,2BAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzC,SAAS;YACX,CAAC;YAED,iFAAiF;YACjF,MAAM,UAAU,GAAG,iCAAqB,CAAC,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjD,2FAA2F;gBAC3F,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC,CAAC;YACzD,CAAC;YAED,mFAAmF;YACnF,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;gBAClD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,yBAAyB,CACrC,mBAAgC;QAEhC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,CAAC,GAAG,mBAAmB,CAAC;aACrB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,iCAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;aACrD,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;aACxC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE;YACjC,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACzD,6DAA6D;YAC7D,sEAAsE;YACtE,OAAO,CAAC,KAAK,EAAE,MAAM,iBAAkB,CAAC,wBAAwB,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC,CACL,CAAC;QACF,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAEO,MAAM,CAAC,kBAAkB,CAAC,KAAc;QAC9C,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,4BAAoB,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAC,SAAyB;QAC3D,2DAA2D;QAC3D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;QAE9C,0BAA0B;QAC1B,IAAI,SAAS,CAAC,eAAe,EAAE,CAAC;YAC9B,MAAM,GAAG,GAAG,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC;YAC5C,wEAAwE;YACxE,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBACpB,IAAI,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC/C,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBACjC,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpD,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,uCAAuC;YACzC,CAAC;QACH,CAAC;QAED,6BAA6B;QAC7B,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YAC/C,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACnC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QAED,+CAA+C;QAC/C,IAAI,SAAS,CAAC,aAAa,KAAK,0CAAqB,EAAE,CAAC;YACtD,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACrC,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBACxE,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;oBAChC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpD,OAAO,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,IAAI,mBAAW,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAEM,mBAAmB,GAAG,KAAK,IAEhC,EAAE;QACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACjD,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACF,IAAI,CAAC,kCAAkC,CAAC,UAAU,CAAC,CAAC;QACpD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEK,MAAM,CAAC,cAAc,CAC1B,UAA0B,EAC1B,aAA6B,EAC7B,gBAAqD;QAErD,OAAO,IAAI,gBAAgB,CACzB,oCAAmB,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,SAAS,EAC5D,gBAAgB,EAChB,aAAa,CACd,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,0BAA0B,CACtC,UAA+B;QAE/B,MAAM,aAAa,GAAG,oCAAmB,CAAC,kBAAkB,CAC1D,UAAU,CAAC,GAAG,CAAC,UAAU,CAC1B,CAAC;QACF,OAAO,gBAAgB,CAAC,qBAAqB,CAC3C,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,CAChC,CAAC;IACJ,CAAC;CACF;AAhMD,4CAgMC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/conditions/context/context.ts"],"names":[],"mappings":"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"}

package/dist/cjs/conditions/shared.d.ts

@@ -8,12 +8,12 @@ export declare const returnValueTestSchema: z.ZodObject<{
     value: z.ZodType<any, z.ZodTypeDef, any>;
 }, "strip", z.ZodTypeAny, {
     comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-    value?: any;
     index?: number | undefined;
+    value?: any;
 }, {
     comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
-    value?: any;
     index?: number | undefined;
+    value?: any;
 }>;
 export type ReturnValueTestProps = z.infer<typeof returnValueTestSchema>;
 export declare const EthAddressOrUserAddressSchema: z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEnum<[":userAddress", ":userAddressExternalEIP4361"]>]>;

package/dist/cjs/conditions/shared.js

@@ -11,7 +11,7 @@ exports.contextParamSchema = zod_1.z.string().regex(const_1.CONTEXT_PARAM_REGEXP
 exports.plainStringSchema = zod_1.z.string().refine((str) => {
     return !str.startsWith(const_1.CONTEXT_PARAM_PREFIX);
 }, {
-    message: 'String must not be a context parameter i.e. not start with ":"',
+    message: `String must not be a context parameter i.e. not start with "${const_1.CONTEXT_PARAM_PREFIX}"`,
 });
 const paramSchema = zod_1.z.union([exports.plainStringSchema, zod_1.z.boolean(), zod_1.z.number()]);
 exports.paramOrContextParamSchema = zod_1.z.union([
@@ -26,7 +26,7 @@ exports.returnValueTestSchema = zod_1.z.object({
 });
 const UserAddressSchema = zod_1.z.enum([
     taco_auth_1.USER_ADDRESS_PARAM_DEFAULT,
-    const_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
+    taco_auth_1.USER_ADDRESS_PARAM_EXTERNAL_EIP4361,
 ]);
 exports.EthAddressOrUserAddressSchema = zod_1.z.union([
     shared_1.EthAddressSchema,

package/dist/cjs/conditions/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/conditions/shared.ts"],"names":[],"mappings":";;;AAAA,6CAAoD;AACpD,mDAAiE;AACjE,6BAAwB;AAExB,mCAKiB;AAEJ,QAAA,kBAAkB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,4BAAoB,CAAC,CAAC;AACzE,kEAAkE;AAClE,mDAAmD;AACtC,QAAA,iBAAiB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAChD,CAAC,GAAG,EAAE,EAAE;IACN,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,4BAAoB,CAAC,CAAC;AAC/C,CAAC,EACD;IACE,OAAO,EAAE,gEAAgE;CAC1E,CACF,CAAC;AAEF,MAAM,WAAW,GAAG,OAAC,CAAC,KAAK,CAAC,CAAC,yBAAiB,EAAE,OAAC,CAAC,OAAO,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAE7D,QAAA,yBAAyB,GAAgB,OAAC,CAAC,KAAK,CAAC;IAC5D,WAAW;IACX,0BAAkB;IAClB,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAC,CAAC,KAAK,CAAC,iCAAyB,CAAC,CAAC;CACjD,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IAChD,UAAU,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACtD,KAAK,EAAE,iCAAyB;CACjC,CAAC,CAAC;AAIH,MAAM,iBAAiB,GAAG,OAAC,CAAC,IAAI,CAAC;IAC/B,sCAA0B;IAC1B,2CAAmC;CACpC,CAAC,CAAC;AACU,QAAA,6BAA6B,GAAG,OAAC,CAAC,KAAK,CAAC;IACnD,yBAAgB;IAChB,iBAAiB;CAClB,CAAC,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/conditions/shared.ts"],"names":[],"mappings":";;;AAAA,6CAAoD;AACpD,mDAG6B;AAC7B,6BAAwB;AAExB,mCAAqE;AAExD,QAAA,kBAAkB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,4BAAoB,CAAC,CAAC;AACzE,kEAAkE;AAClE,mDAAmD;AACtC,QAAA,iBAAiB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAChD,CAAC,GAAG,EAAE,EAAE;IACN,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,4BAAoB,CAAC,CAAC;AAC/C,CAAC,EACD;IACE,OAAO,EAAE,+DAA+D,4BAAoB,GAAG;CAChG,CACF,CAAC;AAEF,MAAM,WAAW,GAAG,OAAC,CAAC,KAAK,CAAC,CAAC,yBAAiB,EAAE,OAAC,CAAC,OAAO,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAE7D,QAAA,yBAAyB,GAAgB,OAAC,CAAC,KAAK,CAAC;IAC5D,WAAW;IACX,0BAAkB;IAClB,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAC,CAAC,KAAK,CAAC,iCAAyB,CAAC,CAAC;CACjD,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5C,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IAChD,UAAU,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACtD,KAAK,EAAE,iCAAyB;CACjC,CAAC,CAAC;AAIH,MAAM,iBAAiB,GAAG,OAAC,CAAC,IAAI,CAAC;IAC/B,sCAA0B;IAC1B,+CAAmC;CACpC,CAAC,CAAC;AACU,QAAA,6BAA6B,GAAG,OAAC,CAAC,KAAK,CAAC;IACnD,yBAAgB;IAChB,iBAAiB;CAClB,CAAC,CAAC"}

package/dist/cjs/dkg.d.ts

@@ -20,7 +20,7 @@ export declare class DkgRitual {
     equals(other: DkgRitual): boolean;
 }
 export declare class DkgClient {
-    static initializeRitual(provider: ethers.providers.Provider, signer: ethers.Signer, domain: Domain, ursulas: ChecksumAddress[], authority: string, duration: BigNumberish, accessController: string, waitUntilEnd?: boolean): Promise<number | undefined>;
+    static initializeRitual(provider: ethers.providers.Provider, signer: ethers.Signer, domain: Domain, ursulas: ChecksumAddress[], authority: string, duration: BigNumberish, feeModel: string, accessController: string, waitUntilEnd?: boolean): Promise<number | undefined>;
     private static waitUntilRitualEnd;
     static getRitual(provider: ethers.providers.Provider, domain: Domain, ritualId: number): Promise<DkgRitual>;
     static getActiveRitual(provider: ethers.providers.Provider, domain: Domain, ritualId: number): Promise<DkgRitual>;

package/dist/cjs/dkg.js

@@ -41,9 +41,9 @@ class DkgRitual {
 exports.DkgRitual = DkgRitual;
 const ERR_RITUAL_NOT_FINALIZED = (ritualId, ritual) => `Ritual ${ritualId} is not finalized. State: ${ritual.state}`;
 class DkgClient {
-    static async initializeRitual(provider, signer, domain, ursulas, authority, duration, accessController, waitUntilEnd = false) {
+    static async initializeRitual(provider, signer, domain, ursulas, authority, duration, feeModel, accessController, waitUntilEnd = false) {
         const ritualId = await shared_1.DkgCoordinatorAgent.initializeRitual(provider, signer, domain, ursulas.sort(), // Contract call requires sorted addresses
-        authority, duration, accessController);
+        authority, duration, feeModel, accessController);
         if (waitUntilEnd) {
             const isSuccessful = await DkgClient.waitUntilRitualEnd(provider, domain, ritualId);
             if (!isSuccessful) {