@nucypher/taco 0.7.0-alpha.4 → 0.7.0-alpha.5
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.
- package/dist/cjs/conditions/schemas/contract.d.ts +14 -14
- package/dist/cjs/conditions/schemas/rpc.d.ts +12 -12
- package/dist/cjs/conditions/schemas/time.d.ts +12 -12
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/sign.d.ts +6 -1
- package/dist/cjs/sign.js +15 -10
- package/dist/cjs/sign.js.map +1 -1
- package/dist/es/conditions/schemas/contract.d.ts +14 -14
- package/dist/es/conditions/schemas/rpc.d.ts +12 -12
- package/dist/es/conditions/schemas/time.d.ts +12 -12
- package/dist/es/index.d.ts +2 -2
- package/dist/es/index.js +1 -1
- package/dist/es/index.js.map +1 -1
- package/dist/es/sign.d.ts +6 -1
- package/dist/es/sign.js +15 -10
- package/dist/es/sign.js.map +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.es.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -12,22 +12,22 @@ export declare const rpcConditionSchema: z.ZodObject<{} & {
|
|
|
12
12
|
operation: z.ZodEnum<["+=", "-=", "*=", "/=", "%=", "index", "round", "abs", "avg", "ceil", "ethToWei", "floor", "len", "max", "min", "sum", "weiToEth", "bool", "float", "int", "str"]>;
|
|
13
13
|
value: z.ZodOptional<z.ZodType<any, z.ZodTypeDef, any>>;
|
|
14
14
|
}, "strip", z.ZodTypeAny, {
|
|
15
|
-
operation: "float" | "
|
|
15
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
16
16
|
value?: any;
|
|
17
17
|
}, {
|
|
18
|
-
operation: "float" | "
|
|
18
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
19
19
|
value?: any;
|
|
20
20
|
}>, {
|
|
21
|
-
operation: "float" | "
|
|
21
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
22
22
|
value?: any;
|
|
23
23
|
}, {
|
|
24
|
-
operation: "float" | "
|
|
24
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
25
25
|
value?: any;
|
|
26
26
|
}>, {
|
|
27
|
-
operation: "float" | "
|
|
27
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
28
28
|
value?: any;
|
|
29
29
|
}, {
|
|
30
|
-
operation: "float" | "
|
|
30
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
31
31
|
value?: any;
|
|
32
32
|
}>, "many">>;
|
|
33
33
|
} & {
|
|
@@ -37,7 +37,7 @@ export declare const rpcConditionSchema: z.ZodObject<{} & {
|
|
|
37
37
|
value?: any;
|
|
38
38
|
index?: number | undefined;
|
|
39
39
|
operations?: {
|
|
40
|
-
operation: "float" | "
|
|
40
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
41
41
|
value?: any;
|
|
42
42
|
}[] | undefined;
|
|
43
43
|
}, {
|
|
@@ -45,7 +45,7 @@ export declare const rpcConditionSchema: z.ZodObject<{} & {
|
|
|
45
45
|
value?: any;
|
|
46
46
|
index?: number | undefined;
|
|
47
47
|
operations?: {
|
|
48
|
-
operation: "float" | "
|
|
48
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
49
49
|
value?: any;
|
|
50
50
|
}[] | undefined;
|
|
51
51
|
}>, {
|
|
@@ -53,7 +53,7 @@ export declare const rpcConditionSchema: z.ZodObject<{} & {
|
|
|
53
53
|
value?: any;
|
|
54
54
|
index?: number | undefined;
|
|
55
55
|
operations?: {
|
|
56
|
-
operation: "float" | "
|
|
56
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
57
57
|
value?: any;
|
|
58
58
|
}[] | undefined;
|
|
59
59
|
}, {
|
|
@@ -61,7 +61,7 @@ export declare const rpcConditionSchema: z.ZodObject<{} & {
|
|
|
61
61
|
value?: any;
|
|
62
62
|
index?: number | undefined;
|
|
63
63
|
operations?: {
|
|
64
|
-
operation: "float" | "
|
|
64
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
65
65
|
value?: any;
|
|
66
66
|
}[] | undefined;
|
|
67
67
|
}>;
|
|
@@ -72,7 +72,7 @@ export declare const rpcConditionSchema: z.ZodObject<{} & {
|
|
|
72
72
|
value?: any;
|
|
73
73
|
index?: number | undefined;
|
|
74
74
|
operations?: {
|
|
75
|
-
operation: "float" | "
|
|
75
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
76
76
|
value?: any;
|
|
77
77
|
}[] | undefined;
|
|
78
78
|
};
|
|
@@ -85,7 +85,7 @@ export declare const rpcConditionSchema: z.ZodObject<{} & {
|
|
|
85
85
|
value?: any;
|
|
86
86
|
index?: number | undefined;
|
|
87
87
|
operations?: {
|
|
88
|
-
operation: "float" | "
|
|
88
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
89
89
|
value?: any;
|
|
90
90
|
}[] | undefined;
|
|
91
91
|
};
|
|
@@ -12,22 +12,22 @@ export declare const timeConditionSchema: z.ZodObject<{
|
|
|
12
12
|
operation: z.ZodEnum<["+=", "-=", "*=", "/=", "%=", "index", "round", "abs", "avg", "ceil", "ethToWei", "floor", "len", "max", "min", "sum", "weiToEth", "bool", "float", "int", "str"]>;
|
|
13
13
|
value: z.ZodOptional<z.ZodType<any, z.ZodTypeDef, any>>;
|
|
14
14
|
}, "strip", z.ZodTypeAny, {
|
|
15
|
-
operation: "float" | "
|
|
15
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
16
16
|
value?: any;
|
|
17
17
|
}, {
|
|
18
|
-
operation: "float" | "
|
|
18
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
19
19
|
value?: any;
|
|
20
20
|
}>, {
|
|
21
|
-
operation: "float" | "
|
|
21
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
22
22
|
value?: any;
|
|
23
23
|
}, {
|
|
24
|
-
operation: "float" | "
|
|
24
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
25
25
|
value?: any;
|
|
26
26
|
}>, {
|
|
27
|
-
operation: "float" | "
|
|
27
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
28
28
|
value?: any;
|
|
29
29
|
}, {
|
|
30
|
-
operation: "float" | "
|
|
30
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
31
31
|
value?: any;
|
|
32
32
|
}>, "many">>;
|
|
33
33
|
} & {
|
|
@@ -37,7 +37,7 @@ export declare const timeConditionSchema: z.ZodObject<{
|
|
|
37
37
|
value?: any;
|
|
38
38
|
index?: number | undefined;
|
|
39
39
|
operations?: {
|
|
40
|
-
operation: "float" | "
|
|
40
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
41
41
|
value?: any;
|
|
42
42
|
}[] | undefined;
|
|
43
43
|
}, {
|
|
@@ -45,7 +45,7 @@ export declare const timeConditionSchema: z.ZodObject<{
|
|
|
45
45
|
value?: any;
|
|
46
46
|
index?: number | undefined;
|
|
47
47
|
operations?: {
|
|
48
|
-
operation: "float" | "
|
|
48
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
49
49
|
value?: any;
|
|
50
50
|
}[] | undefined;
|
|
51
51
|
}>, {
|
|
@@ -53,7 +53,7 @@ export declare const timeConditionSchema: z.ZodObject<{
|
|
|
53
53
|
value?: any;
|
|
54
54
|
index?: number | undefined;
|
|
55
55
|
operations?: {
|
|
56
|
-
operation: "float" | "
|
|
56
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
57
57
|
value?: any;
|
|
58
58
|
}[] | undefined;
|
|
59
59
|
}, {
|
|
@@ -61,7 +61,7 @@ export declare const timeConditionSchema: z.ZodObject<{
|
|
|
61
61
|
value?: any;
|
|
62
62
|
index?: number | undefined;
|
|
63
63
|
operations?: {
|
|
64
|
-
operation: "float" | "
|
|
64
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
65
65
|
value?: any;
|
|
66
66
|
}[] | undefined;
|
|
67
67
|
}>;
|
|
@@ -72,7 +72,7 @@ export declare const timeConditionSchema: z.ZodObject<{
|
|
|
72
72
|
value?: any;
|
|
73
73
|
index?: number | undefined;
|
|
74
74
|
operations?: {
|
|
75
|
-
operation: "float" | "
|
|
75
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
76
76
|
value?: any;
|
|
77
77
|
}[] | undefined;
|
|
78
78
|
};
|
|
@@ -84,7 +84,7 @@ export declare const timeConditionSchema: z.ZodObject<{
|
|
|
84
84
|
value?: any;
|
|
85
85
|
index?: number | undefined;
|
|
86
86
|
operations?: {
|
|
87
|
-
operation: "float" | "
|
|
87
|
+
operation: "float" | "+=" | "-=" | "*=" | "/=" | "%=" | "index" | "round" | "abs" | "avg" | "ceil" | "ethToWei" | "floor" | "len" | "max" | "min" | "sum" | "weiToEth" | "bool" | "int" | "str";
|
|
88
88
|
value?: any;
|
|
89
89
|
}[] | undefined;
|
|
90
90
|
};
|
package/dist/es/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { DkgPublicKey, ThresholdMessageKit } from '@nucypher/nucypher-core';
|
|
2
|
-
export { Domain, domains, fromBytes, getPorterUris, initialize, toBytes, toHexString, } from '@nucypher/shared';
|
|
2
|
+
export { Domain, PackedUserOperationToSign, UserOperationToSign, domains, fromBytes, getPorterUris, initialize, toBytes, toHexString, } from '@nucypher/shared';
|
|
3
3
|
export * as conditions from './conditions';
|
|
4
|
-
export { setSigningCohortConditions, signUserOp } from './sign';
|
|
4
|
+
export { SignResult, TacoSignature, setSigningCohortConditions, signUserOp, } from './sign';
|
|
5
5
|
export { decrypt, encrypt, encryptWithPublicKey } from './taco';
|
package/dist/es/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { DkgPublicKey, ThresholdMessageKit } from '@nucypher/nucypher-core';
|
|
2
2
|
export { domains, fromBytes, getPorterUris, initialize, toBytes, toHexString, } from '@nucypher/shared';
|
|
3
3
|
export * as conditions from './conditions';
|
|
4
|
-
export { setSigningCohortConditions, signUserOp } from './sign';
|
|
4
|
+
export { setSigningCohortConditions, signUserOp, } from './sign';
|
|
5
5
|
export { decrypt, encrypt, encryptWithPublicKey } from './taco';
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
package/dist/es/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAIL,OAAO,EACP,SAAS,EACT,aAAa,EACb,UAAU,EACV,OAAO,EACP,WAAW,GACZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAE3C,OAAO,EAGL,0BAA0B,EAC1B,UAAU,GACX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC"}
|
package/dist/es/sign.d.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
import { Domain, PackedUserOperationToSign,
|
|
1
|
+
import { Domain, PackedUserOperationToSign, UserOperationToSign } from '@nucypher/shared';
|
|
2
2
|
import { ethers } from 'ethers';
|
|
3
3
|
import { Condition } from './conditions/condition';
|
|
4
4
|
import { ConditionContext } from './conditions/context';
|
|
5
|
+
export type TacoSignature = {
|
|
6
|
+
messageHash: string;
|
|
7
|
+
signature: string;
|
|
8
|
+
signerAddress: string;
|
|
9
|
+
};
|
|
5
10
|
export type SignResult = {
|
|
6
11
|
messageHash: string;
|
|
7
12
|
aggregatedSignature: string;
|
package/dist/es/sign.js
CHANGED
|
@@ -4,16 +4,21 @@ import { ethers } from 'ethers';
|
|
|
4
4
|
import { ConditionExpression } from './conditions/condition-expr';
|
|
5
5
|
const ERR_INSUFFICIENT_SIGNATURES = (errors) => `Threshold of signatures not met; TACo signing failed with errors: ${JSON.stringify(errors)}`;
|
|
6
6
|
const ERR_MISMATCHED_HASHES = (hashToSignatures) => `Threshold of signatures not met; multiple mismatched hashes found: ${JSON.stringify(Object.fromEntries(hashToSignatures.entries()))}`;
|
|
7
|
-
function aggregateSignatures(
|
|
8
|
-
// Aggregate hex signatures by concatenating them; being careful to
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
7
|
+
function aggregateSignatures(signatures, threshold) {
|
|
8
|
+
// Aggregate hex signatures by concatenating them; being careful to sort
|
|
9
|
+
// and remove the '0x' prefix from each signature except the first one.
|
|
10
|
+
// sort by signer address
|
|
11
|
+
const sortedSignatures = [...signatures]
|
|
12
|
+
.sort((a, b) => a.signerAddress
|
|
13
|
+
.toLowerCase()
|
|
14
|
+
.localeCompare(b.signerAddress.toLowerCase()))
|
|
15
|
+
.map((sig) => sig.signature);
|
|
16
|
+
const thresholdSignatures = sortedSignatures.slice(0, threshold);
|
|
17
|
+
if (thresholdSignatures.length === 1) {
|
|
18
|
+
return thresholdSignatures[0];
|
|
14
19
|
}
|
|
15
20
|
// Concatenate signatures
|
|
16
|
-
const allBytes =
|
|
21
|
+
const allBytes = thresholdSignatures.flatMap((sig) => Array.from(fromHexString(sig)));
|
|
17
22
|
return `0x${toHexString(new Uint8Array(allBytes))}`;
|
|
18
23
|
}
|
|
19
24
|
async function makeSigningRequests(cohortId, chainId, signers, userOp, aaVersion, conditionContext) {
|
|
@@ -68,7 +73,7 @@ export async function signUserOp(provider, domain, cohortId, chainId, userOp, aa
|
|
|
68
73
|
throw new Error(ERR_INSUFFICIENT_SIGNATURES(errors));
|
|
69
74
|
}
|
|
70
75
|
const signaturesToAggregate = collectSignatures(encryptedResponses, sharedSecrets, threshold);
|
|
71
|
-
const aggregatedSignature = aggregateSignatures(signaturesToAggregate, threshold);
|
|
76
|
+
const aggregatedSignature = aggregateSignatures(Object.values(signaturesToAggregate), threshold);
|
|
72
77
|
return {
|
|
73
78
|
messageHash: Object.values(signaturesToAggregate)[0].messageHash,
|
|
74
79
|
aggregatedSignature,
|
|
@@ -120,7 +125,7 @@ function collectSignatures(encryptedResponses, sharedSecrets, threshold) {
|
|
|
120
125
|
}
|
|
121
126
|
// Insufficient signatures for a message hash to meet the threshold
|
|
122
127
|
if (!signaturesToAggregate) {
|
|
123
|
-
//we have multiple hashes, which means we have mismatched hashes from different nodes
|
|
128
|
+
// we have multiple hashes, which means we have mismatched hashes from different nodes
|
|
124
129
|
// we don't really expect this to happen (other than some malicious nodes)
|
|
125
130
|
console.error('Porter returned mismatched message hashes:', hashToSignatures);
|
|
126
131
|
throw new Error(ERR_MISMATCHED_HASHES(hashToSignatures));
|
package/dist/es/sign.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign.js","sourceRoot":"","sources":["../../src/sign.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mCAAmC,EAEnC,mBAAmB,EAEnB,6BAA6B,GAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEL,aAAa,EACb,aAAa,EACb,qBAAqB,EAErB,YAAY,EAEZ,uBAAuB,
|
|
1
|
+
{"version":3,"file":"sign.js","sourceRoot":"","sources":["../../src/sign.ts"],"names":[],"mappings":"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"}
|