@nucypher/taco 0.1.0-rc.6 → 0.1.0

package/README.md

@@ -1,3 +1,65 @@
 # `@nucypher/taco`
 
-## [`nucypher/nucypher-ts`](../../README.md)
+### [`nucypher/taco-web`](../../README.md)
+
+## Usage
+
+First, install the package:
+
+```bash
+$ yarn add @nucypher/taco ethers@5.7.2
+```
+
+### Encrypt your data
+
+```typescript
+import { conditions, domains, encrypt, initialize } from '@nucypher/taco';
+import { ethers } from 'ethers';
+
+// We have to initialize the TACo library first
+await initialize();
+
+const web3Provider = new ethers.providers.Web3Provider(window.ethereum);
+
+const ownsNFT = new conditions.predefined.ERC721Ownership({
+  contractAddress: '0x1e988ba4692e52Bc50b375bcC8585b95c48AaD77',
+  parameters: [3591],
+  chain: 5,
+});
+
+const message = 'my secret message';
+
+const messageKit = await encrypt(
+  web3Provider,
+  domains.TESTNET,
+  message,
+  ownsNFT,
+  ritualId,
+  web3Provider.getSigner(),
+);
+```
+
+### Decrypt your data
+
+```typescript
+import { decrypt, domains, getPorterUri, initialize } from '@nucypher/taco';
+import { ethers } from 'ethers';
+
+// We have to initialize the TACo library first
+await initialize();
+
+const web3Provider = new ethers.providers.Web3Provider(window.ethereum);
+
+const decryptedMessage = await decrypt(
+  web3Provider,
+  domains.TESTNET,
+  messageKit,
+  getPorterUri(domains.TESTNET),
+  web3Provider.getSigner(),
+);
+```
+
+## Learn more
+
+Please find developer documentation for
+TACo [here](https://docs.threshold.network/app-development/threshold-access-control-tac).

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

@@ -1,4 +1,6 @@
 import { z } from 'zod';
+import { Condition } from '../condition';
+import { OmitConditionType } from '../shared';
 declare const functionAbiSchema: z.ZodEffects<z.ZodEffects<z.ZodObject<{
     name: z.ZodString;
     type: z.ZodLiteral<"function">;
@@ -145,15 +147,15 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<{
     returnValueTest: z.ZodObject<{
         index: z.ZodOptional<z.ZodNumber>;
         comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-        value: z.ZodUnknown;
+        value: z.ZodType<any, z.ZodTypeDef, any>;
     }, "strip", z.ZodTypeAny, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     }, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     }>;
     conditionType: z.ZodDefault<z.ZodLiteral<"contract">>;
     contractAddress: z.ZodString;
@@ -298,15 +300,15 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<{
         }[]];
         stateMutability: "view" | "pure";
     }>>;
-    parameters: z.ZodArray<z.ZodUnknown, "many">;
+    parameters: z.ZodArray<z.ZodType<any, z.ZodTypeDef, any>, "many">;
 }, "strip", z.ZodTypeAny, {
     conditionType: "contract";
     method: string;
-    parameters: unknown[];
+    parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     contractAddress: string;
     chain?: z.Primitive;
@@ -332,11 +334,11 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<{
     } | undefined;
 }, {
     method: string;
-    parameters: unknown[];
+    parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     contractAddress: string;
     chain?: z.Primitive;
@@ -364,11 +366,11 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<{
 }>, {
     conditionType: "contract";
     method: string;
-    parameters: unknown[];
+    parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     contractAddress: string;
     chain?: z.Primitive;
@@ -394,11 +396,11 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<{
     } | undefined;
 }, {
     method: string;
-    parameters: unknown[];
+    parameters: any[];
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     contractAddress: string;
     chain?: z.Primitive;
@@ -425,4 +427,7 @@ export declare const contractConditionSchema: z.ZodEffects<z.ZodObject<{
     } | undefined;
 }>;
 export type ContractConditionProps = z.infer<typeof contractConditionSchema>;
+export declare class ContractCondition extends Condition {
+    constructor(value: OmitConditionType<ContractConditionProps>);
+}
 export {};

package/dist/cjs/conditions/base/contract.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contractConditionSchema = exports.ContractConditionType = void 0;
+exports.ContractCondition = exports.contractConditionSchema = exports.ContractConditionType = void 0;
 const ethers_1 = require("ethers");
 const zod_1 = require("zod");
+const condition_1 = require("../condition");
 const const_1 = require("../const");
+const shared_1 = require("../shared");
 const rpc_1 = require("./rpc");
 // TODO: Consider replacing with `z.unknown`:
 //    Since Solidity types are tied to Solidity version, we may not be able to accurately represent them in Zod.
@@ -46,6 +48,7 @@ const functionAbiSchema = zod_1.z
     return functionsInAbi.length === 1;
 }, {
     message: '"functionAbi" must contain a single function definition',
+    path: ['functionAbi'],
 })
     .refine((functionAbi) => {
     const asInterface = new ethers_1.ethers.utils.Interface(JSON.stringify([functionAbi]));
@@ -53,6 +56,7 @@ const functionAbiSchema = zod_1.z
     return functionAbi.inputs.length === nrOfInputs;
 }, {
     message: '"parameters" must have the same length as "functionAbi.inputs"',
+    path: ['parameters'],
 });
 exports.ContractConditionType = 'contract';
 exports.contractConditionSchema = rpc_1.rpcConditionSchema
