@nucypher/taco 0.6.0-alpha.1 → 0.6.0-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (142) hide show
  1. package/README.md +2 -2
  2. package/dist/cjs/conditions/base/index.d.ts +2 -0
  3. package/dist/cjs/conditions/base/index.js +20 -8
  4. package/dist/cjs/conditions/base/index.js.map +1 -1
  5. package/dist/cjs/conditions/base/json-api.d.ts +1 -1
  6. package/dist/cjs/conditions/base/json-api.js +1 -2
  7. package/dist/cjs/conditions/base/json-api.js.map +1 -1
  8. package/dist/cjs/conditions/base/json-rpc.d.ts +7 -0
  9. package/dist/cjs/conditions/base/json-rpc.js +18 -0
  10. package/dist/cjs/conditions/base/json-rpc.js.map +1 -0
  11. package/dist/cjs/conditions/base/jwt.d.ts +7 -0
  12. package/dist/cjs/conditions/base/jwt.js +19 -0
  13. package/dist/cjs/conditions/base/jwt.js.map +1 -0
  14. package/dist/cjs/conditions/condition-expr.js +5 -5
  15. package/dist/cjs/conditions/condition-expr.js.map +1 -1
  16. package/dist/cjs/conditions/condition-factory.js +6 -0
  17. package/dist/cjs/conditions/condition-factory.js.map +1 -1
  18. package/dist/cjs/conditions/condition.js +2 -1
  19. package/dist/cjs/conditions/condition.js.map +1 -1
  20. package/dist/cjs/conditions/const.d.ts +0 -2
  21. package/dist/cjs/conditions/const.js +1 -9
  22. package/dist/cjs/conditions/const.js.map +1 -1
  23. package/dist/cjs/conditions/context/context.d.ts +2 -1
  24. package/dist/cjs/conditions/context/context.js +57 -61
  25. package/dist/cjs/conditions/context/context.js.map +1 -1
  26. package/dist/cjs/conditions/index.js +17 -7
  27. package/dist/cjs/conditions/index.js.map +1 -1
  28. package/dist/cjs/conditions/predefined/index.js +17 -7
  29. package/dist/cjs/conditions/predefined/index.js.map +1 -1
  30. package/dist/cjs/conditions/schemas/common.d.ts +3 -1
  31. package/dist/cjs/conditions/schemas/common.js +40 -7
  32. package/dist/cjs/conditions/schemas/common.js.map +1 -1
  33. package/dist/cjs/conditions/schemas/context.d.ts +1 -0
  34. package/dist/cjs/conditions/schemas/context.js +24 -3
  35. package/dist/cjs/conditions/schemas/context.js.map +1 -1
  36. package/dist/cjs/conditions/schemas/contract.d.ts +44 -25
  37. package/dist/cjs/conditions/schemas/contract.js +7 -7
  38. package/dist/cjs/conditions/schemas/contract.js.map +1 -1
  39. package/dist/cjs/conditions/schemas/export-for-zod-doc-gen.d.ts +18 -0
  40. package/dist/cjs/conditions/schemas/export-for-zod-doc-gen.js +37 -0
  41. package/dist/cjs/conditions/schemas/export-for-zod-doc-gen.js.map +1 -0
  42. package/dist/cjs/conditions/schemas/json-api.d.ts +14 -12
  43. package/dist/cjs/conditions/schemas/json-api.js +5 -25
  44. package/dist/cjs/conditions/schemas/json-api.js.map +1 -1
  45. package/dist/cjs/conditions/schemas/json-rpc.d.ts +51 -0
  46. package/dist/cjs/conditions/schemas/json-rpc.js +21 -0
  47. package/dist/cjs/conditions/schemas/json-rpc.js.map +1 -0
  48. package/dist/cjs/conditions/schemas/jwt.d.ts +22 -0
  49. package/dist/cjs/conditions/schemas/jwt.js +19 -0
  50. package/dist/cjs/conditions/schemas/jwt.js.map +1 -0
  51. package/dist/cjs/conditions/schemas/return-value-test.d.ts +18 -2
  52. package/dist/cjs/conditions/schemas/return-value-test.js +7 -2
  53. package/dist/cjs/conditions/schemas/return-value-test.js.map +1 -1
  54. package/dist/cjs/conditions/schemas/rpc.d.ts +19 -16
  55. package/dist/cjs/conditions/schemas/rpc.js +19 -37
  56. package/dist/cjs/conditions/schemas/rpc.js.map +1 -1
  57. package/dist/cjs/conditions/schemas/time.d.ts +11 -10
  58. package/dist/cjs/conditions/schemas/utils.js +4 -0
  59. package/dist/cjs/conditions/schemas/utils.js.map +1 -1
  60. package/dist/cjs/conditions/shared.d.ts +1 -1
  61. package/dist/cjs/conditions/shared.js +2 -1
  62. package/dist/cjs/conditions/shared.js.map +1 -1
  63. package/dist/cjs/index.js +17 -7
  64. package/dist/cjs/index.js.map +1 -1
  65. package/dist/cjs/utils.d.ts +2 -0
  66. package/dist/cjs/utils.js +48 -0
  67. package/dist/cjs/utils.js.map +1 -0
  68. package/dist/es/conditions/base/index.d.ts +2 -0
  69. package/dist/es/conditions/base/index.js +2 -0
  70. package/dist/es/conditions/base/index.js.map +1 -1
  71. package/dist/es/conditions/base/json-api.d.ts +1 -1
  72. package/dist/es/conditions/base/json-api.js +1 -1
  73. package/dist/es/conditions/base/json-api.js.map +1 -1
  74. package/dist/es/conditions/base/json-rpc.d.ts +7 -0
  75. package/dist/es/conditions/base/json-rpc.js +12 -0
  76. package/dist/es/conditions/base/json-rpc.js.map +1 -0
  77. package/dist/es/conditions/base/jwt.d.ts +7 -0
  78. package/dist/es/conditions/base/jwt.js +12 -0
  79. package/dist/es/conditions/base/jwt.js.map +1 -0
  80. package/dist/es/conditions/condition-expr.js +3 -3
  81. package/dist/es/conditions/condition-expr.js.map +1 -1
  82. package/dist/es/conditions/condition-factory.js +6 -0
  83. package/dist/es/conditions/condition-factory.js.map +1 -1
  84. package/dist/es/conditions/condition.js +2 -1
  85. package/dist/es/conditions/condition.js.map +1 -1
  86. package/dist/es/conditions/const.d.ts +0 -2
  87. package/dist/es/conditions/const.js +1 -9
  88. package/dist/es/conditions/const.js.map +1 -1
  89. package/dist/es/conditions/context/context.d.ts +2 -1
  90. package/dist/es/conditions/context/context.js +57 -61
  91. package/dist/es/conditions/context/context.js.map +1 -1
  92. package/dist/es/conditions/schemas/common.d.ts +3 -1
  93. package/dist/es/conditions/schemas/common.js +41 -8
  94. package/dist/es/conditions/schemas/common.js.map +1 -1
  95. package/dist/es/conditions/schemas/context.d.ts +1 -0
  96. package/dist/es/conditions/schemas/context.js +23 -2
  97. package/dist/es/conditions/schemas/context.js.map +1 -1
  98. package/dist/es/conditions/schemas/contract.d.ts +44 -25
  99. package/dist/es/conditions/schemas/contract.js +4 -4
  100. package/dist/es/conditions/schemas/contract.js.map +1 -1
  101. package/dist/es/conditions/schemas/export-for-zod-doc-gen.d.ts +18 -0
  102. package/dist/es/conditions/schemas/export-for-zod-doc-gen.js +21 -0
  103. package/dist/es/conditions/schemas/export-for-zod-doc-gen.js.map +1 -0
  104. package/dist/es/conditions/schemas/json-api.d.ts +14 -12
  105. package/dist/es/conditions/schemas/json-api.js +3 -23
  106. package/dist/es/conditions/schemas/json-api.js.map +1 -1
  107. package/dist/es/conditions/schemas/json-rpc.d.ts +51 -0
  108. package/dist/es/conditions/schemas/json-rpc.js +18 -0
  109. package/dist/es/conditions/schemas/json-rpc.js.map +1 -0
  110. package/dist/es/conditions/schemas/jwt.d.ts +22 -0
  111. package/dist/es/conditions/schemas/jwt.js +16 -0
  112. package/dist/es/conditions/schemas/jwt.js.map +1 -0
  113. package/dist/es/conditions/schemas/return-value-test.d.ts +18 -2
  114. package/dist/es/conditions/schemas/return-value-test.js +7 -2
  115. package/dist/es/conditions/schemas/return-value-test.js.map +1 -1
  116. package/dist/es/conditions/schemas/rpc.d.ts +19 -16
  117. package/dist/es/conditions/schemas/rpc.js +20 -15
  118. package/dist/es/conditions/schemas/rpc.js.map +1 -1
  119. package/dist/es/conditions/schemas/time.d.ts +11 -10
  120. package/dist/es/conditions/schemas/utils.js +4 -0
  121. package/dist/es/conditions/schemas/utils.js.map +1 -1
  122. package/dist/es/conditions/shared.d.ts +1 -1
  123. package/dist/es/conditions/shared.js +1 -1
  124. package/dist/es/conditions/shared.js.map +1 -1
  125. package/dist/es/utils.d.ts +2 -0
  126. package/dist/es/utils.js +43 -0
  127. package/dist/es/utils.js.map +1 -0
  128. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  129. package/dist/tsconfig.es.tsbuildinfo +1 -1
  130. package/package.json +13 -8
  131. package/dist/cjs/conditions/context/providers.d.ts +0 -16
  132. package/dist/cjs/conditions/context/providers.js +0 -111
  133. package/dist/cjs/conditions/context/providers.js.map +0 -1
  134. package/dist/cjs/web3.d.ts +0 -33
  135. package/dist/cjs/web3.js +0 -3
  136. package/dist/cjs/web3.js.map +0 -1
  137. package/dist/es/conditions/context/providers.d.ts +0 -16
  138. package/dist/es/conditions/context/providers.js +0 -107
  139. package/dist/es/conditions/context/providers.js.map +0 -1
  140. package/dist/es/web3.d.ts +0 -33
  141. package/dist/es/web3.js +0 -2
  142. package/dist/es/web3.js.map +0 -1
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.jwtConditionSchema = exports.JWTConditionType = exports.JWT_PARAM_DEFAULT = void 0;
4
+ const zod_1 = require("zod");
5
+ const common_1 = require("./common");
6
+ const context_1 = require("./context");
7
+ exports.JWT_PARAM_DEFAULT = ':jwtToken';
8
+ exports.JWTConditionType = 'jwt';
9
+ exports.jwtConditionSchema = common_1.baseConditionSchema.extend({
10
+ conditionType: zod_1.z.literal(exports.JWTConditionType).default(exports.JWTConditionType),
11
+ publicKey: zod_1.z.string(),
12
+ expectedIssuer: zod_1.z.string().optional(),
13
+ // TODO see https://github.com/nucypher/taco-web/pull/604#discussion_r1901746814
14
+ // subject: contextParamSchema.optional(),
15
+ // expirationWindow: z.number().int().nonnegative().optional(),
16
+ // issuedWindow: z.number().int().nonnegative().optional(),
17
+ jwtToken: context_1.contextParamSchema.default(exports.JWT_PARAM_DEFAULT),
18
+ });
19
+ //# sourceMappingURL=jwt.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/jwt.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,qCAA+C;AAC/C,uCAA+C;AAElC,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAEhC,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEzB,QAAA,kBAAkB,GAAG,4BAAmB,CAAC,MAAM,CAAC;IAC3D,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC;IACpE,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,gFAAgF;IAChF,0CAA0C;IAC1C,+DAA+D;IAC/D,2DAA2D;IAC3D,QAAQ,EAAE,4BAAkB,CAAC,OAAO,CAAC,yBAAiB,CAAC;CACxD,CAAC,CAAC"}
@@ -1,15 +1,31 @@
1
1
  import { z } from 'zod';
