diff --git a/package-lock.json b/package-lock.json index c4da846e92..7b5967b928 100644 --- a/package-lock.json +++ b/package-lock.json @@ -845,9 +845,9 @@ "integrity": "sha512-1qxL22a8LRA38xxzmmJktdVdGTfz2d9SXr9SI2gPpCJSKYrKb7SNGbOE3TgIyCRY0fquOHMtkwXuKGRw+LsJoA==" }, "@waves/signature-adapter": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/@waves/signature-adapter/-/signature-adapter-5.1.4.tgz", - "integrity": "sha512-csHaZgkvCn5vQYKKZpEWb3Df5CVOJT3uPGiyhmJqynRGeH3NKcyizCNoBv82MEigJLQPbks0yqOc1dvM/OXYsw==", + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/@waves/signature-adapter/-/signature-adapter-5.1.7.tgz", + "integrity": "sha512-R638d0KGwTAbwKwITM/C5yRnRejBxzOwu+TD6OroVaLsU/LNYeDGB7W6b6am5hJ011wEVZrUvtyGUBXs2UjBiw==", "requires": { "@types/ramda": "^0.25.46", "@waves/bignumber": "^0.0.1", @@ -855,7 +855,7 @@ "@waves/ledger": "^3.4.0", "@waves/money-like-to-node": "0.0.10", "@waves/ts-types": "^0.2.0", - "@waves/waves-transactions": "^3.13.0", + "@waves/waves-transactions": "^3.14.3", "ramda": "^0.25.0" }, "dependencies": { @@ -868,9 +868,27 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/@waves/ts-types/-/ts-types-0.2.0.tgz", "integrity": "sha512-mJOovPtwTyFV6fgI+KKFJ8IeqWSTXdKPOwgcCX9vT7wwMNwiJS2dMboAW2acR8YLiPy7LzZ5t41JCxvGLU+ZSA==" + }, + "@waves/waves-transactions": { + "version": "3.14.3", + "resolved": "https://registry.npmjs.org/@waves/waves-transactions/-/waves-transactions-3.14.3.tgz", + "integrity": "sha512-wmyZZa+bIYbYxsqg6NipcO+d7yrfnhIJXrcl7QH0B4wzaVgUiMTedrPLDlGaxgq7yPMFyH3DALIjd+NBXtJYhw==", + "requires": { + "@waves/marshall": "^0.8.0", + "@waves/ts-lib-crypto": "^1.0.1", + "axios": "^0.19.0" + } } } }, + "@waves/ts-lib-crypto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@waves/ts-lib-crypto/-/ts-lib-crypto-1.0.1.tgz", + "integrity": "sha512-aeB3I5DYE1j5gMbM4tzoHdaOVTJj73MldrJ0LNa5zmOAAWz8cFpELjVTChVj+6qzm0EuQD8I0kTcEfdwmHR/jw==", + "requires": { + "node-forge": "^0.8.5" + } + }, "@waves/ts-types": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/@waves/ts-types/-/ts-types-0.0.2.tgz", @@ -892,21 +910,13 @@ } } }, - "@waves/waves-crypto": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/@waves/waves-crypto/-/waves-crypto-3.0.17.tgz", - "integrity": "sha512-2YZ7KxH3npZhdXMGnw59orvm8FRhok8kQ91ex1/VJG/ZmtR16/S94ujqb6sf4vrrNB3+BryDStrSWeBeoYxHoQ==", - "requires": { - "crypto-js": "^3.1.9-1" - } - }, "@waves/waves-transactions": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/@waves/waves-transactions/-/waves-transactions-3.13.0.tgz", - "integrity": "sha512-cOc/ds3Ul0TYsgjMoZ1MaNIlzWwhcbVWd8GQLGkCY8VCZszJhHNhHccB75BhSxOI72n51gNsRi4uQviyNLTeTQ==", + "version": "3.14.3", + "resolved": "https://registry.npmjs.org/@waves/waves-transactions/-/waves-transactions-3.14.3.tgz", + "integrity": "sha512-wmyZZa+bIYbYxsqg6NipcO+d7yrfnhIJXrcl7QH0B4wzaVgUiMTedrPLDlGaxgq7yPMFyH3DALIjd+NBXtJYhw==", "requires": { "@waves/marshall": "^0.8.0", - "@waves/waves-crypto": "^3.0.17", + "@waves/ts-lib-crypto": "^1.0.1", "axios": "^0.19.0" } }, @@ -4385,11 +4395,6 @@ "randomfill": "^1.0.3" } }, - "crypto-js": { - "version": "3.1.9-1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", - "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" - }, "crypto-random-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", @@ -12076,6 +12081,11 @@ "lower-case": "^1.1.1" } }, + "node-forge": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz", + "integrity": "sha512-vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q==" + }, "node-releases": { "version": "1.1.23", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz", diff --git a/package.json b/package.json index 4db850bb0b..32e302019d 100644 --- a/package.json +++ b/package.json @@ -110,10 +110,10 @@ "@waves/ledger": "^3.4.0", "@waves/marshall": "^0.8.0", "@waves/oracle-data": "^0.0.6", - "@waves/signature-adapter": "^5.1.4", + "@waves/signature-adapter": "^5.1.7", "@waves/ts-types": "0.0.2", "@waves/waves-browser-bus": "^0.1.5", - "@waves/waves-transactions": "^3.13.0", + "@waves/waves-transactions": "^3.14.3", "angular": "1.6.6", "angular-animate": "1.6.6", "angular-aria": "1.6.6", diff --git a/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocation.js b/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocation.js index 25537043c8..21f318e584 100644 --- a/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocation.js +++ b/src/modules/ui/directives/transactionInfo/types/script-invocation/ScriptInvocation.js @@ -41,9 +41,12 @@ $postLink() { this.transaction = this.signable.getTxData(); - this.signable.getDataForApi().then(json => { - this.json = WavesApp.stringifyJSON(json, null, 4); - }); + (this.transaction.id ? Promise.resolve(this.transaction.id) : this.signable.getId()) + .then(id => { + this.id = id; + }); + + this.json = JSON.stringify(this.transaction.call && this.transaction.call.args || [], null, 4); if (this.transaction.payment.length > 0) { const payment = this.transaction.payment[0]; this.payment = `${payment.getTokens().toFormat()} ${payment.asset.displayName}`;