@@ -60,11 +64,11 @@ exports.contractConditionSchema = rpc_1.rpcConditionSchema
     conditionType: zod_1.z
         .literal(exports.ContractConditionType)
         .default(exports.ContractConditionType),
-    contractAddress: zod_1.z.string().regex(const_1.ETH_ADDRESS_REGEXP),
+    contractAddress: zod_1.z.string().regex(const_1.ETH_ADDRESS_REGEXP).length(42),
     standardContractType: zod_1.z.enum(['ERC20', 'ERC721']).optional(),
     method: zod_1.z.string(),
     functionAbi: functionAbiSchema.optional(),
-    parameters: zod_1.z.array(zod_1.z.unknown()),
+    parameters: zod_1.z.array(shared_1.paramOrContextParamSchema),
 })
     // Adding this custom logic causes the return type to be ZodEffects instead of ZodObject
     // https://github.com/colinhacks/zod/issues/2474
@@ -72,5 +76,15 @@ exports.contractConditionSchema = rpc_1.rpcConditionSchema
 // A check to see if either 'standardContractType' or 'functionAbi' is set
 (data) => Boolean(data.standardContractType) !== Boolean(data.functionAbi), {
     message: "At most one of the fields 'standardContractType' and 'functionAbi' must be defined",
+    path: ['standardContractType'],
 });
+class ContractCondition extends condition_1.Condition {
+    constructor(value) {
+        super(exports.contractConditionSchema, {
+            conditionType: exports.ContractConditionType,
+            ...value,
+        });
+    }
+}
+exports.ContractCondition = ContractCondition;
 //# sourceMappingURL=contract.js.map

package/dist/cjs/conditions/base/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../../src/conditions/base/contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../../src/conditions/base/contract.ts"],"names":[],"mappings":"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"}

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

@@ -1,21 +1,3 @@
-import { CompoundConditionProps } from '../compound-condition';
-import { Condition } from '../condition';
-import { ContractConditionProps } from './contract';
-import { RpcConditionProps } from './rpc';
-import { TimeConditionProps } from './time';
-export declare class CompoundCondition extends Condition {
-    constructor(value: CompoundConditionProps);
-}
-export declare class ContractCondition extends Condition {
-    constructor(value: ContractConditionProps);
-}
-export declare class RpcCondition extends Condition {
-    constructor(value: RpcConditionProps);
-}
-export declare class TimeCondition extends Condition {
-    constructor(value: TimeConditionProps);
-}
-export { ContractConditionType, FunctionAbiProps, type ContractConditionProps, } from './contract';
-export { RpcConditionType, type RpcConditionProps } from './rpc';
-export { ReturnValueTestProps } from './shared';
-export { TimeConditionMethod, TimeConditionType, type TimeConditionProps, } from './time';
+export * as contract from './contract';
+export * as rpc from './rpc';
+export * as time from './time';

package/dist/cjs/conditions/base/index.js

@@ -1,42 +1,32 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeConditionType = exports.TimeConditionMethod = exports.RpcConditionType = exports.ContractConditionType = exports.TimeCondition = exports.RpcCondition = exports.ContractCondition = exports.CompoundCondition = void 0;
-const compound_condition_1 = require("../compound-condition");
-const condition_1 = require("../condition");
-const contract_1 = require("./contract");
-const rpc_1 = require("./rpc");
-const time_1 = require("./time");
 // Exporting classes here instead of their respective schema files to
 // avoid circular dependency on Condition class.