2
- export declare const returnValueTestSchema: z.ZodObject<{
2
+ export declare const returnValueTestSchema: z.ZodObject<z.objectUtil.extendShape<{
3
3
  index: z.ZodOptional<z.ZodNumber>;
4
4
  comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
5
+ }, {
5
6
  value: z.ZodType<any, z.ZodTypeDef, any>;
6
- }, "strip", z.ZodTypeAny, {
7
+ }>, "strip", z.ZodTypeAny, {
7
8
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
9
+ value?: any;
8
10
  index?: number | undefined;
11
+ }, {
12
+ comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
9
13
  value?: any;
14
+ index?: number | undefined;
15
+ }>;
16
+ export declare const blockchainReturnValueTestSchema: z.ZodObject<z.objectUtil.extendShape<{
17
+ index: z.ZodOptional<z.ZodNumber>;
18
+ comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
10
19
  }, {
20
+ value: z.ZodType<any, z.ZodTypeDef, any>;
21
+ }>, "strip", z.ZodTypeAny, {
11
22
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
23
+ value?: any;
12
24
  index?: number | undefined;
25
+ }, {
26
+ comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
13
27
  value?: any;
28
+ index?: number | undefined;
14
29
  }>;
15
30
  export type ReturnValueTestProps = z.infer<typeof returnValueTestSchema>;
31
+ export type BlockchainReturnValueTestProps = z.infer<typeof blockchainReturnValueTestSchema>;
@@ -1,11 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.returnValueTestSchema = void 0;
3
+ exports.blockchainReturnValueTestSchema = exports.returnValueTestSchema = void 0;
4
4
  const zod_1 = require("zod");
5
5
  const context_1 = require("./context");
6
- exports.returnValueTestSchema = zod_1.z.object({
6
+ const returnValueTestBaseSchema = zod_1.z.object({
7
7
  index: zod_1.z.number().int().nonnegative().optional(),
8
8
  comparator: zod_1.z.enum(['==', '>', '<', '>=', '<=', '!=']),
9
+ });
10
+ exports.returnValueTestSchema = returnValueTestBaseSchema.extend({
9
11
  value: context_1.paramOrContextParamSchema,
10
12
  });
13
+ exports.blockchainReturnValueTestSchema = returnValueTestBaseSchema.extend({
14
+ value: context_1.blockchainParamOrContextParamSchema,
15
+ });
11
16
  //# sourceMappingURL=return-value-test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"return-value-test.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/return-value-test.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,uCAAsD;AAEzC,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,mCAAyB;CACjC,CAAC,CAAC"}
1
+ {"version":3,"file":"return-value-test.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/return-value-test.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,uCAGmB;AAEnB,MAAM,yBAAyB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,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;CACvD,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,yBAAyB,CAAC,MAAM,CAAC;IACpE,KAAK,EAAE,mCAAyB;CACjC,CAAC,CAAC;AAEU,QAAA,+BAA+B,GAAG,yBAAyB,CAAC,MAAM,CAC7E;IACE,KAAK,EAAE,6CAAmC;CAC3C,CACF,CAAC"}
@@ -1,42 +1,45 @@
1
1
  import { z } from 'zod';
2
2
  export declare const RpcConditionType = "rpc";
3
- export declare const rpcConditionSchema: z.ZodObject<{
3
+ export declare const rpcConditionSchema: z.ZodObject<z.objectUtil.extendShape<{
4
+ conditionType: z.ZodString;
5
+ }, {
4
6
  conditionType: z.ZodDefault<z.ZodLiteral<"rpc">>;
5
- chain: z.ZodNever | z.ZodLiteral<z.Primitive> | z.ZodUnion<[z.ZodLiteral<z.Primitive>, z.ZodLiteral<z.Primitive>, ...z.ZodLiteral<z.Primitive>[]]>;
7
+ chain: z.ZodNumber;
6
8
  method: z.ZodEnum<["eth_getBalance"]>;
7
- parameters: z.ZodUnion<[z.ZodTuple<[z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEnum<[":userAddress", ":userAddressExternalEIP4361"]>, z.ZodString]>, z.ZodUnion<[z.ZodUnion<[z.ZodNumber, z.ZodString, z.ZodEnum<["earliest", "finalized", "safe", "latest", "pending"]>]>, z.ZodString]>], null>, z.ZodTuple<[z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodEnum<[":userAddress", ":userAddressExternalEIP4361"]>, z.ZodString]>], null>]>;
8
- returnValueTest: z.ZodObject<{
9
+ parameters: z.ZodUnion<[z.ZodTuple<[z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodLiteral<":userAddress">, z.ZodString]>, z.ZodUnion<[z.ZodUnion<[z.ZodNumber, z.ZodString, z.ZodEnum<["earliest", "finalized", "safe", "latest", "pending"]>]>, z.ZodString]>], null>, z.ZodTuple<[z.ZodUnion<[z.ZodEffects<z.ZodString, string, string>, z.ZodLiteral<":userAddress">, z.ZodString]>], null>]>;
10
+ returnValueTest: z.ZodObject<z.objectUtil.extendShape<{
9
11
  index: z.ZodOptional<z.ZodNumber>;
10
12
  comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
13
+ }, {
11
14
  value: z.ZodType<any, z.ZodTypeDef, any>;
12
- }, "strip", z.ZodTypeAny, {
15
+ }>, "strip", z.ZodTypeAny, {
13
16
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
14
- index?: number | undefined;
15
17
  value?: any;
18
+ index?: number | undefined;
16
19
  }, {
17
20
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
18
- index?: number | undefined;
19
21
  value?: any;
22
+ index?: number | undefined;
20
23
  }>;
21
- }, "strip", z.ZodTypeAny, {
24
+ }>, "strip", z.ZodTypeAny, {
22
25
  conditionType: "rpc";
23
- parameters: [string] | [string, string | number];
26
+ chain: number;
27
+ method: "eth_getBalance";
28
+ parameters: [string, string | number] | [string];
24
29
  returnValueTest: {
25
30
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
26
- index?: number | undefined;
27
31
  value?: any;
32
+ index?: number | undefined;
28
33
  };
29
- method: "eth_getBalance";
30
- chain?: z.Primitive;
31
34
  }, {
32
- parameters: [string] | [string, string | number];
35
+ chain: number;
36
+ method: "eth_getBalance";
37
+ parameters: [string, string | number] | [string];
33
38
  returnValueTest: {
34
39
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
35
- index?: number | undefined;
36
40
  value?: any;
41
+ index?: number | undefined;
37
42
  };
38
- method: "eth_getBalance";
39
43
  conditionType?: "rpc" | undefined;
40
- chain?: z.Primitive;
41
44
  }>;
42
45
  export type RpcConditionProps = z.infer<typeof rpcConditionSchema>;
@@ -1,33 +1,9 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  Object.defineProperty(exports, "__esModule", { value: true });
26
3
  exports.rpcConditionSchema = exports.RpcConditionType = void 0;
27
4
  const shared_1 = require("@nucypher/shared");
28
5
  const zod_1 = require("zod");
29
- const const_1 = require("../const");
30
- const common_1 = __importStar(require("./common"));
6
+ const common_1 = require("./common");
31
7
  const context_1 = require("./context");
32
8
  const return_value_test_1 = require("./return-value-test");
33
9
  exports.RpcConditionType = 'rpc';
@@ -36,23 +12,29 @@ const EthAddressOrContextVariableSchema = zod_1.z.union([
36
12
  common_1.UserAddressSchema,
37
13
  context_1.contextParamSchema,
38
14
  ]);
39
- const BlockOrContextParamSchema = zod_1.z.union([
40
- shared_1.BlockIdentifierSchema,
41
- context_1.contextParamSchema,
42
- ]);
15
+ const BlockOrContextParamSchema = zod_1.z
16
+ .union([shared_1.BlockIdentifierSchema, context_1.contextParamSchema])
17
+ .describe('A block identifier or a context variable that will be replaced with a block identifier at execution time.');
43
18
  // eth_getBalance schema specification
44
19
  // - Ethereum spec: https://ethereum.github.io/execution-apis/api-documentation/
45
20
  // - web3py: https://web3py.readthedocs.io/en/stable/web3.eth.html#web3.eth.Eth.get_balance
46
- exports.rpcConditionSchema = common_1.baseConditionSchema.extend({
21
+ exports.rpcConditionSchema = common_1.baseConditionSchema
22
+ .extend({
47
23
  conditionType: zod_1.z.literal(exports.RpcConditionType).default(exports.RpcConditionType),
48
- chain: (0, common_1.default)(const_1.SUPPORTED_CHAIN_IDS),
49
- method: zod_1.z.enum(['eth_getBalance']),
24
+ chain: zod_1.z.number().int().nonnegative(),
25
+ method: zod_1.z
26
+ .enum(['eth_getBalance'])
27
+ .describe("Only 'eth_getBalance' method is supported"),
50
28
  parameters: zod_1.z.union([
51
29
  // Spec requires 2 parameters: an address and a block identifier
52
- zod_1.z.tuple([EthAddressOrContextVariableSchema, BlockOrContextParamSchema]),
53
- // Block identifier can be omitted, since web3py (which runs on TACo exec layer) defaults to 'latest',
54
- zod_1.z.tuple([EthAddressOrContextVariableSchema]),
30
+ zod_1.z
31
+ .tuple([EthAddressOrContextVariableSchema, BlockOrContextParamSchema])
32
+ .describe('Spec requires 2 parameters - an address and a block identifier'),
33
+ zod_1.z
34
+ .tuple([EthAddressOrContextVariableSchema])
35
+ .describe("Block identifier, which defaults to 'latest' if not specified"),
55
36
  ]),
56
- returnValueTest: return_value_test_1.returnValueTestSchema, // Update to allow multiple return values after expanding supported methods
57
- });
37
+ returnValueTest: return_value_test_1.blockchainReturnValueTestSchema, // Update to allow multiple return values after expanding supported methods
38
+ })
39
+ .describe('RPC Condition for calling [Ethereum JSON RPC APIs](https://ethereum.github.io/execution-apis/api-documentation/)');
58
40
  //# sourceMappingURL=rpc.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/rpc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA2E;AAC3E,6BAAwB;AAExB,oCAA+C;AAE/C,mDAGkB;AAClB,uCAA+C;AAC/C,2DAA4D;AAE/C,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEtC,MAAM,iCAAiC,GAAG,OAAC,CAAC,KAAK,CAAC;IAChD,yBAAgB;IAChB,0BAAiB;IACjB,4BAAkB;CACnB,CAAC,CAAC;AACH,MAAM,yBAAyB,GAAG,OAAC,CAAC,KAAK,CAAC;IACxC,8BAAqB;IACrB,4BAAkB;CACnB,CAAC,CAAC;AAEH,sCAAsC;AACtC,gFAAgF;AAChF,2FAA2F;AAC9E,QAAA,kBAAkB,GAAG,4BAAmB,CAAC,MAAM,CAAC;IAC3D,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC;IACpE,KAAK,EAAE,IAAA,gBAAiB,EAAC,2BAAmB,CAAC;IAC7C,MAAM,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAClC,UAAU,EAAE,OAAC,CAAC,KAAK,CAAC;QAClB,gEAAgE;QAChE,OAAC,CAAC,KAAK,CAAC,CAAC,iCAAiC,EAAE,yBAAyB,CAAC,CAAC;QACvE,sGAAsG;QACtG,OAAC,CAAC,KAAK,CAAC,CAAC,iCAAiC,CAAC,CAAC;KAC7C,CAAC;IACF,eAAe,EAAE,yCAAqB,EAAE,2EAA2E;CACpH,CAAC,CAAC"}
1
+ {"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/rpc.ts"],"names":[],"mappings":";;;AAAA,6CAA2E;AAC3E,6BAAwB;AAExB,qCAAkE;AAClE,uCAA+C;AAC/C,2DAAsE;AAEzD,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEtC,MAAM,iCAAiC,GAAG,OAAC,CAAC,KAAK,CAAC;IAChD,yBAAgB;IAChB,0BAAiB;IACjB,4BAAkB;CACnB,CAAC,CAAC;AACH,MAAM,yBAAyB,GAAG,OAAC;KAChC,KAAK,CAAC,CAAC,8BAAqB,EAAE,4BAAkB,CAAC,CAAC;KAClD,QAAQ,CACP,2GAA2G,CAC5G,CAAC;AAEJ,sCAAsC;AACtC,gFAAgF;AAChF,2FAA2F;AAC9E,QAAA,kBAAkB,GAAG,4BAAmB;KAClD,MAAM,CAAC;IACN,aAAa,EAAE,OAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC,CAAC,OAAO,CAAC,wBAAgB,CAAC;IACpE,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;IACrC,MAAM,EAAE,OAAC;SACN,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;SACxB,QAAQ,CAAC,2CAA2C,CAAC;IACxD,UAAU,EAAE,OAAC,CAAC,KAAK,CAAC;QAClB,gEAAgE;QAChE,OAAC;aACE,KAAK,CAAC,CAAC,iCAAiC,EAAE,yBAAyB,CAAC,CAAC;aACrE,QAAQ,CACP,gEAAgE,CACjE;QACH,OAAC;aACE,KAAK,CAAC,CAAC,iCAAiC,CAAC,CAAC;aAC1C,QAAQ,CACP,+DAA+D,CAChE;KACJ,CAAC;IACF,eAAe,EAAE,mDAA+B,EAAE,2EAA2E;CAC9H,CAAC;KACD,QAAQ,CACP,kHAAkH,CACnH,CAAC"}
@@ -4,37 +4,38 @@ export declare const TimeConditionMethod = "blocktime";
4
4
  export declare const timeConditionSchema: z.ZodObject<{
5
5
  conditionType: z.ZodDefault<z.ZodLiteral<"time">>;
6
6
  method: z.ZodDefault<z.ZodLiteral<"blocktime">>;
7
- chain: z.ZodNever | z.ZodLiteral<z.Primitive> | z.ZodUnion<[z.ZodLiteral<z.Primitive>, z.ZodLiteral<z.Primitive>, ...z.ZodLiteral<z.Primitive>[]]>;
8
- returnValueTest: z.ZodObject<{
7
+ chain: z.ZodNumber;
8
+ returnValueTest: z.ZodObject<z.objectUtil.extendShape<{
9
9
  index: z.ZodOptional<z.ZodNumber>;
10
10
  comparator: z.ZodEnum<["==", ">", "<", ">=", "<=", "!="]>;
11
+ }, {
11
12
  value: z.ZodType<any, z.ZodTypeDef, any>;
12
- }, "strip", z.ZodTypeAny, {
13
+ }>, "strip", z.ZodTypeAny, {
13
14
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
14
- index?: number | undefined;
15
15
  value?: any;
16
+ index?: number | undefined;
16
17
  }, {
17
18
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
18
- index?: number | undefined;
19
19
  value?: any;
20
+ index?: number | undefined;
20
21
  }>;
21
22
  }, "strip", z.ZodTypeAny, {
22
23
  conditionType: "time";
24
+ chain: number;
25
+ method: "blocktime";
23
26
  returnValueTest: {
24
27
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
25
- index?: number | undefined;
26
28
  value?: any;
29
+ index?: number | undefined;
27
30
  };
28
- method: "blocktime";
29
- chain?: z.Primitive;
30
31
  }, {
32
+ chain: number;
31
33
  returnValueTest: {
32
34
  comparator: "==" | ">" | "<" | ">=" | "<=" | "!=";
33
- index?: number | undefined;
34
35
  value?: any;
36
+ index?: number | undefined;
35
37
  };
36
38
  conditionType?: "time" | undefined;
37
39
  method?: "blocktime" | undefined;
38
- chain?: z.Primitive;
39
40
  }>;
40
41
  export type TimeConditionProps = z.infer<typeof timeConditionSchema>;
@@ -6,6 +6,8 @@ const compound_condition_1 = require("../compound-condition");
6
6
  const contract_1 = require("./contract");
7
7
  const if_then_else_1 = require("./if-then-else");
8
8
  const json_api_1 = require("./json-api");
9
+ const json_rpc_1 = require("./json-rpc");
10
+ const jwt_1 = require("./jwt");
9
11
  const rpc_1 = require("./rpc");
10
12
  const sequential_1 = require("./sequential");
11
13
  const time_1 = require("./time");
@@ -15,6 +17,8 @@ exports.anyConditionSchema = zod_1.z.lazy(() => zod_1.z.union([
15
17
  contract_1.contractConditionSchema,
16
18
  compound_condition_1.compoundConditionSchema,
17
19
  json_api_1.jsonApiConditionSchema,
20
+ json_rpc_1.jsonRpcConditionSchema,
21
+ jwt_1.jwtConditionSchema,
18
22
  sequential_1.sequentialConditionSchema,
19
23
  if_then_else_1.ifThenElseConditionSchema,
20
24
  ]));
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/utils.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,8DAAgE;AAEhE,yCAAqD;AACrD,iDAA2D;AAC3D,yCAAoD;AACpD,+BAA2C;AAC3C,6CAAyD;AACzD,iCAA6C;AAEhC,QAAA,kBAAkB,GAAgB,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACzD,OAAC,CAAC,KAAK,CAAC;IACN,wBAAkB;IAClB,0BAAmB;IACnB,kCAAuB;IACvB,4CAAuB;IACvB,iCAAsB;IACtB,sCAAyB;IACzB,wCAAyB;CAC1B,CAAC,CACH,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/conditions/schemas/utils.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,8DAAgE;AAEhE,yCAAqD;AACrD,iDAA2D;AAC3D,yCAAoD;AACpD,yCAAoD;AACpD,+BAA2C;AAC3C,+BAA2C;AAC3C,6CAAyD;AACzD,iCAA6C;AAEhC,QAAA,kBAAkB,GAAgB,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACzD,OAAC,CAAC,KAAK,CAAC;IACN,wBAAkB;IAClB,0BAAmB;IACnB,kCAAuB;IACvB,4CAAuB;IACvB,iCAAsB;IACtB,iCAAsB;IACtB,wBAAkB;IAClB,sCAAyB;IACzB,wCAAyB;CAC1B,CAAC,CACH,CAAC"}
@@ -1,3 +1,3 @@
1
1
  export type OmitConditionType<T> = Omit<T, 'conditionType'>;
2
2
  export { contextParamSchema, paramOrContextParamSchema, } from './schemas/context';
3
- export { ReturnValueTestProps, returnValueTestSchema, } from './schemas/return-value-test';
3
+ export { BlockchainReturnValueTestProps, ReturnValueTestProps, blockchainReturnValueTestSchema, returnValueTestSchema, } from './schemas/return-value-test';
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.returnValueTestSchema = exports.paramOrContextParamSchema = exports.contextParamSchema = void 0;
3
+ exports.returnValueTestSchema = exports.blockchainReturnValueTestSchema = exports.paramOrContextParamSchema = exports.contextParamSchema = void 0;
4
4
  var context_1 = require("./schemas/context");
5
5
  Object.defineProperty(exports, "contextParamSchema", { enumerable: true, get: function () { return context_1.contextParamSchema; } });
6
6
  Object.defineProperty(exports, "paramOrContextParamSchema", { enumerable: true, get: function () { return context_1.paramOrContextParamSchema; } });
7
7
  var return_value_test_1 = require("./schemas/return-value-test");
8
+ Object.defineProperty(exports, "blockchainReturnValueTestSchema", { enumerable: true, get: function () { return return_value_test_1.blockchainReturnValueTestSchema; } });
8
9
  Object.defineProperty(exports, "returnValueTestSchema", { enumerable: true, get: function () { return return_value_test_1.returnValueTestSchema; } });
9
10
  //# sourceMappingURL=shared.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/conditions/shared.ts"],"names":[],"mappings":";;;AAEA,6CAG2B;AAFzB,6GAAA,kBAAkB,OAAA;AAClB,oHAAA,yBAAyB,OAAA;AAG3B,iEAGqC;AADnC,0HAAA,qBAAqB,OAAA"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/conditions/shared.ts"],"names":[],"mappings":";;;AAEA,6CAG2B;AAFzB,6GAAA,kBAAkB,OAAA;AAClB,oHAAA,yBAAyB,OAAA;AAG3B,iEAKqC;AAFnC,oIAAA,+BAA+B,OAAA;AAC/B,0HAAA,qBAAqB,OAAA"}
package/dist/cjs/index.js CHANGED
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  Object.defineProperty(exports, "__esModule", { value: true });
26
36
  exports.encryptWithPublicKey = exports.encrypt = exports.decrypt = exports.conditions = exports.toHexString = exports.toBytes = exports.initialize = exports.getPorterUris = exports.fromBytes = exports.domains = exports.ThresholdMessageKit = exports.DkgPublicKey = void 0;
27
37
  var nucypher_core_1 = require("@nucypher/nucypher-core");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA4E;AAAnE,6GAAA,YAAY,OAAA;AAAE,oHAAA,mBAAmB,OAAA;AAC1C,2CAQ0B;AANxB,iGAAA,OAAO,OAAA;AACP,mGAAA,SAAS,OAAA;AACT,uGAAA,aAAa,OAAA;AACb,oGAAA,UAAU,OAAA;AACV,iGAAA,OAAO,OAAA;AACP,qGAAA,WAAW,OAAA;AAGb,2DAA2C;AAE3C,+BAAgE;AAAvD,+FAAA,OAAO,OAAA;AAAE,+FAAA,OAAO,OAAA;AAAE,4GAAA,oBAAoB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA4E;AAAnE,6GAAA,YAAY,OAAA;AAAE,oHAAA,mBAAmB,OAAA;AAC1C,2CAQ0B;AANxB,iGAAA,OAAO,OAAA;AACP,mGAAA,SAAS,OAAA;AACT,uGAAA,aAAa,OAAA;AACb,oGAAA,UAAU,OAAA;AACV,iGAAA,OAAO,OAAA;AACP,qGAAA,WAAW,OAAA;AAGb,2DAA2C;AAE3C,+BAAgE;AAAvD,+FAAA,OAAO,OAAA;AAAE,+FAAA,OAAO,OAAA;AAAE,4GAAA,oBAAoB,OAAA"}
@@ -0,0 +1,2 @@
1
+ export declare const toJSON: (obj: unknown) => string;
2
+ export declare const fromJSON: (json: string) => any;
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.fromJSON = exports.toJSON = void 0;
4
+ const shared_1 = require("@nucypher/shared");
5
+ const customTypeReplacer = (_key, value) => {
6
+ if (value instanceof Uint8Array) {
7
+ // use hex string for byte arrays
8
+ return `0x${(0, shared_1.toHexString)(value)}`;
9
+ }
10
+ if (typeof value === 'bigint') {
11
+ if (value > Number.MAX_SAFE_INTEGER || value < Number.MIN_SAFE_INTEGER) {
12
+ // can't serialized to a safe number so use bigint string notation
13
+ return `${value}n`;
14
+ }
15
+ return Number(value);
16
+ }
17
+ return value;
18
+ };
19
+ const customTypeReceiver = (_key, value) => {
20
+ if (typeof value === 'string') {
21
+ if (/^-?\d+n$/.test(value)) {
22
+ // bigint number stored as string (`${value}n`)
23
+ return BigInt(value.slice(0, -1));
24
+ }
25
+ // NOTE: hex strings remain hex strings - could be an address (not bytes) or hex string (originally a byte array). Can't be sure which is which other than length (42) which feels flimsy
26
+ }
27
+ return value;
28
+ };
29
+ const sortedReplacer = (_key, value) => {
30
+ if (value instanceof Object && !(value instanceof Array)) {
31
+ return Object.keys(value)
32
+ .sort()
33
+ .reduce((sorted, key) => {
34
+ sorted[key] = value[key];
35
+ return sorted;
36
+ }, {});
37
+ }
38
+ return value;
39
+ };
40
+ const sortedSerializingReplacer = (_key, value) => {
41
+ const serializedValue = customTypeReplacer(_key, value);
42
+ return sortedReplacer(_key, serializedValue);
43
+ };
44
+ const toJSON = (obj) => JSON.stringify(obj, sortedSerializingReplacer);
45
+ exports.toJSON = toJSON;
46
+ const fromJSON = (json) => JSON.parse(json, customTypeReceiver);
47
+ exports.fromJSON = fromJSON;
48
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAE/C,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,KAAc,EAAE,EAAE;IAC1D,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAChC,iCAAiC;QACjC,OAAO,KAAK,IAAA,oBAAW,EAAC,KAAK,CAAC,EAAE,CAAC;IACnC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,KAAK,GAAG,MAAM,CAAC,gBAAgB,IAAI,KAAK,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;YACvE,kEAAkE;YAClE,OAAO,GAAG,KAAK,GAAG,CAAC;QACrB,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,KAAc,EAAE,EAAE;IAC1D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,+CAA+C;YAC/C,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC;QACD,yLAAyL;IAC3L,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,KAAc,EAAE,EAAE;IACtD,IAAI,KAAK,YAAY,MAAM,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;QACzD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACtB,IAAI,EAAE;aACN,MAAM,CAAC,CAAC,MAA+B,EAAE,GAAG,EAAE,EAAE;YAC/C,MAAM,CAAC,GAAG,CAAC,GAAI,KAAiC,CAAC,GAAG,CAAC,CAAC;YACtD,OAAO,MAAM,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,IAAY,EAAE,KAAc,EAAW,EAAE;IAC1E,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxD,OAAO,cAAc,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEK,MAAM,MAAM,GAAG,CAAC,GAAY,EAAE,EAAE,CACrC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC;AADpC,QAAA,MAAM,UAC8B;AAE1C,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;AAAlE,QAAA,QAAQ,YAA0D"}
@@ -1,4 +1,6 @@
1
1
  export * as contract from './contract';
2
2
  export * as jsonApi from './json-api';
3
+ export * as jsonRpc from './json-rpc';
4
+ export * as jwt from './jwt';
3
5
  export * as rpc from './rpc';
4
6
  export * as time from './time';
@@ -2,6 +2,8 @@
2
2
  // avoid circular dependency on Condition class.
3
3
  export * as contract from './contract';
4
4
  export * as jsonApi from './json-api';
5
+ export * as jsonRpc from './json-rpc';
6
+ export * as jwt from './jwt';
5
7
  export * as rpc from './rpc';
6
8
  export * as time from './time';
7
9
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/conditions/base/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,gDAAgD;AAEhD,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/conditions/base/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,gDAAgD;AAEhD,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { Condition } from '../condition';
2
2
  import { JsonApiConditionProps } from '../schemas/json-api';
3
3
  import { OmitConditionType } from '../shared';
4
- export { JsonApiConditionProps, jsonApiConditionSchema, JsonApiConditionType, jsonPathSchema, } from '../schemas/json-api';
4
+ export { JsonApiConditionProps, jsonApiConditionSchema, JsonApiConditionType, } from '../schemas/json-api';
5
5
  export declare class JsonApiCondition extends Condition {
6
6
  constructor(value: OmitConditionType<JsonApiConditionProps>);
7
7
  }
@@ -1,6 +1,6 @@
1
1
  import { Condition } from '../condition';
2
2
  import { jsonApiConditionSchema, JsonApiConditionType, } from '../schemas/json-api';
3
- export { jsonApiConditionSchema, JsonApiConditionType, jsonPathSchema, } from '../schemas/json-api';
3
+ export { jsonApiConditionSchema, JsonApiConditionType, } from '../schemas/json-api';
4
4
  export class JsonApiCondition extends Condition {
5
5
  constructor(value) {
6
6
  super(jsonApiConditionSchema, {
@@ -1 +1 @@
1
- {"version":3,"file":"json-api.js","sourceRoot":"","sources":["../../../../src/conditions/base/json-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAEL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAC7C,YAAY,KAA+C;QACzD,KAAK,CAAC,sBAAsB,EAAE;YAC5B,aAAa,EAAE,oBAAoB;YACnC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF"}
1
+ {"version":3,"file":"json-api.js","sourceRoot":"","sources":["../../../../src/conditions/base/json-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAEL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAC7C,YAAY,KAA+C;QACzD,KAAK,CAAC,sBAAsB,EAAE;YAC5B,aAAa,EAAE,oBAAoB;YACnC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -0,0 +1,7 @@
1
+ import { Condition } from '../condition';
2
+ import { JsonRpcConditionProps } from '../schemas/json-rpc';
3
+ import { OmitConditionType } from '../shared';
4
+ export { JsonRpcConditionProps, jsonRpcConditionSchema, JsonRpcConditionType, } from '../schemas/json-rpc';
5
+ export declare class JsonRpcCondition extends Condition {
6
+ constructor(value: OmitConditionType<JsonRpcConditionProps>);
7
+ }
@@ -0,0 +1,12 @@
1
+ import { Condition } from '../condition';
2
+ import { jsonRpcConditionSchema, JsonRpcConditionType, } from '../schemas/json-rpc';
3
+ export { jsonRpcConditionSchema, JsonRpcConditionType, } from '../schemas/json-rpc';
4
+ export class JsonRpcCondition extends Condition {
5
+ constructor(value) {
6
+ super(jsonRpcConditionSchema, {
7
+ conditionType: JsonRpcConditionType,
8
+ ...value,
9
+ });
10
+ }
11
+ }
12
+ //# sourceMappingURL=json-rpc.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"json-rpc.js","sourceRoot":"","sources":["../../../../src/conditions/base/json-rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAEL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAC7C,YAAY,KAA+C;QACzD,KAAK,CAAC,sBAAsB,EAAE;YAC5B,aAAa,EAAE,oBAAoB;YACnC,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -0,0 +1,7 @@
1
+ import { Condition } from '../condition';
2
+ import { JWTConditionProps } from '../schemas/jwt';
3
+ import { OmitConditionType } from '../shared';
4
+ export { JWT_PARAM_DEFAULT, JWTConditionProps, jwtConditionSchema, JWTConditionType, } from '../schemas/jwt';
5
+ export declare class JWTCondition extends Condition {
6
+ constructor(value: OmitConditionType<JWTConditionProps>);
7
+ }
@@ -0,0 +1,12 @@
1
+ import { Condition } from '../condition';
2
+ import { jwtConditionSchema, JWTConditionType, } from '../schemas/jwt';
3
+ export { JWT_PARAM_DEFAULT, jwtConditionSchema, JWTConditionType, } from '../schemas/jwt';
4
+ export class JWTCondition extends Condition {
5
+ constructor(value) {
6
+ super(jwtConditionSchema, {
7
+ conditionType: JWTConditionType,
8
+ ...value,
9
+ });
10
+ }
11
+ }
12
+ //# sourceMappingURL=jwt.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../../src/conditions/base/jwt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAEL,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,iBAAiB,EAEjB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAExB,MAAM,OAAO,YAAa,SAAQ,SAAS;IACzC,YAAY,KAA2C;QACrD,KAAK,CAAC,kBAAkB,EAAE;YACxB,aAAa,EAAE,gBAAgB;YAC/B,GAAG,KAAK;SACT,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -1,9 +1,9 @@
1
1
  import { Conditions as CoreConditions } from '@nucypher/nucypher-core';
2
- import { toJSON } from '@nucypher/shared';
3
2
  import { SemVer } from 'semver';
3
+ import { fromJSON, toJSON } from '../utils';
4
4
  import { ConditionFactory } from './condition-factory';
5
5
  const ERR_VERSION = (provided, current) => `Version provided, ${provided}, is incompatible with current version, ${current}`;
6
- const ERR_CONDITION = (condition) => `Invalid condition: unrecognized condition data ${JSON.stringify(condition)}`;
6
+ const ERR_CONDITION = (condition) => `Invalid condition: unrecognized condition data ${toJSON(condition)}`;
7
7
  export class ConditionExpression {
8
8
  condition;
9
9
  version;
@@ -35,7 +35,7 @@ export class ConditionExpression {
35
35
  return toJSON(this.toObj());
36
36
  }
37
37
  static fromJSON(json) {
38
- return ConditionExpression.fromObj(JSON.parse(json));
38
+ return ConditionExpression.fromObj(fromJSON(json));
39
39
  }
40
40
  toCoreCondition() {
41
41
  return new CoreConditions(toJSON(this.toObj()));
@@ -1 +1 @@
1
- {"version":3,"file":"condition-expr.js","sourceRoot":"","sources":["../../../src/conditions/condition-expr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;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,MAAM,OAAO,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,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,MAAM,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,gBAAgB,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,MAAM,CAAC,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,cAAc,CAAC,MAAM,CAAC,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"}
1
+ {"version":3,"file":"condition-expr.js","sourceRoot":"","sources":["../../../src/conditions/condition-expr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;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,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;AAOxE,MAAM,OAAO,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,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,IAAI,MAAM,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,gBAAgB,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,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,IAAY;QACjC,OAAO,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,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"}
@@ -1,5 +1,7 @@
1
1
  import { ContractCondition, ContractConditionType, } from './base/contract';
2
2
  import { JsonApiCondition, JsonApiConditionType, } from './base/json-api';
3
+ import { JsonRpcCondition, JsonRpcConditionType, } from './base/json-rpc';
4
+ import { JWTCondition, JWTConditionType } from './base/jwt';
3
5
  import { RpcCondition, RpcConditionType } from './base/rpc';
4
6
  import { TimeCondition, TimeConditionType, } from './base/time';
5
7
  import { CompoundCondition, CompoundConditionType, } from './compound-condition';
@@ -18,6 +20,10 @@ export class ConditionFactory {
18
20
  return new ContractCondition(props);
19
21
  case JsonApiConditionType:
20
22
  return new JsonApiCondition(props);
23
+ case JsonRpcConditionType:
24
+ return new JsonRpcCondition(props);
25
+ case JWTConditionType:
26
+ return new JWTCondition(props);
21
27
  // Logical Conditions
22
28
  case CompoundConditionType:
23
29
  return new CompoundCondition(props);
@@ -1 +1 @@
1
- {"version":3,"file":"condition-factory.js","sourceRoot":"","sources":["../../../src/conditions/condition-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAEhB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAqB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EACL,aAAa,EAEb,iBAAiB,GAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,mBAAmB,EAEnB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,mBAAmB,EAEnB,uBAAuB,GACxB,MAAM,cAAc,CAAC;AAEtB,MAAM,0BAA0B,GAAG,CAAC,IAAY,EAAE,EAAE,CAClD,2BAA2B,IAAI,EAAE,CAAC;AAEpC,MAAM,OAAO,gBAAgB;IACpB,MAAM,CAAC,kBAAkB,CAAC,KAAqB;QACpD,QAAQ,KAAK,CAAC,aAAa,EAAE,CAAC;YAC5B,kBAAkB;YAClB,KAAK,gBAAgB;gBACnB,OAAO,IAAI,YAAY,CAAC,KAA0B,CAAC,CAAC;YACtD,KAAK,iBAAiB;gBACpB,OAAO,IAAI,aAAa,CAAC,KAA2B,CAAC,CAAC;YACxD,KAAK,qBAAqB;gBACxB,OAAO,IAAI,iBAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE,KAAK,oBAAoB;gBACvB,OAAO,IAAI,gBAAgB,CAAC,KAA8B,CAAC,CAAC;YAC9D,qBAAqB;YACrB,KAAK,qBAAqB;gBACxB,OAAO,IAAI,iBAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE,KAAK,uBAAuB;gBAC1B,OAAO,IAAI,mBAAmB,CAAC,KAAiC,CAAC,CAAC;YACpE,KAAK,uBAAuB;gBAC1B,OAAO,IAAI,mBAAmB,CAAC,KAAiC,CAAC,CAAC;YACpE;gBACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"condition-factory.js","sourceRoot":"","sources":["../../../src/conditions/condition-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAEhB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAEhB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAqB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAqB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EACL,aAAa,EAEb,iBAAiB,GAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EAEjB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,mBAAmB,EAEnB,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,mBAAmB,EAEnB,uBAAuB,GACxB,MAAM,cAAc,CAAC;AAEtB,MAAM,0BAA0B,GAAG,CAAC,IAAY,EAAE,EAAE,CAClD,2BAA2B,IAAI,EAAE,CAAC;AAEpC,MAAM,OAAO,gBAAgB;IACpB,MAAM,CAAC,kBAAkB,CAAC,KAAqB;QACpD,QAAQ,KAAK,CAAC,aAAa,EAAE,CAAC;YAC5B,kBAAkB;YAClB,KAAK,gBAAgB;gBACnB,OAAO,IAAI,YAAY,CAAC,KAA0B,CAAC,CAAC;YACtD,KAAK,iBAAiB;gBACpB,OAAO,IAAI,aAAa,CAAC,KAA2B,CAAC,CAAC;YACxD,KAAK,qBAAqB;gBACxB,OAAO,IAAI,iBAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE,KAAK,oBAAoB;gBACvB,OAAO,IAAI,gBAAgB,CAAC,KAA8B,CAAC,CAAC;YAC9D,KAAK,oBAAoB;gBACvB,OAAO,IAAI,gBAAgB,CAAC,KAA8B,CAAC,CAAC;YAC9D,KAAK,gBAAgB;gBACnB,OAAO,IAAI,YAAY,CAAC,KAA0B,CAAC,CAAC;YACtD,qBAAqB;YACrB,KAAK,qBAAqB;gBACxB,OAAO,IAAI,iBAAiB,CAAC,KAA+B,CAAC,CAAC;YAChE,KAAK,uBAAuB;gBAC1B,OAAO,IAAI,mBAAmB,CAAC,KAAiC,CAAC,CAAC;YACpE,KAAK,uBAAuB;gBAC1B,OAAO,IAAI,mBAAmB,CAAC,KAAiC,CAAC,CAAC;YACpE;gBACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;CACF"}
@@ -1,4 +1,5 @@
1
1
  import { objectEquals } from '@nucypher/shared';
2
+ import { toJSON } from '../utils';
2
3
  import { USER_ADDRESS_PARAMS } from './const';
3
4
  export { baseConditionSchema } from './schemas/common';
4
5
  const ERR_INVALID_CONDITION = (error) => `Invalid condition: ${JSON.stringify(error.issues)}`;
@@ -23,7 +24,7 @@ export class Condition {
23
24
  }
24
25
  // TODO: Fix this method and add a test for it
25
26
  findParamWithAuthentication() {
26
- const serialized = JSON.stringify(this.value);
27
+ const serialized = toJSON(this.value);
27
28
  for (const param of USER_ADDRESS_PARAMS) {
28
29
  if (serialized.includes(param)) {
29
30
  return param;