cojson 0.18.11 → 0.18.13
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +17 -0
- package/dist/coValueCore/branching.d.ts +5 -0
- package/dist/coValueCore/branching.d.ts.map +1 -1
- package/dist/coValueCore/branching.js +26 -8
- package/dist/coValueCore/branching.js.map +1 -1
- package/dist/coValueCore/coValueCore.d.ts +3 -6
- package/dist/coValueCore/coValueCore.d.ts.map +1 -1
- package/dist/coValueCore/coValueCore.js +22 -17
- package/dist/coValueCore/coValueCore.js.map +1 -1
- package/dist/coValues/account.d.ts +0 -5
- package/dist/coValues/account.d.ts.map +1 -1
- package/dist/coValues/account.js +0 -20
- package/dist/coValues/account.js.map +1 -1
- package/dist/crypto/PureJSCrypto.d.ts +0 -5
- package/dist/crypto/PureJSCrypto.d.ts.map +1 -1
- package/dist/crypto/PureJSCrypto.js +13 -30
- package/dist/crypto/PureJSCrypto.js.map +1 -1
- package/dist/crypto/WasmCrypto.d.ts +0 -4
- package/dist/crypto/WasmCrypto.d.ts.map +1 -1
- package/dist/crypto/WasmCrypto.js +1 -14
- package/dist/crypto/WasmCrypto.js.map +1 -1
- package/dist/crypto/crypto.d.ts +1 -39
- package/dist/crypto/crypto.d.ts.map +1 -1
- package/dist/crypto/crypto.js +11 -53
- package/dist/crypto/crypto.js.map +1 -1
- package/dist/exports.d.ts +3 -2
- package/dist/exports.d.ts.map +1 -1
- package/dist/exports.js +3 -2
- package/dist/exports.js.map +1 -1
- package/dist/knownState.d.ts +3 -0
- package/dist/knownState.d.ts.map +1 -0
- package/dist/knownState.js +8 -0
- package/dist/knownState.js.map +1 -0
- package/dist/localNode.d.ts.map +1 -1
- package/dist/localNode.js +4 -0
- package/dist/localNode.js.map +1 -1
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +8 -1
- package/dist/sync.js.map +1 -1
- package/dist/tests/branching.test.js +36 -29
- package/dist/tests/branching.test.js.map +1 -1
- package/dist/tests/coValueCore.test.js +31 -4
- package/dist/tests/coValueCore.test.js.map +1 -1
- package/dist/tests/coValueCoreLoadingState.test.js +15 -5
- package/dist/tests/coValueCoreLoadingState.test.js.map +1 -1
- package/dist/tests/crypto.test.js +0 -41
- package/dist/tests/crypto.test.js.map +1 -1
- package/dist/tests/sync.upload.test.js +20 -1
- package/dist/tests/sync.upload.test.js.map +1 -1
- package/package.json +2 -2
- package/src/coValueCore/branching.ts +37 -16
- package/src/coValueCore/coValueCore.ts +30 -21
- package/src/coValues/account.ts +0 -25
- package/src/crypto/PureJSCrypto.ts +14 -43
- package/src/crypto/WasmCrypto.ts +0 -19
- package/src/crypto/crypto.ts +12 -94
- package/src/exports.ts +2 -2
- package/src/knownState.ts +17 -0
- package/src/localNode.ts +5 -0
- package/src/sync.ts +11 -2
- package/src/tests/branching.test.ts +45 -34
- package/src/tests/coValueCore.test.ts +40 -4
- package/src/tests/coValueCoreLoadingState.test.ts +17 -5
- package/src/tests/crypto.test.ts +0 -53
- package/src/tests/sync.upload.test.ts +28 -1
- package/dist/tests/cryptoImpl.test.d.ts +0 -2
- package/dist/tests/cryptoImpl.test.d.ts.map +0 -1
- package/dist/tests/cryptoImpl.test.js +0 -144
- package/dist/tests/cryptoImpl.test.js.map +0 -1
- package/src/tests/cryptoImpl.test.ts +0 -213
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
|
|
2
2
|
import { PeerState } from "../PeerState";
|
|
3
|
-
import { CoValueCore } from "../coValueCore/coValueCore";
|
|
3
|
+
import { CoValueCore, idforHeader } from "../coValueCore/coValueCore";
|
|
4
4
|
import { createTestMetricReader, tearDownTestMetricReader } from "./testUtils";
|
|
5
|
+
import { WasmCrypto } from "../crypto/WasmCrypto";
|
|
5
6
|
let metricReader;
|
|
6
7
|
beforeEach(() => {
|
|
7
8
|
metricReader = createTestMetricReader();
|
|
@@ -9,9 +10,18 @@ beforeEach(() => {
|
|
|
9
10
|
afterEach(() => {
|
|
10
11
|
tearDownTestMetricReader();
|
|
11
12
|
});
|
|
12
|
-
const mockNode = {
|
|
13
|
+
const mockNode = {
|
|
14
|
+
crypto: await WasmCrypto.create(),
|
|
15
|
+
};
|
|
16
|
+
const testCoValueHeader = {
|
|
17
|
+
type: "comap",
|
|
18
|
+
ruleset: { type: "ownedByGroup", group: "co_ztest123" },
|
|
19
|
+
meta: null,
|
|
20
|
+
uniqueness: null,
|
|
21
|
+
};
|
|
22
|
+
const testCoValueId = idforHeader(testCoValueHeader, mockNode.crypto);
|
|
13
23
|
describe("CoValueCore loading state", () => {
|
|
14
|
-
const mockCoValueId =
|
|
24
|
+
const mockCoValueId = testCoValueId;
|
|
15
25
|
test("should create unknown state", async () => {
|
|
16
26
|
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
17
27
|
expect(state.id).toBe(mockCoValueId);
|
|
@@ -128,7 +138,7 @@ describe("CoValueCore loading state", () => {
|
|
|
128
138
|
id: "peer1",
|
|
129
139
|
role: "server",
|
|
130
140
|
}, async () => {
|
|
131
|
-
state.provideHeader(
|
|
141
|
+
state.provideHeader(testCoValueHeader, "peer1");
|
|
132
142
|
});
|
|
133
143
|
const peer2 = createMockPeerState({
|
|
134
144
|
id: "peer2",
|
|
@@ -165,7 +175,7 @@ describe("CoValueCore loading state", () => {
|
|
|
165
175
|
id: "peer2",
|
|
166
176
|
role: "server",
|
|
167
177
|
}, async () => {
|
|
168
|
-
state.provideHeader(
|
|
178
|
+
state.provideHeader(testCoValueHeader, "peer2");
|
|
169
179
|
});
|
|
170
180
|
peer1.closed = true;
|
|
171
181
|
const state = CoValueCore.fromID(mockCoValueId, mockNode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coValueCoreLoadingState.test.js","sourceRoot":"","sources":["../../src/tests/coValueCoreLoadingState.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"coValueCoreLoadingState.test.js","sourceRoot":"","sources":["../../src/tests/coValueCoreLoadingState.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,47 +55,6 @@ const pureJSCrypto = await PureJSCrypto.create();
|
|
|
55
55
|
expect(crypto.secureHash({ b: "world", a: "hello" })).toEqual(crypto.secureHash({ a: "hello", b: "world" }));
|
|
56
56
|
expect(crypto.shortHash({ b: "world", a: "hello" })).toEqual(crypto.shortHash({ a: "hello", b: "world" }));
|
|
57
57
|
});
|
|
58
|
-
test(`Encryption for transactions round-trips [${name}]`, () => {
|
|
59
|
-
const { secret } = crypto.newRandomKeySecret();
|
|
60
|
-
const encrypted1 = crypto.encryptForTransaction({ a: "hello" }, secret, {
|
|
61
|
-
in: "co_zTEST",
|
|
62
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 0 },
|
|
63
|
-
});
|
|
64
|
-
const encrypted2 = crypto.encryptForTransaction({ b: "world" }, secret, {
|
|
65
|
-
in: "co_zTEST",
|
|
66
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 1 },
|
|
67
|
-
});
|
|
68
|
-
const decrypted1 = crypto.decryptForTransaction(encrypted1, secret, {
|
|
69
|
-
in: "co_zTEST",
|
|
70
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 0 },
|
|
71
|
-
});
|
|
72
|
-
const decrypted2 = crypto.decryptForTransaction(encrypted2, secret, {
|
|
73
|
-
in: "co_zTEST",
|
|
74
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 1 },
|
|
75
|
-
});
|
|
76
|
-
expect([decrypted1, decrypted2]).toEqual([{ a: "hello" }, { b: "world" }]);
|
|
77
|
-
});
|
|
78
|
-
test(`Encryption for transactions doesn't decrypt with a wrong key [${name}]`, () => {
|
|
79
|
-
const { secret } = crypto.newRandomKeySecret();
|
|
80
|
-
const { secret: secret2 } = crypto.newRandomKeySecret();
|
|
81
|
-
const encrypted1 = crypto.encryptForTransaction({ a: "hello" }, secret, {
|
|
82
|
-
in: "co_zTEST",
|
|
83
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 0 },
|
|
84
|
-
});
|
|
85
|
-
const encrypted2 = crypto.encryptForTransaction({ b: "world" }, secret, {
|
|
86
|
-
in: "co_zTEST",
|
|
87
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 1 },
|
|
88
|
-
});
|
|
89
|
-
const decrypted1 = crypto.decryptForTransaction(encrypted1, secret2, {
|
|
90
|
-
in: "co_zTEST",
|
|
91
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 0 },
|
|
92
|
-
});
|
|
93
|
-
const decrypted2 = crypto.decryptForTransaction(encrypted2, secret2, {
|
|
94
|
-
in: "co_zTEST",
|
|
95
|
-
tx: { sessionID: "co_zTEST_session_zTEST", txIndex: 1 },
|
|
96
|
-
});
|
|
97
|
-
expect([decrypted1, decrypted2]).toEqual([undefined, undefined]);
|
|
98
|
-
});
|
|
99
58
|
test(`Encryption of keySecrets round-trips [${name}]`, () => {
|
|
100
59
|
const toEncrypt = crypto.newRandomKeySecret();
|
|
101
60
|
const encrypting = crypto.newRandomKeySecret();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.test.js","sourceRoot":"","sources":["../../src/tests/crypto.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"crypto.test.js","sourceRoot":"","sources":["../../src/tests/crypto.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, test } from "vitest";
|
|
1
|
+
import { assert, beforeEach, describe, expect, test } from "vitest";
|
|
2
2
|
import { expectList, expectMap } from "../coValue";
|
|
3
3
|
import { WasmCrypto } from "../crypto/WasmCrypto";
|
|
4
4
|
import { SyncMessagesLog, TEST_NODE_CONFIG, loadCoValueOrFail, setupTestNode, waitFor, } from "./testUtils";
|
|
@@ -335,5 +335,24 @@ describe("client to server upload", () => {
|
|
|
335
335
|
]
|
|
336
336
|
`);
|
|
337
337
|
});
|
|
338
|
+
test("uploading a coValue with a non-matching header", async () => {
|
|
339
|
+
const client = setupTestNode({
|
|
340
|
+
connected: false,
|
|
341
|
+
});
|
|
342
|
+
const coValue = client.node.createCoValue({
|
|
343
|
+
type: "comap",
|
|
344
|
+
ruleset: { type: "unsafeAllowAll" },
|
|
345
|
+
meta: null,
|
|
346
|
+
...Crypto.createdNowUnique(),
|
|
347
|
+
});
|
|
348
|
+
const map = coValue.getCurrentContent();
|
|
349
|
+
map.set("hello", "world", "trusting");
|
|
350
|
+
const content = map.core.verified.newContentSince(undefined)?.[0];
|
|
351
|
+
assert(content);
|
|
352
|
+
// Simulate a mismatch between the header and the coValue id
|
|
353
|
+
content.id = "co_ztest123";
|
|
354
|
+
jazzCloud.node.syncManager.handleNewContent(content, "import");
|
|
355
|
+
expect(jazzCloud.node.getCoValue(content.id).isAvailable()).toBe(false);
|
|
356
|
+
});
|
|
338
357
|
});
|
|
339
358
|
//# sourceMappingURL=sync.upload.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.upload.test.js","sourceRoot":"","sources":["../../src/tests/sync.upload.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"sync.upload.test.js","sourceRoot":"","sources":["../../src/tests/sync.upload.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"type": "module",
|
|
27
27
|
"license": "MIT",
|
|
28
|
-
"version": "0.18.
|
|
28
|
+
"version": "0.18.13",
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@opentelemetry/sdk-metrics": "^2.0.0",
|
|
31
31
|
"libsql": "^0.5.13",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@scure/base": "1.2.1",
|
|
40
40
|
"neverthrow": "^7.0.1",
|
|
41
41
|
"unicode-segmenter": "^0.12.0",
|
|
42
|
-
"cojson-core-wasm": "0.18.
|
|
42
|
+
"cojson-core-wasm": "0.18.13"
|
|
43
43
|
},
|
|
44
44
|
"gitHead": "33c27053293b4801b968c61d5c4c989f93a67d13",
|
|
45
45
|
"scripts": {
|
|
@@ -3,6 +3,7 @@ import type { RawCoID, SessionID } from "../ids.js";
|
|
|
3
3
|
import { type AvailableCoValueCore, idforHeader } from "./coValueCore.js";
|
|
4
4
|
import type { CoValueHeader } from "./verifiedState.js";
|
|
5
5
|
import type { CoValueKnownState } from "../sync.js";
|
|
6
|
+
import { combineKnownStateSessions } from "../knownState.js";
|
|
6
7
|
|
|
7
8
|
/**
|
|
8
9
|
* Commit to identify the starting point of the branch
|
|
@@ -35,6 +36,7 @@ export type MergedTransactionMetadata = {
|
|
|
35
36
|
*/
|
|
36
37
|
export type MergeCommit = {
|
|
37
38
|
merged: CoValueKnownState["sessions"];
|
|
39
|
+
branch: RawCoID;
|
|
38
40
|
};
|
|
39
41
|
|
|
40
42
|
export function getBranchHeader({
|
|
@@ -67,6 +69,13 @@ export function getBranchHeader({
|
|
|
67
69
|
};
|
|
68
70
|
}
|
|
69
71
|
|
|
72
|
+
/**
|
|
73
|
+
* Checks if the coValue can be branched
|
|
74
|
+
*/
|
|
75
|
+
export function canBeBranched(coValue: CoValueCore): boolean {
|
|
76
|
+
return coValue.verified?.header.ruleset.type === "ownedByGroup";
|
|
77
|
+
}
|
|
78
|
+
|
|
70
79
|
/**
|
|
71
80
|
* Given a coValue, a branch name and an owner id, returns the id for the branch
|
|
72
81
|
*/
|
|
@@ -192,7 +201,7 @@ export function mergeBranch(branch: CoValueCore): CoValueCore {
|
|
|
192
201
|
);
|
|
193
202
|
}
|
|
194
203
|
|
|
195
|
-
if (branch
|
|
204
|
+
if (!canBeBranched(branch)) {
|
|
196
205
|
return branch;
|
|
197
206
|
}
|
|
198
207
|
|
|
@@ -204,19 +213,15 @@ export function mergeBranch(branch: CoValueCore): CoValueCore {
|
|
|
204
213
|
|
|
205
214
|
// Look for previous merge commits, to see which transactions needs to be merged
|
|
206
215
|
// Done mostly for performance reasons, as we could merge all the transactions every time and nothing would change
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
return acc;
|
|
217
|
-
},
|
|
218
|
-
{} as CoValueKnownState["sessions"],
|
|
219
|
-
);
|
|
216
|
+
let mergedTransactions = {} as CoValueKnownState["sessions"];
|
|
217
|
+
for (const item of target.getMergeCommits()) {
|
|
218
|
+
if (item.branch === branch.id) {
|
|
219
|
+
mergedTransactions = combineKnownStateSessions(
|
|
220
|
+
mergedTransactions,
|
|
221
|
+
item.merged,
|
|
222
|
+
);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
220
225
|
|
|
221
226
|
// Get the valid transactions from the branch, skipping the branch source and the previously merged transactions
|
|
222
227
|
const branchValidTransactions = branch
|
|
@@ -257,8 +262,24 @@ export function mergeBranch(branch: CoValueCore): CoValueCore {
|
|
|
257
262
|
}
|
|
258
263
|
|
|
259
264
|
// Track the merged transactions for the branch, so future merges will know which transactions have already been merged
|
|
260
|
-
branch
|
|
261
|
-
|
|
265
|
+
// Store only the diff of sessions between the branch and already merged transactions
|
|
266
|
+
const currentSessions = branch.knownState().sessions;
|
|
267
|
+
const prevMergedSessions = mergedTransactions;
|
|
268
|
+
const diff = {} as CoValueKnownState["sessions"];
|
|
269
|
+
|
|
270
|
+
for (const [sessionId, count] of Object.entries(currentSessions) as [
|
|
271
|
+
SessionID,
|
|
272
|
+
number,
|
|
273
|
+
][]) {
|
|
274
|
+
const prevMergedSession = prevMergedSessions[sessionId] ?? 0;
|
|
275
|
+
if (prevMergedSession < count) {
|
|
276
|
+
diff[sessionId] = count;
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
target.makeTransaction([], "private", {
|
|
281
|
+
merged: diff,
|
|
282
|
+
branch: branch.id,
|
|
262
283
|
} satisfies MergeCommit);
|
|
263
284
|
|
|
264
285
|
return target;
|
|
@@ -39,6 +39,7 @@ import {
|
|
|
39
39
|
} from "./branching.js";
|
|
40
40
|
import { type RawAccountID } from "../coValues/account.js";
|
|
41
41
|
import { decodeTransactionChangesAndMeta } from "./decodeTransactionChangesAndMeta.js";
|
|
42
|
+
import { combineKnownStateSessions } from "../knownState.js";
|
|
42
43
|
|
|
43
44
|
export function idforHeader(
|
|
44
45
|
header: CoValueHeader,
|
|
@@ -337,6 +338,12 @@ export class CoValueCore {
|
|
|
337
338
|
) {
|
|
338
339
|
const previousState = this.loadingState;
|
|
339
340
|
|
|
341
|
+
const expectedId = idforHeader(header, this.node.crypto);
|
|
342
|
+
|
|
343
|
+
if (this.id !== expectedId) {
|
|
344
|
+
return false;
|
|
345
|
+
}
|
|
346
|
+
|
|
340
347
|
if (this._verified?.sessions.size) {
|
|
341
348
|
throw new Error(
|
|
342
349
|
"CoValueCore: provideHeader called on coValue with verified sessions present!",
|
|
@@ -354,6 +361,8 @@ export class CoValueCore {
|
|
|
354
361
|
|
|
355
362
|
this.updateCounter(previousState);
|
|
356
363
|
this.notifyUpdate("immediate");
|
|
364
|
+
|
|
365
|
+
return true;
|
|
357
366
|
}
|
|
358
367
|
|
|
359
368
|
internalMarkMagicallyAvailable(
|
|
@@ -700,7 +709,7 @@ export class CoValueCore {
|
|
|
700
709
|
}
|
|
701
710
|
|
|
702
711
|
// The starting point of the branch, in case this CoValue is a branch
|
|
703
|
-
branchStart:
|
|
712
|
+
branchStart: BranchStartCommit["from"] | undefined;
|
|
704
713
|
|
|
705
714
|
// The list of merge commits that have been made
|
|
706
715
|
mergeCommits: MergeCommit[] = [];
|
|
@@ -748,7 +757,7 @@ export class CoValueCore {
|
|
|
748
757
|
return;
|
|
749
758
|
}
|
|
750
759
|
|
|
751
|
-
const
|
|
760
|
+
const isBranched = this.isBranched();
|
|
752
761
|
|
|
753
762
|
for (const [sessionID, sessionLog] of this.verified.sessions.entries()) {
|
|
754
763
|
const count = this.verifiedTransactionsKnownSessions[sessionID] ?? 0;
|
|
@@ -758,7 +767,7 @@ export class CoValueCore {
|
|
|
758
767
|
return;
|
|
759
768
|
}
|
|
760
769
|
|
|
761
|
-
const txID =
|
|
770
|
+
const txID = isBranched
|
|
762
771
|
? {
|
|
763
772
|
sessionID,
|
|
764
773
|
txIndex,
|
|
@@ -824,24 +833,20 @@ export class CoValueCore {
|
|
|
824
833
|
transaction.hasMetaBeenParsed = true;
|
|
825
834
|
|
|
826
835
|
// Branch related meta information
|
|
827
|
-
if (this.
|
|
836
|
+
if (this.isBranched()) {
|
|
828
837
|
// Check if the transaction is a branch start
|
|
829
838
|
if ("from" in transaction.meta) {
|
|
830
|
-
|
|
831
|
-
|
|
832
|
-
|
|
833
|
-
this.branchStart =
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
839
|
+
const meta = transaction.meta as BranchStartCommit;
|
|
840
|
+
|
|
841
|
+
if (this.branchStart) {
|
|
842
|
+
this.branchStart = combineKnownStateSessions(
|
|
843
|
+
this.branchStart,
|
|
844
|
+
meta.from,
|
|
845
|
+
);
|
|
846
|
+
} else {
|
|
847
|
+
this.branchStart = meta.from;
|
|
837
848
|
}
|
|
838
849
|
}
|
|
839
|
-
|
|
840
|
-
// Check if the transaction is a merged checkpoint for a branch
|
|
841
|
-
if ("merged" in transaction.meta) {
|
|
842
|
-
const mergeCommit = transaction.meta as MergeCommit;
|
|
843
|
-
this.mergeCommits.push(mergeCommit);
|
|
844
|
-
}
|
|
845
850
|
}
|
|
846
851
|
|
|
847
852
|
// Check if the transaction is a branch pointer
|
|
@@ -851,6 +856,12 @@ export class CoValueCore {
|
|
|
851
856
|
this.branches.push(branch);
|
|
852
857
|
}
|
|
853
858
|
|
|
859
|
+
// Check if the transaction is a merged checkpoint for a branch
|
|
860
|
+
if ("merged" in transaction.meta) {
|
|
861
|
+
const mergeCommit = transaction.meta as MergeCommit;
|
|
862
|
+
this.mergeCommits.push(mergeCommit);
|
|
863
|
+
}
|
|
864
|
+
|
|
854
865
|
// Check if the transaction has been merged from a branch
|
|
855
866
|
if ("mi" in transaction.meta) {
|
|
856
867
|
const meta = transaction.meta as MergedTransactionMetadata;
|
|
@@ -952,7 +963,7 @@ export class CoValueCore {
|
|
|
952
963
|
// If this is a branch, we load the valid transactions from the source
|
|
953
964
|
if (source && this.branchStart && !options?.skipBranchSource) {
|
|
954
965
|
const sourceTransactions = source.getValidTransactions({
|
|
955
|
-
to: this.branchStart
|
|
966
|
+
to: this.branchStart,
|
|
956
967
|
ignorePrivateTransactions: options?.ignorePrivateTransactions ?? false,
|
|
957
968
|
knownTransactions: options?.knownTransactions,
|
|
958
969
|
});
|
|
@@ -985,7 +996,7 @@ export class CoValueCore {
|
|
|
985
996
|
return this.verified?.branchSourceId;
|
|
986
997
|
}
|
|
987
998
|
|
|
988
|
-
|
|
999
|
+
isBranched() {
|
|
989
1000
|
return Boolean(this.verified?.branchSourceId);
|
|
990
1001
|
}
|
|
991
1002
|
|
|
@@ -1015,8 +1026,6 @@ export class CoValueCore {
|
|
|
1015
1026
|
}
|
|
1016
1027
|
|
|
1017
1028
|
getMergeCommits() {
|
|
1018
|
-
this.parseNewTransactions(false);
|
|
1019
|
-
|
|
1020
1029
|
return this.mergeCommits;
|
|
1021
1030
|
}
|
|
1022
1031
|
|
package/src/coValues/account.ts
CHANGED
|
@@ -117,11 +117,6 @@ export interface ControlledAccountOrAgent {
|
|
|
117
117
|
export class ControlledAccount implements ControlledAccountOrAgent {
|
|
118
118
|
account: RawAccount<AccountMeta>;
|
|
119
119
|
agentSecret: AgentSecret;
|
|
120
|
-
_cachedCurrentAgentID: AgentID | undefined;
|
|
121
|
-
_cachedCurrentSignerID: SignerID | undefined;
|
|
122
|
-
_cachedCurrentSignerSecret: SignerSecret | undefined;
|
|
123
|
-
_cachedCurrentSealerID: SealerID | undefined;
|
|
124
|
-
_cachedCurrentSealerSecret: SealerSecret | undefined;
|
|
125
120
|
crypto: CryptoProvider;
|
|
126
121
|
|
|
127
122
|
constructor(account: RawAccount<AccountMeta>, agentSecret: AgentSecret) {
|
|
@@ -135,47 +130,27 @@ export class ControlledAccount implements ControlledAccountOrAgent {
|
|
|
135
130
|
}
|
|
136
131
|
|
|
137
132
|
currentAgentID(): AgentID {
|
|
138
|
-
if (this._cachedCurrentAgentID) {
|
|
139
|
-
return this._cachedCurrentAgentID;
|
|
140
|
-
}
|
|
141
133
|
const agentID = this.crypto.getAgentID(this.agentSecret);
|
|
142
|
-
this._cachedCurrentAgentID = agentID;
|
|
143
134
|
return agentID;
|
|
144
135
|
}
|
|
145
136
|
|
|
146
137
|
currentSignerID() {
|
|
147
|
-
if (this._cachedCurrentSignerID) {
|
|
148
|
-
return this._cachedCurrentSignerID;
|
|
149
|
-
}
|
|
150
138
|
const signerID = this.crypto.getAgentSignerID(this.currentAgentID());
|
|
151
|
-
this._cachedCurrentSignerID = signerID;
|
|
152
139
|
return signerID;
|
|
153
140
|
}
|
|
154
141
|
|
|
155
142
|
currentSignerSecret(): SignerSecret {
|
|
156
|
-
if (this._cachedCurrentSignerSecret) {
|
|
157
|
-
return this._cachedCurrentSignerSecret;
|
|
158
|
-
}
|
|
159
143
|
const signerSecret = this.crypto.getAgentSignerSecret(this.agentSecret);
|
|
160
|
-
this._cachedCurrentSignerSecret = signerSecret;
|
|
161
144
|
return signerSecret;
|
|
162
145
|
}
|
|
163
146
|
|
|
164
147
|
currentSealerID() {
|
|
165
|
-
if (this._cachedCurrentSealerID) {
|
|
166
|
-
return this._cachedCurrentSealerID;
|
|
167
|
-
}
|
|
168
148
|
const sealerID = this.crypto.getAgentSealerID(this.currentAgentID());
|
|
169
|
-
this._cachedCurrentSealerID = sealerID;
|
|
170
149
|
return sealerID;
|
|
171
150
|
}
|
|
172
151
|
|
|
173
152
|
currentSealerSecret(): SealerSecret {
|
|
174
|
-
if (this._cachedCurrentSealerSecret) {
|
|
175
|
-
return this._cachedCurrentSealerSecret;
|
|
176
|
-
}
|
|
177
153
|
const sealerSecret = this.crypto.getAgentSealerSecret(this.agentSecret);
|
|
178
|
-
this._cachedCurrentSealerSecret = sealerSecret;
|
|
179
154
|
return sealerSecret;
|
|
180
155
|
}
|
|
181
156
|
}
|