-class CompoundCondition extends condition_1.Condition {
-    constructor(value) {
-        super(compound_condition_1.compoundConditionSchema, value);
-    }
-}
-exports.CompoundCondition = CompoundCondition;
-class ContractCondition extends condition_1.Condition {
-    constructor(value) {
-        super(contract_1.contractConditionSchema, value);
-    }
-}
-exports.ContractCondition = ContractCondition;
-class RpcCondition extends condition_1.Condition {
-    constructor(value) {
-        super(rpc_1.rpcConditionSchema, value);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-}
-exports.RpcCondition = RpcCondition;
-class TimeCondition extends condition_1.Condition {
-    constructor(value) {
-        super(time_1.timeConditionSchema, value);
-    }
-}
-exports.TimeCondition = TimeCondition;
-var contract_2 = require("./contract");
-Object.defineProperty(exports, "ContractConditionType", { enumerable: true, get: function () { return contract_2.ContractConditionType; } });
-var rpc_2 = require("./rpc");
-Object.defineProperty(exports, "RpcConditionType", { enumerable: true, get: function () { return rpc_2.RpcConditionType; } });
-var time_2 = require("./time");
-Object.defineProperty(exports, "TimeConditionMethod", { enumerable: true, get: function () { return time_2.TimeConditionMethod; } });
-Object.defineProperty(exports, "TimeConditionType", { enumerable: true, get: function () { return time_2.TimeConditionType; } });
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.time = exports.rpc = exports.contract = void 0;
+exports.contract = __importStar(require("./contract"));
+exports.rpc = __importStar(require("./rpc"));
+exports.time = __importStar(require("./time"));
 //# sourceMappingURL=index.js.map

package/dist/cjs/conditions/base/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/conditions/base/index.ts"],"names":[],"mappings":";;;AAAA,8DAG+B;AAC/B,4CAAyC;AAEzC,yCAA6E;AAC7E,+BAA8D;AAC9D,iCAAiE;AAEjE,qEAAqE;AACrE,gDAAgD;AAEhD,MAAa,iBAAkB,SAAQ,qBAAS;IAC9C,YAAY,KAA6B;QACvC,KAAK,CAAC,4CAAuB,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,iBAAkB,SAAQ,qBAAS;IAC9C,YAAY,KAA6B;QACvC,KAAK,CAAC,kCAAuB,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;CACF;AAJD,8CAIC;AAED,MAAa,YAAa,SAAQ,qBAAS;IACzC,YAAY,KAAwB;QAClC,KAAK,CAAC,wBAAkB,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AAJD,oCAIC;AAED,MAAa,aAAc,SAAQ,qBAAS;IAC1C,YAAY,KAAyB;QACnC,KAAK,CAAC,0BAAmB,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;CACF;AAJD,sCAIC;AAED,uCAIoB;AAHlB,iHAAA,qBAAqB,OAAA;AAIvB,6BAAiE;AAAxD,uGAAA,gBAAgB,OAAA;AAEzB,+BAIgB;AAHd,2GAAA,mBAAmB,OAAA;AACnB,yGAAA,iBAAiB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/conditions/base/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,gDAAgD;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhD,uDAAuC;AACvC,6CAA6B;AAC7B,+CAA+B"}

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

@@ -1,42 +1,47 @@
 import { z } from 'zod';
+import { Condition } from '../condition';
+import { OmitConditionType } from '../shared';
 export declare const RpcConditionType = "rpc";
 export declare const rpcConditionSchema: z.ZodObject<{
     conditionType: z.ZodDefault<z.ZodLiteral<"rpc">>;
     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", "balanceOf"]>;
-    parameters: z.ZodUnion<[z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodLiteral<":userAddress">]>, "many">, z.ZodTuple<[z.ZodUnion<[z.ZodString, z.ZodLiteral<":userAddress">]>, z.ZodUnion<[z.ZodString, z.ZodNumber]>], null>]>;
+    method: z.ZodEnum<["eth_getBalance"]>;
+    parameters: z.ZodUnion<[z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodLiteral<":userAddress">]>, "atleastone">, z.ZodTuple<[z.ZodUnion<[z.ZodString, z.ZodLiteral<":userAddress">]>, z.ZodType<any, z.ZodTypeDef, any>], null>]>;
     returnValueTest: z.ZodObject<{
         index: z.ZodOptional<z.ZodNumber>;
         comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-        value: z.ZodUnknown;
+        value: z.ZodType<any, z.ZodTypeDef, any>;
     }, "strip", z.ZodTypeAny, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     }, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     }>;
 }, "strip", z.ZodTypeAny, {
     conditionType: "rpc";
-    method: "eth_getBalance" | "balanceOf";
-    parameters: (string[] | [string, string | number]) & (string[] | [string, string | number] | undefined);
+    method: "eth_getBalance";
+    parameters: ([string, ...string[]] | [string, any]) & ([string, ...string[]] | [string, any] | undefined);
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     chain?: z.Primitive;
 }, {
-    method: "eth_getBalance" | "balanceOf";
-    parameters: (string[] | [string, string | number]) & (string[] | [string, string | number] | undefined);
+    method: "eth_getBalance";
+    parameters: ([string, ...string[]] | [string, any]) & ([string, ...string[]] | [string, any] | undefined);
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     conditionType?: "rpc" | undefined;
     chain?: z.Primitive;
 }>;
 export type RpcConditionProps = z.infer<typeof rpcConditionSchema>;
