@inco/js 0.8.0-devnet-3 → 0.8.0-devnet-4
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/encryption/encryption.d.ts +5 -1
- package/dist/cjs/encryption/encryption.js +14 -5
- package/dist/cjs/generated/abis/lightning.d.ts +9 -0
- package/dist/cjs/generated/abis/lightning.js +3 -1
- package/dist/cjs/generated/es/inco/covalidator/compute/v1/types_pb.d.ts +43 -2
- package/dist/cjs/generated/es/inco/covalidator/compute/v1/types_pb.js +41 -3
- package/dist/cjs/handle.d.ts +1 -0
- package/dist/cjs/handle.js +6 -3
- package/dist/cjs/lite/ecies.js +6 -3
- package/dist/cjs/lite/lightning.js +2 -1
- package/dist/esm/encryption/encryption.d.ts +5 -1
- package/dist/esm/encryption/encryption.js +15 -6
- package/dist/esm/generated/abis/lightning.d.ts +9 -0
- package/dist/esm/generated/abis/lightning.js +3 -1
- package/dist/esm/generated/es/inco/covalidator/compute/v1/types_pb.d.ts +43 -2
- package/dist/esm/generated/es/inco/covalidator/compute/v1/types_pb.js +41 -3
- package/dist/esm/handle.d.ts +1 -0
- package/dist/esm/handle.js +6 -3
- package/dist/esm/lite/ecies.js +6 -3
- package/dist/esm/lite/lightning.js +2 -1
- package/dist/types/encryption/encryption.d.ts +5 -1
- package/dist/types/generated/abis/lightning.d.ts +9 -0
- package/dist/types/generated/es/inco/covalidator/compute/v1/types_pb.d.ts +43 -2
- package/dist/types/handle.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
|
|
1
|
+
import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
|
|
2
2
|
import type { ACLProof } from "../../../kms/lite/v1/types_pb";
|
|
3
3
|
import type { Message } from "@bufbuild/protobuf";
|
|
4
4
|
/**
|
|
@@ -25,6 +25,10 @@ export type InputContext = Message<"inco.covalidator.compute.v1.InputContext"> &
|
|
|
25
25
|
* @generated from field: string contract_address = 4;
|
|
26
26
|
*/
|
|
27
27
|
contractAddress: string;
|
|
28
|
+
/**
|
|
29
|
+
* @generated from field: inco.covalidator.compute.v1.InputVersion version = 5;
|
|
30
|
+
*/
|
|
31
|
+
version: InputVersion;
|
|
28
32
|
};
|
|
29
33
|
/**
|
|
30
34
|
* Describes the message inco.covalidator.compute.v1.InputContext.
|
|
@@ -64,7 +68,7 @@ export declare const InputCryptogramSchema: GenMessage<InputCryptogram>;
|
|
|
64
68
|
export type InputPayload = Message<"inco.covalidator.compute.v1.InputPayload"> & {
|
|
65
69
|
/**
|
|
66
70
|
* A canonical hash of the InputContext defined as:
|
|
67
|
-
* keccak256(abi.encodePacked("evm/", hostChainId, aclAddress, userAddress, contractAddress))
|
|
71
|
+
* keccak256(abi.encodePacked("evm/", hostChainId, aclAddress, userAddress, contractAddress, version))
|
|
68
72
|
*
|
|
69
73
|
* @generated from field: bytes context_hash = 1;
|
|
70
74
|
*/
|
|
@@ -204,3 +208,40 @@ export type CryptogramWithProof = Message<"inco.covalidator.compute.v1.Cryptogra
|
|
|
204
208
|
* Use `create(CryptogramWithProofSchema)` to create a new message.
|
|
205
209
|
*/
|
|
206
210
|
export declare const CryptogramWithProofSchema: GenMessage<CryptogramWithProof>;
|
|
211
|
+
/**
|
|
212
|
+
* InputVersion determines how to interpret the InputCryptogram payload.
|
|
213
|
+
* Each version specifies the payload contents, encryption, and key version.
|
|
214
|
+
*
|
|
215
|
+
* @generated from enum inco.covalidator.compute.v1.InputVersion
|
|
216
|
+
*/
|
|
217
|
+
export declare enum InputVersion {
|
|
218
|
+
/**
|
|
219
|
+
* INPUT_VERSION_UNSPECIFIED indicates an unspecified input version
|
|
220
|
+
*
|
|
221
|
+
* @generated from enum value: INPUT_VERSION_UNSPECIFIED = 0;
|
|
222
|
+
*/
|
|
223
|
+
UNSPECIFIED = 0,
|
|
224
|
+
/**
|
|
225
|
+
* INPUT_VERSION_ECIES is the InputPayload message encrypted using ECIES with the primary key version.
|
|
226
|
+
*
|
|
227
|
+
* @generated from enum value: INPUT_VERSION_ECIES = 1;
|
|
228
|
+
*/
|
|
229
|
+
ECIES = 1,
|
|
230
|
+
/**
|
|
231
|
+
* INPUT_VERSION_XWING is the InputPayload message encrypted using HPKE-XWING-CHACHA20POLY1305-SHA256 with the primary key version.
|
|
232
|
+
*
|
|
233
|
+
* @generated from enum value: INPUT_VERSION_XWING = 2;
|
|
234
|
+
*/
|
|
235
|
+
XWING = 2,
|
|
236
|
+
/**
|
|
237
|
+
* INPUT_VERSION_CAESAR is the InputPayload message encrypted using a Caesar cipher.
|
|
238
|
+
* This is meant for tests, and no guidance is given on the rotation amount (i.e. the key).
|
|
239
|
+
*
|
|
240
|
+
* @generated from enum value: INPUT_VERSION_CAESAR = 3;
|
|
241
|
+
*/
|
|
242
|
+
CAESAR = 3
|
|
243
|
+
}
|
|
244
|
+
/**
|
|
245
|
+
* Describes the enum inco.covalidator.compute.v1.InputVersion.
|
|
246
|
+
*/
|
|
247
|
+
export declare const InputVersionSchema: GenEnum<InputVersion>;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
// @generated by protoc-gen-es v2.10.0 with parameter "target=ts"
|
|
2
2
|
// @generated from file inco/covalidator/compute/v1/types.proto (package inco.covalidator.compute.v1, syntax proto3)
|
|
3
3
|
/* eslint-disable */
|
|
4
|
-
import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
|
|
4
|
+
import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
|
|
5
5
|
import { file_inco_kms_lite_v1_types } from "../../../kms/lite/v1/types_pb";
|
|
6
6
|
/**
|
|
7
7
|
* Describes the file inco/covalidator/compute/v1/types.proto.
|
|
8
8
|
*/
|
|
9
|
-
export const file_inco_covalidator_compute_v1_types = /*@__PURE__*/ fileDesc("
|
|
9
|
+
export const file_inco_covalidator_compute_v1_types = /*@__PURE__*/ fileDesc("CidpbmNvL2NvdmFsaWRhdG9yL2NvbXB1dGUvdjEvdHlwZXMucHJvdG8SG2luY28uY292YWxpZGF0b3IuY29tcHV0ZS52MSKmAQoMSW5wdXRDb250ZXh0EhUKDWhvc3RfY2hhaW5faWQYASABKAkSEwoLYWNsX2FkZHJlc3MYAiABKAkSFAoMdXNlcl9hZGRyZXNzGAMgASgJEhgKEGNvbnRyYWN0X2FkZHJlc3MYBCABKAkSOgoHdmVyc2lvbhgFIAEoDjIpLmluY28uY292YWxpZGF0b3IuY29tcHV0ZS52MS5JbnB1dFZlcnNpb24iXgoPSW5wdXRDcnlwdG9ncmFtEjoKB2NvbnRleHQYASABKAsyKS5pbmNvLmNvdmFsaWRhdG9yLmNvbXB1dGUudjEuSW5wdXRDb250ZXh0Eg8KB3BheWxvYWQYAiABKAwilwEKDElucHV0UGF5bG9hZBIUCgxjb250ZXh0X2hhc2gYASABKAwSNQoGc2NhbGFyGAIgASgLMiMuaW5jby5jb3ZhbGlkYXRvci5jb21wdXRlLnYxLlNjYWxhckgAEjEKBGxpc3QYAyABKAsyIS5pbmNvLmNvdmFsaWRhdG9yLmNvbXB1dGUudjEuTGlzdEgAQgcKBXZhbHVlIiUKBlNjYWxhchIMCgR0eXBlGAEgASgFEg0KBXZhbHVlGAIgASgMIisKBExpc3QSEwoLZWxlbWVudFR5cGUYASABKAUSDgoGdmFsdWVzGAIgAygMIjMKEFN0b3JlZENyeXB0b2dyYW0SDgoGaGFuZGxlGAEgASgMEg8KB3BheWxvYWQYAiABKAwihwEKE0NyeXB0b2dyYW1XaXRoUHJvb2YSQQoKY3J5cHRvZ3JhbRgBIAEoCzItLmluY28uY292YWxpZGF0b3IuY29tcHV0ZS52MS5TdG9yZWRDcnlwdG9ncmFtEi0KCWFjbF9wcm9vZhgCIAEoCzIaLmluY28ua21zLmxpdGUudjEuQUNMUHJvb2YqeQoMSW5wdXRWZXJzaW9uEh0KGUlOUFVUX1ZFUlNJT05fVU5TUEVDSUZJRUQQABIXChNJTlBVVF9WRVJTSU9OX0VDSUVTEAESFwoTSU5QVVRfVkVSU0lPTl9YV0lORxACEhgKFElOUFVUX1ZFUlNJT05fQ0FFU0FSEANCN1o1Z2l0aHViLmNvbS9pbmNvLWZoZXZtL2luY28tbW9ub3JlcG8vY292YWxpZGF0b3IvdHlwZXNiBnByb3RvMw", [file_inco_kms_lite_v1_types]);
|
|
10
10
|
/**
|
|
11
11
|
* Describes the message inco.covalidator.compute.v1.InputContext.
|
|
12
12
|
* Use `create(InputContextSchema)` to create a new message.
|
|
@@ -42,4 +42,42 @@ export const StoredCryptogramSchema = /*@__PURE__*/ messageDesc(file_inco_covali
|
|
|
42
42
|
* Use `create(CryptogramWithProofSchema)` to create a new message.
|
|
43
43
|
*/
|
|
44
44
|
export const CryptogramWithProofSchema = /*@__PURE__*/ messageDesc(file_inco_covalidator_compute_v1_types, 6);
|
|
45
|
-
|
|
45
|
+
/**
|
|
46
|
+
* InputVersion determines how to interpret the InputCryptogram payload.
|
|
47
|
+
* Each version specifies the payload contents, encryption, and key version.
|
|
48
|
+
*
|
|
49
|
+
* @generated from enum inco.covalidator.compute.v1.InputVersion
|
|
50
|
+
*/
|
|
51
|
+
export var InputVersion;
|
|
52
|
+
(function (InputVersion) {
|
|
53
|
+
/**
|
|
54
|
+
* INPUT_VERSION_UNSPECIFIED indicates an unspecified input version
|
|
55
|
+
*
|
|
56
|
+
* @generated from enum value: INPUT_VERSION_UNSPECIFIED = 0;
|
|
57
|
+
*/
|
|
58
|
+
InputVersion[InputVersion["UNSPECIFIED"] = 0] = "UNSPECIFIED";
|
|
59
|
+
/**
|
|
60
|
+
* INPUT_VERSION_ECIES is the InputPayload message encrypted using ECIES with the primary key version.
|
|
61
|
+
*
|
|
62
|
+
* @generated from enum value: INPUT_VERSION_ECIES = 1;
|
|
63
|
+
*/
|
|
64
|
+
InputVersion[InputVersion["ECIES"] = 1] = "ECIES";
|
|
65
|
+
/**
|
|
66
|
+
* INPUT_VERSION_XWING is the InputPayload message encrypted using HPKE-XWING-CHACHA20POLY1305-SHA256 with the primary key version.
|
|
67
|
+
*
|
|
68
|
+
* @generated from enum value: INPUT_VERSION_XWING = 2;
|
|
69
|
+
*/
|
|
70
|
+
InputVersion[InputVersion["XWING"] = 2] = "XWING";
|
|
71
|
+
/**
|
|
72
|
+
* INPUT_VERSION_CAESAR is the InputPayload message encrypted using a Caesar cipher.
|
|
73
|
+
* This is meant for tests, and no guidance is given on the rotation amount (i.e. the key).
|
|
74
|
+
*
|
|
75
|
+
* @generated from enum value: INPUT_VERSION_CAESAR = 3;
|
|
76
|
+
*/
|
|
77
|
+
InputVersion[InputVersion["CAESAR"] = 3] = "CAESAR";
|
|
78
|
+
})(InputVersion || (InputVersion = {}));
|
|
79
|
+
/**
|
|
80
|
+
* Describes the enum inco.covalidator.compute.v1.InputVersion.
|
|
81
|
+
*/
|
|
82
|
+
export const InputVersionSchema = /*@__PURE__*/ enumDesc(file_inco_covalidator_compute_v1_types, 0);
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXNfcGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvZ2VuZXJhdGVkL2VzL2luY28vY292YWxpZGF0b3IvY29tcHV0ZS92MS90eXBlc19wYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxpRUFBaUU7QUFDakUsb0hBQW9IO0FBQ3BILG9CQUFvQjtBQUdwQixPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUUvRSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUc1RTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLHNDQUFzQyxHQUFZLGFBQWEsQ0FDMUUsUUFBUSxDQUFDLHd2Q0FBd3ZDLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDLENBQUM7QUFnQ3B5Qzs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBNkIsYUFBYSxDQUN2RSxXQUFXLENBQUMsc0NBQXNDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUF3QnpEOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFnQyxhQUFhLENBQzdFLFdBQVcsQ0FBQyxzQ0FBc0MsRUFBRSxDQUFDLENBQUMsQ0FBQztBQW9DekQ7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQTZCLGFBQWEsQ0FDdkUsV0FBVyxDQUFDLHNDQUFzQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBcUN6RDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQXVCLGFBQWEsQ0FDM0QsV0FBVyxDQUFDLHNDQUFzQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBdUJ6RDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQXFCLGFBQWEsQ0FDdkQsV0FBVyxDQUFDLHNDQUFzQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBd0J6RDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBaUMsYUFBYSxDQUMvRSxXQUFXLENBQUMsc0NBQXNDLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFvQnpEOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUFvQyxhQUFhLENBQ3JGLFdBQVcsQ0FBQyxzQ0FBc0MsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUV6RDs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBTixJQUFZLFlBNkJYO0FBN0JELFdBQVksWUFBWTtJQUN0Qjs7OztPQUlHO0lBQ0gsNkRBQWUsQ0FBQTtJQUVmOzs7O09BSUc7SUFDSCxpREFBUyxDQUFBO0lBRVQ7Ozs7T0FJRztJQUNILGlEQUFTLENBQUE7SUFFVDs7Ozs7T0FLRztJQUNILG1EQUFVLENBQUE7QUFDWixDQUFDLEVBN0JXLFlBQVksS0FBWixZQUFZLFFBNkJ2QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQTBCLGFBQWEsQ0FDcEUsUUFBUSxDQUFDLHNDQUFzQyxFQUFFLENBQUMsQ0FBQyxDQUFDIn0=
|
package/dist/esm/handle.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export declare const InputContext: Schema.Struct<{
|
|
|
25
25
|
aclAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
26
26
|
userAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
27
27
|
contractAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
28
|
+
version: typeof Schema.Number;
|
|
28
29
|
}>;
|
|
29
30
|
export type InputContext = typeof InputContext.Type;
|
|
30
31
|
export type Handle = HexString;
|
package/dist/esm/handle.js
CHANGED
|
@@ -31,6 +31,7 @@ export const InputContext = Schema.Struct({
|
|
|
31
31
|
aclAddress: HexString,
|
|
32
32
|
userAddress: HexString,
|
|
33
33
|
contractAddress: HexString,
|
|
34
|
+
version: Schema.Number,
|
|
34
35
|
});
|
|
35
36
|
// Returns the FheType of the handle. See:
|
|
36
37
|
// https://github.com/Inco-fhevm/inco-monorepo/blob/636756f512ae16535bdcb9a43df76bf14fbd6ba7/pkg/fhe/handle.md
|
|
@@ -83,7 +84,7 @@ export function computeHandle({ prehandle, context, }) {
|
|
|
83
84
|
if (prehandle.length !== 32) {
|
|
84
85
|
throw new Error(`prehandle should be 32 bytes but is: ${prehandle.length}`);
|
|
85
86
|
}
|
|
86
|
-
const packed = encodePacked(['bytes32', 'string', 'uint256', 'address', 'address', 'address'], [
|
|
87
|
+
const packed = encodePacked(['bytes32', 'string', 'uint256', 'address', 'address', 'address', 'int32'], [
|
|
87
88
|
toHex(prehandle),
|
|
88
89
|
// Note: The x/hostchain spec requires the chain ID to be prefixed with 'evm/' for EVM chains
|
|
89
90
|
'evm/',
|
|
@@ -91,6 +92,7 @@ export function computeHandle({ prehandle, context, }) {
|
|
|
91
92
|
context.aclAddress,
|
|
92
93
|
context.userAddress,
|
|
93
94
|
context.contractAddress,
|
|
95
|
+
context.version,
|
|
94
96
|
]);
|
|
95
97
|
return Buffer.concat([
|
|
96
98
|
new Keccak(256)
|
|
@@ -102,13 +104,14 @@ export function computeHandle({ prehandle, context, }) {
|
|
|
102
104
|
]);
|
|
103
105
|
}
|
|
104
106
|
export function hashInputContext(context) {
|
|
105
|
-
const packed = encodePacked(['string', 'uint256', 'address', 'address', 'address'], [
|
|
107
|
+
const packed = encodePacked(['string', 'uint256', 'address', 'address', 'address', 'int32'], [
|
|
106
108
|
// Note: The x/hostchain spec requires the chain ID to be prefixed with 'evm/' for EVM chains
|
|
107
109
|
'evm/',
|
|
108
110
|
context.hostChainId,
|
|
109
111
|
context.aclAddress,
|
|
110
112
|
context.userAddress,
|
|
111
113
|
context.contractAddress,
|
|
114
|
+
context.version,
|
|
112
115
|
]);
|
|
113
116
|
return new Keccak(256).update(Buffer.from(hexToBytes(packed))).digest();
|
|
114
117
|
}
|
|
@@ -117,4 +120,4 @@ function assertUint8(value) {
|
|
|
117
120
|
throw new Error(`Invalid uint8 value: ${value}`);
|
|
118
121
|
}
|
|
119
122
|
}
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hhbmRsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1SEFBdUg7QUFDdkgsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUNoQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQzlCLE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN2RCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXhDLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUFDLENBQUM7QUFFaEMsbUhBQW1IO0FBQ25ILHdIQUF3SDtBQUN4SCwyQkFBMkI7QUFDM0IsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7SUFDdkMsS0FBSyxFQUFFLENBQUM7SUFDUixNQUFNLEVBQUUsQ0FBQztJQUNULE1BQU0sRUFBRSxDQUFDO0lBQ1QsT0FBTyxFQUFFLENBQUM7SUFDVixPQUFPLEVBQUUsQ0FBQztJQUNWLE9BQU8sRUFBRSxDQUFDO0lBQ1YsUUFBUSxFQUFFLENBQUM7SUFDWCxRQUFRLEVBQUUsQ0FBQztJQUNYLFFBQVEsRUFBRSxDQUFDO0lBQ1gsUUFBUSxFQUFFLENBQUM7SUFDWCxTQUFTLEVBQUUsRUFBRTtJQUNiLFNBQVMsRUFBRSxFQUFFO0NBQ2QsQ0FBQyxDQUFDO0FBRUgsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQWlDLENBQUM7QUFFN0UsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxXQUFXLENBQUMsQ0FBQztBQVE3RCxNQUFNLFVBQVUsU0FBUyxDQUFDLEtBQWE7SUFDckMsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDLFFBQVEsQ0FB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
|
package/dist/esm/lite/ecies.js
CHANGED
|
@@ -96,8 +96,9 @@ export function getEciesEncryptor({ pubKeyA, privKeyB, }) {
|
|
|
96
96
|
ciphertext: {
|
|
97
97
|
scheme: encryptionSchemes.ecies,
|
|
98
98
|
type: plaintext.type,
|
|
99
|
+
// The prepended version keeps the bundle self-describing, avoiding a loose parameter.
|
|
99
100
|
// The prepended handle serves as a checksum on the encrypted payload, so we can fail early on an accidental mismatch
|
|
100
|
-
value: encodeCiphertextInput(bytesToHex(handle), bytesToHex(ct)),
|
|
101
|
+
value: encodeCiphertextInput(context.version, bytesToHex(handle), bytesToHex(ct)),
|
|
101
102
|
},
|
|
102
103
|
};
|
|
103
104
|
};
|
|
@@ -116,7 +117,9 @@ export function getEciesDecryptor({ privKeyA, }) {
|
|
|
116
117
|
if (scheme !== encryptionSchemes.ecies) {
|
|
117
118
|
throw new Error(`Ciphertext with scheme ${getEncryptionSchemeName(scheme)} cannot be decrypted with ECIES`);
|
|
118
119
|
}
|
|
119
|
-
// remove the prepended handle
|
|
120
|
+
// remove the prepended version and handle
|
|
121
|
+
// We could verify or dispatch on the version here,
|
|
122
|
+
// but the intention is for the SDK to only support one input version at a time.
|
|
120
123
|
const { ciphertext } = decodeCiphertextInput(value);
|
|
121
124
|
const ptBuf = await eciesDecrypt(privKeyABuffer, bytesFromHexString(ciphertext));
|
|
122
125
|
const payload = decodeInput(ptBuf);
|
|
@@ -128,4 +131,4 @@ export function getEciesDecryptor({ privKeyA, }) {
|
|
|
128
131
|
return bytesToPlaintext(computable.value.value, encryptionSchemes.ecies, typ);
|
|
129
132
|
};
|
|
130
133
|
}
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWNpZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGl0ZS9lY2llcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxJQUFJLFlBQVksRUFBRSxPQUFPLElBQUksWUFBWSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzlFLE9BQU8sS0FBSyxXQUFXLE1BQU0sVUFBVSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxTQUFTLEVBQUUsa0JBQWtCLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3pFLE9BQU8sRUFDTCxnQkFBZ0IsRUFFaEIscUJBQXFCLEVBR3JCLHFCQUFxQixFQUNyQixpQkFBaUIsRUFHakIsdUJBQXVCLEVBR3ZCLGdCQUFnQixHQUNqQixNQUFNLDZCQUE2QixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFL0QsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUNyQyxPQUFPLEVBQUUsV0FBVyxFQUFFLFdBQVcsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUVyRCxNQUFNLFNBQVMsR0FBRyxJQUFJLFdBQVcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUM7QUFFbEQsNENBQTRDO0FBQzVDLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUM5QixzRUFBc0UsQ0FBQztBQUN6RSxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FDbkMsb0VBQW9FLENBQUM7QUFVdkUsb0ZBQW9GO0FBQ3BGLDBEQUEwRDtBQUMxRCxNQUFNLFVBQVUsa0JBQWtCLENBQ2hDLEVBQTBCO0lBRTFCLE9BQU87UUFDTCxNQUFNLEVBQUUsaUJBQWlCLENBQUMsS0FBSztRQUMvQixFQUFFO1FBQ0YsZUFBZTtZQUNiLE9BQU8sSUFBSSxVQUFVLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsSUFB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
|
|
@@ -224,6 +224,7 @@ export class Lightning {
|
|
|
224
224
|
aclAddress: this.executorAddress,
|
|
225
225
|
userAddress: parseAddress(accountAddress),
|
|
226
226
|
contractAddress: parseAddress(dappAddress),
|
|
227
|
+
version: 1, // ECIES
|
|
227
228
|
},
|
|
228
229
|
});
|
|
229
230
|
return ciphertext.value;
|
|
@@ -692,4 +693,4 @@ export class Lightning {
|
|
|
692
693
|
};
|
|
693
694
|
}
|
|
694
695
|
}
|
|
695
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lightning.js","sourceRoot":"","sources":["../../../src/lite/lightning.ts"],"names":[],"mappings":"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"}
|
|
696
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lightning.js","sourceRoot":"","sources":["../../../src/lite/lightning.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,7 @@ export declare const CiphertextWithContext: Schema.Struct<{
|
|
|
43
43
|
aclAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
44
44
|
userAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
45
45
|
contractAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
46
|
+
version: typeof Schema.Number;
|
|
46
47
|
}>;
|
|
47
48
|
}>;
|
|
48
49
|
export type CiphertextWithContext = typeof CiphertextWithContext.Type;
|
|
@@ -60,6 +61,7 @@ export declare const EncryptResult: Schema.Struct<{
|
|
|
60
61
|
aclAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
61
62
|
userAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
62
63
|
contractAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
64
|
+
version: typeof Schema.Number;
|
|
63
65
|
}>;
|
|
64
66
|
prehandle: Schema.brand<Schema.filter<Schema.transformOrFail<Schema.Union<[typeof Schema.String, Schema.refine<object & Uint8Array<ArrayBufferLike>, Schema.Schema<object, object, never>>]>, Schema.TemplateLiteral<`0x${string}`>, never>>, "Bytes32">;
|
|
65
67
|
handle: Schema.brand<Schema.filter<Schema.transformOrFail<Schema.Union<[typeof Schema.String, Schema.refine<object & Uint8Array<ArrayBufferLike>, Schema.Schema<object, object, never>>]>, Schema.TemplateLiteral<`0x${string}`>, never>>, "Bytes32">;
|
|
@@ -94,6 +96,7 @@ export declare const PlaintextWithContext: Schema.Struct<{
|
|
|
94
96
|
aclAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
95
97
|
userAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
96
98
|
contractAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
99
|
+
version: typeof Schema.Number;
|
|
97
100
|
}>;
|
|
98
101
|
}>;
|
|
99
102
|
export type PlaintextWithContext = typeof PlaintextWithContext.Type;
|
|
@@ -102,10 +105,11 @@ export type PlaintextWithContextOf<S extends EncryptionScheme, T extends Support
|
|
|
102
105
|
};
|
|
103
106
|
export declare function bigintToPlaintext<S extends EncryptionScheme, T extends SupportedFheType>(scheme: S, type: T, bigPt: bigint): PlaintextOf<S, T>;
|
|
104
107
|
export declare function decodeCiphertextInput(input: ByteArray | Hex): {
|
|
108
|
+
version: number;
|
|
105
109
|
handle: Hex;
|
|
106
110
|
ciphertext: Hex;
|
|
107
111
|
};
|
|
108
|
-
export declare function encodeCiphertextInput(handle: Hex, ciphertext: Hex): Hex;
|
|
112
|
+
export declare function encodeCiphertextInput(version: number, handle: Hex, ciphertext: Hex): Hex;
|
|
109
113
|
export declare function plaintextToBigint(plaintext: Plaintext): bigint;
|
|
110
114
|
export declare function plaintextToBytes32(plaintext: Plaintext): Bytes32;
|
|
111
115
|
export declare function plaintextToBytes(plaintext: Plaintext): Buffer;
|
|
@@ -1629,6 +1629,11 @@ export declare const incoLightningAbi: readonly [{
|
|
|
1629
1629
|
readonly internalType: "address";
|
|
1630
1630
|
readonly type: "address";
|
|
1631
1631
|
readonly indexed: true;
|
|
1632
|
+
}, {
|
|
1633
|
+
readonly name: "version";
|
|
1634
|
+
readonly internalType: "int32";
|
|
1635
|
+
readonly type: "int32";
|
|
1636
|
+
readonly indexed: false;
|
|
1632
1637
|
}, {
|
|
1633
1638
|
readonly name: "ciphertext";
|
|
1634
1639
|
readonly internalType: "bytes";
|
|
@@ -1752,6 +1757,10 @@ export declare const incoLightningAbi: readonly [{
|
|
|
1752
1757
|
readonly name: "contractAddress";
|
|
1753
1758
|
readonly internalType: "address";
|
|
1754
1759
|
readonly type: "address";
|
|
1760
|
+
}, {
|
|
1761
|
+
readonly name: "version";
|
|
1762
|
+
readonly internalType: "int32";
|
|
1763
|
+
readonly type: "int32";
|
|
1755
1764
|
}];
|
|
1756
1765
|
readonly name: "ExternalHandleDoesNotMatchComputedHandle";
|
|
1757
1766
|
}, {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
|
|
1
|
+
import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
|
|
2
2
|
import type { ACLProof } from "../../../kms/lite/v1/types_pb";
|
|
3
3
|
import type { Message } from "@bufbuild/protobuf";
|
|
4
4
|
/**
|
|
@@ -25,6 +25,10 @@ export type InputContext = Message<"inco.covalidator.compute.v1.InputContext"> &
|
|
|
25
25
|
* @generated from field: string contract_address = 4;
|
|
26
26
|
*/
|
|
27
27
|
contractAddress: string;
|
|
28
|
+
/**
|
|
29
|
+
* @generated from field: inco.covalidator.compute.v1.InputVersion version = 5;
|
|
30
|
+
*/
|
|
31
|
+
version: InputVersion;
|
|
28
32
|
};
|
|
29
33
|
/**
|
|
30
34
|
* Describes the message inco.covalidator.compute.v1.InputContext.
|
|
@@ -64,7 +68,7 @@ export declare const InputCryptogramSchema: GenMessage<InputCryptogram>;
|
|
|
64
68
|
export type InputPayload = Message<"inco.covalidator.compute.v1.InputPayload"> & {
|
|
65
69
|
/**
|
|
66
70
|
* A canonical hash of the InputContext defined as:
|
|
67
|
-
* keccak256(abi.encodePacked("evm/", hostChainId, aclAddress, userAddress, contractAddress))
|
|
71
|
+
* keccak256(abi.encodePacked("evm/", hostChainId, aclAddress, userAddress, contractAddress, version))
|
|
68
72
|
*
|
|
69
73
|
* @generated from field: bytes context_hash = 1;
|
|
70
74
|
*/
|
|
@@ -204,3 +208,40 @@ export type CryptogramWithProof = Message<"inco.covalidator.compute.v1.Cryptogra
|
|
|
204
208
|
* Use `create(CryptogramWithProofSchema)` to create a new message.
|
|
205
209
|
*/
|
|
206
210
|
export declare const CryptogramWithProofSchema: GenMessage<CryptogramWithProof>;
|
|
211
|
+
/**
|
|
212
|
+
* InputVersion determines how to interpret the InputCryptogram payload.
|
|
213
|
+
* Each version specifies the payload contents, encryption, and key version.
|
|
214
|
+
*
|
|
215
|
+
* @generated from enum inco.covalidator.compute.v1.InputVersion
|
|
216
|
+
*/
|
|
217
|
+
export declare enum InputVersion {
|
|
218
|
+
/**
|
|
219
|
+
* INPUT_VERSION_UNSPECIFIED indicates an unspecified input version
|
|
220
|
+
*
|
|
221
|
+
* @generated from enum value: INPUT_VERSION_UNSPECIFIED = 0;
|
|
222
|
+
*/
|
|
223
|
+
UNSPECIFIED = 0,
|
|
224
|
+
/**
|
|
225
|
+
* INPUT_VERSION_ECIES is the InputPayload message encrypted using ECIES with the primary key version.
|
|
226
|
+
*
|
|
227
|
+
* @generated from enum value: INPUT_VERSION_ECIES = 1;
|
|
228
|
+
*/
|
|
229
|
+
ECIES = 1,
|
|
230
|
+
/**
|
|
231
|
+
* INPUT_VERSION_XWING is the InputPayload message encrypted using HPKE-XWING-CHACHA20POLY1305-SHA256 with the primary key version.
|
|
232
|
+
*
|
|
233
|
+
* @generated from enum value: INPUT_VERSION_XWING = 2;
|
|
234
|
+
*/
|
|
235
|
+
XWING = 2,
|
|
236
|
+
/**
|
|
237
|
+
* INPUT_VERSION_CAESAR is the InputPayload message encrypted using a Caesar cipher.
|
|
238
|
+
* This is meant for tests, and no guidance is given on the rotation amount (i.e. the key).
|
|
239
|
+
*
|
|
240
|
+
* @generated from enum value: INPUT_VERSION_CAESAR = 3;
|
|
241
|
+
*/
|
|
242
|
+
CAESAR = 3
|
|
243
|
+
}
|
|
244
|
+
/**
|
|
245
|
+
* Describes the enum inco.covalidator.compute.v1.InputVersion.
|
|
246
|
+
*/
|
|
247
|
+
export declare const InputVersionSchema: GenEnum<InputVersion>;
|
package/dist/types/handle.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export declare const InputContext: Schema.Struct<{
|
|
|
25
25
|
aclAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
26
26
|
userAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
27
27
|
contractAddress: Schema.TemplateLiteral<`0x${string}`>;
|
|
28
|
+
version: typeof Schema.Number;
|
|
28
29
|
}>;
|
|
29
30
|
export type InputContext = typeof InputContext.Type;
|
|
30
31
|
export type Handle = HexString;
|