@bitpay-labs/bitcore-wallet-service 11.10.7 → 11.10.8
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/package.json +3 -3
- package/src/externalservices/coingecko.ts +24 -10
- package/src/externalservices/moonpay.ts +23 -1
- package/src/lib/chain/eth/abi-invoice.ts +139 -90
- package/src/lib/common/constants.ts +5 -2
- package/src/lib/common/defaults.ts +11 -2
- package/src/lib/errors/errordefinitions.ts +6 -0
- package/src/lib/model/copayer.ts +1 -0
- package/src/lib/model/tsskeygen.ts +33 -4
- package/src/lib/model/tsssign.ts +34 -3
- package/src/lib/pushnotificationsservice.ts +3 -1
- package/src/lib/routes/middleware/authTssRequest.ts +10 -4
- package/src/lib/routes/middleware/verifyTssMessage.ts +13 -8
- package/src/lib/routes/tss.ts +11 -4
- package/src/lib/server.ts +53 -25
- package/src/lib/storage.ts +24 -1
- package/src/lib/tss.ts +232 -30
- package/src/types/externalservices.d.ts +29 -1
- package/test/integration/externalservices/coinGecko.test.ts +71 -7
- package/test/integration/server.test.ts +731 -1
- package/test/integration/tss.test.ts +275 -0
- package/test/model/copayer.test.ts +128 -0
- package/test/storage.test.ts +91 -0
- package/ts_build/package.json +1 -1
- package/ts_build/src/externalservices/coingecko.d.ts.map +1 -1
- package/ts_build/src/externalservices/coingecko.js +14 -8
- package/ts_build/src/externalservices/coingecko.js.map +1 -1
- package/ts_build/src/externalservices/moonpay.d.ts.map +1 -1
- package/ts_build/src/externalservices/moonpay.js +38 -2
- package/ts_build/src/externalservices/moonpay.js.map +1 -1
- package/ts_build/src/lib/chain/eth/abi-invoice.d.ts +254 -41
- package/ts_build/src/lib/chain/eth/abi-invoice.d.ts.map +1 -1
- package/ts_build/src/lib/chain/eth/abi-invoice.js +138 -89
- package/ts_build/src/lib/chain/eth/abi-invoice.js.map +1 -1
- package/ts_build/src/lib/common/constants.d.ts +4 -2
- package/ts_build/src/lib/common/constants.d.ts.map +1 -1
- package/ts_build/src/lib/common/constants.js +4 -2
- package/ts_build/src/lib/common/constants.js.map +1 -1
- package/ts_build/src/lib/common/defaults.d.ts +4 -2
- package/ts_build/src/lib/common/defaults.d.ts.map +1 -1
- package/ts_build/src/lib/common/defaults.js +4 -2
- package/ts_build/src/lib/common/defaults.js.map +1 -1
- package/ts_build/src/lib/common/index.d.ts +8 -4
- package/ts_build/src/lib/common/index.d.ts.map +1 -1
- package/ts_build/src/lib/errors/errordefinitions.d.ts +3 -0
- package/ts_build/src/lib/errors/errordefinitions.d.ts.map +1 -1
- package/ts_build/src/lib/errors/errordefinitions.js +3 -0
- package/ts_build/src/lib/errors/errordefinitions.js.map +1 -1
- package/ts_build/src/lib/model/copayer.d.ts.map +1 -1
- package/ts_build/src/lib/model/copayer.js +1 -0
- package/ts_build/src/lib/model/copayer.js.map +1 -1
- package/ts_build/src/lib/model/tsskeygen.d.ts +3 -0
- package/ts_build/src/lib/model/tsskeygen.d.ts.map +1 -1
- package/ts_build/src/lib/model/tsskeygen.js +12 -3
- package/ts_build/src/lib/model/tsskeygen.js.map +1 -1
- package/ts_build/src/lib/model/tsssign.d.ts +7 -0
- package/ts_build/src/lib/model/tsssign.d.ts.map +1 -1
- package/ts_build/src/lib/model/tsssign.js +22 -2
- package/ts_build/src/lib/model/tsssign.js.map +1 -1
- package/ts_build/src/lib/pushnotificationsservice.d.ts.map +1 -1
- package/ts_build/src/lib/pushnotificationsservice.js +3 -1
- package/ts_build/src/lib/pushnotificationsservice.js.map +1 -1
- package/ts_build/src/lib/routes/middleware/authTssRequest.d.ts.map +1 -1
- package/ts_build/src/lib/routes/middleware/authTssRequest.js +8 -2
- package/ts_build/src/lib/routes/middleware/authTssRequest.js.map +1 -1
- package/ts_build/src/lib/routes/middleware/verifyTssMessage.d.ts.map +1 -1
- package/ts_build/src/lib/routes/middleware/verifyTssMessage.js +11 -6
- package/ts_build/src/lib/routes/middleware/verifyTssMessage.js.map +1 -1
- package/ts_build/src/lib/routes/tss.d.ts.map +1 -1
- package/ts_build/src/lib/routes/tss.js +4 -4
- package/ts_build/src/lib/routes/tss.js.map +1 -1
- package/ts_build/src/lib/server.d.ts.map +1 -1
- package/ts_build/src/lib/server.js +33 -25
- package/ts_build/src/lib/server.js.map +1 -1
- package/ts_build/src/lib/storage.d.ts +4 -0
- package/ts_build/src/lib/storage.d.ts.map +1 -1
- package/ts_build/src/lib/storage.js +18 -1
- package/ts_build/src/lib/storage.js.map +1 -1
- package/ts_build/src/lib/tss.d.ts +4 -0
- package/ts_build/src/lib/tss.d.ts.map +1 -1
- package/ts_build/src/lib/tss.js +74 -17
- package/ts_build/src/lib/tss.js.map +1 -1
- package/ts_build/test/integration/externalservices/coinGecko.test.js +62 -8
- package/ts_build/test/integration/externalservices/coinGecko.test.js.map +1 -1
- package/ts_build/test/integration/server.test.js +597 -0
- package/ts_build/test/integration/server.test.js.map +1 -1
- package/ts_build/test/integration/tss.test.js +245 -0
- package/ts_build/test/integration/tss.test.js.map +1 -1
- package/ts_build/test/model/copayer.test.js +91 -0
- package/ts_build/test/model/copayer.test.js.map +1 -1
- package/ts_build/test/storage.test.js +73 -0
- package/ts_build/test/storage.test.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copayer.d.ts","sourceRoot":"","sources":["../../../../src/lib/model/copayer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AASnE,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,KAAK,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,qBAAa,OAAO;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,KAAK,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,MAAM,CAAC,eAAe,CAAC,IAAI,KAAA,EAAE,IAAI,KAAA;
|
|
1
|
+
{"version":3,"file":"copayer.d.ts","sourceRoot":"","sources":["../../../../src/lib/model/copayer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AASnE,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,KAAK,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,eAAe,CAAC;CAClC;AAED,qBAAa,OAAO;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,uBAAuB,EAAE,MAAM,CAAC;IAChC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,KAAK,CAAC;QACpB,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,MAAM,CAAC,eAAe,CAAC,IAAI,KAAA,EAAE,IAAI,KAAA;IAOjC,MAAM,CAAC,MAAM,CAAC,IAAI,KAAA;IA6ClB,MAAM,CAAC,OAAO,CAAC,GAAG,KAAA;IAsClB,aAAa,CAAC,MAAM,KAAA,EAAE,QAAQ,KAAA;CAiB/B"}
|
|
@@ -30,6 +30,7 @@ class Copayer {
|
|
|
30
30
|
isSupportStaff;
|
|
31
31
|
isMarketingStaff;
|
|
32
32
|
static xPubToCopayerId(coin, xpub) {
|
|
33
|
+
$.checkArgument(xpub, 'Missing xPubKey for copayer id derivation');
|
|
33
34
|
const str = coin == Defaults.COIN ? xpub : coin + xpub;
|
|
34
35
|
const hash = sjcl_1.default.hash.sha256.hash(str);
|
|
35
36
|
return sjcl_1.default.codec.hex.fromBits(hash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copayer.js","sourceRoot":"","sources":["../../../../src/lib/model/copayer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"copayer.js","sourceRoot":"","sources":["../../../../src/lib/model/copayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,10 +58,13 @@ export declare class TssKeyGenModel implements ITssKeyGenModel {
|
|
|
58
58
|
n: number;
|
|
59
59
|
copayerId: string;
|
|
60
60
|
passwordHash?: string;
|
|
61
|
+
version: number;
|
|
62
|
+
timeLimit?: number;
|
|
61
63
|
}): TssKeyGenModel;
|
|
62
64
|
static fromObj(obj: ITssKeyGenModel & {
|
|
63
65
|
__v: number;
|
|
64
66
|
}): TssKeyGenModel;
|
|
65
67
|
getCurrentRound(): number;
|
|
68
|
+
isExpired(): boolean;
|
|
66
69
|
}
|
|
67
70
|
//# sourceMappingURL=tsskeygen.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsskeygen.d.ts","sourceRoot":"","sources":["../../../../src/lib/model/tsskeygen.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,KAAK,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE;YACP,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;IACH,WAAW,EAAE,KAAK,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE;YACP,gBAAgB,EAAE,MAAM,CAAC;YACzB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAI9B,EAAE,EAAE,MAAM,CAAC;IAMX,aAAa,EAAE,MAAM,CAAC;IAItB,CAAC,EAAE,MAAM,CAAC;IAKV,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAI5B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,oBAAoB,CAAC;KAChC,CAAC,CAAC,CAAC;IAIJ,eAAe,CAAC,EAAE,MAAM,CAAC;IAIzB,YAAY,CAAC,EAAE,MAAM,CAAC;IAItB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAI1B,SAAS,EAAE,MAAM,CAAC;IAIlB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,aAAa,CAAC,EAAE,MAAM,CAAC;IAIvB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,cAAe,YAAW,eAAe;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,oBAAoB,CAAC;KAChC,CAAC,CAAC,CAAC;IACJ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tsskeygen.d.ts","sourceRoot":"","sources":["../../../../src/lib/model/tsskeygen.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,KAAK,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE;YACP,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;IACH,WAAW,EAAE,KAAK,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE;YACP,gBAAgB,EAAE,MAAM,CAAC;YACzB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAI9B,EAAE,EAAE,MAAM,CAAC;IAMX,aAAa,EAAE,MAAM,CAAC;IAItB,CAAC,EAAE,MAAM,CAAC;IAKV,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAI5B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,oBAAoB,CAAC;KAChC,CAAC,CAAC,CAAC;IAIJ,eAAe,CAAC,EAAE,MAAM,CAAC;IAIzB,YAAY,CAAC,EAAE,MAAM,CAAC;IAItB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAI1B,SAAS,EAAE,MAAM,CAAC;IAIlB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,aAAa,CAAC,EAAE,MAAM,CAAC;IAIvB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,cAAe,YAAW,eAAe;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,oBAAoB,CAAC;KAChC,CAAC,CAAC,CAAC;IACJ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IAMZ,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QAEpB,EAAE,EAAE,MAAM,CAAC;QAEX,OAAO,EAAE,oBAAoB,CAAC;QAE9B,CAAC,EAAE,MAAM,CAAC;QAEV,SAAS,EAAE,MAAM,CAAC;QAElB,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB,OAAO,EAAE,MAAM,CAAC;QAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,cAAc;IA2BlB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,cAAc;IAiBtE,eAAe,IAAI,MAAM;IASzB,SAAS,IAAI,OAAO;CAMrB"}
|
|
@@ -21,12 +21,15 @@ class TssKeyGenModel {
|
|
|
21
21
|
bwsJoinSecret;
|
|
22
22
|
__v;
|
|
23
23
|
static create(params) {
|
|
24
|
-
const { id, message, n, copayerId, passwordHash } = params;
|
|
24
|
+
const { id, message, n, copayerId, passwordHash, version } = params;
|
|
25
25
|
const { partyId } = message;
|
|
26
|
+
const timeLimit = parseFloat(params.timeLimit?.toString());
|
|
26
27
|
$.checkArgument(partyId === 0, 'Key generation session must be started by partyId 0');
|
|
28
|
+
$.checkArgument(!timeLimit || (Number.isFinite(timeLimit) && timeLimit > 0), 'Time limit must be a positive number');
|
|
29
|
+
const ONE_MINUTE = 60 * 1000;
|
|
27
30
|
const x = new TssKeyGenModel();
|
|
28
31
|
x.id = id;
|
|
29
|
-
x.schemeVersion = Defaults.TSS_KEYGEN_SCHEME_VERSION;
|
|
32
|
+
x.schemeVersion = version || Defaults.TSS_KEYGEN_SCHEME_VERSION;
|
|
30
33
|
x.n = n;
|
|
31
34
|
x.participants = new Array(n);
|
|
32
35
|
x.participants[partyId] = copayerId;
|
|
@@ -37,7 +40,7 @@ class TssKeyGenModel {
|
|
|
37
40
|
x.joinPassword = passwordHash;
|
|
38
41
|
x.keyShares = new Array(n);
|
|
39
42
|
x.createdOn = Date.now();
|
|
40
|
-
x.timeLimit =
|
|
43
|
+
x.timeLimit = Math.min(timeLimit || Defaults.TSS_KEYGEN_TIME_LIMIT, 60) * ONE_MINUTE;
|
|
41
44
|
x.__v = 0;
|
|
42
45
|
return x;
|
|
43
46
|
}
|
|
@@ -64,6 +67,12 @@ class TssKeyGenModel {
|
|
|
64
67
|
}
|
|
65
68
|
return mostRecentRound;
|
|
66
69
|
}
|
|
70
|
+
isExpired() {
|
|
71
|
+
if (!this.timeLimit) {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
return Date.now() > this.createdOn + this.timeLimit;
|
|
75
|
+
}
|
|
67
76
|
}
|
|
68
77
|
exports.TssKeyGenModel = TssKeyGenModel;
|
|
69
78
|
//# sourceMappingURL=tsskeygen.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsskeygen.js","sourceRoot":"","sources":["../../../../src/lib/model/tsskeygen.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,sCAAmC;AAEnC,MAAM,CAAC,GAAG,IAAA,yBAAS,GAAE,CAAC;AAEtB,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAM,CAAC;AAuB3B,CAAC;AAyDD,CAAC;AAEF,MAAa,cAAc;IACzB,EAAE,CAAS;IACX,CAAC,CAAS;IACV,YAAY,CAAgB;IAC5B,MAAM,CAGF;IACJ,eAAe,CAAU;IACzB,aAAa,CAAS;IACtB,YAAY,CAAU;IACtB,SAAS,CAAiB;IAC1B,SAAS,CAAS;IAClB,SAAS,CAAU;IACnB,aAAa,CAAU;IACvB,GAAG,CAAS;
|
|
1
|
+
{"version":3,"file":"tsskeygen.js","sourceRoot":"","sources":["../../../../src/lib/model/tsskeygen.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,8 @@ export interface ITssSigGenModel {
|
|
|
36
36
|
fromPartyId: number;
|
|
37
37
|
messages: ITssSigMessageObject;
|
|
38
38
|
}>>;
|
|
39
|
+
createdOn: number;
|
|
40
|
+
timeLimit?: number;
|
|
39
41
|
signature?: {
|
|
40
42
|
r: string;
|
|
41
43
|
s: string;
|
|
@@ -57,14 +59,19 @@ export declare class TssSigGenModel implements ITssSigGenModel {
|
|
|
57
59
|
}>>;
|
|
58
60
|
signature?: ITssSigMessageObject['signature'];
|
|
59
61
|
schemeVersion: number;
|
|
62
|
+
createdOn: number;
|
|
63
|
+
timeLimit?: number;
|
|
60
64
|
__v: number;
|
|
61
65
|
static create(params: {
|
|
62
66
|
id: string;
|
|
63
67
|
message: ITssSigMessageObject;
|
|
64
68
|
m: number;
|
|
65
69
|
copayerId: string;
|
|
70
|
+
version: number;
|
|
71
|
+
timeLimit?: number;
|
|
66
72
|
}): TssSigGenModel;
|
|
67
73
|
static fromObj(obj: ITssSigGenModel): TssSigGenModel;
|
|
68
74
|
getCurrentRound(): number;
|
|
75
|
+
isExpired(): boolean;
|
|
69
76
|
}
|
|
70
77
|
//# sourceMappingURL=tsssign.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsssign.d.ts","sourceRoot":"","sources":["../../../../src/lib/model/tsssign.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tsssign.d.ts","sourceRoot":"","sources":["../../../../src/lib/model/tsssign.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,KAAK,CAAC;QACvB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE;YACP,OAAO,EAAE,MAAM,CAAC;YAChB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;IACH,WAAW,EAAE,KAAK,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE;YACP,gBAAgB,EAAE,MAAM,CAAC;YACzB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAI9B,EAAE,EAAE,MAAM,CAAC;IAMX,aAAa,EAAE,MAAM,CAAC;IAItB,CAAC,EAAE,MAAM,CAAC;IAKV,YAAY,EAAE,KAAK,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IAIH,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,oBAAoB,CAAC;KAChC,CAAC,CAAC,CAAC;IAIJ,SAAS,EAAE,MAAM,CAAC;IAIlB,SAAS,CAAC,EAAE,MAAM,CAAC;IAMnB,SAAS,CAAC,EAAE;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAIF,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,cAAe,YAAW,eAAe;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,EAAE,MAAM,CAAC;IACV,YAAY,EAAE,KAAK,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,oBAAoB,CAAC;KAChC,CAAC,CAAC,CAAC;IACJ,SAAS,CAAC,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IAGZ,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,oBAAoB,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,cAAc;IA6BvJ,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,eAAe,GAAG,cAAc;IAcpD,eAAe,IAAI,MAAM;IASzB,SAAS,IAAI,OAAO;CAMrB"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TssSigGenModel = void 0;
|
|
4
|
+
const preconditions_1 = require("preconditions");
|
|
4
5
|
const common_1 = require("../common");
|
|
6
|
+
const $ = (0, preconditions_1.singleton)();
|
|
5
7
|
const { Defaults } = common_1.Common;
|
|
6
8
|
;
|
|
7
9
|
;
|
|
@@ -12,13 +14,23 @@ class TssSigGenModel {
|
|
|
12
14
|
rounds;
|
|
13
15
|
signature;
|
|
14
16
|
schemeVersion;
|
|
17
|
+
createdOn;
|
|
18
|
+
timeLimit;
|
|
15
19
|
__v;
|
|
16
20
|
static create(params) {
|
|
17
|
-
const { id, message, m, copayerId } = params;
|
|
21
|
+
const { id, message, m, copayerId, version } = params;
|
|
18
22
|
const { partyId } = message;
|
|
23
|
+
const timeLimit = parseFloat(params.timeLimit?.toString());
|
|
24
|
+
$.checkArgument(!timeLimit || (Number.isFinite(timeLimit) && timeLimit > 0), 'Time limit must be a positive number');
|
|
25
|
+
const MAX_TIME_LIMIT = 7 * 24 * 60;
|
|
26
|
+
const ONE_MINUTE = 60 * 1000;
|
|
19
27
|
const x = new TssSigGenModel();
|
|
20
28
|
x.id = id;
|
|
21
|
-
x.schemeVersion = Defaults.TSS_SIGGEN_SCHEME_VERSION;
|
|
29
|
+
x.schemeVersion = version || Defaults.TSS_SIGGEN_SCHEME_VERSION;
|
|
30
|
+
x.createdOn = Date.now();
|
|
31
|
+
x.timeLimit = (timeLimit === 0
|
|
32
|
+
? MAX_TIME_LIMIT
|
|
33
|
+
: Math.min(timeLimit || Defaults.TSS_SIGGEN_TIME_LIMIT, MAX_TIME_LIMIT)) * ONE_MINUTE;
|
|
22
34
|
x.m = m;
|
|
23
35
|
x.participants = [{
|
|
24
36
|
partyId,
|
|
@@ -35,6 +47,8 @@ class TssSigGenModel {
|
|
|
35
47
|
const x = new TssSigGenModel();
|
|
36
48
|
x.id = obj.id;
|
|
37
49
|
x.schemeVersion = obj.schemeVersion;
|
|
50
|
+
x.createdOn = obj.createdOn;
|
|
51
|
+
x.timeLimit = obj.timeLimit;
|
|
38
52
|
x.m = obj.m;
|
|
39
53
|
x.participants = obj.participants;
|
|
40
54
|
x.rounds = obj.rounds;
|
|
@@ -49,6 +63,12 @@ class TssSigGenModel {
|
|
|
49
63
|
}
|
|
50
64
|
return mostRecentRound;
|
|
51
65
|
}
|
|
66
|
+
isExpired() {
|
|
67
|
+
if (!this.timeLimit) {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
return Date.now() > this.createdOn + this.timeLimit;
|
|
71
|
+
}
|
|
52
72
|
}
|
|
53
73
|
exports.TssSigGenModel = TssSigGenModel;
|
|
54
74
|
//# sourceMappingURL=tsssign.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsssign.js","sourceRoot":"","sources":["../../../../src/lib/model/tsssign.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AAEnC,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAM,CAAC;AA4B3B,CAAC;
|
|
1
|
+
{"version":3,"file":"tsssign.js","sourceRoot":"","sources":["../../../../src/lib/model/tsssign.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,sCAAmC;AAEnC,MAAM,CAAC,GAAG,IAAA,yBAAS,GAAE,CAAC;AAEtB,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAM,CAAC;AA4B3B,CAAC;AAuDD,CAAC;AAEF,MAAa,cAAc;IACzB,EAAE,CAAS;IACX,CAAC,CAAS;IACV,YAAY,CAGT;IACH,MAAM,CAGF;IACJ,SAAS,CAAqC;IAC9C,aAAa,CAAS;IACtB,SAAS,CAAS;IAClB,SAAS,CAAU;IACnB,GAAG,CAAS;IAGZ,MAAM,CAAC,MAAM,CAAC,MAAwH;QACpI,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QACtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,aAAa,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,EAAE,sCAAsC,CAAC,CAAC;QAErH,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC;QAE7B,MAAM,CAAC,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC;QACV,CAAC,CAAC,aAAa,GAAG,OAAO,IAAI,QAAQ,CAAC,yBAAyB,CAAC;QAChE,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,CAAC,CAAC,SAAS,GAAG,CAAC,SAAS,KAAK,CAAC;YAC5B,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,QAAQ,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC,GAAG,UAAU,CAAC;QACxF,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACR,CAAC,CAAC,YAAY,GAAG,CAAC;gBAChB,OAAO;gBACP,SAAS;aACV,CAAC,CAAC;QACH,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;oBACX,WAAW,EAAE,OAAO;oBACpB,QAAQ,EAAE,OAAO;iBAClB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,GAAoB;QACjC,MAAM,CAAC,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;QACd,CAAC,CAAC,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC;QACpC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAC5B,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAC5B,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACZ,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;QAClC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QACtB,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAC5B,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QAChB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,eAAe;QACb,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC;YAEnD,OAAO,eAAe,GAAG,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,SAAS;QACP,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACtD,CAAC;CACF;AA5ED,wCA4EC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushnotificationsservice.d.ts","sourceRoot":"","sources":["../../../src/lib/pushnotificationsservice.ts"],"names":[],"mappings":"AAIA,OAAO,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAO9B,OAAO,EAAE,aAAa,EAA6B,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqDpC,MAAM,WAAW,wBAAwB;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,GAAG,CAAC;CACpB;AAED,qBAAa,wBAAwB;IACnC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IAEnB,KAAK,CAAC,IAAI,KAAA,EAAE,EAAE,KAAA;IAmEd,sBAAsB,CAAC,YAAY,KAAA,EAAE,EAAE,KAAA;
|
|
1
|
+
{"version":3,"file":"pushnotificationsservice.d.ts","sourceRoot":"","sources":["../../../src/lib/pushnotificationsservice.ts"],"names":[],"mappings":"AAIA,OAAO,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAO9B,OAAO,EAAE,aAAa,EAA6B,MAAM,SAAS,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqDpC,MAAM,WAAW,wBAAwB;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,GAAG,CAAC;CACpB;AAED,qBAAa,wBAAwB;IACnC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IAEnB,KAAK,CAAC,IAAI,KAAA,EAAE,EAAE,KAAA;IAmEd,sBAAsB,CAAC,YAAY,KAAA,EAAE,EAAE,KAAA;IAsMvC,qBAAqB,CAAC,YAAY,KAAA,EAAE,EAAE,KAAA;IAQtC,kBAAkB,CAAC,YAAY,KAAA,EAAE,gBAAgB,KAAA,EAAE,EAAE,KAAA;IA0DrD,sBAAsB,CAAC,YAAY,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA,EAAE,EAAE,KAAA;IA4C5D,mBAAmB,CAAC,YAAY,EAAE,aAAa,EAAE,SAAS,KAAA,EAAE,EAAE,KAAA;IAgHpE,cAAc,CAAC,QAAQ,KAAA,EAAE,IAAI,KAAA,EAAE,EAAE,KAAA;IAiBjC,aAAa,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,EAAE,KAAA;IAOjD,iBAAiB,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA,EAAE,EAAE,KAAA;IAUxC,gBAAgB,CAAC,QAAQ,KAAA,EAAE,SAAS,KAAA;;;;IAWpC,iBAAiB,CAAC,YAAY,KAAA,EAAE,SAAS,KAAA,EAAE,cAAc,KAAA,EAAE,QAAQ,KAAA,EAAE,EAAE,KAAA;IA0DvE,YAAY,CAAC,IAAI,KAAA,EAAE,EAAE,KAAA;IAgBrB,iBAAiB,CAAC,IAAI,KAAA,EAAE,EAAE,KAAA;IAgB1B,OAAO,CAAC,uBAAuB;IAW/B,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;CAsEJ"}
|
|
@@ -221,6 +221,7 @@ class PushNotificationsService {
|
|
|
221
221
|
const chain = notification?.data?.chain || notification?.data?.coin;
|
|
222
222
|
const coin = chain;
|
|
223
223
|
const network = notification?.data?.network ? Utils.getNetworkName(chain, notification.data.network) : null;
|
|
224
|
+
const txid = typeof notification?.data?.txid === 'string' ? notification.data.txid : null;
|
|
224
225
|
if (sub.token) {
|
|
225
226
|
notificationData = {
|
|
226
227
|
to: sub.token,
|
|
@@ -261,10 +262,11 @@ class PushNotificationsService {
|
|
|
261
262
|
network,
|
|
262
263
|
tokenAddress,
|
|
263
264
|
multisigContractAddress,
|
|
265
|
+
txid,
|
|
264
266
|
title,
|
|
265
267
|
body
|
|
266
268
|
};
|
|
267
|
-
const custom_uri = `bitpay://wallet?walletId=${walletId}&tokenAddress=${tokenAddress}&multisigContractAddress=${multisigContractAddress}&copayerId=${copayerId}&coin=${coin}&chain=${chain}&network=${network}¬ification_type=${notification_type}&title=${title}&body=${body}`;
|
|
269
|
+
const custom_uri = `bitpay://wallet?walletId=${walletId}&tokenAddress=${tokenAddress}&multisigContractAddress=${multisigContractAddress}&copayerId=${copayerId}&coin=${coin}&chain=${chain}&network=${network}¬ification_type=${notification_type}&txid=${txid}&title=${title}&body=${body}`;
|
|
268
270
|
notificationData = {
|
|
269
271
|
external_user_ids: [sub.externalUserId],
|
|
270
272
|
messages: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pushnotificationsservice.js","sourceRoot":"","sources":["../../../src/lib/pushnotificationsservice.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pushnotificationsservice.js","sourceRoot":"","sources":["../../../src/lib/pushnotificationsservice.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authTssRequest.d.ts","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/authTssRequest.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"authTssRequest.d.ts","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/authTssRequest.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAe9B,wBAAgB,cAAc,IAAI,OAAO,CAAC,cAAc,CAwDvD"}
|
|
@@ -17,7 +17,7 @@ function authTssRequest() {
|
|
|
17
17
|
}
|
|
18
18
|
const { copayerId, signature } = credentials;
|
|
19
19
|
const { id } = req.params;
|
|
20
|
-
let session;
|
|
20
|
+
let session = null;
|
|
21
21
|
let partyId = null;
|
|
22
22
|
let pubKey = null;
|
|
23
23
|
if (req.path.includes('/tss/keygen/')) {
|
|
@@ -28,7 +28,10 @@ function authTssRequest() {
|
|
|
28
28
|
else if (req.path.includes('/tss/sign/')) {
|
|
29
29
|
session = await storage.fetchTssSigSession({ id });
|
|
30
30
|
partyId = session?.participants.find(p => p.copayerId === copayerId)?.partyId;
|
|
31
|
-
pubKey = partyId == null ? null : session
|
|
31
|
+
pubKey = partyId == null ? null : session?.rounds[0]?.find(r => r.fromPartyId === partyId)?.messages.publicKey;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
throw new Error('Unknown TSS request path: ' + req.path);
|
|
32
35
|
}
|
|
33
36
|
if (!session) {
|
|
34
37
|
throw errordefinitions_1.Errors.NOT_AUTHORIZED.withMessage('Session not found');
|
|
@@ -36,6 +39,9 @@ function authTssRequest() {
|
|
|
36
39
|
if (!pubKey) {
|
|
37
40
|
throw errordefinitions_1.Errors.NOT_AUTHORIZED.withMessage('Copayer not found in session');
|
|
38
41
|
}
|
|
42
|
+
if (session.isExpired()) {
|
|
43
|
+
throw errordefinitions_1.Errors.TSS_SESSION_EXPIRED;
|
|
44
|
+
}
|
|
39
45
|
const message = (0, authRequest_1.getMessage)(req);
|
|
40
46
|
const isValid = !!utils_1.Utils.verifyMessage(message, signature, pubKey);
|
|
41
47
|
if (!isValid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authTssRequest.js","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/authTssRequest.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"authTssRequest.js","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/authTssRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyTssMessage.d.ts","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/verifyTssMessage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verifyTssMessage.d.ts","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/verifyTssMessage.ts"],"names":[],"mappings":"AAQA,wBAAsB,gBAAgB,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,IAAI,KAAA,gBAgCpD"}
|
|
@@ -2,32 +2,37 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.verifyTssMessage = verifyTssMessage;
|
|
4
4
|
const bitcore_tss_1 = require("@bitpay-labs/bitcore-tss");
|
|
5
|
+
const clienterror_1 = require("../../errors/clienterror");
|
|
5
6
|
const errordefinitions_1 = require("../../errors/errordefinitions");
|
|
7
|
+
const helpers_1 = require("../helpers");
|
|
6
8
|
async function verifyTssMessage(req, res, next) {
|
|
7
9
|
try {
|
|
8
10
|
const { message } = req.body;
|
|
9
11
|
const { publicKey } = message || {};
|
|
10
12
|
if (!publicKey) {
|
|
11
|
-
|
|
13
|
+
throw errordefinitions_1.Errors.TSS_PUBKEY_MISSING;
|
|
12
14
|
}
|
|
13
15
|
if (!message.broadcastMessages?.length && !message.p2pMessages?.length) {
|
|
14
|
-
|
|
16
|
+
throw errordefinitions_1.Errors.TSS_INVALID_MESSAGE;
|
|
15
17
|
}
|
|
16
18
|
for (const m of message.broadcastMessages) {
|
|
17
19
|
if (!bitcore_tss_1.utils.verifySignedData(m.payload, publicKey)) {
|
|
18
|
-
|
|
20
|
+
throw errordefinitions_1.Errors.TSS_INVALID_MESSAGE_SIG;
|
|
19
21
|
}
|
|
20
22
|
;
|
|
21
23
|
}
|
|
22
24
|
for (const m of message.p2pMessages) {
|
|
23
25
|
if (!m.payload || !m.payload.encryptedMessage || !m.payload.signature) {
|
|
24
|
-
|
|
26
|
+
throw errordefinitions_1.Errors.TSS_INVALID_MESSAGE_SIG;
|
|
25
27
|
}
|
|
26
28
|
}
|
|
27
29
|
return next();
|
|
28
30
|
}
|
|
29
|
-
catch {
|
|
30
|
-
|
|
31
|
+
catch (err) {
|
|
32
|
+
if (err instanceof clienterror_1.ClientError) {
|
|
33
|
+
return helpers_1.error.returnError(err, res, req);
|
|
34
|
+
}
|
|
35
|
+
return helpers_1.error.returnError(errordefinitions_1.Errors.TSS_INVALID_MESSAGE, res, req);
|
|
31
36
|
}
|
|
32
37
|
}
|
|
33
38
|
;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyTssMessage.js","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/verifyTssMessage.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"verifyTssMessage.js","sourceRoot":"","sources":["../../../../../src/lib/routes/middleware/verifyTssMessage.ts"],"names":[],"mappings":";;AAQA,4CAgCC;AAxCD,0DAA6D;AAC7D,0DAAuD;AACvD,oEAAuD;AACvD,wCAAmC;AAK5B,KAAK,UAAU,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;IACnD,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAA6D,GAAG,CAAC,IAAI,CAAC;QACvF,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,yBAAM,CAAC,kBAAkB,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;YACvE,MAAM,yBAAM,CAAC,mBAAmB,CAAC;QACnC,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC1C,IAAI,CAAC,mBAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;gBACrD,MAAM,yBAAM,CAAC,uBAAuB,CAAC;YACvC,CAAC;YAAA,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YAIpC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;gBACtE,MAAM,yBAAM,CAAC,uBAAuB,CAAC;YACvC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,yBAAW,EAAE,CAAC;YAC/B,OAAO,eAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,eAAK,CAAC,WAAW,CAAC,yBAAM,CAAC,mBAAmB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAAA,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tss.d.ts","sourceRoot":"","sources":["../../../../src/lib/routes/tss.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,KAAK,MAAM,wBAAwB,CAAC;AAQhD,UAAU,aAAa;IACrB,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,IAAI,EAAE;QACJ,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;CACH;AAED,qBAAa,SAAS;IACpB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;gBAEX,MAAM,EAAE,aAAa;
|
|
1
|
+
{"version":3,"file":"tss.d.ts","sourceRoot":"","sources":["../../../../src/lib/routes/tss.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,KAAK,MAAM,wBAAwB,CAAC;AAQhD,UAAU,aAAa;IACrB,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,IAAI,EAAE;QACJ,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;CACH;AAED,qBAAa,SAAS;IACpB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;gBAEX,MAAM,EAAE,aAAa;CA8GlC"}
|
|
@@ -19,9 +19,9 @@ class TssRouter {
|
|
|
19
19
|
router.post('/v1/tss/keygen/:id', (0, createWalletLimiter_1.createWalletLimiter)(opts), verifyTssMessage_1.verifyTssMessage, async function (req, res) {
|
|
20
20
|
try {
|
|
21
21
|
const id = req.params.id;
|
|
22
|
-
const { message, n, password } = req.body;
|
|
22
|
+
const { message, n, password, version = 1.0, timeLimit } = req.body;
|
|
23
23
|
const copayerId = req.headers['x-identity'];
|
|
24
|
-
await tss_1.TssKeyGen.processMessage({ id, message, n, password, copayerId });
|
|
24
|
+
await tss_1.TssKeyGen.processMessage({ id, message, n, password, copayerId, version, timeLimit });
|
|
25
25
|
return res.send();
|
|
26
26
|
}
|
|
27
27
|
catch (err) {
|
|
@@ -81,9 +81,9 @@ class TssRouter {
|
|
|
81
81
|
router.post('/v1/tss/sign/:id', (0, authRequest_1.authRequest)(), verifyTssMessage_1.verifyTssMessage, async function (req, res) {
|
|
82
82
|
try {
|
|
83
83
|
const id = req.params.id;
|
|
84
|
-
const { message, m } = req.body;
|
|
84
|
+
const { message, m, version = 1.0, timeLimit } = req.body;
|
|
85
85
|
const copayerId = req.headers['x-identity'];
|
|
86
|
-
await tss_1.TssSign.processMessage({ id, message, m, copayerId });
|
|
86
|
+
await tss_1.TssSign.processMessage({ id, message, m, copayerId, version, timeLimit });
|
|
87
87
|
return res.send();
|
|
88
88
|
}
|
|
89
89
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tss.js","sourceRoot":"","sources":["../../../../src/lib/routes/tss.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAE9B,gCAA4C;AAC5C,0DAAuD;AACvD,gEAA6D;AAC7D,0EAAuE;AACvE,oEAAiE;AAQhE,CAAC;AAEF,MAAa,SAAS;IACpB,MAAM,CAAiB;IAEvB,YAAY,MAAqB;QAC/B,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QACrC,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"tss.js","sourceRoot":"","sources":["../../../../src/lib/routes/tss.ts"],"names":[],"mappings":"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"}
|