@activeledger/activeprotocol 2.8.1 → 2.9.1
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/protocol/permissionsChecker.d.ts.map +1 -1
- package/es/protocol/permissionsChecker.js +10 -9
- package/es/protocol/permissionsChecker.js.map +1 -1
- package/es/protocol/shared.d.ts +3 -0
- package/es/protocol/shared.d.ts.map +1 -1
- package/es/protocol/shared.js +24 -2
- package/es/protocol/shared.js.map +1 -1
- package/es/protocol/streamUpdater.js +2 -2
- package/es/protocol/streamUpdater.js.map +1 -1
- package/lib/protocol/permissionsChecker.d.ts.map +1 -1
- package/lib/protocol/permissionsChecker.js +10 -9
- package/lib/protocol/permissionsChecker.js.map +1 -1
- package/lib/protocol/shared.d.ts +3 -0
- package/lib/protocol/shared.d.ts.map +1 -1
- package/lib/protocol/shared.js +24 -2
- package/lib/protocol/shared.js.map +1 -1
- package/lib/protocol/streamUpdater.js +2 -2
- package/lib/protocol/streamUpdater.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissionsChecker.d.ts","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,qBAAa,kBAAkB;IAoB3B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM;IAhBhB,OAAO,CAAC,MAAM,CAAU;IASxB,OAAO,CAAC,IAAI,CAAW;gBAGb,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,EAAE,EAAE,eAAe,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,MAAM;IAWX,OAAO,CAClB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;YAqB9B,aAAa;
|
|
1
|
+
{"version":3,"file":"permissionsChecker.d.ts","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,qBAAa,kBAAkB;IAoB3B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM;IAhBhB,OAAO,CAAC,MAAM,CAAU;IASxB,OAAO,CAAC,IAAI,CAAW;gBAGb,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,EAAE,EAAE,eAAe,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,MAAM;IAWX,OAAO,CAClB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;YAqB9B,aAAa;IA0G3B,OAAO,CAAC,cAAc;IA+GtB,OAAO,CAAC,cAAc;CAuHvB"}
|
|
@@ -21,8 +21,9 @@ export class PermissionsChecker {
|
|
|
21
21
|
async buildPromises() {
|
|
22
22
|
const keys = [];
|
|
23
23
|
for (let i = this.data.length; i--;) {
|
|
24
|
-
|
|
25
|
-
keys.push(
|
|
24
|
+
const filteredPrefix = this.shared.filterPrefix(this.data[i]);
|
|
25
|
+
keys.push(filteredPrefix + ":stream");
|
|
26
|
+
keys.push(filteredPrefix);
|
|
26
27
|
}
|
|
27
28
|
try {
|
|
28
29
|
const docs = await this.db.allDocs({
|
|
@@ -132,7 +133,7 @@ export class PermissionsChecker {
|
|
|
132
133
|
}
|
|
133
134
|
else {
|
|
134
135
|
const type = stream[i].meta.type ? stream[i].meta.type : "rsa";
|
|
135
|
-
const sigCheck = this.shared.signatureCheck(stream[i].meta.public, this.entry.$sigs[streamId], type);
|
|
136
|
+
const sigCheck = this.shared.signatureCheck(stream[i].meta.public, this.entry.$sigs[this.shared.filterPrefix(streamId)], type);
|
|
136
137
|
if (!sigCheck) {
|
|
137
138
|
return reject({
|
|
138
139
|
code: 1220,
|
|
@@ -146,10 +147,10 @@ export class PermissionsChecker {
|
|
|
146
147
|
});
|
|
147
148
|
}
|
|
148
149
|
signatureCheck(streamId, stream, nhpkCheck, nhpkCheckIO, reject) {
|
|
149
|
-
const sigCheck = (authority) => this.shared.signatureCheck(authority.public, this.entry.$sigs[streamId], authority.type);
|
|
150
|
-
const isLedgerAuthSignatures = ActiveDefinitions.LedgerTypeChecks.isLedgerAuthSignatures(this.entry.$sigs[streamId]);
|
|
150
|
+
const sigCheck = (authority) => this.shared.signatureCheck(authority.public, this.entry.$sigs[this.shared.filterPrefix(streamId)], authority.type);
|
|
151
|
+
const isLedgerAuthSignatures = ActiveDefinitions.LedgerTypeChecks.isLedgerAuthSignatures(this.entry.$sigs[this.shared.filterPrefix(streamId)]);
|
|
151
152
|
if (isLedgerAuthSignatures) {
|
|
152
|
-
const sigStreamKeys = Object.keys(this.entry.$sigs[streamId]);
|
|
153
|
+
const sigStreamKeys = Object.keys(this.entry.$sigs[this.shared.filterPrefix(streamId)]);
|
|
153
154
|
const authorities = stream.meta.authorities.length;
|
|
154
155
|
if (sigStreamKeys.length > authorities) {
|
|
155
156
|
return reject({
|
|
@@ -170,7 +171,7 @@ export class PermissionsChecker {
|
|
|
170
171
|
}
|
|
171
172
|
}
|
|
172
173
|
else {
|
|
173
|
-
const signature = this.entry.$sigs[streamId][sigStream];
|
|
174
|
+
const signature = this.entry.$sigs[this.shared.filterPrefix(streamId)][sigStream];
|
|
174
175
|
const authCheck = stream.meta.authorities.some((authority) => {
|
|
175
176
|
if (authority.hash === sigStream) {
|
|
176
177
|
return this.shared.signatureCheck(authority.public, signature, authority.type);
|
|
@@ -196,8 +197,8 @@ export class PermissionsChecker {
|
|
|
196
197
|
});
|
|
197
198
|
}
|
|
198
199
|
if (authority.hash && sigCheck(authority)) {
|
|
199
|
-
this.entry.$sigs[streamId] = {
|
|
200
|
-
[authority.hash]: this.entry.$sigs[streamId],
|
|
200
|
+
this.entry.$sigs[this.shared.filterPrefix(streamId)] = {
|
|
201
|
+
[authority.hash]: this.entry.$sigs[this.shared.filterPrefix(streamId)],
|
|
201
202
|
};
|
|
202
203
|
return true;
|
|
203
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissionsChecker.js","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAUpE,MAAM,OAAO,kBAAkB;IAmB7B,YACU,KAAoC,EACpC,EAAmB,EACnB,SAAkB,EAClB,aAA6B,EAC7B,MAAc;QAJd,UAAK,GAAL,KAAK,CAA+B;QACpC,OAAE,GAAF,EAAE,CAAiB;QACnB,cAAS,GAAT,SAAS,CAAS;QAClB,kBAAa,GAAb,aAAa,CAAgB;QAC7B,WAAM,GAAN,MAAM,CAAQ;IACrB,CAAC;IAUG,KAAK,CAAC,OAAO,CAClB,IAAc,EACd,SAAkB,IAAI;QAEtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI;YAEF,MAAM,OAAO,GAAqC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE7E,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC9B;IACH,CAAC;IASO,KAAK,CAAC,aAAa;QAEzB,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YACpC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"permissionsChecker.js","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":"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"}
|
package/es/protocol/shared.d.ts
CHANGED
|
@@ -18,6 +18,9 @@ export declare class Shared {
|
|
|
18
18
|
});
|
|
19
19
|
set storeSingleError(state: boolean);
|
|
20
20
|
getLabelIOMap(inputs: boolean, streamId: string): string;
|
|
21
|
+
private filterMap;
|
|
22
|
+
assumedVirtualPrefix: string;
|
|
23
|
+
filterPrefix(stream: string): string;
|
|
21
24
|
clearAllComms(virtualMachine: IVirtualMachine, preserveComms: any): ActiveDefinitions.LedgerEntry;
|
|
22
25
|
raiseLedgerError(code: number, reason: Error, stop?: Boolean, priority?: number): Promise<void>;
|
|
23
26
|
storeError(code: number, reason: Error, priority?: number): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":";AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAUtC,qBAAa,MAAM;IA0Bf,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IAtBV,UAAU,EAAE,GAAG,CAAoB;IAQ1C,OAAO,CAAC,SAAS,CAQf;gBAGQ,iBAAiB,EAAE,OAAO,EAC1B,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,YAAY;IAQ/B,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAEA;IAOD,IAAI,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAElC;IAWM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":";AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAUtC,qBAAa,MAAM;IA0Bf,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IAtBV,UAAU,EAAE,GAAG,CAAoB;IAQ1C,OAAO,CAAC,SAAS,CAQf;gBAGQ,iBAAiB,EAAE,OAAO,EAC1B,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,YAAY;IAQ/B,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAEA;IAOD,IAAI,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAElC;IAWM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAoB/D,OAAO,CAAC,SAAS,CAAkC;IAS5C,oBAAoB,EAAE,MAAM,CAAM;IAUlC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAsCpC,aAAa,CAClB,cAAc,EAAE,eAAe,EAC/B,aAAa,EAAE,GAAG,GACjB,iBAAiB,CAAC,WAAW;IA0BnB,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,EACb,IAAI,GAAE,OAAe,EACrB,QAAQ,GAAE,MAAU;IAsCf,UAAU,CACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,EACb,QAAQ,GAAE,MAAU,GACnB,OAAO,CAAC,GAAG,CAAC;IAkDR,cAAc,CACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE,MAAc,GACnB,OAAO;CAYX"}
|
package/es/protocol/shared.js
CHANGED
|
@@ -12,6 +12,8 @@ export class Shared {
|
|
|
12
12
|
reason: "",
|
|
13
13
|
priority: 0,
|
|
14
14
|
};
|
|
15
|
+
this.filterMap = {};
|
|
16
|
+
this.assumedVirtualPrefix = "";
|
|
15
17
|
}
|
|
16
18
|
set errorOut(errorOut) {
|
|
17
19
|
this._errorOut = errorOut;
|
|
@@ -22,9 +24,29 @@ export class Shared {
|
|
|
22
24
|
getLabelIOMap(inputs, streamId) {
|
|
23
25
|
let checkIOMap = inputs ? this.ioLabelMap.i : this.ioLabelMap.o;
|
|
24
26
|
if (!Object.keys(checkIOMap).length) {
|
|
25
|
-
return streamId;
|
|
27
|
+
return this.filterMap[streamId] ? this.filterMap[streamId] : streamId;
|
|
26
28
|
}
|
|
27
|
-
return checkIOMap[streamId]
|
|
29
|
+
return checkIOMap[this.filterMap[streamId]]
|
|
30
|
+
? checkIOMap[this.filterMap[streamId]]
|
|
31
|
+
: checkIOMap[streamId];
|
|
32
|
+
}
|
|
33
|
+
filterPrefix(stream) {
|
|
34
|
+
if (this.filterMap[stream]) {
|
|
35
|
+
return this.filterMap[stream];
|
|
36
|
+
}
|
|
37
|
+
let [streamId, suffix] = stream.split(":");
|
|
38
|
+
if (streamId.length > 64) {
|
|
39
|
+
if (!this.assumedVirtualPrefix) {
|
|
40
|
+
this.assumedVirtualPrefix = streamId.slice(0, 2);
|
|
41
|
+
}
|
|
42
|
+
streamId = streamId.slice(-64);
|
|
43
|
+
this.filterMap[streamId] = stream;
|
|
44
|
+
this.filterMap[stream] = streamId;
|
|
45
|
+
}
|
|
46
|
+
if (suffix) {
|
|
47
|
+
return streamId + ":" + suffix;
|
|
48
|
+
}
|
|
49
|
+
return streamId;
|
|
28
50
|
}
|
|
29
51
|
clearAllComms(virtualMachine, preserveComms) {
|
|
30
52
|
if (virtualMachine.clearingInternodeCommsFromVM(this.entry.$umid)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAQ1D,MAAM,OAAO,MAAM;IAyBjB,YACU,iBAA0B,EAC1B,KAAoC,EACpC,GAAoB,EACpB,OAAqB;QAHrB,sBAAiB,GAAjB,iBAAiB,CAAS;QAC1B,UAAK,GAAL,KAAK,CAA+B;QACpC,QAAG,GAAH,GAAG,CAAiB;QACpB,YAAO,GAAP,OAAO,CAAc;QAtBxB,eAAU,GAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QAQlC,cAAS,GAIb;YACF,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,CAAC;SACZ,CAAC;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,7 +114,7 @@ export class StreamUpdater {
|
|
|
114
114
|
this.collisions.push(this.streams[i].meta._id);
|
|
115
115
|
}
|
|
116
116
|
this.refStreams.new.push({
|
|
117
|
-
id: this.streams[i].state._id,
|
|
117
|
+
id: this.shared.assumedVirtualPrefix + this.streams[i].state._id,
|
|
118
118
|
name: this.streams[i].meta.name,
|
|
119
119
|
});
|
|
120
120
|
}
|
|
@@ -134,7 +134,7 @@ export class StreamUpdater {
|
|
|
134
134
|
});
|
|
135
135
|
}
|
|
136
136
|
this.refStreams.updated.push({
|
|
137
|
-
id: this.streams[i].state._id,
|
|
137
|
+
id: this.shared.filterPrefix(this.streams[i].state._id),
|
|
138
138
|
name: this.streams[i].meta.name,
|
|
139
139
|
});
|
|
140
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamUpdater.js","sourceRoot":"","sources":["../../src/protocol/streamUpdater.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,aAAa,EAAmB,MAAM,6BAA6B,CAAC;AAE7E,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAQ1D,MAAM,OAAO,aAAa;IAyExB,YACU,KAAoC,EACpC,cAA+B,EAC/B,SAAiB,EACjB,YAAiB,EACjB,EAAmB,EACnB,OAAqB,EACrB,MAAc;QANd,UAAK,GAAL,KAAK,CAA+B;QACpC,mBAAc,GAAd,cAAc,CAAiB;QAC/B,cAAS,GAAT,SAAS,CAAQ;QACjB,iBAAY,GAAZ,YAAY,CAAK;QACjB,OAAE,GAAF,EAAE,CAAiB;QACnB,YAAO,GAAP,OAAO,CAAc;QACrB,WAAM,GAAN,MAAM,CAAQ;QAGtB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QAErB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAGf,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC,GAAG,CAAM,UAAU,EAAE,EAAE,CAAC;aACpD,YAAuB,CAAC;QAG3B,IAAI,CAAC,UAAU,GAAG;YAChB,GAAG,EAAE,EAAW;YAChB,OAAO,EAAE,EAAW;SACrB,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,wBAAwB,CACzD,IAAI,CAAC,KAAK,CAAC,KAAK,CACjB,CAAC;QAGF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAEM,aAAa,CAAC,WAAsB;QACzC,IAAI,WAAW;YAAE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACxE,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAG5B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE;YAC/B,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC;SAC7C;QAGD,IAAI;YACF,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAC5D,IAAI,CAAC,KAAK,CAAC,eAAe,KAAK,IAAI,CAAC,SAAS,EAC7C,IAAI,CAAC,KAAK,CAAC,eAAe,EAC1B,IAAI,CAAC,KAAK,CAAC,KAAK,CACjB,CAAC;YAGF,IAAI,CAAC,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CACrE,IAAI,CAAC,KAAK,CAAC,KAAK,CACjB,CAAC;YAGF,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAClE,IAAI,CAAC,KAAK,CAAC,KAAK,CACjB,CAAC;YAGF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CACpC,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,YAAY,CAAC,OAAO,CAC1B,CAAC;YAGF,IAAI,IAAI,CAAC,WAAW;gBAAE,IAAI,CAAC,WAAW,EAAE,CAAC;YAGzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC/B;QAAC,OAAO,KAAK,EAAE;YAEd,IAAI,IAAI,CAAC,WAAW;gBAAE,IAAI,CAAC,WAAW,EAAE,CAAC;YAEzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC/B;IACH,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAEf,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAI7B,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,IAAI,CAAC,YAAY,EAAE,CAAC;QAG3D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACb,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,OAAO;YAC/B,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE;YAC3B,OAAO,EAAE,IAAI,CAAC,UAAU;SACzB,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAUO,cAAc;QACpB,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACvB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACvB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;SAC/D,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,EAAE,CAClC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QAElE,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3B,OAAO,CAAC,EAAE,EAAE;YACV,IACE,SAAS,CAAC,CAAC,CAAC;gBACZ,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG;gBACvB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAC9B;gBAEA,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAG/C,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE;oBAC9C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;iBACjC;gBAGD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aACrC;SACF;IACH,CAAC;IAEO,UAAU,CAAC,KAAU;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAC1C,IAAI,EACJ,KAAK,CAAC,KAAK,CAAC,GAAa,CAC1B,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC;QAIjD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAC/B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAa,CAAC,CAC5C,CAAC;QAEF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAGtC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,EAAE;YACV,MAAM,SAAS,GACb,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAGvB,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,IAAc,CAAC,CAAC;YAErE,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE;gBACvB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;aACtD;SACF;IACH,CAAC;IAQO,qBAAqB;QAE3B,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAC5B,OAAO,CAAC,EAAE,EAAE;YAGV,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;gBAE9B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;oBAE7B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;oBACjD,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;oBACjE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAS,CAAC,GAAG;wBAC3B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,GAAG,WAAW,CAAC;iBAC3C;gBAGD,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAE9C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBAGzC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBAClC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBACjC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAS,CAAC,IAAI,CAAC;gBAGtC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;oBAClD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAa,CAAC,CAAC;iBAC1D;gBAGD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;oBACvB,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"streamUpdater.js","sourceRoot":"","sources":["../../src/protocol/streamUpdater.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissionsChecker.d.ts","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,qBAAa,kBAAkB;IAoB3B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM;IAhBhB,OAAO,CAAC,MAAM,CAAU;IASxB,OAAO,CAAC,IAAI,CAAW;gBAGb,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,EAAE,EAAE,eAAe,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,MAAM;IAWX,OAAO,CAClB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;YAqB9B,aAAa;
|
|
1
|
+
{"version":3,"file":"permissionsChecker.d.ts","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,qBAAa,kBAAkB;IAoB3B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM;IAhBhB,OAAO,CAAC,MAAM,CAAU;IASxB,OAAO,CAAC,IAAI,CAAW;gBAGb,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,EAAE,EAAE,eAAe,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,MAAM;IAWX,OAAO,CAClB,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;YAqB9B,aAAa;IA0G3B,OAAO,CAAC,cAAc;IA+GtB,OAAO,CAAC,cAAc;CAuHvB"}
|
|
@@ -24,8 +24,9 @@ class PermissionsChecker {
|
|
|
24
24
|
async buildPromises() {
|
|
25
25
|
const keys = [];
|
|
26
26
|
for (let i = this.data.length; i--;) {
|
|
27
|
-
|
|
28
|
-
keys.push(
|
|
27
|
+
const filteredPrefix = this.shared.filterPrefix(this.data[i]);
|
|
28
|
+
keys.push(filteredPrefix + ":stream");
|
|
29
|
+
keys.push(filteredPrefix);
|
|
29
30
|
}
|
|
30
31
|
try {
|
|
31
32
|
const docs = await this.db.allDocs({
|
|
@@ -135,7 +136,7 @@ class PermissionsChecker {
|
|
|
135
136
|
}
|
|
136
137
|
else {
|
|
137
138
|
const type = stream[i].meta.type ? stream[i].meta.type : "rsa";
|
|
138
|
-
const sigCheck = this.shared.signatureCheck(stream[i].meta.public, this.entry.$sigs[streamId], type);
|
|
139
|
+
const sigCheck = this.shared.signatureCheck(stream[i].meta.public, this.entry.$sigs[this.shared.filterPrefix(streamId)], type);
|
|
139
140
|
if (!sigCheck) {
|
|
140
141
|
return reject({
|
|
141
142
|
code: 1220,
|
|
@@ -149,10 +150,10 @@ class PermissionsChecker {
|
|
|
149
150
|
});
|
|
150
151
|
}
|
|
151
152
|
signatureCheck(streamId, stream, nhpkCheck, nhpkCheckIO, reject) {
|
|
152
|
-
const sigCheck = (authority) => this.shared.signatureCheck(authority.public, this.entry.$sigs[streamId], authority.type);
|
|
153
|
-
const isLedgerAuthSignatures = activedefinitions_1.ActiveDefinitions.LedgerTypeChecks.isLedgerAuthSignatures(this.entry.$sigs[streamId]);
|
|
153
|
+
const sigCheck = (authority) => this.shared.signatureCheck(authority.public, this.entry.$sigs[this.shared.filterPrefix(streamId)], authority.type);
|
|
154
|
+
const isLedgerAuthSignatures = activedefinitions_1.ActiveDefinitions.LedgerTypeChecks.isLedgerAuthSignatures(this.entry.$sigs[this.shared.filterPrefix(streamId)]);
|
|
154
155
|
if (isLedgerAuthSignatures) {
|
|
155
|
-
const sigStreamKeys = Object.keys(this.entry.$sigs[streamId]);
|
|
156
|
+
const sigStreamKeys = Object.keys(this.entry.$sigs[this.shared.filterPrefix(streamId)]);
|
|
156
157
|
const authorities = stream.meta.authorities.length;
|
|
157
158
|
if (sigStreamKeys.length > authorities) {
|
|
158
159
|
return reject({
|
|
@@ -173,7 +174,7 @@ class PermissionsChecker {
|
|
|
173
174
|
}
|
|
174
175
|
}
|
|
175
176
|
else {
|
|
176
|
-
const signature = this.entry.$sigs[streamId][sigStream];
|
|
177
|
+
const signature = this.entry.$sigs[this.shared.filterPrefix(streamId)][sigStream];
|
|
177
178
|
const authCheck = stream.meta.authorities.some((authority) => {
|
|
178
179
|
if (authority.hash === sigStream) {
|
|
179
180
|
return this.shared.signatureCheck(authority.public, signature, authority.type);
|
|
@@ -199,8 +200,8 @@ class PermissionsChecker {
|
|
|
199
200
|
});
|
|
200
201
|
}
|
|
201
202
|
if (authority.hash && sigCheck(authority)) {
|
|
202
|
-
this.entry.$sigs[streamId] = {
|
|
203
|
-
[authority.hash]: this.entry.$sigs[streamId],
|
|
203
|
+
this.entry.$sigs[this.shared.filterPrefix(streamId)] = {
|
|
204
|
+
[authority.hash]: this.entry.$sigs[this.shared.filterPrefix(streamId)],
|
|
204
205
|
};
|
|
205
206
|
return true;
|
|
206
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissionsChecker.js","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":";;;AAwBA,uEAAoE;AAUpE,MAAa,kBAAkB;IAmB7B,YACU,KAAoC,EACpC,EAAmB,EACnB,SAAkB,EAClB,aAA6B,EAC7B,MAAc;QAJd,UAAK,GAAL,KAAK,CAA+B;QACpC,OAAE,GAAF,EAAE,CAAiB;QACnB,cAAS,GAAT,SAAS,CAAS;QAClB,kBAAa,GAAb,aAAa,CAAgB;QAC7B,WAAM,GAAN,MAAM,CAAQ;IACrB,CAAC;IAUG,KAAK,CAAC,OAAO,CAClB,IAAc,EACd,SAAkB,IAAI;QAEtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI;YAEF,MAAM,OAAO,GAAqC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE7E,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC9B;IACH,CAAC;IASO,KAAK,CAAC,aAAa;QAEzB,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI;YACpC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"permissionsChecker.js","sourceRoot":"","sources":["../../src/protocol/permissionsChecker.ts"],"names":[],"mappings":"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"}
|
package/lib/protocol/shared.d.ts
CHANGED
|
@@ -18,6 +18,9 @@ export declare class Shared {
|
|
|
18
18
|
});
|
|
19
19
|
set storeSingleError(state: boolean);
|
|
20
20
|
getLabelIOMap(inputs: boolean, streamId: string): string;
|
|
21
|
+
private filterMap;
|
|
22
|
+
assumedVirtualPrefix: string;
|
|
23
|
+
filterPrefix(stream: string): string;
|
|
21
24
|
clearAllComms(virtualMachine: IVirtualMachine, preserveComms: any): ActiveDefinitions.LedgerEntry;
|
|
22
25
|
raiseLedgerError(code: number, reason: Error, stop?: Boolean, priority?: number): Promise<void>;
|
|
23
26
|
storeError(code: number, reason: Error, priority?: number): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":";AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAUtC,qBAAa,MAAM;IA0Bf,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IAtBV,UAAU,EAAE,GAAG,CAAoB;IAQ1C,OAAO,CAAC,SAAS,CAQf;gBAGQ,iBAAiB,EAAE,OAAO,EAC1B,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,YAAY;IAQ/B,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAEA;IAOD,IAAI,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAElC;IAWM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":";AAuBA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAUtC,qBAAa,MAAM;IA0Bf,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IAtBV,UAAU,EAAE,GAAG,CAAoB;IAQ1C,OAAO,CAAC,SAAS,CAQf;gBAGQ,iBAAiB,EAAE,OAAO,EAC1B,KAAK,EAAE,iBAAiB,CAAC,WAAW,EACpC,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,YAAY;IAQ/B,IAAI,QAAQ,CAAC,QAAQ,EAAE;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAEA;IAOD,IAAI,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAElC;IAWM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAoB/D,OAAO,CAAC,SAAS,CAAkC;IAS5C,oBAAoB,EAAE,MAAM,CAAM;IAUlC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAsCpC,aAAa,CAClB,cAAc,EAAE,eAAe,EAC/B,aAAa,EAAE,GAAG,GACjB,iBAAiB,CAAC,WAAW;IA0BnB,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,EACb,IAAI,GAAE,OAAe,EACrB,QAAQ,GAAE,MAAU;IAsCf,UAAU,CACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,EACb,QAAQ,GAAE,MAAU,GACnB,OAAO,CAAC,GAAG,CAAC;IAkDR,cAAc,CACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE,MAAc,GACnB,OAAO;CAYX"}
|
package/lib/protocol/shared.js
CHANGED
|
@@ -15,6 +15,8 @@ class Shared {
|
|
|
15
15
|
reason: "",
|
|
16
16
|
priority: 0,
|
|
17
17
|
};
|
|
18
|
+
this.filterMap = {};
|
|
19
|
+
this.assumedVirtualPrefix = "";
|
|
18
20
|
}
|
|
19
21
|
set errorOut(errorOut) {
|
|
20
22
|
this._errorOut = errorOut;
|
|
@@ -25,9 +27,29 @@ class Shared {
|
|
|
25
27
|
getLabelIOMap(inputs, streamId) {
|
|
26
28
|
let checkIOMap = inputs ? this.ioLabelMap.i : this.ioLabelMap.o;
|
|
27
29
|
if (!Object.keys(checkIOMap).length) {
|
|
28
|
-
return streamId;
|
|
30
|
+
return this.filterMap[streamId] ? this.filterMap[streamId] : streamId;
|
|
29
31
|
}
|
|
30
|
-
return checkIOMap[streamId]
|
|
32
|
+
return checkIOMap[this.filterMap[streamId]]
|
|
33
|
+
? checkIOMap[this.filterMap[streamId]]
|
|
34
|
+
: checkIOMap[streamId];
|
|
35
|
+
}
|
|
36
|
+
filterPrefix(stream) {
|
|
37
|
+
if (this.filterMap[stream]) {
|
|
38
|
+
return this.filterMap[stream];
|
|
39
|
+
}
|
|
40
|
+
let [streamId, suffix] = stream.split(":");
|
|
41
|
+
if (streamId.length > 64) {
|
|
42
|
+
if (!this.assumedVirtualPrefix) {
|
|
43
|
+
this.assumedVirtualPrefix = streamId.slice(0, 2);
|
|
44
|
+
}
|
|
45
|
+
streamId = streamId.slice(-64);
|
|
46
|
+
this.filterMap[streamId] = stream;
|
|
47
|
+
this.filterMap[stream] = streamId;
|
|
48
|
+
}
|
|
49
|
+
if (suffix) {
|
|
50
|
+
return streamId + ":" + suffix;
|
|
51
|
+
}
|
|
52
|
+
return streamId;
|
|
31
53
|
}
|
|
32
54
|
clearAllComms(virtualMachine, preserveComms) {
|
|
33
55
|
if (virtualMachine.clearingInternodeCommsFromVM(this.entry.$umid)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":";;;AA2BA,6DAA0D;AAC1D,6DAA0D;AAQ1D,MAAa,MAAM;IAyBjB,YACU,iBAA0B,EAC1B,KAAoC,EACpC,GAAoB,EACpB,OAAqB;QAHrB,sBAAiB,GAAjB,iBAAiB,CAAS;QAC1B,UAAK,GAAL,KAAK,CAA+B;QACpC,QAAG,GAAH,GAAG,CAAiB;QACpB,YAAO,GAAP,OAAO,CAAc;QAtBxB,eAAU,GAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;QAQlC,cAAS,GAIb;YACF,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,CAAC;SACZ,CAAC;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/protocol/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,7 +117,7 @@ class StreamUpdater {
|
|
|
117
117
|
this.collisions.push(this.streams[i].meta._id);
|
|
118
118
|
}
|
|
119
119
|
this.refStreams.new.push({
|
|
120
|
-
id: this.streams[i].state._id,
|
|
120
|
+
id: this.shared.assumedVirtualPrefix + this.streams[i].state._id,
|
|
121
121
|
name: this.streams[i].meta.name,
|
|
122
122
|
});
|
|
123
123
|
}
|
|
@@ -137,7 +137,7 @@ class StreamUpdater {
|
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
139
|
this.refStreams.updated.push({
|
|
140
|
-
id: this.streams[i].state._id,
|
|
140
|
+
id: this.shared.filterPrefix(this.streams[i].state._id),
|
|
141
141
|
name: this.streams[i].meta.name,
|
|
142
142
|
});
|
|
143
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamUpdater.js","sourceRoot":"","sources":["../../src/protocol/streamUpdater.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"streamUpdater.js","sourceRoot":"","sources":["../../src/protocol/streamUpdater.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@activeledger/activeprotocol",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.9.1",
|
|
4
4
|
"description": "Underlying protocol which handles consensus and the smart contract virtual machine of Activeledger",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"blockchain",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"jsnext:main": "./es/index.js",
|
|
40
40
|
"module": "./es/index.js",
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@activeledger/activecontracts": "^2.
|
|
42
|
+
"@activeledger/activecontracts": "^2.9.1",
|
|
43
43
|
"@activeledger/activecrypto": "^2.8.0",
|
|
44
44
|
"@activeledger/activedefinitions": "^2.8.0",
|
|
45
45
|
"@activeledger/activelogger": "^2.7.0",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"typescript": "4.7.3",
|
|
51
51
|
"vm2": "^3.9.3"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "fb1812153fdd937d5e2dd256e0fca2d227113062"
|
|
54
54
|
}
|