+export declare class RpcCondition extends Condition {
+    constructor(value: OmitConditionType<RpcConditionProps>);
+}

package/dist/cjs/conditions/base/rpc.js

@@ -3,21 +3,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rpcConditionSchema = exports.RpcConditionType = void 0;
+exports.RpcCondition = exports.rpcConditionSchema = exports.RpcConditionType = void 0;
 const zod_1 = require("zod");
+const condition_1 = require("../condition");
 const const_1 = require("../const");
+const shared_1 = require("../shared");
 const zod_2 = __importDefault(require("../zod"));
-const shared_1 = require("./shared");
 exports.RpcConditionType = 'rpc';
 exports.rpcConditionSchema = zod_1.z.object({
     conditionType: zod_1.z.literal(exports.RpcConditionType).default(exports.RpcConditionType),
     chain: (0, zod_2.default)(const_1.SUPPORTED_CHAIN_IDS),
-    method: zod_1.z.enum(['eth_getBalance', 'balanceOf']),
+    method: zod_1.z.enum(['eth_getBalance']),
     parameters: zod_1.z.union([
-        zod_1.z.array(shared_1.EthAddressOrUserAddressSchema).length(1),
+        zod_1.z.array(shared_1.EthAddressOrUserAddressSchema).nonempty(),
         // Using tuple here because ordering matters
-        zod_1.z.tuple([shared_1.EthAddressOrUserAddressSchema, zod_1.z.union([zod_1.z.string(), zod_1.z.number()])]),
+        zod_1.z.tuple([shared_1.EthAddressOrUserAddressSchema, shared_1.paramOrContextParamSchema]),
     ]),
-    returnValueTest: shared_1.returnValueTestSchema,
+    returnValueTest: shared_1.returnValueTestSchema, // Update to allow multiple return values after expanding supported methods
 });
+class RpcCondition extends condition_1.Condition {
+    constructor(value) {
+        super(exports.rpcConditionSchema, {
+            conditionType: exports.RpcConditionType,
+            ...value,
+        });
+    }
+}
+exports.RpcCondition = RpcCondition;
 //# sourceMappingURL=rpc.js.map

