From 1d8e33940976c510060c4fddb9eea9321254656c Mon Sep 17 00:00:00 2001 From: vba2000 Date: Thu, 10 Dec 2020 13:34:30 +0300 Subject: [PATCH 1/4] Update libs --- package-lock.json | 128 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c68183..7815c16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -224,9 +224,9 @@ } }, "@babel/polyfill": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.11.5.tgz", - "integrity": "sha512-FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz", + "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==", "requires": { "core-js": "^2.6.5", "regenerator-runtime": "^0.13.4" @@ -506,56 +506,56 @@ } }, "@ledgerhq/devices": { - "version": "5.23.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.23.0.tgz", - "integrity": "sha512-XR9qTwn14WwN8VSMsYD9NTX/TgkmrTnXEh0pIj6HMRZwFzBPzslExOcXuCm3V9ssgAEAxv3VevfV8UulvvZUXA==", + "version": "5.34.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.34.0.tgz", + "integrity": "sha512-oRoZDDfufXAv9KofQdOXc0QztISa9x/YVdiWs55iOlNRQjWYHSPFzeSP6+J+tN0Au/GS9v+wcnTf+tHCtVz27Q==", "requires": { - "@ledgerhq/errors": "^5.23.0", - "@ledgerhq/logs": "^5.23.0", + "@ledgerhq/errors": "^5.34.0", + "@ledgerhq/logs": "^5.30.0", "rxjs": "^6.6.3" } }, "@ledgerhq/errors": { - "version": "5.23.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.23.0.tgz", - "integrity": "sha512-qtpX8aFrUUlYfOMu7BxTvxqUa8CniE+tEBpVEjYUhVbFdVJjM4ouwJD++RtQkMAU2c5jE7xb12WnUnf5BlAgLQ==" + "version": "5.34.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.34.0.tgz", + "integrity": "sha512-8Td60sOP5wzsjmxmj9Q5hjrr1XjCfB3Vdifq+1fiD6rpjyscYLgmoP2y5GYDPceDhalA/GOrKNSf+aIVVmBNOw==" }, "@ledgerhq/hw-transport": { - "version": "5.23.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.23.0.tgz", - "integrity": "sha512-ICTG3Bst62SkC+lYYFgpKk5G4bAOxeIvptXnTLOhf6VqeN7gdHfiRzZwNPnKzI2pxmcEVbBitgsxEIEQJmDKVA==", + "version": "5.34.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.34.0.tgz", + "integrity": "sha512-JxhqU9sBn+WH3CPMus9b70SED7LEeW17xw0VL5aRdxFu4YS5rhy5Xf4Sd5jIQfyDkHik1ouzfJVuQEju8+GGBw==", "requires": { - "@ledgerhq/devices": "^5.23.0", - "@ledgerhq/errors": "^5.23.0", + "@ledgerhq/devices": "^5.34.0", + "@ledgerhq/errors": "^5.34.0", "events": "^3.2.0" } }, "@ledgerhq/hw-transport-u2f": { - "version": "5.22.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-5.22.0.tgz", - "integrity": "sha512-ooSqdeFcW8Oo9BOVYfPNT4NX7IQlffVX9lZMqy2HBpHAjTW/iIViGtZOyKr5ehHrwugAw/hWNH5TqUqs7zgoyA==", + "version": "5.34.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-5.34.0.tgz", + "integrity": "sha512-EM6LcbdD6Xo/msedbAWalBZlv89XAZrAZwL5zN9eKlUcWPjjG8c9+t5NedR/jmIaGuzIUVseUCIRxczqd5byOw==", "requires": { - "@ledgerhq/errors": "^5.22.0", - "@ledgerhq/hw-transport": "^5.22.0", - "@ledgerhq/logs": "^5.22.0", + "@ledgerhq/errors": "^5.34.0", + "@ledgerhq/hw-transport": "^5.34.0", + "@ledgerhq/logs": "^5.30.0", "u2f-api": "0.2.7" } }, "@ledgerhq/hw-transport-webusb": { - "version": "5.23.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-5.23.0.tgz", - "integrity": "sha512-kz0LhlxvE97gIU0TvvzY3Co4DsRudwXoWZ/RCW3/ewn4zJ5ZT/fvp9qCrqbRsXJ+RTuZ7JQOiR1kA+Iz3qJWCg==", + "version": "5.34.1", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-5.34.1.tgz", + "integrity": "sha512-/hNUwNzjMlk7Fk8YrBqw2G9bbC7ahUVIrJqW+xop+Qgr9qrMv2QiHci+UJe3u9ITmG5BtVZF/R62Kfls8plKKA==", "requires": { - "@ledgerhq/devices": "^5.23.0", - "@ledgerhq/errors": "^5.23.0", - "@ledgerhq/hw-transport": "^5.23.0", - "@ledgerhq/logs": "^5.23.0" + "@ledgerhq/devices": "^5.34.0", + "@ledgerhq/errors": "^5.34.0", + "@ledgerhq/hw-transport": "^5.34.0", + "@ledgerhq/logs": "^5.30.0" } }, "@ledgerhq/logs": { - "version": "5.23.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.23.0.tgz", - "integrity": "sha512-88M8RkVHl44k6MAhfrYhx25opnJV24/2XpuTUVklID11f9rBdE+6RZ9OMs39dyX2sDv7TuzIPi5nTRoCqZMDYw==" + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.30.0.tgz", + "integrity": "sha512-wUhg2VTfUrWihjdGqKkH/s7TBzdIM1yyd2LiscYsfTX2I0xYDMnpE+NkMReeGU8PN3QhCPgnlg9/P9V6UWoJBA==" }, "@protobufjs/aspromise": { "version": "1.1.2", @@ -761,15 +761,26 @@ } }, "@waves/ledger": { - "version": "4.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@waves/ledger/-/ledger-4.0.0-beta.1.tgz", - "integrity": "sha512-l78yq7xw/qErhmAMjXnkz04rJAf3FmzGOTaZlJylpRgpfQCXfNi4wtCH4rGbV9FrC9A+3LxaVhnrT7wYkPkxMg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@waves/ledger/-/ledger-4.0.0.tgz", + "integrity": "sha512-tQp3ifMChJLl7MmRachgpKVHw7+DAqTalMCYiuM1q6CUkfewv9C9mp7PqpJ16/4dZCgMKizAcFU8O6RtFue37A==", "requires": { "@babel/polyfill": "^7.6.0", - "@ledgerhq/hw-transport-u2f": "^5.19.1", - "@ledgerhq/hw-transport-webusb": "^5.19.1", + "@ledgerhq/hw-transport-u2f": "^5.34.0", + "@ledgerhq/hw-transport-webusb": "^5.34.1", "@ledgerhq/logs": "^5.19.1", - "@waves/ts-lib-crypto": "^1.4.3" + "@waves/ts-lib-crypto": "^1.4.3", + "rimraf": "^3.0.2" + }, + "dependencies": { + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + } } }, "@waves/marshall": { @@ -1163,8 +1174,7 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base": { "version": "0.11.2", @@ -1260,7 +1270,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1696,8 +1705,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.2", @@ -1736,9 +1744,9 @@ "dev": true }, "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-util-is": { "version": "1.0.2", @@ -2473,8 +2481,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "1.2.12", @@ -3079,7 +3086,6 @@ "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -3286,7 +3292,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -3295,8 +3300,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "inline-source-map": { "version": "0.6.2", @@ -4423,7 +4427,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4537,9 +4540,9 @@ "dev": true }, "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-forge": { "version": "0.8.5", @@ -4706,7 +4709,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } @@ -4842,8 +4844,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { "version": "2.0.1", @@ -6096,9 +6097,9 @@ "integrity": "sha512-FZIXf1ksVyLcfr7M317jbB67XFJhOO1YqdTcuGaq9q5jLUoTikukZ+98TPjKiP2jC5CgmYdWWYs0s2nLSU0/1A==" }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "tty-browserify": { "version": "0.0.1", @@ -6432,8 +6433,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write-file-atomic": { "version": "2.4.1", diff --git a/package.json b/package.json index c34c053..bd82a6c 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@types/ramda": "^0.27.3", "@waves/bignumber": "^1.0.0", "@waves/data-entities": "^2.0.3", - "@waves/ledger": "^4.0.0-beta.1", + "@waves/ledger": "^4.0.0", "@waves/money-like-to-node": "0.1.3", "@waves/ts-types": "^0.2.0", "@waves/waves-transactions": "4.1.3", @@ -33,7 +33,7 @@ "@types/node-fetch": "^2.5.5", "browserify": "^16.5.1", "jest": "^24.8.0", - "node-fetch": "^2.6.0", + "node-fetch": "^2.6.1", "ts-jest": "^23.10.3", "typescript": "^3.2.2", "uglify-js": "^3.4.7" From da29c45b81a7a252db358d5a6d5f1aaea7244d91 Mon Sep 17 00:00:00 2001 From: vba2000 Date: Thu, 10 Dec 2020 13:34:45 +0300 Subject: [PATCH 2/4] 6.1.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7815c16..cbc1bbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@waves/signature-adapter", - "version": "6.0.7", + "version": "6.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bd82a6c..b6929c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@waves/signature-adapter", - "version": "6.0.7", + "version": "6.1.0", "types": "dist/index.d.ts", "main": "dist/index.js", "license": "MIT", From 595eb8b85fb44830ca23c55f160e495be2c2c40c Mon Sep 17 00:00:00 2001 From: vba2000 Date: Tue, 26 Jan 2021 21:51:17 +0300 Subject: [PATCH 3/4] fix api --- src/Signable.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Signable.ts b/src/Signable.ts index 92ffb71..2ae2f59 100644 --- a/src/Signable.ts +++ b/src/Signable.ts @@ -235,11 +235,11 @@ export class Signable { }); } - public async getDataForApi() { + public async getDataForApi(needSign = true) { const data = await this.getSignData(); - - await this.addMyProof(); - + if (needSign) { + await this.addMyProof(); + } const proofs = (this._proofs || []).slice(); try { From 29d8371d4bd0fd0eb9ab1049712c56d46845c5f0 Mon Sep 17 00:00:00 2001 From: vba2000 Date: Tue, 26 Jan 2021 21:51:30 +0300 Subject: [PATCH 4/4] 6.1.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index cbc1bbb..d399183 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@waves/signature-adapter", - "version": "6.1.0", + "version": "6.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b6929c9..dafba04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@waves/signature-adapter", - "version": "6.1.0", + "version": "6.1.1", "types": "dist/index.d.ts", "main": "dist/index.js", "license": "MIT",