@requestnetwork/transaction-manager 0.30.1-next.1990 → 0.30.1-next.1991
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/clear-transaction.js +2 -2
- package/dist/clear-transaction.js.map +1 -1
- package/dist/encrypted-transaction.js +3 -3
- package/dist/encrypted-transaction.js.map +1 -1
- package/dist/transaction-manager.js +2 -2
- package/dist/transaction-manager.js.map +1 -1
- package/dist/transactions-factory.js +7 -7
- package/dist/transactions-factory.js.map +1 -1
- package/dist/transactions-parser.js +3 -3
- package/dist/transactions-parser.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const
|
|
4
|
+
const MultiFormat = require("@requestnetwork/multi-format");
|
|
5
5
|
const utils_1 = require("@requestnetwork/utils");
|
|
6
6
|
/**
|
|
7
7
|
* Class representing a clear transaction
|
|
@@ -27,7 +27,7 @@ class ClearTransaction {
|
|
|
27
27
|
*/
|
|
28
28
|
getHash() {
|
|
29
29
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
30
|
-
return
|
|
30
|
+
return MultiFormat.serialize((0, utils_1.normalizeKeccak256Hash)(JSON.parse(this.data)));
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clear-transaction.js","sourceRoot":"","sources":["../src/clear-transaction.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"clear-transaction.js","sourceRoot":"","sources":["../src/clear-transaction.ts"],"names":[],"mappings":";;;AAAA,4DAA4D;AAE5D,iDAA+D;AAE/D;;GAEG;AACH,MAAqB,gBAAgB;IAGnC,YAAY,IAAuC;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACU,OAAO;;YAClB,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;KAAA;IAED;;;;OAIG;IACU,OAAO;;YAClB,OAAO,WAAW,CAAC,SAAS,CAAC,IAAA,8BAAsB,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC;KAAA;IAED;;;;OAIG;IACU,QAAQ;;YACnB,IAAI;gBACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,EAAE,CAAC;aACX;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,0CAA0C,CAAC;aACnD;QACH,CAAC;KAAA;CACF;AAtCD,mCAsCC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const
|
|
4
|
+
const MultiFormat = require("@requestnetwork/multi-format");
|
|
5
5
|
const utils_1 = require("@requestnetwork/utils");
|
|
6
6
|
/**
|
|
7
7
|
* Class representing an encrypted transaction
|
|
@@ -29,7 +29,7 @@ class EncryptedTransaction {
|
|
|
29
29
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
30
30
|
if (this.data === '') {
|
|
31
31
|
try {
|
|
32
|
-
const encryptedData =
|
|
32
|
+
const encryptedData = MultiFormat.deserialize(this.persistedData);
|
|
33
33
|
this.data = yield (0, utils_1.decrypt)(encryptedData, this.channelKey);
|
|
34
34
|
}
|
|
35
35
|
catch (_a) {
|
|
@@ -50,7 +50,7 @@ class EncryptedTransaction {
|
|
|
50
50
|
const data = yield this.getData();
|
|
51
51
|
try {
|
|
52
52
|
const dataHash = (0, utils_1.normalizeKeccak256Hash)(JSON.parse(data));
|
|
53
|
-
this.dataHashSerialized =
|
|
53
|
+
this.dataHashSerialized = MultiFormat.serialize(dataHash);
|
|
54
54
|
}
|
|
55
55
|
catch (e) {
|
|
56
56
|
throw new Error('Impossible to JSON parse the decrypted transaction data');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encrypted-transaction.js","sourceRoot":"","sources":["../src/encrypted-transaction.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"encrypted-transaction.js","sourceRoot":"","sources":["../src/encrypted-transaction.ts"],"names":[],"mappings":";;;AAAA,4DAA4D;AAE5D,iDAAwE;AAExE;;GAEG;AACH,MAAqB,oBAAoB;IAavC;;;;OAIG;IACH,YACE,aAAgD,EAChD,UAAiD;QAnBnD,4DAA4D;QACpD,SAAI,GAAsC,EAAE,CAAC;QAErD,mFAAmF;QAC3E,uBAAkB,GAAG,EAAE,CAAC;QAiB9B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACU,OAAO;;YAClB,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,EAAE;gBACpB,IAAI;oBACF,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAClE,IAAI,CAAC,IAAI,GAAG,MAAM,IAAA,eAAO,EAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;iBAC3D;gBAAC,WAAM;oBACN,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;iBAC1D;aACF;YACD,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;KAAA;IAED;;;;OAIG;IACU,OAAO;;YAClB,IAAI,IAAI,CAAC,kBAAkB,KAAK,EAAE,EAAE;gBAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClC,IAAI;oBACF,MAAM,QAAQ,GAAG,IAAA,8BAAsB,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC1D,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;iBAC3D;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;iBAC5E;aACF;YACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACjC,CAAC;KAAA;IAED;;;;OAIG;IACU,QAAQ;;YACnB,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI;gBACF,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;aAC7B;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,CAAC,OAAO,CAAC;aAClB;YACD,IAAI;gBACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAClB;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,yDAAyD,CAAC;aAClE;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;CACF;AAhFD,uCAgFC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const
|
|
4
|
+
const MultiFormat = require("@requestnetwork/multi-format");
|
|
5
5
|
const types_1 = require("@requestnetwork/types");
|
|
6
6
|
const utils_1 = require("@requestnetwork/utils");
|
|
7
7
|
const events_1 = require("events");
|
|
@@ -30,7 +30,7 @@ class TransactionManager {
|
|
|
30
30
|
let transaction = {};
|
|
31
31
|
let channelEncryptionMethod;
|
|
32
32
|
// compute hash to add it to the topics
|
|
33
|
-
const hash =
|
|
33
|
+
const hash = MultiFormat.serialize((0, utils_1.normalizeKeccak256Hash)(JSON.parse(transactionData)));
|
|
34
34
|
// Need to create a new channel (only the first transaction can have the hash equals to the channel id)
|
|
35
35
|
if (channelId === hash) {
|
|
36
36
|
if (encryptionParams.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-manager.js","sourceRoot":"","sources":["../src/transaction-manager.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"transaction-manager.js","sourceRoot":"","sources":["../src/transaction-manager.ts"],"names":[],"mappings":";;;AAAA,4DAA4D;AAC5D,iDAK+B;AAC/B,iDAA+D;AAE/D,mCAAsC;AAEtC,qDAA6C;AAC7C,iEAAyD;AAEzD;;GAEG;AACH,MAAqB,kBAAkB;IAIrC,YACE,UAAuC,EACvC,kBAAgE;QAEhE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,wBAAa,CAAC,kBAAkB,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;;;OASG;IACU,kBAAkB,CAC7B,eAAkD,EAClD,SAAiB,EACjB,SAAmB,EAAE,EACrB,mBAA4D,EAAE;;YAE9D,IAAI,WAAW,GAA2C,EAAE,CAAC;YAC7D,IAAI,uBAA2C,CAAC;YAEhD,uCAAuC;YACvC,MAAM,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC,IAAA,8BAAsB,EAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAExF,uGAAuG;YACvG,IAAI,SAAS,KAAK,IAAI,EAAE;gBACtB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;oBACjC,yBAAyB;oBACzB,WAAW,GAAG,MAAM,8BAAmB,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC;iBACjF;qBAAM;oBACL,8BAA8B;oBAC9B,WAAW,GAAG,MAAM,8BAAmB,CAAC,sCAAsC,CAC5E,eAAe,EACf,gBAAgB,CACjB,CAAC;oBACF,uBAAuB,GAAG,WAAW,CAAC,gBAAgB,CAAC;iBACxD;gBAED,6CAA6C;aAC9C;iBAAM;gBACL,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;gBAEhF,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,GACjD,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,CAClD,SAAS,EACT,WAAW,CAAC,MAAM,CAAC,YAAY,CAChC,CAAC;gBAEJ,IAAI,WAAW,KAAK,wBAAgB,CAAC,WAAW,CAAC,OAAO,EAAE;oBACxD,MAAM,IAAI,KAAK,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;iBACrE;gBAED,IAAI,WAAW,KAAK,wBAAgB,CAAC,WAAW,CAAC,KAAK,EAAE;oBACtD,yCAAyC;oBACzC,WAAW,GAAG,MAAM,8BAAmB,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC;iBACjF;gBAED,IAAI,WAAW,KAAK,wBAAgB,CAAC,WAAW,CAAC,SAAS,EAAE;oBAC1D,IAAI,CAAC,UAAU,EAAE;wBACf,MAAM,IAAI,KAAK,CAAC,6CAA6C,SAAS,EAAE,CAAC,CAAC;qBAC3E;oBAED,WAAW,GAAG,MAAM,8BAAmB,CAAC,0BAA0B,CAChE,eAAe,EACf,UAAU,EACV,gBAAgB,CACjB,CAAC;oBAEF,uBAAuB,GAAG,gBAAgB,CAAC;iBAC5C;aACF;YAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAC5D,WAAW,EACX,SAAS;YACT,6BAA6B;YAC7B,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CACtB,CAAC;YAEF,6CAA6C;YAC7C,MAAM,MAAM,GAA+C,MAAM,CAAC,MAAM,CAAC,IAAI,qBAAY,EAAE,EAAE;gBAC3F,IAAI,EAAE;oBACJ,cAAc,EAAE,aAAa,CAAC,IAAI;oBAClC,gBAAgB,EAAE,uBAAuB;iBAC1C;gBACD,MAAM,EAAE,EAAE;aACX,CAAC,CAAC;YAEH,+EAA+E;YAC/E,aAAa;iBACV,EAAE,CAAC,WAAW,EAAE,CAAC,wBAAwB,EAAE,EAAE;gBAC5C,MAAM,uBAAuB,GAAG;oBAC9B,IAAI,EAAE;wBACJ,cAAc,EAAE,wBAAwB,CAAC,IAAI;wBAC7C,gBAAgB,EAAE,uBAAuB;qBAC1C;oBACD,MAAM,EAAE,EAAE;iBACX,CAAC;gBAEF,6BAA6B;gBAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;YACpD,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACrB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YAEL,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;;;;;;;OAQG;IACU,0BAA0B,CACrC,SAAiB,EACjB,mBAA2D;;YAE3D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAClE,SAAS,EACT,mBAAmB,CACpB,CAAC;YAEF,8DAA8D;YAC9D,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAC3D,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAE9F,MAAM,IAAI,GAAG;gBACX,cAAc,EAAE,WAAW,CAAC,IAAI;gBAChC,gBAAgB;gBAChB,mBAAmB;aACpB,CAAC;YAEF,sDAAsD;YACtD,mDAAmD;YACnD,IAAI,CAAC,gBAAgB,EAAE;gBACrB,OAAO,IAAI,CAAC,gBAAgB,CAAC;aAC9B;YAED,OAAO;gBACL,IAAI;gBACJ,MAAM,EAAE,EAAE,YAAY,EAAE;aACzB,CAAC;QACJ,CAAC;KAAA;IAED;;;;;;OAMG;IACU,kBAAkB,CAC7B,KAAa,EACb,cAAsD;;YAEtD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAEpF,OAAO,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QACjD,CAAC;KAAA;IAED;;;;;;OAMG;IACU,2BAA2B,CACtC,MAAgB,EAChB,cAAsD;;YAEtD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YAE9F,OAAO,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QACjD,CAAC;KAAA;IAED;;;;;OAKG;IACW,qBAAqB,CACjC,WAAsD;;YAEtD,oFAAoF;YACpF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CACtE,CAAO,kBAAkB,EAAE,SAAS,EAAE,EAAE;gBACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAC7D,SAAS,EACT,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAC3C,CAAC;gBAEF,oGAAoG;gBACpG,MAAM,WAAW,GAAQ,MAAM,kBAAkB,CAAC;gBAElD,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;gBAC3D,WAAW,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;gBACzE,OAAO,WAAW,CAAC;YACrB,CAAC,CAAA,EACD,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAAC,CAC/D,CAAC;YAEF,OAAO;gBACL,IAAI,EAAE;oBACJ,cAAc,EAAE,WAAW,CAAC,IAAI;oBAChC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;iBAChD;gBACD,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE;aAC9C,CAAC;QACJ,CAAC;KAAA;CACF;AAlOD,qCAkOC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const
|
|
4
|
+
const MultiFormat = require("@requestnetwork/multi-format");
|
|
5
5
|
const types_1 = require("@requestnetwork/types");
|
|
6
6
|
const utils_1 = require("@requestnetwork/utils");
|
|
7
7
|
/**
|
|
@@ -57,17 +57,17 @@ class TransactionsFactory {
|
|
|
57
57
|
const encryptedKeyAndIdentityHashesPromises = encryptionParams.map((encryptionParam) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
58
|
const encryptedKey = yield (0, utils_1.encrypt)(symmetricKey, encryptionParam);
|
|
59
59
|
const identityEncryption = (0, utils_1.getIdentityFromEncryptionParams)(encryptionParam);
|
|
60
|
-
const multiFormattedIdentity =
|
|
60
|
+
const multiFormattedIdentity = MultiFormat.serialize(identityEncryption);
|
|
61
61
|
return { encryptedKey, multiFormattedIdentity };
|
|
62
62
|
}));
|
|
63
63
|
const encryptedKeyAndIdentityHashes = yield Promise.all(encryptedKeyAndIdentityHashesPromises);
|
|
64
64
|
// Create the encrypted keys object - Encrypted keys indexed by identity multi-format
|
|
65
65
|
const keys = encryptedKeyAndIdentityHashes.reduce((allKeys, keyAndHash) => {
|
|
66
|
-
const encryptedKeySerialized =
|
|
66
|
+
const encryptedKeySerialized = MultiFormat.serialize(keyAndHash.encryptedKey);
|
|
67
67
|
allKeys[keyAndHash.multiFormattedIdentity] = encryptedKeySerialized;
|
|
68
68
|
return allKeys;
|
|
69
69
|
}, {});
|
|
70
|
-
const encryptedDataSerialized =
|
|
70
|
+
const encryptedDataSerialized = MultiFormat.serialize(encryptedData);
|
|
71
71
|
return { encryptedData: encryptedDataSerialized, keys, encryptionMethod };
|
|
72
72
|
});
|
|
73
73
|
}
|
|
@@ -94,7 +94,7 @@ class TransactionsFactory {
|
|
|
94
94
|
catch (error) {
|
|
95
95
|
throw new Error('Data not parsable');
|
|
96
96
|
}
|
|
97
|
-
const encryptedDataSerialized =
|
|
97
|
+
const encryptedDataSerialized = MultiFormat.serialize(encryptedData);
|
|
98
98
|
if (encryptionParams.length === 0) {
|
|
99
99
|
return { encryptedData: encryptedDataSerialized };
|
|
100
100
|
}
|
|
@@ -108,13 +108,13 @@ class TransactionsFactory {
|
|
|
108
108
|
const encryptedKeyAndIdentityHashesPromises = encryptionParams.map((encryptionParam) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
109
109
|
const encryptedKey = yield (0, utils_1.encrypt)(channelKey.key, encryptionParam);
|
|
110
110
|
const identityEncryption = (0, utils_1.getIdentityFromEncryptionParams)(encryptionParam);
|
|
111
|
-
const multiFormattedIdentity =
|
|
111
|
+
const multiFormattedIdentity = MultiFormat.serialize(identityEncryption);
|
|
112
112
|
return { encryptedKey, multiFormattedIdentity };
|
|
113
113
|
}));
|
|
114
114
|
const encryptedKeyAndIdentityHashes = yield Promise.all(encryptedKeyAndIdentityHashesPromises);
|
|
115
115
|
// Create the encrypted keys object - Encrypted keys indexed by identity multi-format
|
|
116
116
|
const keys = encryptedKeyAndIdentityHashes.reduce((allKeys, keyAndHash) => {
|
|
117
|
-
const encryptedKeySerialized =
|
|
117
|
+
const encryptedKeySerialized = MultiFormat.serialize(keyAndHash.encryptedKey);
|
|
118
118
|
allKeys[keyAndHash.multiFormattedIdentity] = encryptedKeySerialized;
|
|
119
119
|
return allKeys;
|
|
120
120
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactions-factory.js","sourceRoot":"","sources":["../src/transactions-factory.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"transactions-factory.js","sourceRoot":"","sources":["../src/transactions-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const
|
|
4
|
+
const MultiFormat = require("@requestnetwork/multi-format");
|
|
5
5
|
const types_1 = require("@requestnetwork/types");
|
|
6
6
|
const clear_transaction_1 = require("./clear-transaction");
|
|
7
7
|
const encrypted_transaction_1 = require("./encrypted-transaction");
|
|
@@ -117,7 +117,7 @@ class TransactionsParser {
|
|
|
117
117
|
if (keys && decryptedChannelKey === '') {
|
|
118
118
|
let identity;
|
|
119
119
|
try {
|
|
120
|
-
identity =
|
|
120
|
+
identity = MultiFormat.deserialize(identityMultiFormatted);
|
|
121
121
|
}
|
|
122
122
|
catch (e) {
|
|
123
123
|
// if we cannot deserialize it, just ignore this identity
|
|
@@ -128,7 +128,7 @@ class TransactionsParser {
|
|
|
128
128
|
if (this.decryptionProvider &&
|
|
129
129
|
(yield this.decryptionProvider.isIdentityRegistered(identity))) {
|
|
130
130
|
try {
|
|
131
|
-
const key =
|
|
131
|
+
const key = MultiFormat.deserialize(keys[identityMultiFormatted]);
|
|
132
132
|
decryptedChannelKey = yield this.decryptionProvider.decrypt(key, identity);
|
|
133
133
|
}
|
|
134
134
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactions-parser.js","sourceRoot":"","sources":["../src/transactions-parser.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"transactions-parser.js","sourceRoot":"","sources":["../src/transactions-parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@requestnetwork/transaction-manager",
|
|
3
|
-
"version": "0.30.1-next.
|
|
3
|
+
"version": "0.30.1-next.1991+45d1f5b8",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
"test:watch": "yarn test --watch"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@requestnetwork/multi-format": "0.15.14-next.
|
|
43
|
-
"@requestnetwork/types": "0.39.1-next.
|
|
44
|
-
"@requestnetwork/utils": "0.39.1-next.
|
|
42
|
+
"@requestnetwork/multi-format": "0.15.14-next.1991+45d1f5b8",
|
|
43
|
+
"@requestnetwork/types": "0.39.1-next.1991+45d1f5b8",
|
|
44
|
+
"@requestnetwork/utils": "0.39.1-next.1991+45d1f5b8",
|
|
45
45
|
"tslib": "2.5.0"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"ts-node": "10.9.1",
|
|
56
56
|
"typescript": "5.1.3"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "45d1f5b8a659e4d8dd90d95651d4aec902d4281e"
|
|
59
59
|
}
|