@activeledger/activerestore 5.0.2 → 5.1.0
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/es/modules/contract/contract.d.ts +1 -2
- package/es/modules/contract/contract.d.ts.map +1 -1
- package/es/modules/contract/contract.js +36 -27
- package/es/modules/contract/contract.js.map +1 -1
- package/es/modules/helper/helper.d.ts +3 -0
- package/es/modules/helper/helper.d.ts.map +1 -1
- package/es/modules/helper/helper.js +15 -0
- package/es/modules/helper/helper.js.map +1 -1
- package/es/modules/quick-restore/quick-restore.d.ts +0 -2
- package/es/modules/quick-restore/quick-restore.d.ts.map +1 -1
- package/es/modules/quick-restore/quick-restore.js +11 -62
- package/es/modules/quick-restore/quick-restore.js.map +1 -1
- package/lib/modules/contract/contract.d.ts +1 -2
- package/lib/modules/contract/contract.d.ts.map +1 -1
- package/lib/modules/contract/contract.js +36 -60
- package/lib/modules/contract/contract.js.map +1 -1
- package/lib/modules/helper/helper.d.ts +3 -0
- package/lib/modules/helper/helper.d.ts.map +1 -1
- package/lib/modules/helper/helper.js +15 -0
- package/lib/modules/helper/helper.js.map +1 -1
- package/lib/modules/quick-restore/quick-restore.d.ts +0 -2
- package/lib/modules/quick-restore/quick-restore.d.ts.map +1 -1
- package/lib/modules/quick-restore/quick-restore.js +11 -62
- package/lib/modules/quick-restore/quick-restore.js.map +1 -1
- package/package.json +7 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":"AAqCA,qBAAa,QAAQ;IASnB,OAAoB,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CA+CxD;CACF"}
|
|
@@ -1,33 +1,42 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import { ActiveLogger } from "@activeledger/activelogger";
|
|
2
|
+
import { ContractFiles, ContractSource, } from "@activeledger/activecontracts/lib/source";
|
|
3
|
+
import { Provider } from "../provider/provider";
|
|
3
4
|
export class Contract {
|
|
4
|
-
static rebuild(contract) {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
5
|
+
static async rebuild(contract) {
|
|
6
|
+
const files = new ContractFiles("contracts");
|
|
7
|
+
const fetchUmid = (umid) => Provider.database.get(`${umid}:umid`).catch(() => undefined);
|
|
8
|
+
for (const version of Object.keys(contract.contract)) {
|
|
9
|
+
try {
|
|
10
|
+
const source = await ContractSource.resolve(contract, version, fetchUmid);
|
|
11
|
+
files.write(contract.namespace, contract._id, version, ContractSource.transpile(source.base64, source.target));
|
|
12
|
+
}
|
|
13
|
+
catch (e) {
|
|
14
|
+
ActiveLogger.warn(`Cannot rebuild ${contract._id}@${version}, its file is missing: ${e.message}`);
|
|
15
|
+
}
|
|
15
16
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
target: ts.ScriptTarget.ES2017,
|
|
27
|
-
esModuleInterop: false,
|
|
28
|
-
ignoreDeprecations: "6.0"
|
|
17
|
+
try {
|
|
18
|
+
const locks = contract.locks;
|
|
19
|
+
const held = [];
|
|
20
|
+
if (locks && locks.all === true)
|
|
21
|
+
held.push("");
|
|
22
|
+
if (locks && Array.isArray(locks.versions)) {
|
|
23
|
+
for (const v of locks.versions) {
|
|
24
|
+
if (typeof v === "string")
|
|
25
|
+
held.push("@" + v);
|
|
26
|
+
}
|
|
29
27
|
}
|
|
30
|
-
|
|
28
|
+
for (const version of held) {
|
|
29
|
+
try {
|
|
30
|
+
files.lock(contract.namespace, contract._id, version);
|
|
31
|
+
}
|
|
32
|
+
catch (e) {
|
|
33
|
+
ActiveLogger.warn(`Cannot restore the lock on ${contract._id}${version}: ${e.message}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
catch (e) {
|
|
38
|
+
ActiveLogger.warn(`Cannot restore the locks on ${contract._id}: ${e.message}`);
|
|
39
|
+
}
|
|
31
40
|
}
|
|
32
41
|
}
|
|
33
42
|
//# sourceMappingURL=contract.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":"AAuBA,OAAO,
|
|
1
|
+
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EACL,aAAa,EACb,cAAc,GACf,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAShD,MAAM,OAAO,QAAQ;IASZ,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAa;QACvC,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CACjC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAE/D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,OAAO,CACzC,QAAQ,EACR,OAAO,EACP,SAAS,CACV,CAAC;gBACF,KAAK,CAAC,KAAK,CACT,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,GAAG,EACZ,OAAO,EACP,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CACvD,CAAC;YACJ,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,YAAY,CAAC,IAAI,CACf,kBAAkB,QAAQ,CAAC,GAAG,IAAI,OAAO,0BAA0B,CAAC,CAAC,OAAO,EAAE,CAC/E,CAAC;YACJ,CAAC;QACH,CAAC;QAGD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC7B,MAAM,IAAI,GAAa,EAAE,CAAC;YAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI;gBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/C,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3C,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ;wBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBACxD,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,YAAY,CAAC,IAAI,CACf,8BAA8B,QAAQ,CAAC,GAAG,GAAG,OAAO,KAAK,CAAC,CAAC,OAAO,EAAE,CACrE,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,YAAY,CAAC,IAAI,CAAC,+BAA+B,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import { IConsensusData, IStreamInformation } from "../../interfaces/quick-restore.interface";
|
|
1
2
|
export declare class Helper {
|
|
2
3
|
static verbose: boolean;
|
|
3
4
|
static output(message: string, other?: any): void;
|
|
4
5
|
static getNeighbourCount: (dontIncludeSelf: boolean) => number;
|
|
5
6
|
static metConsensus: (votes: number, dontIncludeSelf?: boolean) => boolean;
|
|
7
|
+
static votesNeeded: () => number;
|
|
8
|
+
static majority(nodes: IStreamInformation[], needed: number): IConsensusData[];
|
|
6
9
|
static replayEvents(umidDoc: any): Promise<void>;
|
|
7
10
|
}
|
|
8
11
|
//# sourceMappingURL=helper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":"AA0BA,OAAO,EACL,cAAc,EACd,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAQlD,qBAAa,MAAM;IACjB,OAAc,OAAO,EAAE,OAAO,CAAS;IASvC,OAAc,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,IAAI,CAIvD;IAQD,OAAc,iBAAiB,oBAAqB,OAAO,YACe;IAQ1E,OAAc,YAAY,UACjB,MAAM,oBACI,OAAO,aAGQ;IASlC,OAAc,WAAW,QAAO,MAAM,CAMpC;IAcF,OAAc,QAAQ,CACpB,KAAK,EAAE,kBAAkB,EAAE,EAC3B,MAAM,EAAE,MAAM,GACb,cAAc,EAAE,CAWlB;IAoBD,OAAoB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB5D;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ActiveLogger } from "@activeledger/activelogger";
|
|
2
|
+
import { spiConsensus } from "@activeledger/activesync";
|
|
2
3
|
import { Provider } from "../provider/provider";
|
|
3
4
|
export class Helper {
|
|
4
5
|
static verbose = false;
|
|
@@ -10,6 +11,20 @@ export class Helper {
|
|
|
10
11
|
static getNeighbourCount = (dontIncludeSelf) => dontIncludeSelf ? Provider.neighbourCount - 1 : Provider.neighbourCount;
|
|
11
12
|
static metConsensus = (votes, dontIncludeSelf = false) => (votes / Helper.getNeighbourCount(dontIncludeSelf)) * 100 >=
|
|
12
13
|
Provider.consensusReachedAmount;
|
|
14
|
+
static votesNeeded = () => {
|
|
15
|
+
const needed = Math.ceil((Provider.consensusReachedAmount * Helper.getNeighbourCount(false)) / 100);
|
|
16
|
+
return Number.isFinite(needed) && needed > 0 ? needed : Infinity;
|
|
17
|
+
};
|
|
18
|
+
static majority(nodes, needed) {
|
|
19
|
+
const answers = nodes.map((n) => (Array.isArray(n?.streams) ? n.streams : [])
|
|
20
|
+
.filter((s) => s && s.id && s.id !== "undefined" && s.rev)
|
|
21
|
+
.map((s) => ({ _id: s.id, _rev: s.rev })));
|
|
22
|
+
const { winners } = spiConsensus(answers, needed);
|
|
23
|
+
return Object.keys(winners).map((stream) => ({
|
|
24
|
+
stream,
|
|
25
|
+
revision: winners[stream].rev
|
|
26
|
+
}));
|
|
27
|
+
}
|
|
13
28
|
static async replayEvents(umidDoc) {
|
|
14
29
|
const events = umidDoc?.events;
|
|
15
30
|
if (!Array.isArray(events) || !events.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,7 @@ export declare class QuickRestore {
|
|
|
6
6
|
private static adoptDocument;
|
|
7
7
|
private uploadData;
|
|
8
8
|
private handleNetworkData;
|
|
9
|
-
private checkConsensus;
|
|
10
9
|
private processRebuildPromises;
|
|
11
|
-
private reduceStreamInformation;
|
|
12
10
|
private getRebuildData;
|
|
13
11
|
}
|
|
14
12
|
//# sourceMappingURL=quick-restore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"AA4CA,qBAAa,YAAY;IAIvB,cAEC;IAOD,OAAO,CAAC,aAAa,CACmB;YAQ1B,mBAAmB;IAkDjC,OAAO,CAAC,cAAc;mBAgDD,aAAa;IAiClC,OAAO,CAAC,UAAU;YA2DJ,iBAAiB;IA6C/B,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,cAAc;CAoCvB"}
|
|
@@ -19,13 +19,17 @@ export class QuickRestore {
|
|
|
19
19
|
.map(preparePromise);
|
|
20
20
|
try {
|
|
21
21
|
const streamInformation = await this.processRebuildPromises(promises);
|
|
22
|
-
const
|
|
22
|
+
const needed = Helper.votesNeeded();
|
|
23
|
+
if (!Number.isFinite(needed)) {
|
|
24
|
+
ActiveLogger.error("consensus.reached is not set in the config file, so no revision can be a majority and nothing will be restored");
|
|
25
|
+
}
|
|
26
|
+
const consensusData = Helper.majority(streamInformation, needed);
|
|
23
27
|
await this.fetchDocuments(consensusData);
|
|
24
28
|
const duration = Date.now() - startTime;
|
|
25
29
|
ActiveLogger.info(`Rebuild Complete; Duration: ${duration}ms`);
|
|
26
30
|
}
|
|
27
31
|
catch (error) {
|
|
28
|
-
ActiveLogger.error(error,
|
|
32
|
+
ActiveLogger.error(error, `There was an error running quick full restore: ${error?.message ?? JSON.stringify(error)}`);
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
35
|
fetchDocuments(consensusData) {
|
|
@@ -38,7 +42,7 @@ export class QuickRestore {
|
|
|
38
42
|
ActiveLogger.info(`[Fetching] ${activity.stream}`);
|
|
39
43
|
const streamDataPromise = await streamData(activity);
|
|
40
44
|
ActiveLogger.info(`[Fetching Complete] ${activity.stream}`);
|
|
41
|
-
const networkData = this.handleNetworkData(streamDataPromise);
|
|
45
|
+
const networkData = await this.handleNetworkData(streamDataPromise);
|
|
42
46
|
await this.uploadData(networkData);
|
|
43
47
|
}
|
|
44
48
|
resolve();
|
|
@@ -96,8 +100,8 @@ export class QuickRestore {
|
|
|
96
100
|
}
|
|
97
101
|
});
|
|
98
102
|
}
|
|
99
|
-
handleNetworkData(activityData) {
|
|
100
|
-
const hasNotErrored = (data) =>
|
|
103
|
+
async handleNetworkData(activityData) {
|
|
104
|
+
const hasNotErrored = (data) => !!data && typeof data._id === "string" && !data.error;
|
|
101
105
|
const isNotStreamOrUmid = (data) => data._id.indexOf(":stream") === -1 &&
|
|
102
106
|
data._id.indexOf(":umid") === -1 &&
|
|
103
107
|
data._id.indexOf("_design") === -1;
|
|
@@ -111,7 +115,7 @@ export class QuickRestore {
|
|
|
111
115
|
if (isNotStreamOrUmid(data)) {
|
|
112
116
|
volatile.push({ _id: `${data._id}:volatile` });
|
|
113
117
|
hasRequiredData(data)
|
|
114
|
-
? Contract.rebuild(data)
|
|
118
|
+
? await Contract.rebuild(data)
|
|
115
119
|
: Helper.output("Data does not have required fields", data);
|
|
116
120
|
}
|
|
117
121
|
break;
|
|
@@ -119,33 +123,6 @@ export class QuickRestore {
|
|
|
119
123
|
}
|
|
120
124
|
return { documents, volatile };
|
|
121
125
|
}
|
|
122
|
-
checkConsensus(streamInformation) {
|
|
123
|
-
const streamIdCorrect = (streamId) => !!(streamId && streamId !== "undefined");
|
|
124
|
-
return new Promise((resolve) => {
|
|
125
|
-
const consensusReached = [];
|
|
126
|
-
const streams = Object.keys(streamInformation);
|
|
127
|
-
for (let i = streams.length; i--;) {
|
|
128
|
-
const streamId = streams[i];
|
|
129
|
-
if (streamIdCorrect(streamId)) {
|
|
130
|
-
const stream = streamInformation[streamId];
|
|
131
|
-
const revisions = Object.keys(stream);
|
|
132
|
-
for (let i = revisions.length; i--;) {
|
|
133
|
-
const revision = revisions[i];
|
|
134
|
-
const vote = stream[revision];
|
|
135
|
-
Helper.output("Check Consensus: Adding", {
|
|
136
|
-
stream: streamId,
|
|
137
|
-
revision
|
|
138
|
-
});
|
|
139
|
-
if (Helper.metConsensus(vote)) {
|
|
140
|
-
consensusReached.push({ stream: streamId, revision });
|
|
141
|
-
break;
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
resolve(consensusReached);
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
126
|
processRebuildPromises(promises) {
|
|
150
127
|
const streamDataCorrect = (data) => !!data;
|
|
151
128
|
return new Promise(async (resolve, reject) => {
|
|
@@ -154,7 +131,7 @@ export class QuickRestore {
|
|
|
154
131
|
const cleanedStreamInformation = streamInformation.filter(streamDataCorrect);
|
|
155
132
|
Helper.output("cleanedStreamInformation", cleanedStreamInformation);
|
|
156
133
|
Object.keys(cleanedStreamInformation).length > 0
|
|
157
|
-
? resolve(
|
|
134
|
+
? resolve(cleanedStreamInformation)
|
|
158
135
|
: reject("No data to process");
|
|
159
136
|
}
|
|
160
137
|
catch (error) {
|
|
@@ -162,34 +139,6 @@ export class QuickRestore {
|
|
|
162
139
|
}
|
|
163
140
|
});
|
|
164
141
|
}
|
|
165
|
-
reduceStreamInformation(streamInformation) {
|
|
166
|
-
const haveStream = (stream) => !!reduction[stream.id];
|
|
167
|
-
const haveRevision = (stream) => !!reduction[stream.id][stream.rev];
|
|
168
|
-
const incrementStreamRevisionCounter = (stream) => reduction[stream.id][stream.rev]++;
|
|
169
|
-
const startStreamRevisionCounter = (stream) => (reduction[stream.id][stream.rev] = 1);
|
|
170
|
-
const initialiseStreamCounter = (stream) => (reduction[stream.id] = { [stream.rev]: 1 });
|
|
171
|
-
let reduction = {};
|
|
172
|
-
Helper.output("Stream Information", streamInformation);
|
|
173
|
-
for (let i = streamInformation.length; i--;) {
|
|
174
|
-
if (streamInformation[i] && streamInformation[i].streams) {
|
|
175
|
-
const streams = Object.values(streamInformation[i].streams);
|
|
176
|
-
Helper.output(`Reducing ${streams.length} streams`);
|
|
177
|
-
for (let s = streams.length; s--;) {
|
|
178
|
-
const stream = streams[s];
|
|
179
|
-
if (stream) {
|
|
180
|
-
Helper.output("Reducing stream", stream);
|
|
181
|
-
haveStream(stream)
|
|
182
|
-
? haveRevision(stream)
|
|
183
|
-
? incrementStreamRevisionCounter(stream)
|
|
184
|
-
: startStreamRevisionCounter(stream)
|
|
185
|
-
: initialiseStreamCounter(stream);
|
|
186
|
-
}
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
Helper.output("Reduction", reduction);
|
|
191
|
-
return reduction;
|
|
192
|
-
}
|
|
193
142
|
getRebuildData(node) {
|
|
194
143
|
return new Promise(async (resolve, reject) => {
|
|
195
144
|
let streams = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":"AAqCA,qBAAa,QAAQ;IASnB,OAAoB,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CA+CxD;CACF"}
|
|
@@ -1,69 +1,45 @@
|
|
|
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 () {
|
|
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
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
3
|
exports.Contract = void 0;
|
|
37
|
-
const
|
|
38
|
-
const
|
|
4
|
+
const activelogger_1 = require("@activeledger/activelogger");
|
|
5
|
+
const source_1 = require("@activeledger/activecontracts/lib/source");
|
|
6
|
+
const provider_1 = require("../provider/provider");
|
|
39
7
|
class Contract {
|
|
40
|
-
static rebuild(contract) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
8
|
+
static async rebuild(contract) {
|
|
9
|
+
const files = new source_1.ContractFiles("contracts");
|
|
10
|
+
const fetchUmid = (umid) => provider_1.Provider.database.get(`${umid}:umid`).catch(() => undefined);
|
|
11
|
+
for (const version of Object.keys(contract.contract)) {
|
|
12
|
+
try {
|
|
13
|
+
const source = await source_1.ContractSource.resolve(contract, version, fetchUmid);
|
|
14
|
+
files.write(contract.namespace, contract._id, version, source_1.ContractSource.transpile(source.base64, source.target));
|
|
15
|
+
}
|
|
16
|
+
catch (e) {
|
|
17
|
+
activelogger_1.ActiveLogger.warn(`Cannot rebuild ${contract._id}@${version}, its file is missing: ${e.message}`);
|
|
18
|
+
}
|
|
51
19
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
target: ts.ScriptTarget.ES2017,
|
|
63
|
-
esModuleInterop: false,
|
|
64
|
-
ignoreDeprecations: "6.0"
|
|
20
|
+
try {
|
|
21
|
+
const locks = contract.locks;
|
|
22
|
+
const held = [];
|
|
23
|
+
if (locks && locks.all === true)
|
|
24
|
+
held.push("");
|
|
25
|
+
if (locks && Array.isArray(locks.versions)) {
|
|
26
|
+
for (const v of locks.versions) {
|
|
27
|
+
if (typeof v === "string")
|
|
28
|
+
held.push("@" + v);
|
|
29
|
+
}
|
|
65
30
|
}
|
|
66
|
-
|
|
31
|
+
for (const version of held) {
|
|
32
|
+
try {
|
|
33
|
+
files.lock(contract.namespace, contract._id, version);
|
|
34
|
+
}
|
|
35
|
+
catch (e) {
|
|
36
|
+
activelogger_1.ActiveLogger.warn(`Cannot restore the lock on ${contract._id}${version}: ${e.message}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
activelogger_1.ActiveLogger.warn(`Cannot restore the locks on ${contract._id}: ${e.message}`);
|
|
42
|
+
}
|
|
67
43
|
}
|
|
68
44
|
}
|
|
69
45
|
exports.Contract = Contract;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/modules/contract/contract.ts"],"names":[],"mappings":";;;AAuBA,6DAA0D;AAC1D,qEAGkD;AAClD,mDAAgD;AAShD;IASS,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAa;QACvC,MAAM,KAAK,GAAG,IAAI,sBAAa,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CACjC,mBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAE/D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,uBAAc,CAAC,OAAO,CACzC,QAAQ,EACR,OAAO,EACP,SAAS,CACV,CAAC;gBACF,KAAK,CAAC,KAAK,CACT,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,GAAG,EACZ,OAAO,EACP,uBAAc,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CACvD,CAAC;YACJ,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,2BAAY,CAAC,IAAI,CACf,kBAAkB,QAAQ,CAAC,GAAG,IAAI,OAAO,0BAA0B,CAAC,CAAC,OAAO,EAAE,CAC/E,CAAC;YACJ,CAAC;QACH,CAAC;QAGD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC7B,MAAM,IAAI,GAAa,EAAE,CAAC;YAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI;gBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/C,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC3C,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAC/B,IAAI,OAAO,CAAC,KAAK,QAAQ;wBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBACxD,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,2BAAY,CAAC,IAAI,CACf,8BAA8B,QAAQ,CAAC,GAAG,GAAG,OAAO,KAAK,CAAC,CAAC,OAAO,EAAE,CACrE,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,2BAAY,CAAC,IAAI,CAAC,+BAA+B,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import { IConsensusData, IStreamInformation } from "../../interfaces/quick-restore.interface";
|
|
1
2
|
export declare class Helper {
|
|
2
3
|
static verbose: boolean;
|
|
3
4
|
static output(message: string, other?: any): void;
|
|
4
5
|
static getNeighbourCount: (dontIncludeSelf: boolean) => number;
|
|
5
6
|
static metConsensus: (votes: number, dontIncludeSelf?: boolean) => boolean;
|
|
7
|
+
static votesNeeded: () => number;
|
|
8
|
+
static majority(nodes: IStreamInformation[], needed: number): IConsensusData[];
|
|
6
9
|
static replayEvents(umidDoc: any): Promise<void>;
|
|
7
10
|
}
|
|
8
11
|
//# sourceMappingURL=helper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":"AA0BA,OAAO,EACL,cAAc,EACd,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAQlD,qBAAa,MAAM;IACjB,OAAc,OAAO,EAAE,OAAO,CAAS;IASvC,OAAc,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,IAAI,CAIvD;IAQD,OAAc,iBAAiB,oBAAqB,OAAO,YACe;IAQ1E,OAAc,YAAY,UACjB,MAAM,oBACI,OAAO,aAGQ;IASlC,OAAc,WAAW,QAAO,MAAM,CAMpC;IAcF,OAAc,QAAQ,CACpB,KAAK,EAAE,kBAAkB,EAAE,EAC3B,MAAM,EAAE,MAAM,GACb,cAAc,EAAE,CAWlB;IAoBD,OAAoB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB5D;CACF"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Helper = void 0;
|
|
4
4
|
const activelogger_1 = require("@activeledger/activelogger");
|
|
5
|
+
const activesync_1 = require("@activeledger/activesync");
|
|
5
6
|
const provider_1 = require("../provider/provider");
|
|
6
7
|
class Helper {
|
|
7
8
|
static verbose = false;
|
|
@@ -13,6 +14,20 @@ class Helper {
|
|
|
13
14
|
static getNeighbourCount = (dontIncludeSelf) => dontIncludeSelf ? provider_1.Provider.neighbourCount - 1 : provider_1.Provider.neighbourCount;
|
|
14
15
|
static metConsensus = (votes, dontIncludeSelf = false) => (votes / Helper.getNeighbourCount(dontIncludeSelf)) * 100 >=
|
|
15
16
|
provider_1.Provider.consensusReachedAmount;
|
|
17
|
+
static votesNeeded = () => {
|
|
18
|
+
const needed = Math.ceil((provider_1.Provider.consensusReachedAmount * Helper.getNeighbourCount(false)) / 100);
|
|
19
|
+
return Number.isFinite(needed) && needed > 0 ? needed : Infinity;
|
|
20
|
+
};
|
|
21
|
+
static majority(nodes, needed) {
|
|
22
|
+
const answers = nodes.map((n) => (Array.isArray(n?.streams) ? n.streams : [])
|
|
23
|
+
.filter((s) => s && s.id && s.id !== "undefined" && s.rev)
|
|
24
|
+
.map((s) => ({ _id: s.id, _rev: s.rev })));
|
|
25
|
+
const { winners } = (0, activesync_1.spiConsensus)(answers, needed);
|
|
26
|
+
return Object.keys(winners).map((stream) => ({
|
|
27
|
+
stream,
|
|
28
|
+
revision: winners[stream].rev
|
|
29
|
+
}));
|
|
30
|
+
}
|
|
16
31
|
static async replayEvents(umidDoc) {
|
|
17
32
|
const events = umidDoc?.events;
|
|
18
33
|
if (!Array.isArray(events) || !events.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":";;;AAuBA,6DAA0D;AAC1D,mDAAgD;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/modules/helper/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,7 @@ export declare class QuickRestore {
|
|
|
6
6
|
private static adoptDocument;
|
|
7
7
|
private uploadData;
|
|
8
8
|
private handleNetworkData;
|
|
9
|
-
private checkConsensus;
|
|
10
9
|
private processRebuildPromises;
|
|
11
|
-
private reduceStreamInformation;
|
|
12
10
|
private getRebuildData;
|
|
13
11
|
}
|
|
14
12
|
//# sourceMappingURL=quick-restore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"quick-restore.d.ts","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"AA4CA,qBAAa,YAAY;IAIvB,cAEC;IAOD,OAAO,CAAC,aAAa,CACmB;YAQ1B,mBAAmB;IAkDjC,OAAO,CAAC,cAAc;mBAgDD,aAAa;IAiClC,OAAO,CAAC,UAAU;YA2DJ,iBAAiB;IA6C/B,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,cAAc;CAoCvB"}
|
|
@@ -22,13 +22,17 @@ class QuickRestore {
|
|
|
22
22
|
.map(preparePromise);
|
|
23
23
|
try {
|
|
24
24
|
const streamInformation = await this.processRebuildPromises(promises);
|
|
25
|
-
const
|
|
25
|
+
const needed = helper_1.Helper.votesNeeded();
|
|
26
|
+
if (!Number.isFinite(needed)) {
|
|
27
|
+
activelogger_1.ActiveLogger.error("consensus.reached is not set in the config file, so no revision can be a majority and nothing will be restored");
|
|
28
|
+
}
|
|
29
|
+
const consensusData = helper_1.Helper.majority(streamInformation, needed);
|
|
26
30
|
await this.fetchDocuments(consensusData);
|
|
27
31
|
const duration = Date.now() - startTime;
|
|
28
32
|
activelogger_1.ActiveLogger.info(`Rebuild Complete; Duration: ${duration}ms`);
|
|
29
33
|
}
|
|
30
34
|
catch (error) {
|
|
31
|
-
activelogger_1.ActiveLogger.error(error,
|
|
35
|
+
activelogger_1.ActiveLogger.error(error, `There was an error running quick full restore: ${error?.message ?? JSON.stringify(error)}`);
|
|
32
36
|
}
|
|
33
37
|
}
|
|
34
38
|
fetchDocuments(consensusData) {
|
|
@@ -41,7 +45,7 @@ class QuickRestore {
|
|
|
41
45
|
activelogger_1.ActiveLogger.info(`[Fetching] ${activity.stream}`);
|
|
42
46
|
const streamDataPromise = await streamData(activity);
|
|
43
47
|
activelogger_1.ActiveLogger.info(`[Fetching Complete] ${activity.stream}`);
|
|
44
|
-
const networkData = this.handleNetworkData(streamDataPromise);
|
|
48
|
+
const networkData = await this.handleNetworkData(streamDataPromise);
|
|
45
49
|
await this.uploadData(networkData);
|
|
46
50
|
}
|
|
47
51
|
resolve();
|
|
@@ -99,8 +103,8 @@ class QuickRestore {
|
|
|
99
103
|
}
|
|
100
104
|
});
|
|
101
105
|
}
|
|
102
|
-
handleNetworkData(activityData) {
|
|
103
|
-
const hasNotErrored = (data) =>
|
|
106
|
+
async handleNetworkData(activityData) {
|
|
107
|
+
const hasNotErrored = (data) => !!data && typeof data._id === "string" && !data.error;
|
|
104
108
|
const isNotStreamOrUmid = (data) => data._id.indexOf(":stream") === -1 &&
|
|
105
109
|
data._id.indexOf(":umid") === -1 &&
|
|
106
110
|
data._id.indexOf("_design") === -1;
|
|
@@ -114,7 +118,7 @@ class QuickRestore {
|
|
|
114
118
|
if (isNotStreamOrUmid(data)) {
|
|
115
119
|
volatile.push({ _id: `${data._id}:volatile` });
|
|
116
120
|
hasRequiredData(data)
|
|
117
|
-
? contract_1.Contract.rebuild(data)
|
|
121
|
+
? await contract_1.Contract.rebuild(data)
|
|
118
122
|
: helper_1.Helper.output("Data does not have required fields", data);
|
|
119
123
|
}
|
|
120
124
|
break;
|
|
@@ -122,33 +126,6 @@ class QuickRestore {
|
|
|
122
126
|
}
|
|
123
127
|
return { documents, volatile };
|
|
124
128
|
}
|
|
125
|
-
checkConsensus(streamInformation) {
|
|
126
|
-
const streamIdCorrect = (streamId) => !!(streamId && streamId !== "undefined");
|
|
127
|
-
return new Promise((resolve) => {
|
|
128
|
-
const consensusReached = [];
|
|
129
|
-
const streams = Object.keys(streamInformation);
|
|
130
|
-
for (let i = streams.length; i--;) {
|
|
131
|
-
const streamId = streams[i];
|
|
132
|
-
if (streamIdCorrect(streamId)) {
|
|
133
|
-
const stream = streamInformation[streamId];
|
|
134
|
-
const revisions = Object.keys(stream);
|
|
135
|
-
for (let i = revisions.length; i--;) {
|
|
136
|
-
const revision = revisions[i];
|
|
137
|
-
const vote = stream[revision];
|
|
138
|
-
helper_1.Helper.output("Check Consensus: Adding", {
|
|
139
|
-
stream: streamId,
|
|
140
|
-
revision
|
|
141
|
-
});
|
|
142
|
-
if (helper_1.Helper.metConsensus(vote)) {
|
|
143
|
-
consensusReached.push({ stream: streamId, revision });
|
|
144
|
-
break;
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
resolve(consensusReached);
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
129
|
processRebuildPromises(promises) {
|
|
153
130
|
const streamDataCorrect = (data) => !!data;
|
|
154
131
|
return new Promise(async (resolve, reject) => {
|
|
@@ -157,7 +134,7 @@ class QuickRestore {
|
|
|
157
134
|
const cleanedStreamInformation = streamInformation.filter(streamDataCorrect);
|
|
158
135
|
helper_1.Helper.output("cleanedStreamInformation", cleanedStreamInformation);
|
|
159
136
|
Object.keys(cleanedStreamInformation).length > 0
|
|
160
|
-
? resolve(
|
|
137
|
+
? resolve(cleanedStreamInformation)
|
|
161
138
|
: reject("No data to process");
|
|
162
139
|
}
|
|
163
140
|
catch (error) {
|
|
@@ -165,34 +142,6 @@ class QuickRestore {
|
|
|
165
142
|
}
|
|
166
143
|
});
|
|
167
144
|
}
|
|
168
|
-
reduceStreamInformation(streamInformation) {
|
|
169
|
-
const haveStream = (stream) => !!reduction[stream.id];
|
|
170
|
-
const haveRevision = (stream) => !!reduction[stream.id][stream.rev];
|
|
171
|
-
const incrementStreamRevisionCounter = (stream) => reduction[stream.id][stream.rev]++;
|
|
172
|
-
const startStreamRevisionCounter = (stream) => (reduction[stream.id][stream.rev] = 1);
|
|
173
|
-
const initialiseStreamCounter = (stream) => (reduction[stream.id] = { [stream.rev]: 1 });
|
|
174
|
-
let reduction = {};
|
|
175
|
-
helper_1.Helper.output("Stream Information", streamInformation);
|
|
176
|
-
for (let i = streamInformation.length; i--;) {
|
|
177
|
-
if (streamInformation[i] && streamInformation[i].streams) {
|
|
178
|
-
const streams = Object.values(streamInformation[i].streams);
|
|
179
|
-
helper_1.Helper.output(`Reducing ${streams.length} streams`);
|
|
180
|
-
for (let s = streams.length; s--;) {
|
|
181
|
-
const stream = streams[s];
|
|
182
|
-
if (stream) {
|
|
183
|
-
helper_1.Helper.output("Reducing stream", stream);
|
|
184
|
-
haveStream(stream)
|
|
185
|
-
? haveRevision(stream)
|
|
186
|
-
? incrementStreamRevisionCounter(stream)
|
|
187
|
-
: startStreamRevisionCounter(stream)
|
|
188
|
-
: initialiseStreamCounter(stream);
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
helper_1.Helper.output("Reduction", reduction);
|
|
194
|
-
return reduction;
|
|
195
|
-
}
|
|
196
145
|
getRebuildData(node) {
|
|
197
146
|
return new Promise(async (resolve, reject) => {
|
|
198
147
|
let streams = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":";;;AAuBA,6DAA0D;AAC1D,mDAAgD;AAChD,+DAA4D;
|
|
1
|
+
{"version":3,"file":"quick-restore.js","sourceRoot":"","sources":["../../../src/modules/quick-restore/quick-restore.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@activeledger/activerestore",
|
|
3
|
-
"version": "5.0
|
|
3
|
+
"version": "5.1.0",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=24.0.0"
|
|
6
6
|
},
|
|
@@ -49,10 +49,12 @@
|
|
|
49
49
|
"jsnext:main": "./es/index.js",
|
|
50
50
|
"module": "./es/index.js",
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@activeledger/
|
|
53
|
-
"@activeledger/
|
|
54
|
-
"@activeledger/
|
|
55
|
-
"@activeledger/
|
|
52
|
+
"@activeledger/activecontracts": "5.1.0",
|
|
53
|
+
"@activeledger/activecrypto": "5.1.0",
|
|
54
|
+
"@activeledger/activelogger": "5.1.0",
|
|
55
|
+
"@activeledger/activenetwork": "5.1.0",
|
|
56
|
+
"@activeledger/activeoptions": "5.1.0",
|
|
57
|
+
"@activeledger/activesync": "5.1.0",
|
|
56
58
|
"typescript-api": "npm:typescript@6.0.3"
|
|
57
59
|
},
|
|
58
60
|
"gitHead": "0e3737c01cf21565ceee635a5b912af3020a5fd6"
|