keri 0.0.0-dev.5e5dc7c → 0.0.0-dev.84f4fe1
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/README.md +3 -0
- package/dist/cesr/__main__.d.ts +10 -0
- package/dist/cesr/__main__.js +11 -0
- package/dist/cesr/__main__.js.map +1 -0
- package/dist/cesr/array-utils.d.ts +3 -0
- package/dist/cesr/array-utils.js +29 -0
- package/dist/cesr/array-utils.js.map +1 -0
- package/dist/cesr/attachments-reader.d.ts +10 -0
- package/dist/cesr/attachments-reader.js +273 -0
- package/dist/cesr/attachments-reader.js.map +1 -0
- package/dist/cesr/attachments.d.ts +68 -0
- package/dist/cesr/attachments.js +116 -0
- package/dist/cesr/attachments.js.map +1 -0
- package/dist/cesr/codec.d.ts +26 -0
- package/dist/cesr/codec.js +26 -0
- package/dist/cesr/codec.js.map +1 -0
- package/dist/cesr/codes.d.ts +1208 -0
- package/dist/cesr/codes.js +309 -0
- package/dist/cesr/codes.js.map +1 -0
- package/dist/cesr/counter.d.ts +117 -0
- package/dist/cesr/counter.js +93 -0
- package/dist/cesr/counter.js.map +1 -0
- package/dist/cesr/frame.d.ts +36 -0
- package/dist/cesr/frame.js +97 -0
- package/dist/cesr/frame.js.map +1 -0
- package/dist/cesr/genus.d.ts +21 -0
- package/dist/cesr/genus.js +66 -0
- package/dist/cesr/genus.js.map +1 -0
- package/dist/cesr/groups/generic-map.d.ts +11 -0
- package/dist/cesr/groups/generic-map.js +59 -0
- package/dist/cesr/groups/generic-map.js.map +1 -0
- package/dist/cesr/indexer.d.ts +70 -0
- package/dist/cesr/indexer.js +177 -0
- package/dist/cesr/indexer.js.map +1 -0
- package/dist/cesr/matter.d.ts +163 -0
- package/dist/cesr/matter.js +311 -0
- package/dist/cesr/matter.js.map +1 -0
- package/dist/cesr/message.d.ts +17 -0
- package/dist/cesr/message.js +81 -0
- package/dist/cesr/message.js.map +1 -0
- package/dist/cesr/parse.d.ts +37 -0
- package/dist/cesr/parse.js +137 -0
- package/dist/cesr/parse.js.map +1 -0
- package/dist/cesr/shifting.d.ts +7 -0
- package/dist/cesr/shifting.js +10 -0
- package/dist/cesr/shifting.js.map +1 -0
- package/dist/cesr/version-string.d.ts +35 -0
- package/dist/cesr/version-string.js +147 -0
- package/dist/cesr/version-string.js.map +1 -0
- package/dist/cli/cli.d.ts +5 -0
- package/dist/cli/cli.js +73 -0
- package/dist/cli/cli.js.map +1 -0
- package/dist/cli/input.d.ts +1 -0
- package/dist/cli/input.js +22 -0
- package/dist/cli/input.js.map +1 -0
- package/dist/cli/node-cli.d.ts +2 -0
- package/dist/cli/node-cli.js +19 -0
- package/dist/cli/node-cli.js.map +1 -0
- package/dist/controller/controller.d.ts +15 -13
- package/dist/controller/controller.js +8 -4
- package/dist/controller/controller.js.map +1 -1
- package/dist/core/credential-event.d.ts +5 -9
- package/dist/core/credential-event.js +1 -1
- package/dist/core/credential-event.js.map +1 -1
- package/dist/core/credential.d.ts +1 -1
- package/dist/core/credential.js +1 -1
- package/dist/core/credential.js.map +1 -1
- package/dist/core/digest.js +1 -1
- package/dist/core/digest.js.map +1 -1
- package/dist/core/endpoint-discovery.d.ts +4 -4
- package/dist/core/endpoint-discovery.js.map +1 -1
- package/dist/core/events.js +1 -1
- package/dist/core/events.js.map +1 -1
- package/dist/core/kawa.d.ts +2 -2
- package/dist/core/kawa.js +39 -30
- package/dist/core/kawa.js.map +1 -1
- package/dist/core/key-event-log.d.ts +3 -3
- package/dist/core/key-event-log.js +1 -1
- package/dist/core/key-event-log.js.map +1 -1
- package/dist/core/key-event.d.ts +7 -9
- package/dist/core/key-event.js +1 -1
- package/dist/core/key-event.js.map +1 -1
- package/dist/core/keys.js +1 -1
- package/dist/core/keys.js.map +1 -1
- package/dist/core/mailbox-client.d.ts +7 -1
- package/dist/core/mailbox-client.js +4 -2
- package/dist/core/mailbox-client.js.map +1 -1
- package/dist/core/main.d.ts +13 -8
- package/dist/core/main.js +1 -1
- package/dist/core/main.js.map +1 -1
- package/dist/core/receipt-event.d.ts +2 -2
- package/dist/core/receipt-event.js +1 -1
- package/dist/core/receipt-event.js.map +1 -1
- package/dist/core/registry-event.d.ts +3 -5
- package/dist/core/registry-event.js +1 -1
- package/dist/core/registry-event.js.map +1 -1
- package/dist/core/routed-event.d.ts +7 -13
- package/dist/core/routed-event.js +1 -1
- package/dist/core/routed-event.js.map +1 -1
- package/dist/core/said.js +1 -1
- package/dist/core/said.js.map +1 -1
- package/dist/core/sign.js +1 -1
- package/dist/core/sign.js.map +1 -1
- package/dist/core/verify.d.ts +1 -0
- package/dist/core/verify.js +1 -1
- package/dist/core/verify.js.map +1 -1
- package/dist/encoding/base64.d.ts +4 -0
- package/dist/encoding/base64.js +82 -0
- package/dist/encoding/base64.js.map +1 -0
- package/dist/encoding/utf8.d.ts +2 -0
- package/dist/encoding/utf8.js +9 -0
- package/dist/encoding/utf8.js.map +1 -0
- package/dist/main.d.ts +1 -0
- package/dist/main.js +1 -0
- package/dist/main.js.map +1 -1
- package/dist/storage/sqlite/storage-sqlite.d.ts +4 -4
- package/dist/storage/sqlite/storage-sqlite.js.map +1 -1
- package/dist/witness/app.d.ts +9 -0
- package/dist/witness/app.js +91 -0
- package/dist/witness/app.js.map +1 -0
- package/dist/witness/env.d.ts +1 -0
- package/dist/witness/env.js +8 -0
- package/dist/witness/env.js.map +1 -0
- package/dist/witness/event-storage.d.ts +8 -0
- package/dist/witness/event-storage.js +2 -0
- package/dist/witness/event-storage.js.map +1 -0
- package/dist/witness/local.d.ts +1 -0
- package/dist/witness/local.js +48 -0
- package/dist/witness/local.js.map +1 -0
- package/dist/witness/main.d.ts +6 -0
- package/dist/witness/main.js +4 -0
- package/dist/witness/main.js.map +1 -0
- package/dist/witness/parser.d.ts +3 -0
- package/dist/witness/parser.js +7 -0
- package/dist/witness/parser.js.map +1 -0
- package/dist/witness/seed.d.ts +1 -0
- package/dist/witness/seed.js +5 -0
- package/dist/witness/seed.js.map +1 -0
- package/dist/witness/witness.d.ts +16 -0
- package/dist/witness/witness.js +59 -0
- package/dist/witness/witness.js.map +1 -0
- package/package.json +30 -22
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/witness/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/witness/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAG7D,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,cAAc,CAAC,KAAiB;IACrD,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC;IAC3C,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function createSeed(passphrase: string, salt: string): Uint8Array;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"seed.js","sourceRoot":"","sources":["../../src/witness/seed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,MAAM,UAAU,UAAU,CAAC,UAAkB,EAAE,IAAY;IACzD,OAAO,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { type Message } from "../cesr/__main__.ts";
|
|
2
|
+
import { type KeyEventBody } from "../core/main.ts";
|
|
3
|
+
export interface WitnessOptions {
|
|
4
|
+
privateKey?: Uint8Array;
|
|
5
|
+
url?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface WitnessEvent {
|
|
8
|
+
readonly message: Message;
|
|
9
|
+
readonly timestamp: Date;
|
|
10
|
+
}
|
|
11
|
+
export interface Witness {
|
|
12
|
+
readonly aid: string;
|
|
13
|
+
readonly events: readonly WitnessEvent[];
|
|
14
|
+
endorse(event: Message<KeyEventBody>): Message;
|
|
15
|
+
}
|
|
16
|
+
export declare function createWitness(options: WitnessOptions): Witness;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { ed25519 } from "@noble/curves/ed25519.js";
|
|
2
|
+
import { Indexer, Matter } from "../cesr/__main__.js";
|
|
3
|
+
import { keri } from "../core/main.js";
|
|
4
|
+
export function createWitness(options) {
|
|
5
|
+
const privateKey = options.privateKey ?? ed25519.utils.randomSecretKey();
|
|
6
|
+
const publicKey = new Matter({ code: Matter.Code.Ed25519N, raw: ed25519.getPublicKey(privateKey) }).text();
|
|
7
|
+
const icp = keri.incept({
|
|
8
|
+
signingKeys: [publicKey],
|
|
9
|
+
nextKeys: [],
|
|
10
|
+
});
|
|
11
|
+
const icpSig = Indexer.crypto.ed25519_sig(ed25519.sign(icp.raw, privateKey), 0).text();
|
|
12
|
+
icp.attachments = { ControllerIdxSigs: [icpSig] };
|
|
13
|
+
const events = [{ message: icp, timestamp: new Date() }];
|
|
14
|
+
if (options.url) {
|
|
15
|
+
const url = new URL(options.url);
|
|
16
|
+
const scheme = url.protocol.replace(":", "");
|
|
17
|
+
const location = keri.reply({
|
|
18
|
+
r: "/loc/scheme",
|
|
19
|
+
a: {
|
|
20
|
+
eid: icp.body.i,
|
|
21
|
+
scheme: scheme,
|
|
22
|
+
url: options.url,
|
|
23
|
+
},
|
|
24
|
+
});
|
|
25
|
+
const endrole = keri.reply({
|
|
26
|
+
r: "/end/role/add",
|
|
27
|
+
a: {
|
|
28
|
+
cid: icp.body.i,
|
|
29
|
+
role: "controller",
|
|
30
|
+
eid: icp.body.i,
|
|
31
|
+
},
|
|
32
|
+
});
|
|
33
|
+
location.attachments = {
|
|
34
|
+
NonTransReceiptCouples: [{ prefix: icp.body.i, sig: sign(location) }],
|
|
35
|
+
};
|
|
36
|
+
endrole.attachments = {
|
|
37
|
+
NonTransReceiptCouples: [{ prefix: icp.body.i, sig: sign(endrole) }],
|
|
38
|
+
};
|
|
39
|
+
events.push({ message: location, timestamp: new Date() });
|
|
40
|
+
events.push({ message: endrole, timestamp: new Date() });
|
|
41
|
+
}
|
|
42
|
+
function sign(message) {
|
|
43
|
+
const rawSignature = ed25519.sign(message.raw, privateKey);
|
|
44
|
+
return new Matter({ code: Matter.Code.Ed25519_Sig, raw: rawSignature }).text();
|
|
45
|
+
}
|
|
46
|
+
function endorse(event) {
|
|
47
|
+
const receipt = keri.receipt({ d: event.body.d, i: event.body.i, s: event.body.s });
|
|
48
|
+
receipt.attachments = {
|
|
49
|
+
NonTransReceiptCouples: [{ prefix: icp.body.i, sig: sign(event) }],
|
|
50
|
+
};
|
|
51
|
+
return receipt;
|
|
52
|
+
}
|
|
53
|
+
return {
|
|
54
|
+
aid: icp.body.i,
|
|
55
|
+
events,
|
|
56
|
+
endorse,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=witness.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"witness.js","sourceRoot":"","sources":["../../src/witness/witness.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,18 +1,33 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "keri",
|
|
3
|
-
"version": "0.0.0-dev.
|
|
3
|
+
"version": "0.0.0-dev.84f4fe1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/lenkan/keri-js.git"
|
|
7
7
|
},
|
|
8
|
+
"scripts": {
|
|
9
|
+
"build": "tsc -p tsconfig.build.json",
|
|
10
|
+
"dev": "tsc -p tsconfig.build.json --watch",
|
|
11
|
+
"test": "node --test --no-warnings 'src/**/*.test.ts'",
|
|
12
|
+
"test:integration": "node --test --no-warnings 'test_integration/**/*.test.ts'",
|
|
13
|
+
"test:interop": "node --no-warnings scripts/run-scripts.ts",
|
|
14
|
+
"test:vector": "node --test --no-warnings 'test_vectors/**/*.test.ts'",
|
|
15
|
+
"lint": "biome check .",
|
|
16
|
+
"lint:fix": "biome check --write .",
|
|
17
|
+
"check": "tsc --noEmit",
|
|
18
|
+
"clean": "node scripts/clean.ts",
|
|
19
|
+
"format": "biome format --write .",
|
|
20
|
+
"docs:build": "typedoc",
|
|
21
|
+
"docs:serve": "concurrently \"serve docs\" \"typedoc --watch --preserveWatchOutput\""
|
|
22
|
+
},
|
|
8
23
|
"imports": {
|
|
9
|
-
"#keri": "./src
|
|
10
|
-
"#keri/core": "./src/core/main.ts",
|
|
11
|
-
"#keri/sqlite-storage": "./src/storage/sqlite/storage-sqlite.ts"
|
|
24
|
+
"#keri/*": "./src/*"
|
|
12
25
|
},
|
|
13
26
|
"exports": {
|
|
14
27
|
".": "./dist/main.js",
|
|
15
|
-
"./sqlite-storage": "./dist/storage/sqlite/storage-sqlite.js"
|
|
28
|
+
"./sqlite-storage": "./dist/storage/sqlite/storage-sqlite.js",
|
|
29
|
+
"./witness": "./dist/witness/main.js",
|
|
30
|
+
"./witness/local": "./dist/witness/local.js"
|
|
16
31
|
},
|
|
17
32
|
"files": [
|
|
18
33
|
"dist"
|
|
@@ -26,32 +41,25 @@
|
|
|
26
41
|
"name": "node",
|
|
27
42
|
"version": ">=24",
|
|
28
43
|
"onFail": "warn"
|
|
29
|
-
},
|
|
30
|
-
"packageManager": {
|
|
31
|
-
"name": "pnpm",
|
|
32
|
-
"version": ">=10",
|
|
33
|
-
"onFail": "warn"
|
|
34
44
|
}
|
|
35
45
|
},
|
|
36
46
|
"engines": {
|
|
37
47
|
"node": ">=22"
|
|
38
48
|
},
|
|
39
49
|
"dependencies": {
|
|
50
|
+
"@hono/node-server": "^1.19.5",
|
|
40
51
|
"@noble/curves": "^2.0.0",
|
|
41
52
|
"@noble/ed25519": "^3.0.0",
|
|
42
53
|
"@noble/hashes": "^2.0.0",
|
|
43
54
|
"@noble/secp256k1": "^3.0.0",
|
|
44
|
-
"
|
|
55
|
+
"hono": "^4.9.9"
|
|
45
56
|
},
|
|
46
|
-
"
|
|
47
|
-
"
|
|
48
|
-
"
|
|
49
|
-
"
|
|
50
|
-
"
|
|
51
|
-
"
|
|
52
|
-
"
|
|
53
|
-
"check": "tsc --noEmit",
|
|
54
|
-
"format": "biome format --write .",
|
|
55
|
-
"format:check": "biome format ."
|
|
57
|
+
"devDependencies": {
|
|
58
|
+
"@biomejs/biome": "^2.4.9",
|
|
59
|
+
"@types/node": "^22.15.30",
|
|
60
|
+
"concurrently": "^9.2.1",
|
|
61
|
+
"serve": "^14.2.5",
|
|
62
|
+
"typedoc": "^0.28.14",
|
|
63
|
+
"typescript": "^6.0.2"
|
|
56
64
|
}
|
|
57
|
-
}
|
|
65
|
+
}
|