package/dist/cjs/conditions/base/rpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/conditions/base/rpc.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAwB;AAExB,oCAA+C;AAC/C,iDAAuC;AAEvC,qCAAgF;AAEnE,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEzB,QAAA,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC;IACpE,KAAK,EAAE,IAAA,aAAiB,EAAC,2BAAmB,CAAC;IAC7C,MAAM,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;IAC/C,UAAU,EAAE,OAAC,CAAC,KAAK,CAAC;QAClB,OAAC,CAAC,KAAK,CAAC,sCAA6B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAChD,4CAA4C;QAC5C,OAAC,CAAC,KAAK,CAAC,CAAC,sCAA6B,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;KAC5E,CAAC;IACF,eAAe,EAAE,8BAAqB;CACvC,CAAC,CAAC"}
+{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/conditions/base/rpc.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAwB;AAExB,4CAAyC;AACzC,oCAA+C;AAC/C,sCAKmB;AACnB,iDAAuC;AAE1B,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEzB,QAAA,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC;IACpE,KAAK,EAAE,IAAA,aAAiB,EAAC,2BAAmB,CAAC;IAC7C,MAAM,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAClC,UAAU,EAAE,OAAC,CAAC,KAAK,CAAC;QAClB,OAAC,CAAC,KAAK,CAAC,sCAA6B,CAAC,CAAC,QAAQ,EAAE;QACjD,4CAA4C;QAC5C,OAAC,CAAC,KAAK,CAAC,CAAC,sCAA6B,EAAE,kCAAyB,CAAC,CAAC;KACpE,CAAC;IACF,eAAe,EAAE,8BAAqB,EAAE,2EAA2E;CACpH,CAAC,CAAC;AAIH,MAAa,YAAa,SAAQ,qBAAS;IACzC,YAAY,KAA2C;QACrD,KAAK,CAAC,0BAAkB,EAAE;YACxB,aAAa,EAAE,wBAAgB;YAC/B,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAPD,oCAOC"}

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

@@ -1,4 +1,6 @@
 import { z } from 'zod';
+import { Condition } from '../condition';
+import { OmitConditionType } from '../shared';
 export declare const TimeConditionType = "time";
 export declare const TimeConditionMethod = "blocktime";
 export declare const timeConditionSchema: z.ZodObject<{
@@ -8,15 +10,15 @@ export declare const timeConditionSchema: z.ZodObject<{
     returnValueTest: z.ZodObject<{
         index: z.ZodOptional<z.ZodNumber>;
         comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
-        value: z.ZodUnknown;
+        value: z.ZodType<any, z.ZodTypeDef, any>;
     }, "strip", z.ZodTypeAny, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     }, {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     }>;
 }, "strip", z.ZodTypeAny, {
     conditionType: "time";
@@ -24,17 +26,20 @@ export declare const timeConditionSchema: z.ZodObject<{
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     chain?: z.Primitive;
 }, {
     returnValueTest: {
         comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
         index?: number | undefined;
-        value?: unknown;
+        value?: any;
     };
     conditionType?: "time" | undefined;
     method?: "blocktime" | undefined;
     chain?: z.Primitive;
 }>;
 export type TimeConditionProps = z.infer<typeof timeConditionSchema>;
+export declare class TimeCondition extends Condition {
+    constructor(value: OmitConditionType<TimeConditionProps>);
+}

package/dist/cjs/conditions/base/time.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeConditionSchema = exports.TimeConditionMethod = exports.TimeConditionType = void 0;
+exports.TimeCondition = exports.timeConditionSchema = exports.TimeConditionMethod = exports.TimeConditionType = void 0;
 const zod_1 = require("zod");
+const condition_1 = require("../condition");
 const rpc_1 = require("./rpc");
 // TimeCondition is an RpcCondition with the method set to 'blocktime' and no parameters
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -13,4 +14,13 @@ exports.timeConditionSchema = zod_1.z.object({
     conditionType: zod_1.z.literal(exports.TimeConditionType).default(exports.TimeConditionType),
     method: zod_1.z.literal(exports.TimeConditionMethod).default(exports.TimeConditionMethod),
 });
+class TimeCondition extends condition_1.Condition {
+    constructor(value) {
+        super(exports.timeConditionSchema, {
+            conditionType: exports.TimeConditionType,
+            ...value,
+        });
+    }
+}
+exports.TimeCondition = TimeCondition;
 //# sourceMappingURL=time.js.map

package/dist/cjs/conditions/base/time.js.map

@@ -1 +1 @@
-{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../../src/conditions/base/time.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,+BAA2C;AAE3C,wFAAwF;AACxF,6DAA6D;AAC7D,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,wBAAkB,CAAC,KAAK,CAAC;AAEpD,QAAA,iBAAiB,GAAG,MAAM,CAAC;AAC3B,QAAA,mBAAmB,GAAG,WAAW,CAAC;AAElC,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,GAAG,SAAS;IACZ,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,yBAAiB,CAAC,CAAC,OAAO,CAAC,yBAAiB,CAAC;IACtE,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,2BAAmB,CAAC,CAAC,OAAO,CAAC,2BAAmB,CAAC;CACpE,CAAC,CAAC"}
+{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../../src/conditions/base/time.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,4CAAyC;AAGzC,+BAA2C;AAE3C,wFAAwF;AACxF,6DAA6D;AAC7D,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,wBAAkB,CAAC,KAAK,CAAC;AAEpD,QAAA,iBAAiB,GAAG,MAAM,CAAC;AAC3B,QAAA,mBAAmB,GAAG,WAAW,CAAC;AAElC,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,GAAG,SAAS;IACZ,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,yBAAiB,CAAC,CAAC,OAAO,CAAC,yBAAiB,CAAC;IACtE,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,2BAAmB,CAAC,CAAC,OAAO,CAAC,2BAAmB,CAAC;CACpE,CAAC,CAAC;AAIH,MAAa,aAAc,SAAQ,qBAAS;IAC1C,YAAY,KAA4C;QACtD,KAAK,CAAC,2BAAmB,EAAE;YACzB,aAAa,EAAE,yBAAiB;YAChC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF;AAPD,sCAOC"}

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

@@ -1,4 +1,14 @@
 import { z } from 'zod';
+import { Condition, ConditionProps } from './condition';
+import { OmitConditionType } from './shared';
 export declare const CompoundConditionType = "compound";
 export declare const compoundConditionSchema: z.ZodSchema;
 export type CompoundConditionProps = z.infer<typeof compoundConditionSchema>;
+export type ConditionOrProps = Condition | ConditionProps;
+export declare class CompoundCondition extends Condition {
+    constructor(value: OmitConditionType<CompoundConditionProps>);
+    private static withOperator;
+    static or(conditions: ConditionOrProps[]): CompoundCondition;
+    static and(conditions: ConditionOrProps[]): CompoundCondition;
+    static not(condition: ConditionOrProps): CompoundCondition;
+}

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

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compoundConditionSchema = exports.CompoundConditionType = void 0;
+exports.CompoundCondition = exports.compoundConditionSchema = exports.CompoundConditionType = void 0;
 const zod_1 = require("zod");
 const contract_1 = require("./base/contract");
 const rpc_1 = require("./base/rpc");
 const time_1 = require("./base/time");
+const condition_1 = require("./condition");
 exports.CompoundConditionType = 'compound';
-exports.compoundConditionSchema = zod_1.z.object({
+exports.compoundConditionSchema = zod_1.z
+    .object({
     conditionType: zod_1.z
         .literal(exports.CompoundConditionType)
         .default(exports.CompoundConditionType),
-    operator: zod_1.z.enum(['and', 'or']),
+    operator: zod_1.z.enum(['and', 'or', 'not']),
     operands: zod_1.z
         .array(zod_1.z.lazy(() => zod_1.z.union([
         rpc_1.rpcConditionSchema,
@@ -18,6 +20,51 @@ exports.compoundConditionSchema = zod_1.z.object({
         contract_1.contractConditionSchema,
         exports.compoundConditionSchema,
     ])))
-        .min(2),
-});
+        .min(1),
+})
+    .refine((condition) => {
+    // 'and' and 'or' operators must have at least 2 operands
+    if (['and', 'or'].includes(condition.operator)) {
+        return condition.operands.length >= 2;
+    }
+    // 'not' operator must have exactly 1 operand
+    if (condition.operator === 'not') {
+        return condition.operands.length === 1;
+    }
+    // We test positive cases exhaustively, so we return false here:
+    return false;
+}, ({ operands, operator }) => ({
+    message: `Invalid number of operands ${operands.length} for operator "${operator}"`,
+    path: ['operands'],
+}));
+class CompoundCondition extends condition_1.Condition {
+    constructor(value) {
+        super(exports.compoundConditionSchema, {
+            conditionType: exports.CompoundConditionType,
+            ...value,
+        });
+    }
+    static withOperator(operands, operator) {
+        const asObjects = operands.map((operand) => {
+            if (operand instanceof condition_1.Condition) {
+                return operand.toObj();
+            }
+            return operand;
+        });
+        return new CompoundCondition({
+            operator,
+            operands: asObjects,
+        });
+    }
+    static or(conditions) {
+        return CompoundCondition.withOperator(conditions, 'or');
+    }
+    static and(conditions) {
+        return CompoundCondition.withOperator(conditions, 'and');
+    }
+    static not(condition) {
+        return CompoundCondition.withOperator([condition], 'not');
+    }
+}
+exports.CompoundCondition = CompoundCondition;
 //# sourceMappingURL=compound-condition.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"compound-condition.js","sourceRoot":"","sources":["../../../src/conditions/compound-condition.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,8CAA0D;AAC1D,oCAAgD;AAChD,sCAAkD;AAErC,QAAA,qBAAqB,GAAG,UAAU,CAAC;AAEnC,QAAA,uBAAuB,GAAgB,OAAC,CAAC,MAAM,CAAC;IAC3D,aAAa,EAAE,OAAC;SACb,OAAO,CAAC,6BAAqB,CAAC;SAC9B,OAAO,CAAC,6BAAqB,CAAC;IACjC,QAAQ,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/B,QAAQ,EAAE,OAAC;SACR,KAAK,CACJ,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACV,OAAC,CAAC,KAAK,CAAC;QACN,wBAAkB;QAClB,0BAAmB;QACnB,kCAAuB;QACvB,+BAAuB;KACxB,CAAC,CACH,CACF;SACA,GAAG,CAAC,CAAC,CAAC;CACV,CAAC,CAAC"}
+{"version":3,"file":"compound-condition.js","sourceRoot":"","sources":["../../../src/conditions/compound-condition.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,8CAA0D;AAC1D,oCAAgD;AAChD,sCAAkD;AAClD,2CAAwD;AAG3C,QAAA,qBAAqB,GAAG,UAAU,CAAC;AAEnC,QAAA,uBAAuB,GAAgB,OAAC;KAClD,MAAM,CAAC;IACN,aAAa,EAAE,OAAC;SACb,OAAO,CAAC,6BAAqB,CAAC;SAC9B,OAAO,CAAC,6BAAqB,CAAC;IACjC,QAAQ,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACtC,QAAQ,EAAE,OAAC;SACR,KAAK,CACJ,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACV,OAAC,CAAC,KAAK,CAAC;QACN,wBAAkB;QAClB,0BAAmB;QACnB,kCAAuB;QACvB,+BAAuB;KACxB,CAAC,CACH,CACF;SACA,GAAG,CAAC,CAAC,CAAC;CACV,CAAC;KACD,MAAM,CACL,CAAC,SAAS,EAAE,EAAE;IACZ,yDAAyD;IACzD,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;QAC9C,OAAO,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;KACvC;IAED,6CAA6C;IAC7C,IAAI,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE;QAChC,OAAO,SAAS,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;KACxC;IAED,gEAAgE;IAChE,OAAO,KAAK,CAAC;AACf,CAAC,EACD,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3B,OAAO,EAAE,8BAA8B,QAAQ,CAAC,MAAM,kBAAkB,QAAQ,GAAG;IACnF,IAAI,EAAE,CAAC,UAAU,CAAC;CACnB,CAAC,CACH,CAAC;AAMJ,MAAa,iBAAkB,SAAQ,qBAAS;IAC9C,YAAY,KAAgD;QAC1D,KAAK,CAAC,+BAAuB,EAAE;YAC7B,aAAa,EAAE,6BAAqB;YACpC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,YAAY,CACzB,QAA4B,EAC5B,QAA8B;QAE9B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACzC,IAAI,OAAO,YAAY,qBAAS,EAAE;gBAChC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC;aACxB;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,iBAAiB,CAAC;YAC3B,QAAQ;YACR,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,EAAE,CAAC,UAA8B;QAC7C,OAAO,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,UAA8B;QAC9C,OAAO,iBAAiB,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,GAAG,CAAC,SAA2B;QAC3C,OAAO,iBAAiB,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;CACF;AAnCD,8CAmCC"}

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

@@ -4,7 +4,7 @@ exports.ConditionExpression = void 0;
 const nucypher_core_1 = require("@nucypher/nucypher-core");
 const shared_1 = require("@nucypher/shared");
 const semver_1 = require("semver");
-const condition_1 = require("./condition");
+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)}`;
@@ -32,7 +32,7 @@ class ConditionExpression {
         if (!obj.condition) {
             throw new Error(ERR_CONDITION(obj.condition));
         }
-        const condition = condition_1.Condition.fromObj(obj.condition);
+        const condition = condition_factory_1.ConditionFactory.conditionFromProps(obj.condition);
         return new ConditionExpression(condition, obj.version);
     }
     toJson() {