From dd2de33be085f56bede47237fcb43202e4753f4e Mon Sep 17 00:00:00 2001 From: Bogdan Manole Date: Mon, 28 Aug 2023 19:38:50 +0300 Subject: [PATCH] fix: mobile --- package-lock.json | 274 ++++++++++++++++++++------------- package.json | 2 +- src/App.vue | 3 +- src/store/index.js | 19 +-- src/store/modules/aeternity.js | 3 - 5 files changed, 184 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04645940..5a293618 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "dex-ui", "version": "1.17.3", "dependencies": { - "@aeternity/aepp-sdk": "^13.0.1", + "@aeternity/aepp-sdk": "^13.2.1", "@fontsource/ibm-plex-sans": "^4.5.11", "@popperjs/core": "^2.11.5", "@sentry/tracing": "^7.8.1", @@ -94,31 +94,34 @@ } }, "node_modules/@aeternity/aepp-sdk": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-13.0.1.tgz", - "integrity": "sha512-kQ12UUtYJ5tBucJIDKJbWbpkCuBaqphkWcyjDL7HdOeycCrFjPcjYGMkJJfCmQ8VnVoCXxUjywyDF5vkHc296g==", + "version": "13.2.1", + "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-13.2.1.tgz", + "integrity": "sha512-YJOCDNHKR3s/zAU8hsGKNBp0TOmdPUSTyhRhVnl9j8Wedt+WfgtRtteun9y6MHH9MMnLsa3g8ClY37M7X+J3hg==", "dependencies": { "@aeternity/aepp-calldata": "^1.4.0", "@aeternity/argon2": "^0.0.1", "@aeternity/uuid": "^0.0.1", "@azure/core-client": "1.6.0", - "@azure/core-rest-pipeline": "^1.10.1", - "@babel/runtime-corejs3": "^7.21.0", - "@ledgerhq/hw-transport": "^6.28.1", + "@azure/core-rest-pipeline": "^1.11.0", + "@babel/runtime-corejs3": "^7.22.6", + "@ledgerhq/hw-transport": "^6.28.6", "@types/aes-js": "^3.1.1", "@types/json-bigint": "^1.0.1", "@types/node": "~18.11.9", - "@types/sha.js": "^2.4.0", - "@types/uuid": "^9.0.1", - "@types/webextension-polyfill": "^0.10.0", + "@types/sha.js": "^2.4.1", + "@types/uuid": "^9.0.2", + "@types/webextension-polyfill": "^0.10.1", "@types/websocket": "^1.0.5", + "@types/ws": "^8.5.5", "aes-js": "^3.1.2", "bignumber.js": "^9.1.1", "bip32-path": "^0.4.2", "blakejs": "^1.2.1", "bs58": "^5.0.0", "buffer": "^6.0.3", + "canonicalize": "^2.0.0", "events": "^3.3.0", + "isomorphic-ws": "^5.0.0", "json-bigint": "^1.0.0", "process": "^0.11.10", "rlp": "^3.0.0", @@ -126,7 +129,8 @@ "tweetnacl": "^1.0.3", "tweetnacl-auth": "^1.0.1", "varuint-bitcoin": "^1.1.2", - "websocket": "^1.0.34" + "websocket": "^1.0.34", + "ws": "^8.13.0" }, "engines": { "node": ">=14.19.0" @@ -145,6 +149,26 @@ "base-x": "^4.0.0" } }, + "node_modules/@aeternity/aepp-sdk/node_modules/ws": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/@aeternity/argon2": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/@aeternity/argon2/-/argon2-0.0.1.tgz", @@ -221,9 +245,9 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.3.tgz", - "integrity": "sha512-AMQb0ttiGJ0MIV/r+4TVra6U4+90mPeOveehFnrqKlo7dknPJYdJ61wOzYJXJjDxF8LcCtSogfRelkq+fCGFTw==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.0.tgz", + "integrity": "sha512-+MnSB0vGZjszSzr5AW8z93/9fkDu2RLtWmAN8gskURq7EW2sSwqy8jZa0V26rjuBVkwhdA3Hw8z3VWoeBUOw+A==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -2036,17 +2060,22 @@ } }, "node_modules/@babel/runtime-corejs3": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.21.5.tgz", - "integrity": "sha512-FRqFlFKNazWYykft5zvzuEl1YyTDGsIRrjV9rvxvYkUC7W/ueBng1X68Xd6uRMzAaJ0xMKn08/wem5YS1lpX8w==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz", + "integrity": "sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA==", "dependencies": { - "core-js-pure": "^3.25.1", - "regenerator-runtime": "^0.13.11" + "core-js-pure": "^3.30.2", + "regenerator-runtime": "^0.14.0" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/runtime-corejs3/node_modules/regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + }, "node_modules/@babel/template": { "version": "7.18.10", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", @@ -3822,11 +3851,11 @@ } }, "node_modules/@ledgerhq/devices": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.1.tgz", - "integrity": "sha512-8uuyR8DGowYBLatur+MyJtRJ8RYDWSFFqGnNmgBBdlRG6VPf9vjhrFZlmYqukWesPwkZNZstP475W4TS+j6EFw==", + "version": "8.0.6", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.6.tgz", + "integrity": "sha512-KWA68krUD9pFp6bJAhTe2nurhku4HnS5LwtHnCXg8PB0DbzWt27PTKgVOCKO7TEdJ3wu4eVcgP5RQrap22pQHQ==", "dependencies": { - "@ledgerhq/errors": "^6.12.4", + "@ledgerhq/errors": "^6.13.1", "@ledgerhq/logs": "^6.10.1", "rxjs": "6", "semver": "^7.3.5" @@ -3844,9 +3873,9 @@ } }, "node_modules/@ledgerhq/devices/node_modules/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -3863,17 +3892,17 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@ledgerhq/errors": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.4.tgz", - "integrity": "sha512-qi5poMrcIuFuivdzRjjQsNp7rRwUA5v3eo6D4yEy+l+w8wT4d4JtQ5u1TbrlGfFHfgLq7Lv6dsvh2ooLyWTyfg==" + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.13.1.tgz", + "integrity": "sha512-y5qOFiX7ILACF7GvCAB67S5nCABEP5rm8lxK66qKIBRApcLlTplbjUACDRfKQbAIwf0SJPuR31rtTKB92ykwKQ==" }, "node_modules/@ledgerhq/hw-transport": { - "version": "6.28.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.2.tgz", - "integrity": "sha512-2LxQdZnhSzu394brKuUZIWfuT2YAyNI3glRMf8+yHx3wUFqi10v8NzII99SHDyT8tN3Ovzmq+hbGHvrR2PqYRA==", + "version": "6.28.7", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.7.tgz", + "integrity": "sha512-P6XWv/Blb3AvzNH/33ouqFvsUwjCsQN5iMTLuVJqxVKwj91QmdYZfYR9U9FB0gBKrIQ7BONUgTX/ko9EnDV6/g==", "dependencies": { - "@ledgerhq/devices": "^8.0.1", - "@ledgerhq/errors": "^6.12.4", + "@ledgerhq/devices": "^8.0.6", + "@ledgerhq/errors": "^6.13.1", "events": "^3.3.0" } }, @@ -4575,9 +4604,9 @@ } }, "node_modules/@types/sha.js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.0.tgz", - "integrity": "sha512-amxKgPy6WJTKuw8mpUwjX2BSxuBtBmZfRwIUDIuPJKNwGN8CWDli8JTg5ONTWOtcTkHIstvT7oAhhYXqEjStHQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.1.tgz", + "integrity": "sha512-QHWKOJ4dkWB0OCfCoOFUZkhvpqUllcPs2WIhYFk7ugAprv3ts0z4nSuHtc0jlWBYLdPwfNRpVpv9pIpFSbYBYQ==", "dependencies": { "@types/node": "*" } @@ -4628,14 +4657,14 @@ "dev": true }, "node_modules/@types/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==" + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz", + "integrity": "sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==" }, "node_modules/@types/webextension-polyfill": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.10.0.tgz", - "integrity": "sha512-If4EcaHzYTqcbNMp/FdReVdRmLL/Te42ivnJII551bYjhX19bWem5m14FERCqdJA732OloGuxCRvLBvcMGsn4A==" + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.10.1.tgz", + "integrity": "sha512-Sdg+E2F5JUbhkE1qX15QUxpyhfMFKRGJqND9nb1C0gNN4NR7kCV31/1GvNbg6Xe+m/JElJ9/lG5kepMzjGPuQw==" }, "node_modules/@types/websocket": { "version": "1.0.5", @@ -4646,10 +4675,9 @@ } }, "node_modules/@types/ws": { - "version": "8.5.2", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz", - "integrity": "sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==", - "dev": true, + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dependencies": { "@types/node": "*" } @@ -7051,6 +7079,11 @@ } ] }, + "node_modules/canonicalize": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-2.0.0.tgz", + "integrity": "sha512-ulDEYPv7asdKvqahuAY35c1selLdzDwHqugK92hfkzvlDCwXRRelDkR+Er33md/PtnpqHemgkuDPanZ4fiYZ8w==" + }, "node_modules/case-sensitive-paths-webpack-plugin": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz", @@ -7747,9 +7780,9 @@ } }, "node_modules/core-js-pure": { - "version": "3.30.2", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.30.2.tgz", - "integrity": "sha512-p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg==", + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.0.tgz", + "integrity": "sha512-qsev1H+dTNYpDUEURRuOXMvpdtAnNEvQWS/FMJ2Vb5AY8ZP4rAPQldkE27joykZPJTe0+IVgHZYh1P5Xu1/i1g==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -12614,6 +12647,14 @@ "node": ">=0.10.0" } }, + "node_modules/isomorphic-ws": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz", + "integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==", + "peerDependencies": { + "ws": "*" + } + }, "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -19378,7 +19419,8 @@ "node_modules/regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "dev": true }, "node_modules/regenerator-transform": { "version": "0.15.0", @@ -23136,7 +23178,6 @@ "version": "7.5.5", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", - "dev": true, "engines": { "node": ">=8.3.0" }, @@ -23374,31 +23415,34 @@ } }, "@aeternity/aepp-sdk": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-13.0.1.tgz", - "integrity": "sha512-kQ12UUtYJ5tBucJIDKJbWbpkCuBaqphkWcyjDL7HdOeycCrFjPcjYGMkJJfCmQ8VnVoCXxUjywyDF5vkHc296g==", + "version": "13.2.1", + "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-13.2.1.tgz", + "integrity": "sha512-YJOCDNHKR3s/zAU8hsGKNBp0TOmdPUSTyhRhVnl9j8Wedt+WfgtRtteun9y6MHH9MMnLsa3g8ClY37M7X+J3hg==", "requires": { "@aeternity/aepp-calldata": "^1.4.0", "@aeternity/argon2": "^0.0.1", "@aeternity/uuid": "^0.0.1", "@azure/core-client": "1.6.0", - "@azure/core-rest-pipeline": "^1.10.1", - "@babel/runtime-corejs3": "^7.21.0", - "@ledgerhq/hw-transport": "^6.28.1", + "@azure/core-rest-pipeline": "^1.11.0", + "@babel/runtime-corejs3": "^7.22.6", + "@ledgerhq/hw-transport": "^6.28.6", "@types/aes-js": "^3.1.1", "@types/json-bigint": "^1.0.1", "@types/node": "~18.11.9", - "@types/sha.js": "^2.4.0", - "@types/uuid": "^9.0.1", - "@types/webextension-polyfill": "^0.10.0", + "@types/sha.js": "^2.4.1", + "@types/uuid": "^9.0.2", + "@types/webextension-polyfill": "^0.10.1", "@types/websocket": "^1.0.5", + "@types/ws": "^8.5.5", "aes-js": "^3.1.2", "bignumber.js": "^9.1.1", "bip32-path": "^0.4.2", "blakejs": "^1.2.1", "bs58": "^5.0.0", "buffer": "^6.0.3", + "canonicalize": "^2.0.0", "events": "^3.3.0", + "isomorphic-ws": "^5.0.0", "json-bigint": "^1.0.0", "process": "^0.11.10", "rlp": "^3.0.0", @@ -23406,7 +23450,8 @@ "tweetnacl": "^1.0.3", "tweetnacl-auth": "^1.0.1", "varuint-bitcoin": "^1.1.2", - "websocket": "^1.0.34" + "websocket": "^1.0.34", + "ws": "^8.13.0" }, "dependencies": { "base-x": { @@ -23421,6 +23466,12 @@ "requires": { "base-x": "^4.0.0" } + }, + "ws": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "requires": {} } } }, @@ -23485,9 +23536,9 @@ } }, "@azure/core-rest-pipeline": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.3.tgz", - "integrity": "sha512-AMQb0ttiGJ0MIV/r+4TVra6U4+90mPeOveehFnrqKlo7dknPJYdJ61wOzYJXJjDxF8LcCtSogfRelkq+fCGFTw==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.0.tgz", + "integrity": "sha512-+MnSB0vGZjszSzr5AW8z93/9fkDu2RLtWmAN8gskURq7EW2sSwqy8jZa0V26rjuBVkwhdA3Hw8z3VWoeBUOw+A==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.4.0", @@ -24742,12 +24793,19 @@ } }, "@babel/runtime-corejs3": { - "version": "7.21.5", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.21.5.tgz", - "integrity": "sha512-FRqFlFKNazWYykft5zvzuEl1YyTDGsIRrjV9rvxvYkUC7W/ueBng1X68Xd6uRMzAaJ0xMKn08/wem5YS1lpX8w==", + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.22.10.tgz", + "integrity": "sha512-IcixfV2Jl3UrqZX4c81+7lVg5++2ufYJyAFW3Aux/ZTvY6LVYYhJ9rMgnbX0zGVq6eqfVpnoatTjZdVki/GmWA==", "requires": { - "core-js-pure": "^3.25.1", - "regenerator-runtime": "^0.13.11" + "core-js-pure": "^3.30.2", + "regenerator-runtime": "^0.14.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + } } }, "@babel/template": { @@ -26133,11 +26191,11 @@ } }, "@ledgerhq/devices": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.1.tgz", - "integrity": "sha512-8uuyR8DGowYBLatur+MyJtRJ8RYDWSFFqGnNmgBBdlRG6VPf9vjhrFZlmYqukWesPwkZNZstP475W4TS+j6EFw==", + "version": "8.0.6", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.6.tgz", + "integrity": "sha512-KWA68krUD9pFp6bJAhTe2nurhku4HnS5LwtHnCXg8PB0DbzWt27PTKgVOCKO7TEdJ3wu4eVcgP5RQrap22pQHQ==", "requires": { - "@ledgerhq/errors": "^6.12.4", + "@ledgerhq/errors": "^6.13.1", "@ledgerhq/logs": "^6.10.1", "rxjs": "6", "semver": "^7.3.5" @@ -26152,9 +26210,9 @@ } }, "semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -26167,17 +26225,17 @@ } }, "@ledgerhq/errors": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.4.tgz", - "integrity": "sha512-qi5poMrcIuFuivdzRjjQsNp7rRwUA5v3eo6D4yEy+l+w8wT4d4JtQ5u1TbrlGfFHfgLq7Lv6dsvh2ooLyWTyfg==" + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.13.1.tgz", + "integrity": "sha512-y5qOFiX7ILACF7GvCAB67S5nCABEP5rm8lxK66qKIBRApcLlTplbjUACDRfKQbAIwf0SJPuR31rtTKB92ykwKQ==" }, "@ledgerhq/hw-transport": { - "version": "6.28.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.2.tgz", - "integrity": "sha512-2LxQdZnhSzu394brKuUZIWfuT2YAyNI3glRMf8+yHx3wUFqi10v8NzII99SHDyT8tN3Ovzmq+hbGHvrR2PqYRA==", + "version": "6.28.7", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.7.tgz", + "integrity": "sha512-P6XWv/Blb3AvzNH/33ouqFvsUwjCsQN5iMTLuVJqxVKwj91QmdYZfYR9U9FB0gBKrIQ7BONUgTX/ko9EnDV6/g==", "requires": { - "@ledgerhq/devices": "^8.0.1", - "@ledgerhq/errors": "^6.12.4", + "@ledgerhq/devices": "^8.0.6", + "@ledgerhq/errors": "^6.13.1", "events": "^3.3.0" } }, @@ -26804,9 +26862,9 @@ } }, "@types/sha.js": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.0.tgz", - "integrity": "sha512-amxKgPy6WJTKuw8mpUwjX2BSxuBtBmZfRwIUDIuPJKNwGN8CWDli8JTg5ONTWOtcTkHIstvT7oAhhYXqEjStHQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.1.tgz", + "integrity": "sha512-QHWKOJ4dkWB0OCfCoOFUZkhvpqUllcPs2WIhYFk7ugAprv3ts0z4nSuHtc0jlWBYLdPwfNRpVpv9pIpFSbYBYQ==", "requires": { "@types/node": "*" } @@ -26857,14 +26915,14 @@ "dev": true }, "@types/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA==" + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz", + "integrity": "sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==" }, "@types/webextension-polyfill": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.10.0.tgz", - "integrity": "sha512-If4EcaHzYTqcbNMp/FdReVdRmLL/Te42ivnJII551bYjhX19bWem5m14FERCqdJA732OloGuxCRvLBvcMGsn4A==" + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@types/webextension-polyfill/-/webextension-polyfill-0.10.1.tgz", + "integrity": "sha512-Sdg+E2F5JUbhkE1qX15QUxpyhfMFKRGJqND9nb1C0gNN4NR7kCV31/1GvNbg6Xe+m/JElJ9/lG5kepMzjGPuQw==" }, "@types/websocket": { "version": "1.0.5", @@ -26875,10 +26933,9 @@ } }, "@types/ws": { - "version": "8.5.2", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz", - "integrity": "sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==", - "dev": true, + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "requires": { "@types/node": "*" } @@ -28741,6 +28798,11 @@ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001370.tgz", "integrity": "sha512-3PDmaP56wz/qz7G508xzjx8C+MC2qEm4SYhSEzC9IBROo+dGXFWRuaXkWti0A9tuI00g+toiriVqxtWMgl350g==" }, + "canonicalize": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-2.0.0.tgz", + "integrity": "sha512-ulDEYPv7asdKvqahuAY35c1selLdzDwHqugK92hfkzvlDCwXRRelDkR+Er33md/PtnpqHemgkuDPanZ4fiYZ8w==" + }, "case-sensitive-paths-webpack-plugin": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz", @@ -29279,9 +29341,9 @@ } }, "core-js-pure": { - "version": "3.30.2", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.30.2.tgz", - "integrity": "sha512-p/npFUJXXBkCCTIlEGBdghofn00jWG6ZOtdoIXSJmAu2QBvN0IqpZXWweOytcwE6cfx8ZvVUy1vw8zxhe4Y2vg==" + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.32.0.tgz", + "integrity": "sha512-qsev1H+dTNYpDUEURRuOXMvpdtAnNEvQWS/FMJ2Vb5AY8ZP4rAPQldkE27joykZPJTe0+IVgHZYh1P5Xu1/i1g==" }, "core-util-is": { "version": "1.0.3", @@ -32909,6 +32971,12 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, + "isomorphic-ws": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz", + "integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==", + "requires": {} + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -37991,7 +38059,8 @@ "regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "dev": true }, "regenerator-transform": { "version": "0.15.0", @@ -40830,7 +40899,6 @@ "version": "7.5.5", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", - "dev": true, "requires": {} }, "xml-name-validator": { diff --git a/package.json b/package.json index aad5b231..b50cf87f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "lint": "npm run lint:script && npm run lint:style" }, "dependencies": { - "@aeternity/aepp-sdk": "^13.0.1", + "@aeternity/aepp-sdk": "^13.2.1", "@fontsource/ibm-plex-sans": "^4.5.11", "@popperjs/core": "^2.11.5", "@sentry/tracing": "^7.8.1", diff --git a/src/App.vue b/src/App.vue index 613e8579..868794c2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,7 +69,8 @@ export default { try { if (this.$isMobile) { await this.$store.dispatch('initUniversal'); // TODO: remove after https://github.com/aeternity/aepp-sdk-js/issues/1390 is resolved - this.$store.dispatch('parseAndSendTransactionFromQuery'); + setTimeout(() => this.$store.dispatch('parseAndSendTransactionFromQuery'), + 1000); } else { await this.$store.dispatch('initSdk'); } diff --git a/src/store/index.js b/src/store/index.js index f40f3606..ddcbfed5 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,7 +1,7 @@ import { shallowReactive } from 'vue'; import { createStore } from 'vuex'; import { - Node, AeSdkAepp, walletDetector, BrowserWindowMessageConnection, AeSdk, TxBuilder, + Node, AeSdkAepp, walletDetector, BrowserWindowMessageConnection, AeSdk, unpackTx, } from '@aeternity/aepp-sdk'; import createPersistedState from 'vuex-persistedstate'; import { @@ -125,9 +125,7 @@ export default createStore({ compilerUrl: process.env.VUE_APP_COMPILER_URL, })); commit('setSdk', instance); - setTimeout(() => { - dispatch('selectNetwork', networkId); - }, 1000); + await dispatch('selectNetwork', networkId); }, async initSdk({ commit, dispatch, state, getters: { networks }, @@ -271,18 +269,21 @@ export default createStore({ window.location.search = ''; }, async parseAndSendTransactionFromQuery( - { commit, dispatch, state: { route, transactions, sdk } }, + { commit, dispatch, state: { transactions, sdk /* address */ } }, ) { - const { transaction } = route.query; + // const { transaction } = route.query; + const transaction = new URLSearchParams(window.location.search).get('transaction'); if (transactions?.length && transaction) { try { - const { tx } = TxBuilder.unpackTx(transaction); + const tx = unpackTx(transaction); const index = transactions.indexOf(transactions - .find((t) => JSON.stringify(t.txParams) === JSON.stringify(tx.encodedTx.tx))); + .find((t) => JSON.stringify(t.txParams) === JSON.stringify(tx.encodedTx))); if (index !== -1 && transactions[index].pending && transactions[index].unfinished) { // HERE - const { hash } = await sdk.sendTransaction(transaction, { waitMined: false }); + const { txHash: hash } = await sdk.api.postTransaction({ tx: transaction }); + console.log('HASH', hash); + debugger; commit('changeTransactionById', { index, transaction: { unfinished: false, hash } }); } } catch (e) { diff --git a/src/store/modules/aeternity.js b/src/store/modules/aeternity.js index ef1e1ec0..ffa41b00 100644 --- a/src/store/modules/aeternity.js +++ b/src/store/modules/aeternity.js @@ -57,7 +57,6 @@ const genRouterWaeMethodAction = (method, argsMapper, isWae = false) => async ( return result; } const result = await (isWae ? wae : router)[method](...methodArgs); - debugger; const builded = await sdk.buildTx(result.tx); console.log('builded', builded); const decoded = decode(builded); @@ -66,7 +65,6 @@ const genRouterWaeMethodAction = (method, argsMapper, isWae = false) => async ( txParams: result.tx, info: transactionInfo, pending: true, unfinished: true, }, { root: true }); const ret = await dispatch('sendTxDeepLinkUrl', builded, { root: true }); - debugger; console.log(ret); console.log('href', ret.href); window.location = ret; @@ -688,7 +686,6 @@ export default { amountWithSlippage - currentAllowance, { onAccount, callStatic: true }, ); - debugger; const builded = await sdk.buildTx(tx); commit('addTransaction', { txParams: tx, info: transactionInfo, pending: true, unfinished: true,