From 922545cd0171b6c492dbfe64bc379fb4299f8805 Mon Sep 17 00:00:00 2001 From: Pavel Ivanov Date: Sat, 27 Jul 2024 17:23:52 +0300 Subject: [PATCH 01/11] [bump] - package versions - Bump @jscutlery/semver from 3.1.0 to 5.2.2 - Bump react-qr-code from 2.0.12 to 2.0.15 - Bump @ledgerhq/hw-transport-webhid from 6.28.6 to 6.29.2 - Bump @types/w3c-web-usb from 1.0.5 to 1.0.6 - Bump big.js from 6.1.1 to 6.2.1 --- package.json | 10 +- yarn.lock | 522 +++++++++++++++++++++++++++------------------------ 2 files changed, 283 insertions(+), 249 deletions(-) diff --git a/package.json b/package.json index b63032a06..d5f3eb3f4 100644 --- a/package.json +++ b/package.json @@ -91,9 +91,9 @@ "@angular/platform-browser-dynamic": "16.1.9", "@angular/router": "16.1.9", "@here-wallet/core": "1.6.6", - "@jscutlery/semver": "3.1.0", + "@jscutlery/semver": "5.2.2", "@ledgerhq/hw-transport": "6.30.3", - "@ledgerhq/hw-transport-webhid": "6.28.6", + "@ledgerhq/hw-transport-webhid": "6.29.2", "@metamask/detect-provider": "2.0.0", "@meteorwallet/sdk": "1.0.9", "@mintbase-js/wallet": "0.6.0-beta.10", @@ -107,7 +107,7 @@ "@walletconnect/sign-client": "2.13.0", "@web3modal/wagmi": "5.0.6", "better-sqlite3": "11.1.2", - "big.js": "6.1.1", + "big.js": "6.2.1", "borsh": "0.7.0", "browserify-fs": "1.0.0", "bs58": "5.0.0", @@ -125,7 +125,7 @@ "qrcode": "1.5.3", "react": "18.2.0", "react-dom": "18.2.0", - "react-qr-code": "2.0.12", + "react-qr-code": "2.0.15", "regenerator-runtime": "0.14.1", "rxjs": "7.8.1", "stream-browserify": "3.0.0", @@ -180,7 +180,7 @@ "@types/react-dom": "18.0.9", "@types/regenerator-runtime": "0.13.1", "@types/w3c-web-hid": "1.0.2", - "@types/w3c-web-usb": "1.0.5", + "@types/w3c-web-usb": "1.0.6", "@typescript-eslint/eslint-plugin": "5.58.0", "@typescript-eslint/parser": "5.58.0", "babel-jest": "29.4.3", diff --git a/yarn.lock b/yarn.lock index 904263775..0cf2a06c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -305,7 +305,7 @@ resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06" integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg== -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.24.7": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== @@ -3313,10 +3313,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@hutson/parse-repository-url@^3.0.0": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" - integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q== +"@hutson/parse-repository-url@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-5.0.0.tgz#bf344cc75136039bc41bcf5d1ddbcb40405fca3b" + integrity sha512-e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg== "@improbable-eng/grpc-web@^0.15.0": version "0.15.0" @@ -3621,16 +3621,27 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jscutlery/semver@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jscutlery/semver/-/semver-3.1.0.tgz#8b30061d9f6687a6c6be28c06ba878b8acaadb5a" - integrity sha512-x/v+6HN0/UpQW8L3sIlvRodBY/pGJ3AjtNpKmMkR4RmnTuuRo+OMAiIS4/EJ2pzXhmn9YqNm8rYzIIqiWt62IA== +"@jscutlery/semver@5.2.2": + version "5.2.2" + resolved "https://registry.yarnpkg.com/@jscutlery/semver/-/semver-5.2.2.tgz#5e1eec2554e38d449c2de4a6c5a41abeb3bc9d7f" + integrity sha512-lhklWnwa5X4N6aiBLbybdsZ37agtxa0EBRdXmjOFA+LzViVR6QIYZpk+/X/XLw/TB6z1rLrmFp/MakmNyaJiYg== dependencies: chalk "4.1.2" - conventional-changelog "^4.0.0" - conventional-recommended-bump "^7.0.0" + conventional-changelog "^5.1.0" + conventional-changelog-angular "^7.0.0" + conventional-changelog-atom "^4.0.0" + conventional-changelog-codemirror "^4.0.0" + conventional-changelog-conventionalcommits "^7.0.2" + conventional-changelog-ember "^4.0.0" + conventional-changelog-eslint "^5.0.0" + conventional-changelog-express "^4.0.0" + conventional-changelog-jquery "^5.0.0" + conventional-changelog-jshint "^4.0.0" + conventional-commits-parser "^5.0.0" + conventional-recommended-bump "^9.0.0" detect-indent "6.1.0" - inquirer "8.2.5" + git-semver-tags "^7.0.1" + inquirer "8.2.6" rxjs "7.8.1" "@jsdoc/salty@^0.2.1": @@ -3661,7 +3672,7 @@ resolved "https://registry.yarnpkg.com/@jspm/import-map/-/import-map-1.1.0.tgz#1faf1209d6c2631d67e1520097f797c6947d8464" integrity sha512-vmk583YnMi4fmqeXbWIBiyzFu+vqVZ5VCoaa6H4xeSQy5E6JAWtmcq72OAMFTeSTqw7xxHQIJFq2OlHKdUWitQ== -"@ledgerhq/devices@^8.2.0", "@ledgerhq/devices@^8.3.0", "@ledgerhq/devices@^8.4.0": +"@ledgerhq/devices@^8.2.0": version "8.4.0" resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.4.0.tgz#f3a03576d4a53d731bdaa212a00bd0adbfb86fb1" integrity sha512-TUrMlWZJ+5AFp2lWMw4rGQoU+WtjIqlFX5SzQDL9phaUHrt4TFierAGHsaj5+tUHudhD4JhIaLI2cn1NOyq5NQ== @@ -3671,19 +3682,34 @@ rxjs "^7.8.1" semver "^7.3.5" -"@ledgerhq/errors@^6.16.1", "@ledgerhq/errors@^6.16.4", "@ledgerhq/errors@^6.17.0": +"@ledgerhq/devices@^8.4.2": + version "8.4.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.4.2.tgz#f1c56194cf1343d56cad49c8feba92ad93432e14" + integrity sha512-oWNTp3jCMaEvRHsXNYE/yo+PFMgXAJGFHLOU1UdE4/fYkniHbD9wdxwyZrZvrxr9hNw4/9wHiThyITwPtMzG7g== + dependencies: + "@ledgerhq/errors" "^6.18.0" + "@ledgerhq/logs" "^6.12.0" + rxjs "^7.8.1" + semver "^7.3.5" + +"@ledgerhq/errors@^6.16.1", "@ledgerhq/errors@^6.17.0": version "6.17.0" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.17.0.tgz#0d56361fe6eb7de3b239e661710679f933f1fcca" integrity sha512-xnOVpy/gUUkusEORdr2Qhw3Vd0MGfjyVGgkGR9Ck6FXE26OIdIQ3tNmG5BdZN+gwMMFJJVxxS4/hr0taQfZ43w== -"@ledgerhq/hw-transport-webhid@6.28.6": - version "6.28.6" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.28.6.tgz#94562750136d869774cb56304573a1875ca6375f" - integrity sha512-npU1mgL97KovpTUgcdORoOZ7eVFgwCA7zt0MpgUGUMRNJWDgCFsJslx7KrVXlCGOg87gLfDojreIre502I5pYg== +"@ledgerhq/errors@^6.18.0": + version "6.18.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.18.0.tgz#d55d6a57430d7a86532a9033ce0b45103264c620" + integrity sha512-L3jQWAGyooxRDk/MRlW2v4Ji9+kloBtdmz9wBkHaj2j0n+05rweJSV3GHw9oye1BYMbVFqFffmT4H3hlXlCasw== + +"@ledgerhq/hw-transport-webhid@6.29.2": + version "6.29.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.29.2.tgz#8ffd83a9b01377f941668aa97456799493754790" + integrity sha512-kmVsctlR3rpHmxpT2SB1mEayrBMXCc3Fb+VT9xZnpcZhMSXVDA+AdpuXamJkGl2ow72JDN+QcSPfoVT1entXwA== dependencies: - "@ledgerhq/devices" "^8.3.0" - "@ledgerhq/errors" "^6.16.4" - "@ledgerhq/hw-transport" "^6.30.6" + "@ledgerhq/devices" "^8.4.2" + "@ledgerhq/errors" "^6.18.0" + "@ledgerhq/hw-transport" "^6.31.2" "@ledgerhq/logs" "^6.12.0" "@ledgerhq/hw-transport@6.30.3": @@ -3696,13 +3722,13 @@ "@ledgerhq/logs" "^6.12.0" events "^3.3.0" -"@ledgerhq/hw-transport@^6.30.6": - version "6.31.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.0.tgz#82d8154bbcec8dc0104009a646159190fba5ae76" - integrity sha512-BY1poLk8vlJdIYngp8Zfaa/V9n14dqgt1G7iNetVRhJVFEKp9EYONeC3x6q/N7x81LUpzBk6M+T+s46Z4UiXHw== +"@ledgerhq/hw-transport@^6.31.2": + version "6.31.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.2.tgz#79c95f7928a64a0e3b5bc4ea7b5be04b9f738322" + integrity sha512-B27UIzMzm2IXPGYnEB95R7eHxpXBkTBHh6MUJJQZVknt8LilEz1tfpTYUdzAKDGQ+Z5MZyYb01Eh3Zqm3kn3uw== dependencies: - "@ledgerhq/devices" "^8.4.0" - "@ledgerhq/errors" "^6.17.0" + "@ledgerhq/devices" "^8.4.2" + "@ledgerhq/errors" "^6.18.0" "@ledgerhq/logs" "^6.12.0" events "^3.3.0" @@ -7674,7 +7700,7 @@ dependencies: undici-types "~5.26.4" -"@types/normalize-package-data@^2.4.0": +"@types/normalize-package-data@^2.4.0", "@types/normalize-package-data@^2.4.1": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== @@ -7851,10 +7877,10 @@ resolved "https://registry.yarnpkg.com/@types/w3c-web-hid/-/w3c-web-hid-1.0.2.tgz#bdf2f813ffa7ccd1ca63aa218d680edddd839417" integrity sha512-tNLnl6+/AkmASEnviwdLLE6kaXlY28cDVyQ3e+WwnEAm5DHyO7c71a5TtYX6ofrnzzdQSnNsjNMoggsbrtOYfQ== -"@types/w3c-web-usb@1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/w3c-web-usb/-/w3c-web-usb-1.0.5.tgz#90284d17f35de981670c85d29053ae8b88fa5543" - integrity sha512-dYolx2XWesl1TMu+1BjtjU6eC6c2zZ2VDKhjU4f/mtR3+UBfMW6h1tPCQt7leY5Y8JBg0Fe/mMnoDMkPPNX9sw== +"@types/w3c-web-usb@1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/w3c-web-usb/-/w3c-web-usb-1.0.6.tgz#5d8560d0d9f585ffc80865bc773db7bc975b680c" + integrity sha512-cSjhgrr8g4KbPnnijAr/KJDNKa/bBa+ixYkywFRvrhvi9n1WEl7yYbtRyzE6jqNQiSxxJxoAW3STaOQwJHndaw== "@types/ws@^8.5.1", "@types/ws@^8.5.5": version "8.5.10" @@ -9808,10 +9834,10 @@ better-sqlite3@11.1.2: bindings "^1.5.0" prebuild-install "^7.1.1" -big.js@6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.1.1.tgz#63b35b19dc9775c94991ee5db7694880655d5537" - integrity sha512-1vObw81a8ylZO5ePrtMay0n018TcftpTA5HFKDaSuiUDBo8biRBtjIobw60OpwuvrGk+FsxKamqN4cnmj/eXdg== +big.js@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f" + integrity sha512-bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ== big.js@^5.2.2: version "5.2.2" @@ -10859,16 +10885,6 @@ concat-stream@^1.4.4: readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" - integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.0.2" - typedarray "^0.0.6" - concat-with-sourcemaps@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" @@ -10938,78 +10954,77 @@ conventional-changelog-angular@^5.0.0: compare-func "^2.0.0" q "^1.5.1" -conventional-changelog-angular@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541" - integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg== +conventional-changelog-angular@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz#5eec8edbff15aa9b1680a8dcfbd53e2d7eb2ba7a" + integrity sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ== dependencies: compare-func "^2.0.0" -conventional-changelog-atom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-3.0.0.tgz#32de463a29db773de15382c96acda47930d3d24d" - integrity sha512-pnN5bWpH+iTUWU3FaYdw5lJmfWeqSyrUkG+wyHBI9tC1dLNnHkbAOg1SzTQ7zBqiFrfo55h40VsGXWMdopwc5g== +conventional-changelog-atom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-4.0.0.tgz#291fd1583517d4e7131dba779ad9fa238359daa1" + integrity sha512-q2YtiN7rnT1TGwPTwjjBSIPIzDJCRE+XAUahWxnh+buKK99Kks4WLMHoexw38GXx9OUxAsrp44f9qXe5VEMYhw== -conventional-changelog-codemirror@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-3.0.0.tgz#6d5a4c67713346a9ebbcfb6336b3269ce8ddceeb" - integrity sha512-wzchZt9HEaAZrenZAUUHMCFcuYzGoZ1wG/kTRMICxsnW5AXohYMRxnyecP9ob42Gvn5TilhC0q66AtTPRSNMfw== +conventional-changelog-codemirror@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-4.0.0.tgz#3421aced2377552229cef454447aa06e2a319516" + integrity sha512-hQSojc/5imn1GJK3A75m9hEZZhc3urojA5gMpnar4JHmgLnuM3CUIARPpEk86glEKr3c54Po3WV/vCaO/U8g3Q== -conventional-changelog-conventionalcommits@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz#3bad05f4eea64e423d3d90fc50c17d2c8cf17652" - integrity sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw== +conventional-changelog-conventionalcommits@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz#aa5da0f1b2543094889e8cf7616ebe1a8f5c70d5" + integrity sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w== dependencies: compare-func "^2.0.0" -conventional-changelog-core@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-5.0.2.tgz#78dbe6c346162be4132b7890668d3e860cad2d08" - integrity sha512-RhQOcDweXNWvlRwUDCpaqXzbZemKPKncCWZG50Alth72WITVd6nhVk9MJ6w1k9PFNBcZ3YwkdkChE+8+ZwtUug== +conventional-changelog-core@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-7.0.0.tgz#d8879ebb8692cd1fa8126c209e1b3af34d94e113" + integrity sha512-UYgaB1F/COt7VFjlYKVE/9tTzfU3VUq47r6iWf6lM5T7TlOxr0thI63ojQueRLIpVbrtHK4Ffw+yQGduw2Bhdg== dependencies: + "@hutson/parse-repository-url" "^5.0.0" add-stream "^1.0.0" - conventional-changelog-writer "^6.0.0" - conventional-commits-parser "^4.0.0" - dateformat "^3.0.3" - get-pkg-repo "^4.2.1" - git-raw-commits "^3.0.0" - git-remote-origin-url "^2.0.0" - git-semver-tags "^5.0.0" - normalize-package-data "^3.0.3" - read-pkg "^3.0.0" - read-pkg-up "^3.0.0" - -conventional-changelog-ember@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-3.0.0.tgz#8a02adc12f87285195dda43b573b7c0d1a1b266c" - integrity sha512-7PYthCoSxIS98vWhVcSphMYM322OxptpKAuHYdVspryI0ooLDehRXWeRWgN+zWSBXKl/pwdgAg8IpLNSM1/61A== - -conventional-changelog-eslint@^4.0.0: + conventional-changelog-writer "^7.0.0" + conventional-commits-parser "^5.0.0" + git-raw-commits "^4.0.0" + git-semver-tags "^7.0.0" + hosted-git-info "^7.0.0" + normalize-package-data "^6.0.0" + read-pkg "^8.0.0" + read-pkg-up "^10.0.0" + +conventional-changelog-ember@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-4.0.0.tgz#cdcaee9bc14ffc97540ecef6771c472e54f3d75e" - integrity sha512-nEZ9byP89hIU0dMx37JXQkE1IpMmqKtsaR24X7aM3L6Yy/uAtbb+ogqthuNYJkeO1HyvK7JsX84z8649hvp43Q== + resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-4.0.0.tgz#d90409083a840cd8955bf8257b17498fc539db6a" + integrity sha512-D0IMhwcJUg1Y8FSry6XAplEJcljkHVlvAZddhhsdbL1rbsqRsMfGx/PIkPYq0ru5aDgn+OxhQ5N5yR7P9mfsvA== -conventional-changelog-express@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-3.0.0.tgz#25bee76f7d11df45b42bd5580228b1f94c77a64f" - integrity sha512-HqxihpUMfIuxvlPvC6HltA4ZktQEUan/v3XQ77+/zbu8No/fqK3rxSZaYeHYant7zRxQNIIli7S+qLS9tX9zQA== +conventional-changelog-eslint@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-5.0.0.tgz#d7f428f787f079b3ce08ccc76ed46d4b1852f41b" + integrity sha512-6JtLWqAQIeJLn/OzUlYmzd9fKeNSWmQVim9kql+v4GrZwLx807kAJl3IJVc3jTYfVKWLxhC3BGUxYiuVEcVjgA== -conventional-changelog-jquery@^4.0.0: +conventional-changelog-express@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-4.0.0.tgz#bbfea102b8ea66a781e245d43ead0608842ae326" - integrity sha512-TTIN5CyzRMf8PUwyy4IOLmLV2DFmPtasKN+x7EQKzwSX8086XYwo+NeaeA3VUT8bvKaIy5z/JoWUvi7huUOgaw== + resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-4.0.0.tgz#5f50086bae1cd9887959af1fa3d5244fd1f55974" + integrity sha512-yWyy5c7raP9v7aTvPAWzqrztACNO9+FEI1FSYh7UP7YT1AkWgv5UspUeB5v3Ibv4/o60zj2o9GF2tqKQ99lIsw== -conventional-changelog-jshint@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-3.0.0.tgz#a1743e77ffdee03b704af6faa199520d3a90a868" - integrity sha512-bQof4byF4q+n+dwFRkJ/jGf9dCNUv4/kCDcjeCizBvfF81TeimPZBB6fT4HYbXgxxfxWXNl/i+J6T0nI4by6DA== +conventional-changelog-jquery@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-5.0.0.tgz#d56e5cc9158b5035669ac6e0f773c3e593621887" + integrity sha512-slLjlXLRNa/icMI3+uGLQbtrgEny3RgITeCxevJB+p05ExiTgHACP5p3XiMKzjBn80n+Rzr83XMYfRInEtCPPw== + +conventional-changelog-jshint@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-4.0.0.tgz#95aec357f9122b214671381ef94124287208ece9" + integrity sha512-LyXq1bbl0yG0Ai1SbLxIk8ZxUOe3AjnlwE6sVRQmMgetBk+4gY9EO3d00zlEt8Y8gwsITytDnPORl8al7InTjg== dependencies: compare-func "^2.0.0" -conventional-changelog-preset-loader@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz#14975ef759d22515d6eabae6396c2ae721d4c105" - integrity sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA== +conventional-changelog-preset-loader@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-4.1.0.tgz#996bc40d516471c5bf8248fdc30222563b9bcfe6" + integrity sha512-HozQjJicZTuRhCRTq4rZbefaiCzRM2pr6u2NL3XhrmQm4RMnDXfESU6JKu/pnKwx5xtdkYfNCsbhN5exhiKGJA== conventional-changelog-writer@^5.0.0: version "5.0.1" @@ -11026,35 +11041,34 @@ conventional-changelog-writer@^5.0.0: split "^1.0.0" through2 "^4.0.0" -conventional-changelog-writer@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz#d8d3bb5e1f6230caed969dcc762b1c368a8f7b01" - integrity sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ== +conventional-changelog-writer@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-7.0.1.tgz#e64ef74fa8e773cab4124af217f3f02b29eb0a9c" + integrity sha512-Uo+R9neH3r/foIvQ0MKcsXkX642hdm9odUp7TqgFS7BsalTcjzRlIfWZrZR1gbxOozKucaKt5KAbjW8J8xRSmA== dependencies: - conventional-commits-filter "^3.0.0" - dateformat "^3.0.3" + conventional-commits-filter "^4.0.0" handlebars "^4.7.7" json-stringify-safe "^5.0.1" - meow "^8.1.2" - semver "^7.0.0" - split "^1.0.1" + meow "^12.0.1" + semver "^7.5.2" + split2 "^4.0.0" -conventional-changelog@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-4.0.0.tgz#51a8d7765e5837bb29b3ef1cf395d6ef594827a9" - integrity sha512-JbZjwE1PzxQCvm+HUTIr+pbSekS8qdOZzMakdFyPtdkEWwFvwEJYONzjgMm0txCb2yBcIcfKDmg8xtCKTdecNQ== - dependencies: - conventional-changelog-angular "^6.0.0" - conventional-changelog-atom "^3.0.0" - conventional-changelog-codemirror "^3.0.0" - conventional-changelog-conventionalcommits "^6.0.0" - conventional-changelog-core "^5.0.0" - conventional-changelog-ember "^3.0.0" - conventional-changelog-eslint "^4.0.0" - conventional-changelog-express "^3.0.0" - conventional-changelog-jquery "^4.0.0" - conventional-changelog-jshint "^3.0.0" - conventional-changelog-preset-loader "^3.0.0" +conventional-changelog@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-5.1.0.tgz#04b36a5ad0518e0323e9d629e3b86e34f7abb7eb" + integrity sha512-aWyE/P39wGYRPllcCEZDxTVEmhyLzTc9XA6z6rVfkuCD2UBnhV/sgSOKbQrEG5z9mEZJjnopjgQooTKxEg8mAg== + dependencies: + conventional-changelog-angular "^7.0.0" + conventional-changelog-atom "^4.0.0" + conventional-changelog-codemirror "^4.0.0" + conventional-changelog-conventionalcommits "^7.0.2" + conventional-changelog-core "^7.0.0" + conventional-changelog-ember "^4.0.0" + conventional-changelog-eslint "^5.0.0" + conventional-changelog-express "^4.0.0" + conventional-changelog-jquery "^5.0.0" + conventional-changelog-jshint "^4.0.0" + conventional-changelog-preset-loader "^4.1.0" conventional-commits-filter@^2.0.0, conventional-commits-filter@^2.0.7: version "2.0.7" @@ -11064,13 +11078,10 @@ conventional-commits-filter@^2.0.0, conventional-commits-filter@^2.0.7: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-filter@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz#bf1113266151dd64c49cd269e3eb7d71d7015ee2" - integrity sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q== - dependencies: - lodash.ismatch "^4.4.0" - modify-values "^1.0.1" +conventional-commits-filter@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-4.0.0.tgz#845d713e48dc7d1520b84ec182e2773c10c7bf7f" + integrity sha512-rnpnibcSOdFcdclpFwWa+pPlZJhXE7l+XK04zxhbWrhgpR96h33QLz8hITTXbcYICxVr3HZFtbtUAQ+4LdBo9A== conventional-commits-parser@^3.2.3: version "3.2.4" @@ -11084,28 +11095,27 @@ conventional-commits-parser@^3.2.3: split2 "^3.0.0" through2 "^4.0.0" -conventional-commits-parser@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" - integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== +conventional-commits-parser@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz#57f3594b81ad54d40c1b4280f04554df28627d9a" + integrity sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA== dependencies: JSONStream "^1.3.5" - is-text-path "^1.0.1" - meow "^8.1.2" - split2 "^3.2.2" + is-text-path "^2.0.0" + meow "^12.0.1" + split2 "^4.0.0" -conventional-recommended-bump@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz#ec01f6c7f5d0e2491c2d89488b0d757393392424" - integrity sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA== +conventional-recommended-bump@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-9.0.0.tgz#2910b08b10e6c705301335ab916e7438eba5907f" + integrity sha512-HR1yD0G5HgYAu6K0wJjLd7QGRK8MQDqqj6Tn1n/ja1dFwBCE6QmV+iSgQ5F7hkx7OUR/8bHpxJqYtXj2f/opPQ== dependencies: - concat-stream "^2.0.0" - conventional-changelog-preset-loader "^3.0.0" - conventional-commits-filter "^3.0.0" - conventional-commits-parser "^4.0.0" - git-raw-commits "^3.0.0" - git-semver-tags "^5.0.0" - meow "^8.1.2" + conventional-changelog-preset-loader "^4.1.0" + conventional-commits-filter "^4.0.0" + conventional-commits-parser "^5.0.0" + git-raw-commits "^4.0.0" + git-semver-tags "^7.0.0" + meow "^12.0.1" convert-source-map@^1.5.1, convert-source-map@^1.7.0: version "1.9.0" @@ -11714,10 +11724,10 @@ damerau-levenshtein@^1.0.8: resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== -dargs@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" - integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== +dargs@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-8.1.0.tgz#a34859ea509cbce45485e5aa356fef70bfcc7272" + integrity sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw== dashdash@^1.12.0: version "1.14.1" @@ -11769,7 +11779,7 @@ date-fns@^2.29.3: dependencies: "@babel/runtime" "^7.21.0" -dateformat@^3.0.0, dateformat@^3.0.3: +dateformat@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== @@ -12478,7 +12488,7 @@ errno@^0.1.1, errno@~0.1.1: dependencies: prr "~1.0.1" -error-ex@^1.3.1: +error-ex@^1.3.1, error-ex@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -13887,16 +13897,6 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-pkg-repo@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385" - integrity sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA== - dependencies: - "@hutson/parse-repository-url" "^3.0.0" - hosted-git-info "^4.0.0" - through2 "^2.0.0" - yargs "^16.2.0" - get-port-please@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.2.tgz#502795e56217128e4183025c89a48c71652f4e49" @@ -13979,37 +13979,22 @@ git-log-parser@^1.2.0: through2 "~2.0.0" traverse "0.6.8" -git-raw-commits@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-3.0.0.tgz#5432f053a9744f67e8db03dbc48add81252cfdeb" - integrity sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw== - dependencies: - dargs "^7.0.0" - meow "^8.1.2" - split2 "^3.2.2" - -git-remote-origin-url@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f" - integrity sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw== - dependencies: - gitconfiglocal "^1.0.0" - pify "^2.3.0" - -git-semver-tags@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-5.0.1.tgz#db748aa0e43d313bf38dcd68624d8443234e1c15" - integrity sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA== +git-raw-commits@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-4.0.0.tgz#b212fd2bff9726d27c1283a1157e829490593285" + integrity sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ== dependencies: - meow "^8.1.2" - semver "^7.0.0" + dargs "^8.0.0" + meow "^12.0.1" + split2 "^4.0.0" -gitconfiglocal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b" - integrity sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ== +git-semver-tags@^7.0.0, git-semver-tags@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-7.0.1.tgz#74426e7d7710e5a263655e78b4c651eed804d63e" + integrity sha512-NY0ZHjJzyyNXHTDZmj+GG7PyuAKtMsyWSwh07CR2hOZFa+/yoTsXci/nF2obzL8UDhakFNkD9gNdt/Ed+cxh2Q== dependencies: - ini "^1.3.2" + meow "^12.0.1" + semver "^7.5.2" github-from-package@0.0.0: version "0.0.0" @@ -14413,6 +14398,13 @@ hosted-git-info@^6.0.0: dependencies: lru-cache "^7.5.1" +hosted-git-info@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-7.0.2.tgz#9b751acac097757667f30114607ef7b661ff4f17" + integrity sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w== + dependencies: + lru-cache "^10.0.1" + hpack.js@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" @@ -14821,7 +14813,7 @@ ini@4.1.1: resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1" integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g== -ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -14865,10 +14857,10 @@ inquirer@8.2.4: through "^2.3.6" wrap-ansi "^7.0.0" -inquirer@8.2.5: - version "8.2.5" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8" - integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ== +inquirer@8.2.6: + version "8.2.6" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.6.tgz#733b74888195d8d400a67ac332011b5fae5ea562" + integrity sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg== dependencies: ansi-escapes "^4.2.1" chalk "^4.1.1" @@ -14884,7 +14876,7 @@ inquirer@8.2.5: string-width "^4.1.0" strip-ansi "^6.0.0" through "^2.3.6" - wrap-ansi "^7.0.0" + wrap-ansi "^6.0.1" interface-datastore@^7.0.0: version "7.0.4" @@ -15463,6 +15455,13 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" +is-text-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636" + integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw== + dependencies: + text-extensions "^2.0.0" + is-typed-array@^1.1.13, is-typed-array@^1.1.3: version "1.1.13" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" @@ -16842,7 +16841,7 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -lines-and-columns@~2.0.3: +lines-and-columns@^2.0.3, lines-and-columns@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42" integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A== @@ -17138,7 +17137,7 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lru-cache@^10.2.0: +lru-cache@^10.0.1, lru-cache@^10.2.0: version "10.4.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== @@ -17387,7 +17386,12 @@ memfs@^3.4.1, memfs@^3.4.12, memfs@^3.4.3: dependencies: fs-monkey "^1.0.4" -meow@^8.0.0, meow@^8.1.2: +meow@^12.0.1: + version "12.1.1" + resolved "https://registry.yarnpkg.com/meow/-/meow-12.1.1.tgz#e558dddbab12477b69b2e9a2728c327f191bace6" + integrity sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw== + +meow@^8.0.0: version "8.1.2" resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== @@ -17721,7 +17725,7 @@ mlly@^1.6.1, mlly@^1.7.1: pkg-types "^1.1.1" ufo "^1.5.3" -modify-values@^1.0.0, modify-values@^1.0.1: +modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== @@ -18181,7 +18185,7 @@ nopt@^6.0.0: dependencies: abbrev "^1.0.0" -normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: +normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -18191,7 +18195,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0, normalize-package-data@^3.0.3: +normalize-package-data@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== @@ -18221,6 +18225,15 @@ normalize-package-data@^5.0.0: semver "^7.3.5" validate-npm-package-license "^3.0.4" +normalize-package-data@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-6.0.2.tgz#a7bc22167fe24025412bcff0a9651eb768b03506" + integrity sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g== + dependencies: + hosted-git-info "^7.0.0" + semver "^7.3.5" + validate-npm-package-license "^3.0.4" + normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" @@ -19177,6 +19190,17 @@ parse-json@^5.0.0, parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-json@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-7.1.1.tgz#68f7e6f0edf88c54ab14c00eb700b753b14e2120" + integrity sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw== + dependencies: + "@babel/code-frame" "^7.21.4" + error-ex "^1.3.2" + json-parse-even-better-errors "^3.0.0" + lines-and-columns "^2.0.3" + type-fest "^3.8.0" + parse-node-version@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" @@ -19284,13 +19308,6 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== - dependencies: - pify "^3.0.0" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -20461,10 +20478,10 @@ react-native-webview@^11.26.0: escape-string-regexp "2.0.0" invariant "2.2.4" -react-qr-code@2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/react-qr-code/-/react-qr-code-2.0.12.tgz#98f99e9ad5ede46d73ab819e2dd9925c5f5d7a2d" - integrity sha512-k+pzP5CKLEGBRwZsDPp98/CAJeXlsYRHM2iZn1Sd5Th/HnKhIZCSg27PXO58zk8z02RaEryg+60xa4vyywMJwg== +react-qr-code@2.0.15: + version "2.0.15" + resolved "https://registry.yarnpkg.com/react-qr-code/-/react-qr-code-2.0.15.tgz#fbfc12952c504bcd64275647e9d1ea63251742ce" + integrity sha512-MkZcjEXqVKqXEIMVE0mbcGgDpkfSdd8zhuzXEl9QzYeNcw8Hq2oVIzDLWuZN2PQBwM5PWjc2S31K8Q1UbcFMfw== dependencies: prop-types "^15.8.1" qr.js "0.0.0" @@ -20551,13 +20568,14 @@ read-package-json@^6.0.0: normalize-package-data "^5.0.0" npm-normalize-package-bin "^3.0.0" -read-pkg-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" - integrity sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw== +read-pkg-up@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-10.1.0.tgz#2d13ab732d2f05d6e8094167c2112e2ee50644f4" + integrity sha512-aNtBq4jR8NawpKJQldrQcSW9y/d+KWH4v24HWkHljOZ7H0av+YTGANBzRh9A5pw7v/bLVsLVPpOhJ7gHNVy8lA== dependencies: - find-up "^2.0.0" - read-pkg "^3.0.0" + find-up "^6.3.0" + read-pkg "^8.1.0" + type-fest "^4.2.0" read-pkg-up@^7.0.0, read-pkg-up@^7.0.1: version "7.0.1" @@ -20568,15 +20586,6 @@ read-pkg-up@^7.0.0, read-pkg-up@^7.0.1: read-pkg "^5.2.0" type-fest "^0.8.1" -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA== - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - read-pkg@^5.0.0, read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -20587,6 +20596,16 @@ read-pkg@^5.0.0, read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" +read-pkg@^8.0.0, read-pkg@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-8.1.0.tgz#6cf560b91d90df68bce658527e7e3eee75f7c4c7" + integrity sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ== + dependencies: + "@types/normalize-package-data" "^2.4.1" + normalize-package-data "^6.0.0" + parse-json "^7.0.0" + type-fest "^4.2.0" + read@1, read@^1.0.7, read@~1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" @@ -20594,7 +20613,7 @@ read@1, read@^1.0.7, read@~1.0.7: dependencies: mute-stream "~0.0.4" -readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0, readable-stream@^3.6.2: +readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0, readable-stream@^3.6.2: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -21751,7 +21770,7 @@ split-on-first@^1.0.0: resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== -split2@^3.0.0, split2@^3.2.2: +split2@^3.0.0: version "3.2.2" resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== @@ -21770,7 +21789,7 @@ split2@~1.0.0: dependencies: through2 "~2.0.0" -split@^1.0.0, split@^1.0.1: +split@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== @@ -22436,6 +22455,11 @@ text-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== +text-extensions@^2.0.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.4.0.tgz#a1cfcc50cf34da41bfd047cc744f804d1680ea34" + integrity sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g== + text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -22453,14 +22477,6 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.1.tgz#304ec51631c3b770c65c6c6f76938b384000f4d5" integrity sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ== -through2@^2.0.0, through2@~2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - through2@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" @@ -22468,6 +22484,14 @@ through2@^4.0.0: dependencies: readable-stream "3" +through2@~2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -22805,6 +22829,16 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^3.8.0: + version "3.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706" + integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g== + +type-fest@^4.2.0: + version "4.23.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.23.0.tgz#8196561a6b835175473be744f3e41e2dece1496b" + integrity sha512-ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -23872,7 +23906,7 @@ wordwrap@^1.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^6.2.0: +wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== From 9ebabff722e2c98faa809138dfbd0daf1a55127b Mon Sep 17 00:00:00 2001 From: paouvrard Date: Mon, 29 Jul 2024 14:29:20 +0900 Subject: [PATCH 02/11] fix: Hide modal after tx error within a batch. --- packages/ethereum-wallets/src/lib/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/ethereum-wallets/src/lib/index.ts b/packages/ethereum-wallets/src/lib/index.ts index 9f9951317..8ff973315 100644 --- a/packages/ethereum-wallets/src/lib/index.ts +++ b/packages/ethereum-wallets/src/lib/index.ts @@ -688,6 +688,8 @@ const EthereumWallets: WalletBehaviourFactory< "Transaction execution error, failed to parse failure reason." ); } + // NOTE: after return, `finally { hideModal() }` will run. + return; } results.push(nearTx); } From c116dfe6d5036e8f32fa98fbf9d9286f48ef9040 Mon Sep 17 00:00:00 2001 From: Dimitar Daskalov Date: Mon, 29 Jul 2024 11:12:45 +0300 Subject: [PATCH 03/11] feat:add the new toggle functionality --- packages/core/src/lib/constants.ts | 5 + packages/core/src/lib/locale/ar.json | 1 + packages/core/src/lib/locale/bg.json | 1 + packages/core/src/lib/locale/en.json | 1 + packages/core/src/lib/locale/es.json | 1 + packages/core/src/lib/locale/hi.json | 1 + packages/core/src/lib/locale/hr.json | 1 + packages/core/src/lib/locale/ko.json | 1 + packages/core/src/lib/locale/mk.json | 1 + packages/core/src/lib/locale/sl.json | 1 + packages/core/src/lib/locale/sr.json | 3 +- packages/core/src/lib/locale/vi.json | 1 + packages/core/src/lib/locale/zh.json | 1 + .../wallet-modules/wallet-modules.service.ts | 48 +++++++-- packages/core/src/lib/store.ts | 39 +++++++ packages/core/src/lib/store.types.ts | 12 +++ packages/core/src/lib/wallet-selector.ts | 8 ++ .../core/src/lib/wallet-selector.types.ts | 5 + packages/modal-ui-js/src/lib/render-modal.ts | 102 ++++++++++++++++++ packages/modal-ui-js/src/lib/styles.css | 97 ++++++++++++++++- .../modal-ui/src/lib/components/Modal.tsx | 21 ++++ .../src/lib/components/WalletOptions.tsx | 7 ++ .../modal-ui/src/lib/components/styles.css | 92 +++++++++++++++- 23 files changed, 435 insertions(+), 15 deletions(-) diff --git a/packages/core/src/lib/constants.ts b/packages/core/src/lib/constants.ts index b7d204beb..b3ad210c8 100644 --- a/packages/core/src/lib/constants.ts +++ b/packages/core/src/lib/constants.ts @@ -1,5 +1,10 @@ export const PACKAGE_NAME = "near-wallet-selector"; export const RECENTLY_SIGNED_IN_WALLETS = "recentlySignedInWallets"; +export const REMEMBER_RECENT_WALLETS = "rememberRecentWallets"; +export const REMEMBER_RECENT_WALLETS_STATE = { + ENABLED: "enabled", + DISABLED: "disabled", +}; export const CONTRACT = "contract"; export const PENDING_CONTRACT = "contract:pending"; diff --git a/packages/core/src/lib/locale/ar.json b/packages/core/src/lib/locale/ar.json index d7223b8bc..aa5517da5 100644 --- a/packages/core/src/lib/locale/ar.json +++ b/packages/core/src/lib/locale/ar.json @@ -11,6 +11,7 @@ "useAWallet": "استخدم محفظة لتأمين وإدارة أصول نير الخاصة بك، وادخل لأي تطبيق يستخدم نير دون الحاجة إلى اسم المستخدم وكلمةالمرور", "connectionFailed": "اتصال فاشل", "connectionSuccessful": "اتصال ناجح", + "rememberWallet": "تذكر المحافظ", "connected": "متصل", "connectingTo": "جاري الاتصال ب", "connectingMessage": { diff --git a/packages/core/src/lib/locale/bg.json b/packages/core/src/lib/locale/bg.json index af5dfdd86..29775e92f 100644 --- a/packages/core/src/lib/locale/bg.json +++ b/packages/core/src/lib/locale/bg.json @@ -11,6 +11,7 @@ "useAWallet": "Използвайте портфейла, за да защитите и управлявате активите си на NEAR както и да използвате всяко приложение на NEAR без нужда от потребителски имена и пароли.", "connectionFailed": "Свързването неуспешно", "connectionSuccessful": "Свързването успешно", + "rememberWallet": "Запази портфейлите", "connected": "Свързан", "connectingTo": "Свързване към", "connectingMessage": { diff --git a/packages/core/src/lib/locale/en.json b/packages/core/src/lib/locale/en.json index 0121a994e..311e78f90 100644 --- a/packages/core/src/lib/locale/en.json +++ b/packages/core/src/lib/locale/en.json @@ -11,6 +11,7 @@ "useAWallet": "Use a wallet to secure and manage your NEAR assets, and to log in to any NEAR app without the need for usernames and passwords.", "connectionFailed": "Connection Failed", "connectionSuccessful": "Connection Successful", + "rememberWallet": "Remember wallets", "connected": "Connected", "connectingTo": "Connecting to", "connectingMessage": { diff --git a/packages/core/src/lib/locale/es.json b/packages/core/src/lib/locale/es.json index d78196203..61b4eec1c 100644 --- a/packages/core/src/lib/locale/es.json +++ b/packages/core/src/lib/locale/es.json @@ -11,6 +11,7 @@ "useAWallet": "Usa tu Billetera para resguardar y administrar tus activos en NEAR, e Iniciar sesión en cualquier aplicacion NEAR sin la necesidad de nombres de usuarios y contraseñas", "connectionFailed": "Conexión Fallida", "connectionSuccessful": "Conexión Existosa", + "rememberWallet": "Recordar las carteras", "connected": "Conectado", "connectingTo": "Conectando a ", "connectingMessage": { diff --git a/packages/core/src/lib/locale/hi.json b/packages/core/src/lib/locale/hi.json index c254f08ee..f487c5398 100644 --- a/packages/core/src/lib/locale/hi.json +++ b/packages/core/src/lib/locale/hi.json @@ -11,6 +11,7 @@ "useAWallet": "अपनी NEAR संपत्तियों को सुरक्षित और प्रबंधित करने के लिए वॉलेट का उपयोग करें और किसी भी NEAR ऐप (app) में लॉग इन करें, किसी उपयोगकर्ता (user) नाम और पासवर्ड की आवश्यकता नहीं है।", "connectionFailed": "कनेक्शन विफल|", "connectionSuccessful": "कनेक्शन सफल|", + "rememberWallet": "वॉलेटों को याद रखें", "connected": "वॉलेट जुड़ गया|", "connectingTo": "वॉलेट जुड़ रहा हे|", "connectingMessage": { diff --git a/packages/core/src/lib/locale/hr.json b/packages/core/src/lib/locale/hr.json index 75e5d0a8b..d50df7521 100644 --- a/packages/core/src/lib/locale/hr.json +++ b/packages/core/src/lib/locale/hr.json @@ -11,6 +11,7 @@ "useAWallet": "Koristite crypto novčanik da biste osigurali i upravljali svojom NEAR imovinom, te se prijavite u bilo koju NEAR aplikaciju bez korisničkog imena i lozinke.", "connectionFailed": "Neuspješno povezivanje.", "connectionSuccessful": "Uspješno povezivanje.", + "rememberWallet": "Zapamti novčanike", "connected": "Povezano.", "connectingTo": "Povezivanje u tijeku", "connectingMessage": { diff --git a/packages/core/src/lib/locale/ko.json b/packages/core/src/lib/locale/ko.json index 82d3d8516..d1d5f4c02 100644 --- a/packages/core/src/lib/locale/ko.json +++ b/packages/core/src/lib/locale/ko.json @@ -11,6 +11,7 @@ "useAWallet": "지갑을 사용하여 NEAR 자산을 보호·관리하고, 아이디와 비밀번호 없이 NEAR 앱에 로그인할 수 있습니다.", "connectionFailed": "연결 실패", "connectionSuccessful": "연결 성공", + "rememberWallet": "지갑들 기억하기", "connected": "Connected", "connectingTo": "연결 중: ", "connectingMessage": { diff --git a/packages/core/src/lib/locale/mk.json b/packages/core/src/lib/locale/mk.json index 59594e18a..8c846250a 100644 --- a/packages/core/src/lib/locale/mk.json +++ b/packages/core/src/lib/locale/mk.json @@ -11,6 +11,7 @@ "useAWallet": "Користете паричник за да ги заштитите и управувате вашите NEAR средства и да се најавите на која било NEAR апликација без потреба од кориснички имиња и лозинки.", "connectionFailed": "Поврзувањето не беше успешно.", "connectionSuccessful": "Успешно поврзување.", + "rememberWallet": "Запомни паричници", "connected": "Поврзано.", "connectingTo": "Поврзување со", "connectingMessage": { diff --git a/packages/core/src/lib/locale/sl.json b/packages/core/src/lib/locale/sl.json index 314c91629..48230a162 100644 --- a/packages/core/src/lib/locale/sl.json +++ b/packages/core/src/lib/locale/sl.json @@ -11,6 +11,7 @@ "useAWallet": "Uporabite denarnico, da bi zavarovali in upravljali s svoja NEAR digitalna sredstva, in se prijavite v katero koli aplikacijo ekosistema NEAR", "connectionFailed": "Povezava ni bila uspešna.", "connectionSuccessful": "Povezava je bila uspešna.", + "rememberWallet": "Zapomni si denarnice", "connected": "Vaša denarnica je povezana.", "connectingTo": "Povezovanje z", "connectingMessage": { diff --git a/packages/core/src/lib/locale/sr.json b/packages/core/src/lib/locale/sr.json index 71097b389..7172127b5 100644 --- a/packages/core/src/lib/locale/sr.json +++ b/packages/core/src/lib/locale/sr.json @@ -11,6 +11,7 @@ "useAWallet": "Користите новчаник да обезбедите и управљате својим NEAR средствима и да се пријавите у било коју апликацију NEAR без потребе за корисничким именима и лозинкама.", "connectionFailed": "Веза није успостављена.", "connectionSuccessful": "Веза је успела.", + "rememberWallet": "Запамти новчанике", "connected": "Повезан.", "connectingTo": "Повезивање на", "connectingMessage": { @@ -103,4 +104,4 @@ } } } -} +} \ No newline at end of file diff --git a/packages/core/src/lib/locale/vi.json b/packages/core/src/lib/locale/vi.json index 837ab1bf6..cc81436b4 100644 --- a/packages/core/src/lib/locale/vi.json +++ b/packages/core/src/lib/locale/vi.json @@ -11,6 +11,7 @@ "useAWallet": "Sử dụng ví để bảo mật và quản lý tài sản trên NEAR của bạn và đăng nhập vào bất kỳ ứng dụng NEAR nào, không cần tên người dùng và mật khẩu.", "connectionFailed": "Kết nối thất bại", "connectionSuccessful": "Kết nối thành công", + "rememberWallet": "Ghi nhớ lựa chọn ví", "connected": "Đã kết nối", "connectingTo": "Đang kết nối tới", "connectingMessage": { diff --git a/packages/core/src/lib/locale/zh.json b/packages/core/src/lib/locale/zh.json index 8321d7a70..09e4ab781 100644 --- a/packages/core/src/lib/locale/zh.json +++ b/packages/core/src/lib/locale/zh.json @@ -11,6 +11,7 @@ "useAWallet": "使用钱包来保护和管理你的 NEAR 资产，无需用户名和密码即可登录任何 NEAR 应用", "connectionFailed": "连接失败", "connectionSuccessful": "连接成功", + "rememberWallet": "记住钱包选择", "connected": "已连接", "connectingTo": "正在连接" }, diff --git a/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts b/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts index 61f37f585..f56e1ebd0 100644 --- a/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts +++ b/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts @@ -20,6 +20,8 @@ import { PACKAGE_NAME, PENDING_CONTRACT, PENDING_SELECTED_WALLET_ID, + REMEMBER_RECENT_WALLETS, + REMEMBER_RECENT_WALLETS_STATE, } from "../../constants"; import { JsonStorage } from "../storage/json-storage.service"; import type { ProviderService } from "../provider/provider.service.types"; @@ -81,6 +83,9 @@ export class WalletModules { const pendingContract = await jsonStorage.getItem( PENDING_CONTRACT ); + const rememberRecentWallets = await jsonStorage.getItem( + REMEMBER_RECENT_WALLETS + ); if (pendingSelectedWalletId && pendingContract) { const accounts = await this.validateWallet(pendingSelectedWalletId); @@ -99,14 +104,18 @@ export class WalletModules { }); } - const recentlySignedInWalletsFromPending = - await this.setWalletAsRecentlySignedIn(pendingSelectedWalletId); - + let recentlySignedInWalletsFromPending: Array = []; + if (rememberRecentWallets === REMEMBER_RECENT_WALLETS_STATE.ENABLED) { + recentlySignedInWalletsFromPending = + await this.setWalletAsRecentlySignedIn(pendingSelectedWalletId); + } return { accounts, contract: pendingContract, selectedWalletId: pendingSelectedWalletId, recentlySignedInWallets: recentlySignedInWalletsFromPending, + rememberRecentWallets: + rememberRecentWallets || REMEMBER_RECENT_WALLETS_STATE.ENABLED, }; } } @@ -124,6 +133,8 @@ export class WalletModules { contract: null, selectedWalletId: null, recentlySignedInWallets: recentlySignedInWallets || [], + rememberRecentWallets: + rememberRecentWallets || REMEMBER_RECENT_WALLETS_STATE.ENABLED, }; } @@ -132,6 +143,8 @@ export class WalletModules { contract, selectedWalletId, recentlySignedInWallets: recentlySignedInWallets || [], + rememberRecentWallets: + rememberRecentWallets || REMEMBER_RECENT_WALLETS_STATE.ENABLED, }; } @@ -174,7 +187,7 @@ export class WalletModules { walletId: string, { accounts, contractId, methodNames }: WalletEvents["signedIn"] ) { - const { selectedWalletId } = this.store.getState(); + const { selectedWalletId, rememberRecentWallets } = this.store.getState(); const jsonStorage = new JsonStorage(this.storage, PACKAGE_NAME); const contract = { contractId, methodNames }; @@ -194,13 +207,22 @@ export class WalletModules { await this.signOutWallet(selectedWalletId); } - const recentlySignedInWallets = await this.setWalletAsRecentlySignedIn( - walletId - ); + let recentlySignedInWallets: Array = []; + if (rememberRecentWallets === REMEMBER_RECENT_WALLETS_STATE.ENABLED) { + recentlySignedInWallets = await this.setWalletAsRecentlySignedIn( + walletId + ); + } this.store.dispatch({ type: "WALLET_CONNECTED", - payload: { walletId, contract, accounts, recentlySignedInWallets }, + payload: { + walletId, + contract, + accounts, + recentlySignedInWallets, + rememberRecentWallets, + }, }); this.emitter.emit("signedIn", { @@ -411,8 +433,13 @@ export class WalletModules { this.modules = modules; - const { accounts, contract, selectedWalletId, recentlySignedInWallets } = - await this.resolveStorageState(); + const { + accounts, + contract, + selectedWalletId, + recentlySignedInWallets, + rememberRecentWallets, + } = await this.resolveStorageState(); this.store.dispatch({ type: "SETUP_WALLET_MODULES", @@ -422,6 +449,7 @@ export class WalletModules { contract, selectedWalletId, recentlySignedInWallets, + rememberRecentWallets, }, }); diff --git a/packages/core/src/lib/store.ts b/packages/core/src/lib/store.ts index 48c22ee82..6019aea4f 100644 --- a/packages/core/src/lib/store.ts +++ b/packages/core/src/lib/store.ts @@ -12,6 +12,8 @@ import { CONTRACT, SELECTED_WALLET_ID, RECENTLY_SIGNED_IN_WALLETS, + REMEMBER_RECENT_WALLETS, + REMEMBER_RECENT_WALLETS_STATE, } from "./constants"; const reducer = ( @@ -28,6 +30,7 @@ const reducer = ( contract, selectedWalletId, recentlySignedInWallets, + rememberRecentWallets, } = action.payload; const accountStates = accounts.map((account, i) => { @@ -44,6 +47,7 @@ const reducer = ( contract, selectedWalletId, recentlySignedInWallets, + rememberRecentWallets, }; } case "WALLET_CONNECTED": { @@ -129,6 +133,33 @@ const reducer = ( accounts: accountStates, }; } + case "SET_REMEMBER_RECENT_WALLETS": { + const { selectedWalletId, recentlySignedInWallets } = state; + const { rememberRecentWallets } = action.payload; + const newRecentWallets = + rememberRecentWallets === REMEMBER_RECENT_WALLETS_STATE.ENABLED + ? REMEMBER_RECENT_WALLETS_STATE.DISABLED + : REMEMBER_RECENT_WALLETS_STATE.ENABLED; + + const newWalletsVal = [...recentlySignedInWallets]; + if ( + selectedWalletId && + !recentlySignedInWallets.includes(selectedWalletId) + ) { + newWalletsVal.push(selectedWalletId); + } + + const newRecentlySignedInWallets = + newRecentWallets === REMEMBER_RECENT_WALLETS_STATE.ENABLED + ? newWalletsVal + : []; + + return { + ...state, + rememberRecentWallets: newRecentWallets, + recentlySignedInWallets: newRecentlySignedInWallets, + }; + } default: return state; } @@ -143,6 +174,8 @@ export const createStore = async (storage: StorageService): Promise => { selectedWalletId: await jsonStorage.getItem(SELECTED_WALLET_ID), recentlySignedInWallets: (await jsonStorage.getItem(RECENTLY_SIGNED_IN_WALLETS)) || [], + rememberRecentWallets: + (await jsonStorage.getItem(REMEMBER_RECENT_WALLETS)) || "", }; const state$ = new BehaviorSubject(initialState); @@ -178,6 +211,12 @@ export const createStore = async (storage: StorageService): Promise => { RECENTLY_SIGNED_IN_WALLETS, "recentlySignedInWallets" ); + syncStorage( + prevState, + state, + REMEMBER_RECENT_WALLETS, + "rememberRecentWallets" + ); prevState = state; }); diff --git a/packages/core/src/lib/store.types.ts b/packages/core/src/lib/store.types.ts index a5696a146..76ee887c1 100644 --- a/packages/core/src/lib/store.types.ts +++ b/packages/core/src/lib/store.types.ts @@ -61,6 +61,10 @@ export interface WalletSelectorState { * Returns ID-s of 5 recently signed in wallets. */ recentlySignedInWallets: Array; + /** + * Returns a string, which indicates if the functionality about recentlySignedInWallets is active. + */ + rememberRecentWallets: string; } export type WalletSelectorAction = @@ -72,6 +76,7 @@ export type WalletSelectorAction = contract: ContractState | null; selectedWalletId: string | null; recentlySignedInWallets: Array; + rememberRecentWallets: string; }; } | { @@ -81,6 +86,7 @@ export type WalletSelectorAction = contract: ContractState; accounts: Array; recentlySignedInWallets: Array; + rememberRecentWallets: string; }; } | { @@ -101,6 +107,12 @@ export type WalletSelectorAction = payload: { accountId: string; }; + } + | { + type: "SET_REMEMBER_RECENT_WALLETS"; + payload: { + rememberRecentWallets: string; + }; }; export interface ReadOnlyStore { diff --git a/packages/core/src/lib/wallet-selector.ts b/packages/core/src/lib/wallet-selector.ts index 0ea7a36d1..76123bfbe 100644 --- a/packages/core/src/lib/wallet-selector.ts +++ b/packages/core/src/lib/wallet-selector.ts @@ -49,6 +49,14 @@ const createSelector = ( payload: { accountId }, }); }, + setRememberRecentWallets: () => { + const { rememberRecentWallets } = store.getState(); + + store.dispatch({ + type: "SET_REMEMBER_RECENT_WALLETS", + payload: { rememberRecentWallets }, + }); + }, isSignedIn() { const { accounts } = store.getState(); diff --git a/packages/core/src/lib/wallet-selector.types.ts b/packages/core/src/lib/wallet-selector.types.ts index a50079c14..ff636fb8a 100644 --- a/packages/core/src/lib/wallet-selector.types.ts +++ b/packages/core/src/lib/wallet-selector.types.ts @@ -94,6 +94,11 @@ export interface WalletSelector { */ setActiveAccount(accountId: string): void; + /** + * Programmatically changes the rememberRecentWallets behavior, it can deactivate and activate rememberRecentWallets. + */ + setRememberRecentWallets(): void; + /** * Attach an event handler to important events. */ diff --git a/packages/modal-ui-js/src/lib/render-modal.ts b/packages/modal-ui-js/src/lib/render-modal.ts index f33968ee4..7fb822215 100644 --- a/packages/modal-ui-js/src/lib/render-modal.ts +++ b/packages/modal-ui-js/src/lib/render-modal.ts @@ -22,6 +22,8 @@ export type HardwareWalletAccountState = HardwareWalletAccount & { }; let initialRender = true; +let isChecked = false; + const getAccountIds = async (publicKey: string): Promise> => { if (!modalState) { return []; @@ -237,12 +239,92 @@ function renderOptionsList( }); } } +const renderWalletOptions = () => { + if (!modalState) { + return; + } + + const moreWallets: Array> = []; + const recentlySignedInWallets: Array> = []; + + modalState.modules.forEach((module) => { + if ( + modalState?.selector.store + .getState() + .recentlySignedInWallets.includes(module.id) + ) { + recentlySignedInWallets.push(module); + } else { + moreWallets.push(module); + } + }); + + const optionsWrapper = document.querySelector(".wallet-options-wrapper"); + if (optionsWrapper) { + optionsWrapper.innerHTML = ""; + } + + if ( + modalState.selector.options.optimizeWalletOrder && + recentlySignedInWallets.length > 0 + ) { + optionsWrapper?.insertAdjacentHTML( + "beforeend", + ` +
+
Recent
+
+
+ ` + ); + optionsWrapper?.insertAdjacentHTML( + "beforeend", + ` +
+
More
+
+
+ ` + ); + renderOptionsList(".recent-options-list-content", recentlySignedInWallets); + + if (modalState.selector.options.randomizeWalletOrder) { + renderOptionsList( + ".more-options-list-content", + moreWallets.sort(() => Math.random() - 0.5) + ); + } else { + renderOptionsList(".more-options-list-content", moreWallets); + } + } else { + optionsWrapper?.insertAdjacentHTML( + "beforeend", + `
` + ); + renderOptionsList(".options-list", modalState.modules); + } +}; + +const handleSwitchChange = () => { + if (!modalState) { + return; + } + + isChecked = !isChecked; + modalState.selector.setRememberRecentWallets(); + + renderWalletOptions(); +}; export function renderModal() { if (!modalState) { return; } + const { rememberRecentWallets, selectedWalletId } = + modalState.selector.store.getState(); + isChecked = rememberRecentWallets === "enabled"; + modalState.container.innerHTML = `

${translate("modal.wallet.connectYourWallet")}

+ + ${translate("modal.wallet.rememberWallet")} + +
@@ -262,6 +353,10 @@ export function renderModal() {
`; + document + .getElementById("rememberWalletSwitch") + ?.addEventListener("change", handleSwitchChange); + const moreWallets: Array> = []; const recentlySignedInWallets: Array> = []; @@ -309,6 +404,13 @@ export function renderModal() { } else { renderOptionsList(".more-options-list-content", moreWallets); } + + if (!selectedWalletId && recentlySignedInWallets.length > 0) { + const firstWallet = recentlySignedInWallets[0]; + document + .querySelector(`#module-${firstWallet.id}`) + ?.classList.add("selected-wallet"); + } } else { document .querySelector(".wallet-options-wrapper") diff --git a/packages/modal-ui-js/src/lib/styles.css b/packages/modal-ui-js/src/lib/styles.css index 6d5ffeba1..402d22a4f 100644 --- a/packages/modal-ui-js/src/lib/styles.css +++ b/packages/modal-ui-js/src/lib/styles.css @@ -191,6 +191,17 @@ color: var(--wallet-selector-heading-color, var(--heading-color)); } +.nws-modal-wrapper .nws-modal .modal-left .modal-left-title { + position: fixed; + width: 34%; + top: 0; + left: 0; + right: 0; + z-index: 10; + background: var(--content-bg); + padding: 32px 24px 0px 24px; +} + .nws-modal-wrapper .nws-modal .modal-left::-webkit-scrollbar { width: 10px; } @@ -201,6 +212,7 @@ .nws-modal-wrapper .nws-modal .wallet-options-wrapper { margin-bottom: 20px; + margin-top: 100px } .nws-modal-wrapper .nws-modal .wallet-options-wrapper .description { @@ -1297,6 +1309,70 @@ padding: 8px 24px; } +.nws-switch { + position: relative; + display: inline-block; + vertical-align: middle; + width: 34px; + height: 20px; + margin-left: 12px; +} + +.nws-switch input { + opacity: 0; + width: 0; + height: 0; +} + +.nws-slider { + position: absolute; + cursor: pointer; + inset: 0; + background-color: var(--gray); + -webkit-transition: .4s; + transition: .4s; +} + +.nws-slider:before { + position: absolute; + content: ""; + height: 16px; + width: 16px; + top: 50%; + transform: translate(3px, -50%); + background-color: var(--heading-color); + -webkit-transition: .4s; + transition: .4s; +} + +input:checked + .nws-slider { + background-color: var(--selected-wallet-bg); +} + +input:focus + .nws-slider { + box-shadow: 0 0 1px var(--selected-wallet-bg); +} + +input:checked + .nws-slider:before { + -webkit-transform: translate(calc(100% - 1px), -50%); + -ms-transform: translate(calc(100% - 1px), -50%); + transform: translate(calc(100% - 1px), -50%); +} + +.nws-slider.round { + border-radius: 34px; +} + +.nws-slider.round:before { + border-radius: 50%; +} + +.nws-remember-wallet { + margin-top: 10px; + font-size: 16px; + color: var(--wallet-selector-text-color, var(--text-color)); +} + /************* Responsive and mobile **********/ @media (min-width: 577px) { @@ -1314,6 +1390,11 @@ } } +@media (max-width: 810px) { + .nws-modal-wrapper .nws-modal .wallet-options-wrapper { + margin-top: 90px + } +} @media (max-width: 768px) { @@ -1349,6 +1430,11 @@ margin-top: 30px; margin-bottom: 35px; } + + .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { + width: 39%; + padding: 32px 16px 0px 16px; + } } @@ -1362,8 +1448,15 @@ margin-top: 20px; } - .nws-modal-wrapper .nws-modal .modal-left .modal-left-title h2 { - text-align: center; + .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { + position: relative; + width: 100%; + padding: 0px; + z-index: 0; + } + + .options-list .recent-options-list-content { + margin-top: 100px; } .nws-modal-wrapper .wallet-not-installed-wrapper > p { diff --git a/packages/modal-ui/src/lib/components/Modal.tsx b/packages/modal-ui/src/lib/components/Modal.tsx index afcce63da..530b4c0ff 100644 --- a/packages/modal-ui/src/lib/components/Modal.tsx +++ b/packages/modal-ui/src/lib/components/Modal.tsx @@ -57,6 +57,16 @@ export const Modal: React.FC = ({ const [selectedWallet, setSelectedWallet] = useState(); const [bridgeWalletUri, setBridgeWalletUri] = useState(); + const { rememberRecentWallets } = selector.store.getState(); + const [isChecked, setIsChecked] = useState( + rememberRecentWallets === "enabled" + ); + + const handleSwitchChange = () => { + setIsChecked((prevIsChecked) => !prevIsChecked); + selector.setRememberRecentWallets(); + }; + useEffect(() => { setRoute({ name: "WalletHome", @@ -261,6 +271,17 @@ export const Modal: React.FC = ({

{translate("modal.wallet.connectYourWallet")}

+ + {translate("modal.wallet.rememberWallet")} + +
{ diff --git a/packages/modal-ui/src/lib/components/WalletOptions.tsx b/packages/modal-ui/src/lib/components/WalletOptions.tsx index 971ff7667..4699129d2 100644 --- a/packages/modal-ui/src/lib/components/WalletOptions.tsx +++ b/packages/modal-ui/src/lib/components/WalletOptions.tsx @@ -77,6 +77,13 @@ export const WalletOptions: React.FC = ({ // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + useEffect(() => { + const { recentlySignedInWallets } = selector.store.getState(); + if (recentlySignedInWallets.length) { + setActiveWalletId(recentlySignedInWallets[0]); + } + }, [selector.store]); + function renderOptionsList(modulesToRender: Array>) { return modulesToRender.reduce>( (result, module, index) => { diff --git a/packages/modal-ui/src/lib/components/styles.css b/packages/modal-ui/src/lib/components/styles.css index edd9f9aad..d00d4d490 100644 --- a/packages/modal-ui/src/lib/components/styles.css +++ b/packages/modal-ui/src/lib/components/styles.css @@ -191,6 +191,17 @@ color: var(--wallet-selector-heading-color, var(--heading-color)); } +.nws-modal-wrapper .nws-modal .modal-left .modal-left-title { + position: fixed; + width: 34%; + top: 0; + left: 0; + right: 0; + z-index: 10; + background: var(--content-bg); + padding: 32px 24px 0px 24px; +} + .nws-modal-wrapper .nws-modal .modal-left::-webkit-scrollbar { width: 10px; } @@ -201,6 +212,7 @@ .nws-modal-wrapper .nws-modal .wallet-options-wrapper { margin-bottom: 20px; + margin-top: 100px } .nws-modal-wrapper .nws-modal .wallet-options-wrapper .description { @@ -1298,6 +1310,70 @@ padding: 8px 24px; } +.nws-switch { + position: relative; + display: inline-block; + vertical-align: middle; + width: 34px; + height: 20px; + margin-left: 12px; +} + +.nws-switch input { + opacity: 0; + width: 0; + height: 0; +} + +.nws-slider { + position: absolute; + cursor: pointer; + inset: 0; + background-color: var(--gray); + -webkit-transition: .4s; + transition: .4s; +} + +.nws-slider:before { + position: absolute; + content: ""; + height: 16px; + width: 16px; + top: 50%; + transform: translate(3px, -50%); + background-color: var(--heading-color); + -webkit-transition: .4s; + transition: .4s; +} + +input:checked + .nws-slider { + background-color: var(--selected-wallet-bg); +} + +input:focus + .nws-slider { + box-shadow: 0 0 1px var(--selected-wallet-bg); +} + +input:checked + .nws-slider:before { + -webkit-transform: translate(calc(100% - 1px), -50%); + -ms-transform: translate(calc(100% - 1px), -50%); + transform: translate(calc(100% - 1px), -50%); +} + +.nws-slider.round { + border-radius: 34px; +} + +.nws-slider.round:before { + border-radius: 50%; +} + +.nws-remember-wallet { + margin-top: 10px; + font-size: 16px; + color: var(--wallet-selector-text-color, var(--text-color)); +} + /************* Responsive and mobile **********/ @media (min-width: 577px) { @@ -1315,6 +1391,11 @@ } } +@media (max-width: 810px) { + .nws-modal-wrapper .nws-modal .wallet-options-wrapper { + margin-top: 90px + } +} @media (max-width: 768px) { @@ -1350,6 +1431,11 @@ margin-top: 30px; margin-bottom: 35px; } + + .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { + width: 39%; + padding: 32px 16px 0px 16px; + } } @@ -1363,8 +1449,10 @@ margin-top: 20px; } - .nws-modal-wrapper .nws-modal .modal-left .modal-left-title h2 { - text-align: center; + .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { + width: 100%; + padding: 32px 12px 0px 12px; + z-index: 0; } .nws-modal-wrapper .wallet-not-installed-wrapper > p { From d97a9691204e593c12eb247bc1e41e0f1f4ec9ac Mon Sep 17 00:00:00 2001 From: Dimitar Daskalov Date: Mon, 29 Jul 2024 11:38:40 +0300 Subject: [PATCH 04/11] feat: add failoverRPCprovider --- packages/core/src/lib/options.spec.ts | 40 +++- packages/core/src/lib/options.ts | 9 +- .../provider/provider.service.spec.ts | 2 +- .../lib/services/provider/provider.service.ts | 29 ++- .../wallet-modules/wallet-modules.service.ts | 2 +- packages/core/src/lib/wallet-selector.spec.ts | 184 ++++++++++++++++++ packages/core/src/lib/wallet-selector.ts | 18 +- .../core/src/lib/wallet-selector.types.ts | 4 + packages/neth/src/lib/neth-lib.ts | 2 +- 9 files changed, 272 insertions(+), 18 deletions(-) create mode 100644 packages/core/src/lib/wallet-selector.spec.ts diff --git a/packages/core/src/lib/options.spec.ts b/packages/core/src/lib/options.spec.ts index f8544efa8..a347e3758 100644 --- a/packages/core/src/lib/options.spec.ts +++ b/packages/core/src/lib/options.spec.ts @@ -2,7 +2,7 @@ import { getNetworkPreset, resolveNetwork } from "./options"; import type { NetworkId, Network } from "./options.types"; describe("getNetworkPreset", () => { - it("returns the correct config for 'mainnet'", () => { + it("returns the correct config for 'mainnet' without fallbackRpcUrls", () => { const networkId: NetworkId = "mainnet"; const network = getNetworkPreset(networkId); @@ -15,7 +15,25 @@ describe("getNetworkPreset", () => { }); }); - it("returns the correct config for 'testnet'", () => { + it("returns the correct config for 'mainnet' with fallbackRpcUrls", () => { + const networkId: NetworkId = "mainnet"; + const fallbackRpcUrls: Array = [ + "https://rpc1.mainnet.near.org", + "https://rpc2.mainnet.near.org", + "https://rpc3.mainnet.near.org", + ]; + const network = getNetworkPreset(networkId, fallbackRpcUrls); + + expect(network).toEqual({ + networkId, + nodeUrl: "https://rpc1.mainnet.near.org", + helperUrl: "https://helper.mainnet.near.org", + explorerUrl: "https://nearblocks.io", + indexerUrl: "https://api.kitwallet.app", + }); + }); + + it("returns the correct config for 'testnet' without fallbackRpcUrls", () => { const networkId: NetworkId = "testnet"; const network = getNetworkPreset(networkId); @@ -27,6 +45,24 @@ describe("getNetworkPreset", () => { indexerUrl: "https://testnet-api.kitwallet.app", }); }); + + it("returns the correct config for 'testnet' with fallbackRpcUrls", () => { + const networkId: NetworkId = "testnet"; + const fallbackRpcUrls: Array = [ + "https://rpc1.testnet.near.org", + "https://rpc2.testnet.near.org", + "https://rpc3.testnet.near.org", + ]; + const network = getNetworkPreset(networkId, fallbackRpcUrls); + + expect(network).toEqual({ + networkId, + nodeUrl: "https://rpc1.testnet.near.org", + helperUrl: "https://helper.testnet.near.org", + explorerUrl: "https://testnet.nearblocks.io", + indexerUrl: "https://testnet-api.kitwallet.app", + }); + }); }); describe("resolveNetwork", () => { diff --git a/packages/core/src/lib/options.ts b/packages/core/src/lib/options.ts index 299a8ade9..7a5cf0dd5 100644 --- a/packages/core/src/lib/options.ts +++ b/packages/core/src/lib/options.ts @@ -2,12 +2,15 @@ import type { WalletSelectorParams } from "./wallet-selector.types"; import type { Options, Network, NetworkId } from "./options.types"; import { WebStorageService } from "./services"; -export const getNetworkPreset = (networkId: NetworkId): Network => { +export const getNetworkPreset = ( + networkId: NetworkId, + fallbackRpcUrls?: Array +): Network => { switch (networkId) { case "mainnet": return { networkId, - nodeUrl: "https://rpc.mainnet.near.org", + nodeUrl: fallbackRpcUrls?.[0] || "https://rpc.mainnet.near.org", helperUrl: "https://helper.mainnet.near.org", explorerUrl: "https://nearblocks.io", indexerUrl: "https://api.kitwallet.app", @@ -15,7 +18,7 @@ export const getNetworkPreset = (networkId: NetworkId): Network => { case "testnet": return { networkId, - nodeUrl: "https://rpc.testnet.near.org", + nodeUrl: fallbackRpcUrls?.[0] || "https://rpc.testnet.near.org", helperUrl: "https://helper.testnet.near.org", explorerUrl: "https://testnet.nearblocks.io", indexerUrl: "https://testnet-api.kitwallet.app", diff --git a/packages/core/src/lib/services/provider/provider.service.spec.ts b/packages/core/src/lib/services/provider/provider.service.spec.ts index 573dd7348..ed66ba560 100644 --- a/packages/core/src/lib/services/provider/provider.service.spec.ts +++ b/packages/core/src/lib/services/provider/provider.service.spec.ts @@ -30,7 +30,7 @@ const setup = (url: string) => { return { provider, - service: new Provider(url), + service: new Provider([url]), }; }; diff --git a/packages/core/src/lib/services/provider/provider.service.ts b/packages/core/src/lib/services/provider/provider.service.ts index d9cb996c7..6cf257b6b 100644 --- a/packages/core/src/lib/services/provider/provider.service.ts +++ b/packages/core/src/lib/services/provider/provider.service.ts @@ -3,23 +3,34 @@ import type { AccessKeyView, BlockReference, QueryResponseKind, + RpcQueryRequest, } from "near-api-js/lib/providers/provider"; -import type { SignedTransaction } from "near-api-js/lib/transaction"; import type { ProviderService, QueryParams, ViewAccessKeyParams, } from "./provider.service.types"; +import { JsonRpcProvider } from "near-api-js/lib/providers"; +import type { SignedTransaction } from "near-api-js/lib/transaction"; export class Provider implements ProviderService { - private provider: nearAPI.providers.JsonRpcProvider; + private provider: nearAPI.providers.FailoverRpcProvider; - constructor(url: string) { - this.provider = new nearAPI.providers.JsonRpcProvider({ url }); + constructor(urls: Array) { + this.provider = new nearAPI.providers.FailoverRpcProvider( + this.urlsToProviders(urls) + ); } - query(params: QueryParams) { - return this.provider.query(params); + query( + paramsOrPath: QueryParams | RpcQueryRequest | string, + data?: string + ): Promise { + if (typeof paramsOrPath === "string" && data !== undefined) { + return this.provider.query(paramsOrPath, data); + } else { + return this.provider.query(paramsOrPath as RpcQueryRequest); + } } viewAccessKey({ accountId, publicKey }: ViewAccessKeyParams) { @@ -38,4 +49,10 @@ export class Provider implements ProviderService { sendTransaction(signedTransaction: SignedTransaction) { return this.provider.sendTransaction(signedTransaction); } + + private urlsToProviders(urls: Array) { + return urls && urls.length > 0 + ? urls.map((url) => new JsonRpcProvider({ url })) + : []; + } } diff --git a/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts b/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts index 61f37f585..10ef44a7a 100644 --- a/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts +++ b/packages/core/src/lib/services/wallet-modules/wallet-modules.service.ts @@ -22,8 +22,8 @@ import { PENDING_SELECTED_WALLET_ID, } from "../../constants"; import { JsonStorage } from "../storage/json-storage.service"; -import type { ProviderService } from "../provider/provider.service.types"; import type { SignMessageMethod } from "../../wallet"; +import type { ProviderService } from "../provider/provider.service.types"; export class WalletModules { private factories: Array; diff --git a/packages/core/src/lib/wallet-selector.spec.ts b/packages/core/src/lib/wallet-selector.spec.ts new file mode 100644 index 000000000..4edca0c64 --- /dev/null +++ b/packages/core/src/lib/wallet-selector.spec.ts @@ -0,0 +1,184 @@ +import { setupWalletSelector } from "./wallet-selector"; +import { FailoverRpcProvider } from "@near-js/providers"; +import { getNetworkPreset } from "./options"; +import { JsonRpcProvider } from "near-api-js/lib/providers"; +import type { Network } from "./options.types"; +import type { Store } from "./store.types"; +import type { WalletModuleFactory } from "./wallet"; + +// Mock implementations for required modules +const _state: Record = {}; + +global.localStorage = { + getItem: jest.fn((key) => _state[key] || null), + setItem: jest.fn((key, value) => { + _state[key] = value; + }), + removeItem: jest.fn((key) => { + delete _state[key]; + }), + clear: jest.fn(() => { + for (const key in _state) { + delete _state[key]; + } + }), + get length() { + return Object.keys(_state).length; + }, + key: jest.fn((index) => Object.keys(_state)[index] || null), +}; + +jest.mock("./options", () => { + return { + ...jest.requireActual("./options"), + getNetworkPreset: jest.fn().mockResolvedValue({ + networkId: "testnet", + nodeUrl: "http://node.example.com", + helperUrl: "http://helper.example.com", + explorerUrl: "http://explorer.example.com", + indexerUrl: "http://indexer.example.com", + }), + }; +}); + +jest.mock("./store", () => { + return { + ...jest.requireActual("./store"), + createStore: jest.fn().mockResolvedValue({ + toReadOnly: jest.fn().mockReturnValue({}), + getState: jest.fn().mockReturnValue({}), + dispatch: jest.fn(), + } as unknown as Store), + }; +}); + +jest.mock("@near-js/providers", () => { + const originalModule = jest.requireActual("@near-js/providers"); + return { + ...originalModule, + FailoverRpcProvider: jest.fn(), + }; +}); + +describe("setupWalletSelector", () => { + let params: { + network: Network; + fallbackRpcUrls: Array; + modules: Array; + }; + + beforeEach(() => { + jest.clearAllMocks(); + + params = { + network: { + networkId: "testnet", + nodeUrl: "http://node.example.com", + helperUrl: "http://helper.example.com", + explorerUrl: "http://explorer.example.com", + indexerUrl: "http://indexer.example.com", + }, + fallbackRpcUrls: ["http://rpc1.example.com", "http://rpc2.example.com"], + modules: [], + }; + }); + + it("should instantiate FailoverRpcProvider correctly with single URL", async () => { + const mockedRpcProvider = { setup: jest.fn() }; + const mockedFailoverRpcProvider = FailoverRpcProvider as jest.MockedClass< + typeof FailoverRpcProvider + >; + + mockedFailoverRpcProvider.mockImplementationOnce( + () => mockedRpcProvider as unknown as FailoverRpcProvider + ); + + const mockFallbackRpcUrl = "http://rpc1.example.com"; + + await setupWalletSelector({ + ...params, + fallbackRpcUrls: [mockFallbackRpcUrl], + }); + + const mockExpectedProviders = [ + new JsonRpcProvider({ url: mockFallbackRpcUrl }), + ]; + + expect(mockedFailoverRpcProvider).toHaveBeenCalledTimes(1); + expect(mockedFailoverRpcProvider).toHaveBeenCalledWith( + mockExpectedProviders + ); + }); + + it("should instantiate FailoverRpcProvider correctly with multiple URLs", async () => { + const mockedRpcProvider = { setup: jest.fn() }; + const mockedFailoverRpcProvider = FailoverRpcProvider as jest.MockedClass< + typeof FailoverRpcProvider + >; + + mockedFailoverRpcProvider.mockImplementationOnce( + () => mockedRpcProvider as unknown as FailoverRpcProvider + ); + + const mockFallbackRpcUrls = [ + "https://rpc1.example.com", + "https://rpc2.example.com", + ]; + + await setupWalletSelector({ + ...params, + fallbackRpcUrls: mockFallbackRpcUrls, + }); + + const mockExpectedProviders = mockFallbackRpcUrls.map( + (url) => new JsonRpcProvider({ url }) + ); + + expect(mockedFailoverRpcProvider).toHaveBeenCalledTimes(1); + expect(mockedFailoverRpcProvider).toHaveBeenCalledWith( + mockExpectedProviders + ); + }); + + it("should instantiate FailoverRpcProvider correctly with default value when fallbackRpcUrls are empty", async () => { + const mockedRpcProvider = { setup: jest.fn() }; + const mockedFailoverRpcProvider = FailoverRpcProvider as jest.MockedClass< + typeof FailoverRpcProvider + >; + + mockedFailoverRpcProvider.mockImplementationOnce( + () => mockedRpcProvider as unknown as FailoverRpcProvider + ); + + const networkPreset = await getNetworkPreset("testnet", []); + + await setupWalletSelector({ + ...params, + fallbackRpcUrls: [], + }); + + const mockExpectedProvider = [ + new JsonRpcProvider({ url: networkPreset.nodeUrl }), + ]; + + expect(mockedFailoverRpcProvider).toHaveBeenCalledTimes(1); + expect(mockedFailoverRpcProvider).toHaveBeenCalledWith( + mockExpectedProvider + ); + }); + + it("should handle error during FailoverRpcProvider instantiation", async () => { + const mockedFailoverRpcProvider = FailoverRpcProvider as jest.MockedClass< + typeof FailoverRpcProvider + >; + mockedFailoverRpcProvider.mockImplementationOnce(() => { + throw new Error("Failed to instantiate FailoverRpcProvider"); + }); + + await expect(setupWalletSelector(params)).rejects.toThrow( + "Failed to instantiate FailoverRpcProvider" + ); + + expect(mockedFailoverRpcProvider).toHaveBeenCalledTimes(1); + }); +}); diff --git a/packages/core/src/lib/wallet-selector.ts b/packages/core/src/lib/wallet-selector.ts index 0ea7a36d1..cbdb5b807 100644 --- a/packages/core/src/lib/wallet-selector.ts +++ b/packages/core/src/lib/wallet-selector.ts @@ -1,14 +1,14 @@ -import { resolveOptions } from "./options"; +import { getNetworkPreset, resolveOptions } from "./options"; import { createStore } from "./store"; import type { WalletSelector, WalletSelectorEvents, WalletSelectorParams, } from "./wallet-selector.types"; -import { EventEmitter, Logger, Provider, WalletModules } from "./services"; +import { EventEmitter, Logger, WalletModules, Provider } from "./services"; import type { Wallet } from "./wallet"; import type { Store } from "./store.types"; -import type { Options } from "./options.types"; +import type { NetworkId, Options } from "./options.types"; let walletSelectorInstance: WalletSelector | null = null; @@ -76,13 +76,23 @@ export const setupWalletSelector = async ( const emitter = new EventEmitter(); const store = await createStore(storage); + const network = await getNetworkPreset( + options.network.networkId as NetworkId, + params.fallbackRpcUrls + ); + + const rpcProviderUrls = + params.fallbackRpcUrls && params.fallbackRpcUrls.length > 0 + ? params.fallbackRpcUrls + : [network.nodeUrl]; + const walletModules = new WalletModules({ factories: params.modules, storage, options, store, emitter, - provider: new Provider(options.network.nodeUrl), + provider: new Provider(rpcProviderUrls), }); await walletModules.setup(); diff --git a/packages/core/src/lib/wallet-selector.types.ts b/packages/core/src/lib/wallet-selector.types.ts index a50079c14..5037e9a38 100644 --- a/packages/core/src/lib/wallet-selector.types.ts +++ b/packages/core/src/lib/wallet-selector.types.ts @@ -46,6 +46,10 @@ export interface WalletSelectorParams { * The URL where DelegateActions are sent by meta transaction enabled wallet modules. */ relayerUrl?: string; + /** + * Whether multiple RPC URLs are included, used for the FailoverRpcProvider. + */ + fallbackRpcUrls?: Array; } export type WalletSelectorStore = ReadOnlyStore; diff --git a/packages/neth/src/lib/neth-lib.ts b/packages/neth/src/lib/neth-lib.ts index 150adc831..f35741a52 100644 --- a/packages/neth/src/lib/neth-lib.ts +++ b/packages/neth/src/lib/neth-lib.ts @@ -984,7 +984,7 @@ export const getEthereum = async () => { decimals: 18, }, blockExplorerUrls: ["https://explorer.mainnet.aurora.dev/"], - rpcUrls: ["https://mainnet.aurora.dev"], + fallbackRpcUrls: ["https://mainnet.aurora.dev"], }, ], }); From 6026939725b766b9d11051a072cf7fdb4b8ef17a Mon Sep 17 00:00:00 2001 From: pablo Date: Tue, 30 Jul 2024 11:56:57 +0200 Subject: [PATCH 05/11] Feat : upgrade near-mobile-signer to v1.1.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b63032a06..bfdc1ec38 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "@near-snap/sdk": "0.6.0", "@noble/ciphers": "0.5.3", "@noble/hashes": "1.4.0", - "@peersyst/near-mobile-signer": "1.0.12", + "@peersyst/near-mobile-signer": "1.1.0", "@ramper/near": "0.0.30", "@tanstack/react-query": "5.24.8", "@walletconnect/modal": "2.6.2", @@ -222,4 +222,4 @@ "webpack": "5.75.0", "webpack-merge": "5.8.0" } -} +} \ No newline at end of file From c9725667c8a11d872d3d3bfccf956a06df30b9cb Mon Sep 17 00:00:00 2001 From: Pavel Ivanov Date: Thu, 1 Aug 2024 12:29:59 +0300 Subject: [PATCH 06/11] [UI/UX] - improve UI/UX --- packages/modal-ui-js/src/lib/render-modal.ts | 8 ++++---- packages/modal-ui-js/src/lib/styles.css | 11 +++++++---- .../modal-ui/src/lib/components/WalletOptions.tsx | 4 ++-- packages/modal-ui/src/lib/components/styles.css | 11 +++++++---- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/packages/modal-ui-js/src/lib/render-modal.ts b/packages/modal-ui-js/src/lib/render-modal.ts index 7fb822215..fee984a8c 100644 --- a/packages/modal-ui-js/src/lib/render-modal.ts +++ b/packages/modal-ui-js/src/lib/render-modal.ts @@ -271,7 +271,7 @@ const renderWalletOptions = () => { optionsWrapper?.insertAdjacentHTML( "beforeend", ` -
+
Recent
@@ -280,7 +280,7 @@ const renderWalletOptions = () => { optionsWrapper?.insertAdjacentHTML( "beforeend", ` -
+
More
@@ -379,7 +379,7 @@ export function renderModal() { document.querySelector(".wallet-options-wrapper")?.insertAdjacentHTML( "beforeend", ` -
+
Recent
@@ -388,7 +388,7 @@ export function renderModal() { document.querySelector(".wallet-options-wrapper")?.insertAdjacentHTML( "beforeend", ` -
+
More
diff --git a/packages/modal-ui-js/src/lib/styles.css b/packages/modal-ui-js/src/lib/styles.css index 402d22a4f..08aa338f4 100644 --- a/packages/modal-ui-js/src/lib/styles.css +++ b/packages/modal-ui-js/src/lib/styles.css @@ -199,7 +199,7 @@ right: 0; z-index: 10; background: var(--content-bg); - padding: 32px 24px 0px 24px; + padding: 32px 24px 12px 24px; } .nws-modal-wrapper .nws-modal .modal-left::-webkit-scrollbar { @@ -1286,8 +1286,11 @@ font-size: 14px; } +.options-list-section-recent { + margin-bottom: 20px; +} -.scan-qr-code .footer{ +.scan-qr-code .footer { position: relative; display: flex; align-items: center; @@ -1433,7 +1436,7 @@ input:checked + .nws-slider:before { .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { width: 39%; - padding: 32px 16px 0px 16px; + padding: 32px 16px 12px 16px; } } @@ -1451,7 +1454,7 @@ input:checked + .nws-slider:before { .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { position: relative; width: 100%; - padding: 0px; + padding: 32px 12px 12px 12px; z-index: 0; } diff --git a/packages/modal-ui/src/lib/components/WalletOptions.tsx b/packages/modal-ui/src/lib/components/WalletOptions.tsx index 4699129d2..746053034 100644 --- a/packages/modal-ui/src/lib/components/WalletOptions.tsx +++ b/packages/modal-ui/src/lib/components/WalletOptions.tsx @@ -133,13 +133,13 @@ export const WalletOptions: React.FC = ({ {selector.options.optimizeWalletOrder && selector.store.getState().recentlySignedInWallets.length > 0 ? (
-
+
Recent
{renderOptionsList(recentModules)}
-
+
More
{renderOptionsList(moreModules)} diff --git a/packages/modal-ui/src/lib/components/styles.css b/packages/modal-ui/src/lib/components/styles.css index d00d4d490..68536505f 100644 --- a/packages/modal-ui/src/lib/components/styles.css +++ b/packages/modal-ui/src/lib/components/styles.css @@ -199,7 +199,7 @@ right: 0; z-index: 10; background: var(--content-bg); - padding: 32px 24px 0px 24px; + padding: 32px 24px 12px 24px; } .nws-modal-wrapper .nws-modal .modal-left::-webkit-scrollbar { @@ -1287,8 +1287,11 @@ font-size: 14px; } +.options-list-section-recent { + margin-bottom: 20px; +} -.scan-qr-code .footer{ +.scan-qr-code .footer { position: relative; display: flex; align-items: center; @@ -1434,7 +1437,7 @@ input:checked + .nws-slider:before { .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { width: 39%; - padding: 32px 16px 0px 16px; + padding: 32px 16px 12px 16px; } } @@ -1451,7 +1454,7 @@ input:checked + .nws-slider:before { .nws-modal-wrapper .nws-modal .modal-left .modal-left-title { width: 100%; - padding: 32px 12px 0px 12px; + padding: 32px 12px 12px 12px; z-index: 0; } From 1d9a624a646364b07faae15bea26163363555975 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 09:37:46 +0000 Subject: [PATCH 07/11] build(deps-dev): bump @types/w3c-web-hid from 1.0.2 to 1.0.3 Bumps [@types/w3c-web-hid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/w3c-web-hid) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/w3c-web-hid) --- updated-dependencies: - dependency-name: "@types/w3c-web-hid" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 209 ++++----------------------------------------------- 2 files changed, 15 insertions(+), 196 deletions(-) diff --git a/package.json b/package.json index 712cdde1c..be8b1e2f3 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "@types/react": "18.0.25", "@types/react-dom": "18.0.9", "@types/regenerator-runtime": "0.13.1", - "@types/w3c-web-hid": "1.0.2", + "@types/w3c-web-hid": "1.0.3", "@types/w3c-web-usb": "1.0.6", "@typescript-eslint/eslint-plugin": "5.58.0", "@typescript-eslint/parser": "5.58.0", diff --git a/yarn.lock b/yarn.lock index 0cf2a06c9..342591fc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4219,24 +4219,6 @@ uint8-varint "^2.0.1" uint8arrays "^5.0.0" -"@near-js/accounts@0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@near-js/accounts/-/accounts-0.1.4.tgz#ff557dc65c5064ee4ac2dbfdd39aa3e35ae4d222" - integrity sha512-zHFmL4OUZ4qHXOE+dDBkYgTNHLWC5RmYUVp9LiuGciO5zFPp7WlxmowJL0QjgXqV1w+dNXq3mgmkfAgYVS8Xjw== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/providers" "0.0.7" - "@near-js/signers" "0.0.5" - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - ajv "^8.11.2" - ajv-formats "^2.1.1" - bn.js "5.2.1" - borsh "^0.7.0" - depd "^2.0.0" - near-abi "0.1.1" - "@near-js/accounts@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@near-js/accounts/-/accounts-1.0.4.tgz#b699dc1c63ffccc1598481b4260dfaf2507f0a69" @@ -4273,16 +4255,6 @@ lru_map "0.4.1" near-abi "0.1.1" -"@near-js/crypto@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/crypto/-/crypto-0.0.5.tgz#3191cdc8dcdba572bdead482b5d38f364bdcc2a0" - integrity sha512-nbQ971iYES5Spiolt+p568gNuZ//HeMHm3qqT3xT+i8ZzgbC//l6oRf48SUVTPAboQ1TJ5dW/NqcxOY0pe7b4g== - dependencies: - "@near-js/types" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - tweetnacl "^1.0.1" - "@near-js/crypto@1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@near-js/crypto/-/crypto-1.2.1.tgz#aa18bed171e68653dae9f82114636eba34ece32a" @@ -4314,14 +4286,6 @@ "@near-js/crypto" "1.2.4" "@near-js/keystores" "0.0.12" -"@near-js/keystores-browser@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/keystores-browser/-/keystores-browser-0.0.5.tgz#7e94181ca5c4fbad8b8e67cda16888b4ccafae61" - integrity sha512-mHF3Vcvsr7xnkaM/reOyxtykbE3OWKV6vQzqyTH2tZYT2OTEnj0KhRT9BCFC0Ra67K1zQLbg49Yc/kDCc5qupA== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/keystores-browser@0.0.9": version "0.0.9" resolved "https://registry.yarnpkg.com/@near-js/keystores-browser/-/keystores-browser-0.0.9.tgz#4d6211ad617613124aeee78ede5771b153e3bcdd" @@ -4338,14 +4302,6 @@ "@near-js/crypto" "1.2.4" "@near-js/keystores" "0.0.12" -"@near-js/keystores-node@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/keystores-node/-/keystores-node-0.0.5.tgz#f474dabbb84590896dd8861bb33a7304580e0d99" - integrity sha512-BYmWyGNydfAqi7eYA1Jo8zULL13cxejD2VBr0BBIXx5bJ+BO4TLecsY1xdTBEq06jyWXHa7kV4h8BJzAjvpTLg== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/keystores-node@0.0.9": version "0.0.9" resolved "https://registry.yarnpkg.com/@near-js/keystores-node/-/keystores-node-0.0.9.tgz#c2fd2f5bfbca1c75699dd7324e300cfd12e790ed" @@ -4362,14 +4318,6 @@ "@near-js/crypto" "1.2.4" "@near-js/types" "0.2.1" -"@near-js/keystores@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/keystores/-/keystores-0.0.5.tgz#44ec009b23c552809b6f9bc9a83632f79de4112b" - integrity sha512-kxqV+gw/3L8/axe9prhlU+M0hfybkxX54xfI0EEpWP2QiUV+qw+jkKolYIbdk5tdEZrGf9jHawh1yFtwP7APPQ== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/types" "0.0.4" - "@near-js/keystores@0.0.9": version "0.0.9" resolved "https://registry.yarnpkg.com/@near-js/keystores/-/keystores-0.0.9.tgz#768aaaab1beb7f797432513cb1bbf9430e305a85" @@ -4378,20 +4326,6 @@ "@near-js/crypto" "1.2.1" "@near-js/types" "0.0.4" -"@near-js/providers@0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@near-js/providers/-/providers-0.0.7.tgz#b2189e5d14d1afb1798c91c59e6dfb9bb476f46b" - integrity sha512-qj16Ey+vSw7lHE85xW+ykYJoLPr4A6Q/TsfpwhJLS6zBInSC6sKVqPO1L8bK4VA/yB7V7JJPor9UVCWgRXdNEA== - dependencies: - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - http-errors "^1.7.2" - optionalDependencies: - node-fetch "^2.6.1" - "@near-js/providers@0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@near-js/providers/-/providers-0.1.1.tgz#7489eb5a4248562fe98fdbc4cb55ea3f6d787e0a" @@ -4419,15 +4353,6 @@ optionalDependencies: node-fetch "2.6.7" -"@near-js/signers@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/signers/-/signers-0.0.5.tgz#f3f946440314bf039dd32154928163ceaec8bedb" - integrity sha512-XJjYYatehxHakHa7WAoiQ8uIBSWBR2EnO4GzlIe8qpWL+LoH4t68MSezC1HwT546y9YHIvePjwDrBeYk8mg20w== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - js-sha256 "^0.9.0" - "@near-js/signers@0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@near-js/signers/-/signers-0.1.1.tgz#6d32b262eac9b03fab5fc1ee93d2c4055c86980f" @@ -4446,19 +4371,6 @@ "@near-js/keystores" "0.0.12" "@noble/hashes" "1.3.3" -"@near-js/transactions@0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@near-js/transactions/-/transactions-0.2.1.tgz#ab6d246e94e6f64b4e5a651fe6e9de03dd573521" - integrity sha512-V9tXzkICDPruSxihKXkBhUgsI4uvW7TwXlnZS2GZpPsFFiIUeGrso0wo4uiQwB6miFA5q6fKaAtQa4F2v1s+zg== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/signers" "0.0.5" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - js-sha256 "^0.9.0" - "@near-js/transactions@1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@near-js/transactions/-/transactions-1.1.2.tgz#7dec18b463cd336e325ee61b1e1c39a6192d9e81" @@ -4496,16 +4408,6 @@ resolved "https://registry.yarnpkg.com/@near-js/types/-/types-0.2.1.tgz#a298f0e70dbe059ee8c762dfac05c2eae3e0ae0e" integrity sha512-YygQEGMdFe6d2e/6dtNZer9paH396XeAdIKEhY/RPXDUnjDdfiDQ5DK4mM130sEeID2bAH9X1LQ+7vXGRjvyWw== -"@near-js/utils@0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@near-js/utils/-/utils-0.0.4.tgz#1a387f81974ebbfa4521c92590232be97e3335dd" - integrity sha512-mPUEPJbTCMicGitjEGvQqOe8AS7O4KkRCxqd0xuE/X6gXF1jz1pYMZn4lNUeUz2C84YnVSGLAM0o9zcN6Y4hiA== - dependencies: - "@near-js/types" "0.0.4" - bn.js "5.2.1" - depd "^2.0.0" - mustache "^4.0.0" - "@near-js/utils@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@near-js/utils/-/utils-0.1.0.tgz#1368f59008c39df1e903bd3e0f308eedcdf25c1d" @@ -4527,21 +4429,6 @@ depd "2.0.0" mustache "4.0.0" -"@near-js/wallet-account@0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@near-js/wallet-account/-/wallet-account-0.0.7.tgz#efa6738114171b2a6e40e8b35a8194b7cf86c11e" - integrity sha512-tmRyieG/wHmuNkg/WGFyKD6iH6atHPbY0rZ5OjOIiteuhZEPgp+z8OBpiQ4qumTa63q46aj/QVSQL0J3+JmBfw== - dependencies: - "@near-js/accounts" "0.1.4" - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/signers" "0.0.5" - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - "@near-js/wallet-account@1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@near-js/wallet-account/-/wallet-account-1.1.1.tgz#e66e8d10fb51f71f7cb722bdff63fb98e2b0d486" @@ -6436,14 +6323,15 @@ "@parcel/utils" "2.12.0" nullthrows "^1.1.1" -"@peersyst/near-mobile-signer@1.0.12": - version "1.0.12" - resolved "https://registry.yarnpkg.com/@peersyst/near-mobile-signer/-/near-mobile-signer-1.0.12.tgz#26052b4136016e5353297b764811440a0ac4f997" - integrity sha512-YxYmH+DKw2FdavOIjzqW6JPKehZvF75IV8eXailE9RHCt3a+z0PG3UFqbdIr/hp6ojSvTa9Zn3g4yWYNw4vvSg== +"@peersyst/near-mobile-signer@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@peersyst/near-mobile-signer/-/near-mobile-signer-1.1.0.tgz#4d1346f37dd1a05a7225d9c5cb8c59cbd0b2f258" + integrity sha512-5bbN1EHLDpEpM6J8lFN1y+bAiDIsTa8rhjtYv9PMBr0wiEY951BQR3kSLPGwMbX6oBpV1ZNNafTYHdtZJngb1Q== dependencies: bn.js "^5.2.1" + borsh "^0.7.0" js-sha256 "^0.9.0" - near-api-js "^2.1.1" + near-api-js "^4.0.0" parcel "^2.9.3" "@phenomnomnominal/tsquery@~5.0.1": @@ -7872,10 +7760,10 @@ resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz#832c58e460c9435e4e34bb866e85e9146e12cdbb" integrity sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg== -"@types/w3c-web-hid@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/w3c-web-hid/-/w3c-web-hid-1.0.2.tgz#bdf2f813ffa7ccd1ca63aa218d680edddd839417" - integrity sha512-tNLnl6+/AkmASEnviwdLLE6kaXlY28cDVyQ3e+WwnEAm5DHyO7c71a5TtYX6ofrnzzdQSnNsjNMoggsbrtOYfQ== +"@types/w3c-web-hid@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/w3c-web-hid/-/w3c-web-hid-1.0.3.tgz#e08587a7d737f8654ea6bc0a88689ce5d3ce2d19" + integrity sha512-eTQRkPd2JukZfS9+kRtrBAaTCCb6waGh5X8BJHmH1MiVQPLMYwm4+EvhwFfOo9SDna15o9dFAwmWwN6r/YM53A== "@types/w3c-web-usb@1.0.6": version "1.0.6" @@ -9162,7 +9050,7 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.11.2, ajv@^8.9.0: +ajv@^8.0.0, ajv@^8.9.0: version "8.16.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4" integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw== @@ -10383,11 +10271,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001464, can resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz" integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== -capability@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/capability/-/capability-0.2.5.tgz#51ad87353f1936ffd77f2f21c74633a4dea88801" - integrity sha512-rsJZYVCgXd08sPqwmaIqjAd5SUTfonV0z/gDJ8D6cN8wQphky1kkAYEqQ+hmDxTw7UihvBfjUVUSY+DBEe44jg== - capital-case@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" @@ -11981,7 +11864,7 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -depd@2.0.0, depd@^2.0.0: +depd@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== @@ -12495,15 +12378,6 @@ error-ex@^1.3.1, error-ex@^1.3.2: dependencies: is-arrayish "^0.2.1" -error-polyfill@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/error-polyfill/-/error-polyfill-0.1.3.tgz#df848b61ad8834f7a5db69a70b9913df86721d15" - integrity sha512-XHJk60ufE+TG/ydwp4lilOog549iiQF2OAPhkk9DdiYWMrltz5yhDz/xnKuenNwP7gy3dsibssO5QpVhkrSzzg== - dependencies: - capability "^0.2.5" - o3 "^1.0.3" - u3 "^0.1.1" - error-stack-parser@^2.0.6: version "2.1.4" resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" @@ -14493,17 +14367,6 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" -http-errors@^1.7.2: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" - http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" @@ -17826,11 +17689,6 @@ mustache@4.0.0: resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31" integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA== -mustache@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64" - integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== - mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" @@ -17888,7 +17746,7 @@ near-abi@0.1.1: dependencies: "@types/json-schema" "^7.0.11" -near-api-js@4.0.3: +near-api-js@4.0.3, near-api-js@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-4.0.3.tgz#7b31e8d86224acf526cda7c4e5e57f44b23c4719" integrity sha512-NNxIUOGjTafDp65WKRmRqjOTdn4gukse5zFzo2YS/1YJMac++WR05mEsiAB2Aj54rDb/PL8TObQZgHtSs/Pjvg== @@ -17911,33 +17769,6 @@ near-api-js@4.0.3: near-abi "0.1.1" node-fetch "2.6.7" -near-api-js@^2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-2.1.4.tgz#562bb7047bf3699fbdf78f9a6620366069ad7cd9" - integrity sha512-e1XicyvJvQMtu7qrG8oWyAdjHJJCoy+cvbW6h2Dky4yj7vC85omQz/x7IgKl71VhzDj2/TGUwjTVESp6NSe75A== - dependencies: - "@near-js/accounts" "0.1.4" - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/keystores-browser" "0.0.5" - "@near-js/keystores-node" "0.0.5" - "@near-js/providers" "0.0.7" - "@near-js/signers" "0.0.5" - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - "@near-js/wallet-account" "0.0.7" - ajv "^8.11.2" - ajv-formats "^2.1.1" - bn.js "5.2.1" - borsh "^0.7.0" - depd "^2.0.0" - error-polyfill "^0.1.3" - http-errors "^1.7.2" - near-abi "0.1.1" - node-fetch "^2.6.1" - tweetnacl "^1.0.1" - near-api-js@^3.0.0, near-api-js@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-3.0.4.tgz#5ee094ce53e30239cc817ca942ec3e9739296dbb" @@ -18649,13 +18480,6 @@ nx@16.4.0: "@nx/nx-win32-arm64-msvc" "16.4.0" "@nx/nx-win32-x64-msvc" "16.4.0" -o3@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/o3/-/o3-1.0.3.tgz#192ce877a882dfa6751f0412a865fafb2da1dac0" - integrity sha512-f+4n+vC6s4ysy7YO7O2gslWZBUu8Qj2i2OUJOvjRxQva7jVjYjB29jrr9NCjmxZQR0gzrOcv1RnqoYOeMs5VRQ== - dependencies: - capability "^0.2.5" - obj-multiplex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/obj-multiplex/-/obj-multiplex-1.0.0.tgz#2f2ae6bfd4ae11befe742ea9ea5b36636eabffc1" @@ -22777,7 +22601,7 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.2: +tweetnacl@1.0.3, tweetnacl@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== @@ -22911,11 +22735,6 @@ typescript@5.0.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== -u3@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/u3/-/u3-0.1.1.tgz#5f52044f42ee76cd8de33148829e14528494b73b" - integrity sha512-+J5D5ir763y+Am/QY6hXNRlwljIeRMZMGs0cT6qqZVVzzT3X3nFPXVyPOFRMOR4kupB0T8JnCdpWdp6Q/iXn3w== - ua-parser-js@^1.0.2: version "1.0.38" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.38.tgz#66bb0c4c0e322fe48edfe6d446df6042e62f25e2" From e34d9469ad7e4c415b96a3406272aea700c06fc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 09:37:50 +0000 Subject: [PATCH 08/11] build(deps): bump tslib from 2.6.2 to 2.6.3 Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.2 to 2.6.3. - [Release notes](https://github.com/Microsoft/tslib/releases) - [Commits](https://github.com/Microsoft/tslib/compare/v2.6.2...v2.6.3) --- updated-dependencies: - dependency-name: tslib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 208 +++------------------------------------------------ 2 files changed, 12 insertions(+), 198 deletions(-) diff --git a/package.json b/package.json index 712cdde1c..4d6ec6772 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "rxjs": "7.8.1", "stream-browserify": "3.0.0", "stream-http": "3.2.0", - "tslib": "2.6.2", + "tslib": "2.6.3", "url": "0.11.0", "viem": "2.16.2", "wagmi": "2.10.9", diff --git a/yarn.lock b/yarn.lock index 0cf2a06c9..2d2d1389d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4219,24 +4219,6 @@ uint8-varint "^2.0.1" uint8arrays "^5.0.0" -"@near-js/accounts@0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@near-js/accounts/-/accounts-0.1.4.tgz#ff557dc65c5064ee4ac2dbfdd39aa3e35ae4d222" - integrity sha512-zHFmL4OUZ4qHXOE+dDBkYgTNHLWC5RmYUVp9LiuGciO5zFPp7WlxmowJL0QjgXqV1w+dNXq3mgmkfAgYVS8Xjw== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/providers" "0.0.7" - "@near-js/signers" "0.0.5" - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - ajv "^8.11.2" - ajv-formats "^2.1.1" - bn.js "5.2.1" - borsh "^0.7.0" - depd "^2.0.0" - near-abi "0.1.1" - "@near-js/accounts@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@near-js/accounts/-/accounts-1.0.4.tgz#b699dc1c63ffccc1598481b4260dfaf2507f0a69" @@ -4273,16 +4255,6 @@ lru_map "0.4.1" near-abi "0.1.1" -"@near-js/crypto@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/crypto/-/crypto-0.0.5.tgz#3191cdc8dcdba572bdead482b5d38f364bdcc2a0" - integrity sha512-nbQ971iYES5Spiolt+p568gNuZ//HeMHm3qqT3xT+i8ZzgbC//l6oRf48SUVTPAboQ1TJ5dW/NqcxOY0pe7b4g== - dependencies: - "@near-js/types" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - tweetnacl "^1.0.1" - "@near-js/crypto@1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@near-js/crypto/-/crypto-1.2.1.tgz#aa18bed171e68653dae9f82114636eba34ece32a" @@ -4314,14 +4286,6 @@ "@near-js/crypto" "1.2.4" "@near-js/keystores" "0.0.12" -"@near-js/keystores-browser@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/keystores-browser/-/keystores-browser-0.0.5.tgz#7e94181ca5c4fbad8b8e67cda16888b4ccafae61" - integrity sha512-mHF3Vcvsr7xnkaM/reOyxtykbE3OWKV6vQzqyTH2tZYT2OTEnj0KhRT9BCFC0Ra67K1zQLbg49Yc/kDCc5qupA== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/keystores-browser@0.0.9": version "0.0.9" resolved "https://registry.yarnpkg.com/@near-js/keystores-browser/-/keystores-browser-0.0.9.tgz#4d6211ad617613124aeee78ede5771b153e3bcdd" @@ -4338,14 +4302,6 @@ "@near-js/crypto" "1.2.4" "@near-js/keystores" "0.0.12" -"@near-js/keystores-node@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/keystores-node/-/keystores-node-0.0.5.tgz#f474dabbb84590896dd8861bb33a7304580e0d99" - integrity sha512-BYmWyGNydfAqi7eYA1Jo8zULL13cxejD2VBr0BBIXx5bJ+BO4TLecsY1xdTBEq06jyWXHa7kV4h8BJzAjvpTLg== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/keystores-node@0.0.9": version "0.0.9" resolved "https://registry.yarnpkg.com/@near-js/keystores-node/-/keystores-node-0.0.9.tgz#c2fd2f5bfbca1c75699dd7324e300cfd12e790ed" @@ -4362,14 +4318,6 @@ "@near-js/crypto" "1.2.4" "@near-js/types" "0.2.1" -"@near-js/keystores@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/keystores/-/keystores-0.0.5.tgz#44ec009b23c552809b6f9bc9a83632f79de4112b" - integrity sha512-kxqV+gw/3L8/axe9prhlU+M0hfybkxX54xfI0EEpWP2QiUV+qw+jkKolYIbdk5tdEZrGf9jHawh1yFtwP7APPQ== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/types" "0.0.4" - "@near-js/keystores@0.0.9": version "0.0.9" resolved "https://registry.yarnpkg.com/@near-js/keystores/-/keystores-0.0.9.tgz#768aaaab1beb7f797432513cb1bbf9430e305a85" @@ -4378,20 +4326,6 @@ "@near-js/crypto" "1.2.1" "@near-js/types" "0.0.4" -"@near-js/providers@0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@near-js/providers/-/providers-0.0.7.tgz#b2189e5d14d1afb1798c91c59e6dfb9bb476f46b" - integrity sha512-qj16Ey+vSw7lHE85xW+ykYJoLPr4A6Q/TsfpwhJLS6zBInSC6sKVqPO1L8bK4VA/yB7V7JJPor9UVCWgRXdNEA== - dependencies: - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - http-errors "^1.7.2" - optionalDependencies: - node-fetch "^2.6.1" - "@near-js/providers@0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@near-js/providers/-/providers-0.1.1.tgz#7489eb5a4248562fe98fdbc4cb55ea3f6d787e0a" @@ -4419,15 +4353,6 @@ optionalDependencies: node-fetch "2.6.7" -"@near-js/signers@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@near-js/signers/-/signers-0.0.5.tgz#f3f946440314bf039dd32154928163ceaec8bedb" - integrity sha512-XJjYYatehxHakHa7WAoiQ8uIBSWBR2EnO4GzlIe8qpWL+LoH4t68MSezC1HwT546y9YHIvePjwDrBeYk8mg20w== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - js-sha256 "^0.9.0" - "@near-js/signers@0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@near-js/signers/-/signers-0.1.1.tgz#6d32b262eac9b03fab5fc1ee93d2c4055c86980f" @@ -4446,19 +4371,6 @@ "@near-js/keystores" "0.0.12" "@noble/hashes" "1.3.3" -"@near-js/transactions@0.2.1": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@near-js/transactions/-/transactions-0.2.1.tgz#ab6d246e94e6f64b4e5a651fe6e9de03dd573521" - integrity sha512-V9tXzkICDPruSxihKXkBhUgsI4uvW7TwXlnZS2GZpPsFFiIUeGrso0wo4uiQwB6miFA5q6fKaAtQa4F2v1s+zg== - dependencies: - "@near-js/crypto" "0.0.5" - "@near-js/signers" "0.0.5" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - js-sha256 "^0.9.0" - "@near-js/transactions@1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@near-js/transactions/-/transactions-1.1.2.tgz#7dec18b463cd336e325ee61b1e1c39a6192d9e81" @@ -4496,16 +4408,6 @@ resolved "https://registry.yarnpkg.com/@near-js/types/-/types-0.2.1.tgz#a298f0e70dbe059ee8c762dfac05c2eae3e0ae0e" integrity sha512-YygQEGMdFe6d2e/6dtNZer9paH396XeAdIKEhY/RPXDUnjDdfiDQ5DK4mM130sEeID2bAH9X1LQ+7vXGRjvyWw== -"@near-js/utils@0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@near-js/utils/-/utils-0.0.4.tgz#1a387f81974ebbfa4521c92590232be97e3335dd" - integrity sha512-mPUEPJbTCMicGitjEGvQqOe8AS7O4KkRCxqd0xuE/X6gXF1jz1pYMZn4lNUeUz2C84YnVSGLAM0o9zcN6Y4hiA== - dependencies: - "@near-js/types" "0.0.4" - bn.js "5.2.1" - depd "^2.0.0" - mustache "^4.0.0" - "@near-js/utils@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@near-js/utils/-/utils-0.1.0.tgz#1368f59008c39df1e903bd3e0f308eedcdf25c1d" @@ -4527,21 +4429,6 @@ depd "2.0.0" mustache "4.0.0" -"@near-js/wallet-account@0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@near-js/wallet-account/-/wallet-account-0.0.7.tgz#efa6738114171b2a6e40e8b35a8194b7cf86c11e" - integrity sha512-tmRyieG/wHmuNkg/WGFyKD6iH6atHPbY0rZ5OjOIiteuhZEPgp+z8OBpiQ4qumTa63q46aj/QVSQL0J3+JmBfw== - dependencies: - "@near-js/accounts" "0.1.4" - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/signers" "0.0.5" - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - bn.js "5.2.1" - borsh "^0.7.0" - "@near-js/wallet-account@1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@near-js/wallet-account/-/wallet-account-1.1.1.tgz#e66e8d10fb51f71f7cb722bdff63fb98e2b0d486" @@ -6436,14 +6323,15 @@ "@parcel/utils" "2.12.0" nullthrows "^1.1.1" -"@peersyst/near-mobile-signer@1.0.12": - version "1.0.12" - resolved "https://registry.yarnpkg.com/@peersyst/near-mobile-signer/-/near-mobile-signer-1.0.12.tgz#26052b4136016e5353297b764811440a0ac4f997" - integrity sha512-YxYmH+DKw2FdavOIjzqW6JPKehZvF75IV8eXailE9RHCt3a+z0PG3UFqbdIr/hp6ojSvTa9Zn3g4yWYNw4vvSg== +"@peersyst/near-mobile-signer@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@peersyst/near-mobile-signer/-/near-mobile-signer-1.1.0.tgz#4d1346f37dd1a05a7225d9c5cb8c59cbd0b2f258" + integrity sha512-5bbN1EHLDpEpM6J8lFN1y+bAiDIsTa8rhjtYv9PMBr0wiEY951BQR3kSLPGwMbX6oBpV1ZNNafTYHdtZJngb1Q== dependencies: bn.js "^5.2.1" + borsh "^0.7.0" js-sha256 "^0.9.0" - near-api-js "^2.1.1" + near-api-js "^4.0.0" parcel "^2.9.3" "@phenomnomnominal/tsquery@~5.0.1": @@ -9162,7 +9050,7 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.11.2, ajv@^8.9.0: +ajv@^8.0.0, ajv@^8.9.0: version "8.16.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4" integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw== @@ -10383,11 +10271,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001406, caniuse-lite@^1.0.30001464, can resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz" integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg== -capability@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/capability/-/capability-0.2.5.tgz#51ad87353f1936ffd77f2f21c74633a4dea88801" - integrity sha512-rsJZYVCgXd08sPqwmaIqjAd5SUTfonV0z/gDJ8D6cN8wQphky1kkAYEqQ+hmDxTw7UihvBfjUVUSY+DBEe44jg== - capital-case@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" @@ -11981,7 +11864,7 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -depd@2.0.0, depd@^2.0.0: +depd@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== @@ -12495,15 +12378,6 @@ error-ex@^1.3.1, error-ex@^1.3.2: dependencies: is-arrayish "^0.2.1" -error-polyfill@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/error-polyfill/-/error-polyfill-0.1.3.tgz#df848b61ad8834f7a5db69a70b9913df86721d15" - integrity sha512-XHJk60ufE+TG/ydwp4lilOog549iiQF2OAPhkk9DdiYWMrltz5yhDz/xnKuenNwP7gy3dsibssO5QpVhkrSzzg== - dependencies: - capability "^0.2.5" - o3 "^1.0.3" - u3 "^0.1.1" - error-stack-parser@^2.0.6: version "2.1.4" resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" @@ -14493,17 +14367,6 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" -http-errors@^1.7.2: - version "1.8.1" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" - integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.1" - http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" @@ -17826,11 +17689,6 @@ mustache@4.0.0: resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31" integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA== -mustache@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64" - integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== - mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" @@ -17888,7 +17746,7 @@ near-abi@0.1.1: dependencies: "@types/json-schema" "^7.0.11" -near-api-js@4.0.3: +near-api-js@4.0.3, near-api-js@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-4.0.3.tgz#7b31e8d86224acf526cda7c4e5e57f44b23c4719" integrity sha512-NNxIUOGjTafDp65WKRmRqjOTdn4gukse5zFzo2YS/1YJMac++WR05mEsiAB2Aj54rDb/PL8TObQZgHtSs/Pjvg== @@ -17911,33 +17769,6 @@ near-api-js@4.0.3: near-abi "0.1.1" node-fetch "2.6.7" -near-api-js@^2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-2.1.4.tgz#562bb7047bf3699fbdf78f9a6620366069ad7cd9" - integrity sha512-e1XicyvJvQMtu7qrG8oWyAdjHJJCoy+cvbW6h2Dky4yj7vC85omQz/x7IgKl71VhzDj2/TGUwjTVESp6NSe75A== - dependencies: - "@near-js/accounts" "0.1.4" - "@near-js/crypto" "0.0.5" - "@near-js/keystores" "0.0.5" - "@near-js/keystores-browser" "0.0.5" - "@near-js/keystores-node" "0.0.5" - "@near-js/providers" "0.0.7" - "@near-js/signers" "0.0.5" - "@near-js/transactions" "0.2.1" - "@near-js/types" "0.0.4" - "@near-js/utils" "0.0.4" - "@near-js/wallet-account" "0.0.7" - ajv "^8.11.2" - ajv-formats "^2.1.1" - bn.js "5.2.1" - borsh "^0.7.0" - depd "^2.0.0" - error-polyfill "^0.1.3" - http-errors "^1.7.2" - near-abi "0.1.1" - node-fetch "^2.6.1" - tweetnacl "^1.0.1" - near-api-js@^3.0.0, near-api-js@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-3.0.4.tgz#5ee094ce53e30239cc817ca942ec3e9739296dbb" @@ -18649,13 +18480,6 @@ nx@16.4.0: "@nx/nx-win32-arm64-msvc" "16.4.0" "@nx/nx-win32-x64-msvc" "16.4.0" -o3@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/o3/-/o3-1.0.3.tgz#192ce877a882dfa6751f0412a865fafb2da1dac0" - integrity sha512-f+4n+vC6s4ysy7YO7O2gslWZBUu8Qj2i2OUJOvjRxQva7jVjYjB29jrr9NCjmxZQR0gzrOcv1RnqoYOeMs5VRQ== - dependencies: - capability "^0.2.5" - obj-multiplex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/obj-multiplex/-/obj-multiplex-1.0.0.tgz#2f2ae6bfd4ae11befe742ea9ea5b36636eabffc1" @@ -22744,12 +22568,7 @@ tslib@2.5.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" integrity sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w== -tslib@2.6.2, tslib@^2.0.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== - -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0: +tslib@2.6.3, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0: version "2.6.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== @@ -22777,7 +22596,7 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.2: +tweetnacl@1.0.3, tweetnacl@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== @@ -22911,11 +22730,6 @@ typescript@5.0.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== -u3@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/u3/-/u3-0.1.1.tgz#5f52044f42ee76cd8de33148829e14528494b73b" - integrity sha512-+J5D5ir763y+Am/QY6hXNRlwljIeRMZMGs0cT6qqZVVzzT3X3nFPXVyPOFRMOR4kupB0T8JnCdpWdp6Q/iXn3w== - ua-parser-js@^1.0.2: version "1.0.38" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.38.tgz#66bb0c4c0e322fe48edfe6d446df6042e62f25e2" From 21a2d34cb2b3fba848d089e0452a696a5ae202ec Mon Sep 17 00:00:00 2001 From: Pavel Ivanov Date: Fri, 2 Aug 2024 11:14:08 +0300 Subject: [PATCH 09/11] Bump version to 8.9.12 --- package.json | 4 ++-- packages/account-export/package.json | 2 +- packages/bitget-wallet/package.json | 2 +- packages/bitte-wallet/package.json | 2 +- packages/coin98-wallet/package.json | 2 +- packages/core/package.json | 2 +- packages/here-wallet/package.json | 2 +- packages/ledger/package.json | 2 +- packages/math-wallet/package.json | 2 +- packages/meteor-wallet/package.json | 2 +- packages/mintbase-wallet/package.json | 2 +- packages/modal-ui-js/package.json | 2 +- packages/modal-ui/package.json | 2 +- packages/my-near-wallet/package.json | 2 +- packages/narwallets/package.json | 2 +- packages/near-mobile-wallet/package.json | 2 +- packages/near-snap/package.json | 2 +- packages/nearfi/package.json | 2 +- packages/neth/package.json | 2 +- packages/nightly/package.json | 2 +- packages/okx-wallet/package.json | 2 +- packages/ramper-wallet/package.json | 2 +- packages/sender/package.json | 2 +- packages/wallet-connect/package.json | 2 +- packages/wallet-utils/package.json | 2 +- packages/welldone-wallet/package.json | 2 +- packages/xdefi/package.json | 2 +- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index caa5955be..84daf9165 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "near-wallet-selector", - "version": "8.9.11", + "version": "8.9.12", "description": "NEAR Wallet Selector makes it easy for users to interact with your dApp by providing an abstraction over various wallets within the NEAR ecosystem", "keywords": [ "near", @@ -222,4 +222,4 @@ "webpack": "5.75.0", "webpack-merge": "5.8.0" } -} \ No newline at end of file +} diff --git a/packages/account-export/package.json b/packages/account-export/package.json index f1750bf9c..db9b70777 100644 --- a/packages/account-export/package.json +++ b/packages/account-export/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/account-export", - "version": "8.9.11", + "version": "8.9.12", "description": "This is the Export Selector UI package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/bitget-wallet/package.json b/packages/bitget-wallet/package.json index 165166b35..417fdb9ad 100644 --- a/packages/bitget-wallet/package.json +++ b/packages/bitget-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/bitget-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Bitget wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/bitte-wallet/package.json b/packages/bitte-wallet/package.json index de5a49f4f..1d091788b 100644 --- a/packages/bitte-wallet/package.json +++ b/packages/bitte-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/bitte-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Bitte wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/coin98-wallet/package.json b/packages/coin98-wallet/package.json index 37e61c585..9f7bd88d8 100644 --- a/packages/coin98-wallet/package.json +++ b/packages/coin98-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/coin98-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Coin 98 wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/core/package.json b/packages/core/package.json index 9d288831b..4f6b896a7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/core", - "version": "8.9.11", + "version": "8.9.12", "description": "This is the core package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/here-wallet/package.json b/packages/here-wallet/package.json index 532bcd35c..28f5b8bc1 100644 --- a/packages/here-wallet/package.json +++ b/packages/here-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/here-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Here wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/ledger/package.json b/packages/ledger/package.json index 0d5e5dbde..980c52b33 100644 --- a/packages/ledger/package.json +++ b/packages/ledger/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/ledger", - "version": "8.9.11", + "version": "8.9.12", "description": "Ledger package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/math-wallet/package.json b/packages/math-wallet/package.json index 862bafe29..5972ee816 100644 --- a/packages/math-wallet/package.json +++ b/packages/math-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/math-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Math wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/meteor-wallet/package.json b/packages/meteor-wallet/package.json index c42971023..180143e75 100644 --- a/packages/meteor-wallet/package.json +++ b/packages/meteor-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/meteor-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Meteor wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/mintbase-wallet/package.json b/packages/mintbase-wallet/package.json index 2f1ec15f3..efd4d57b4 100644 --- a/packages/mintbase-wallet/package.json +++ b/packages/mintbase-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/mintbase-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Mintbase wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/modal-ui-js/package.json b/packages/modal-ui-js/package.json index fd725d3c6..8815d0cd7 100644 --- a/packages/modal-ui-js/package.json +++ b/packages/modal-ui-js/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/modal-ui-js", - "version": "8.9.11", + "version": "8.9.12", "description": "Modal UI package for NEAR wallet Selector", "keywords": [ "near", diff --git a/packages/modal-ui/package.json b/packages/modal-ui/package.json index a71bf72ac..29b097cc3 100644 --- a/packages/modal-ui/package.json +++ b/packages/modal-ui/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/modal-ui", - "version": "8.9.11", + "version": "8.9.12", "description": "Modal UI package for NEAR wallet Selector", "keywords": [ "near", diff --git a/packages/my-near-wallet/package.json b/packages/my-near-wallet/package.json index e535764c5..ef9ad790a 100644 --- a/packages/my-near-wallet/package.json +++ b/packages/my-near-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/my-near-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "My Near Wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/narwallets/package.json b/packages/narwallets/package.json index fd72b452e..c48c776a2 100644 --- a/packages/narwallets/package.json +++ b/packages/narwallets/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/narwallets", - "version": "8.9.11", + "version": "8.9.12", "description": "This is the Narwallets package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/near-mobile-wallet/package.json b/packages/near-mobile-wallet/package.json index 28ea68ece..f90b6b093 100644 --- a/packages/near-mobile-wallet/package.json +++ b/packages/near-mobile-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/near-mobile-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "NEAR Mobile wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/near-snap/package.json b/packages/near-snap/package.json index 12f590438..b9ba2708d 100644 --- a/packages/near-snap/package.json +++ b/packages/near-snap/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/near-snap", - "version": "8.9.11", + "version": "8.9.12", "description": "Metamask snap to interact with Near dapps.", "keywords": [ "near", diff --git a/packages/nearfi/package.json b/packages/nearfi/package.json index 21d6fe2f0..a92d43589 100644 --- a/packages/nearfi/package.json +++ b/packages/nearfi/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/nearfi", - "version": "8.9.11", + "version": "8.9.12", "description": "Nearfi package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/neth/package.json b/packages/neth/package.json index 6c91c38bb..78f727bd8 100644 --- a/packages/neth/package.json +++ b/packages/neth/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/neth", - "version": "8.9.11", + "version": "8.9.12", "description": "Control NEAR accounts with ETH accounts", "author": "mattlockyer", "keywords": [ diff --git a/packages/nightly/package.json b/packages/nightly/package.json index 1f5fc774c..a8ad257b3 100644 --- a/packages/nightly/package.json +++ b/packages/nightly/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/nightly", - "version": "8.9.11", + "version": "8.9.12", "description": "Nightly wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/okx-wallet/package.json b/packages/okx-wallet/package.json index 798e09dc2..a7e2f343e 100644 --- a/packages/okx-wallet/package.json +++ b/packages/okx-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/okx-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "OKX Wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/ramper-wallet/package.json b/packages/ramper-wallet/package.json index 65e7e2852..839a549cb 100644 --- a/packages/ramper-wallet/package.json +++ b/packages/ramper-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/ramper-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Ramper wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/sender/package.json b/packages/sender/package.json index 89c523dbd..962526de6 100644 --- a/packages/sender/package.json +++ b/packages/sender/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/sender", - "version": "8.9.11", + "version": "8.9.12", "description": "Sender wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/wallet-connect/package.json b/packages/wallet-connect/package.json index 616ad6436..c88eabb95 100644 --- a/packages/wallet-connect/package.json +++ b/packages/wallet-connect/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/wallet-connect", - "version": "8.9.11", + "version": "8.9.12", "description": "Wallet Connect package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/wallet-utils/package.json b/packages/wallet-utils/package.json index 85fabea98..ff2127af2 100644 --- a/packages/wallet-utils/package.json +++ b/packages/wallet-utils/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/wallet-utils", - "version": "8.9.11", + "version": "8.9.12", "description": "Wallet utils package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/welldone-wallet/package.json b/packages/welldone-wallet/package.json index 8f1c3b0a1..aea6e9dcf 100644 --- a/packages/welldone-wallet/package.json +++ b/packages/welldone-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/welldone-wallet", - "version": "8.9.11", + "version": "8.9.12", "description": "Welldone wallet package for NEAR Wallet Selector.", "keywords": [ "near", diff --git a/packages/xdefi/package.json b/packages/xdefi/package.json index 131153cf4..97910782a 100644 --- a/packages/xdefi/package.json +++ b/packages/xdefi/package.json @@ -1,6 +1,6 @@ { "name": "@near-wallet-selector/xdefi", - "version": "8.9.11", + "version": "8.9.12", "description": "This is the XDEFI package for NEAR Wallet Selector.", "keywords": [ "near", From b8e31efccec2a70c2e26d2395ea036af3006c785 Mon Sep 17 00:00:00 2001 From: Pavel Ivanov Date: Fri, 2 Aug 2024 11:49:49 +0300 Subject: [PATCH 10/11] [fix] - here wallet --- package.json | 2 +- packages/here-wallet/src/index.ts | 1 - packages/here-wallet/src/lib/index.ts | 28 +++++-------- packages/here-wallet/src/lib/selector.ts | 42 +++++-------------- packages/here-wallet/src/lib/types.ts | 13 ++---- .../src/lib/components/WalletOptions.tsx | 7 ++++ yarn.lock | 31 +++++++++----- 7 files changed, 51 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index 84daf9165..bda89d9ce 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "@angular/platform-browser": "16.1.9", "@angular/platform-browser-dynamic": "16.1.9", "@angular/router": "16.1.9", - "@here-wallet/core": "1.6.6", + "@here-wallet/core": "3.3.1", "@jscutlery/semver": "5.2.2", "@ledgerhq/hw-transport": "6.30.3", "@ledgerhq/hw-transport-webhid": "6.29.2", diff --git a/packages/here-wallet/src/index.ts b/packages/here-wallet/src/index.ts index c9dc716d7..11eddcf8e 100644 --- a/packages/here-wallet/src/index.ts +++ b/packages/here-wallet/src/index.ts @@ -1,2 +1 @@ -export type { HereWallet } from "./lib/types"; export { setupHereWallet } from "./lib"; diff --git a/packages/here-wallet/src/lib/index.ts b/packages/here-wallet/src/lib/index.ts index 3224b4da6..b4e195689 100644 --- a/packages/here-wallet/src/lib/index.ts +++ b/packages/here-wallet/src/lib/index.ts @@ -1,10 +1,9 @@ -import { - waitInjectedHereWallet, - type HereProvider, - type HereStrategy, -} from "@here-wallet/core"; -import type { WalletModuleFactory } from "@near-wallet-selector/core"; -import type { HereWallet } from "./types"; +import type { HereInitializeOptions } from "@here-wallet/core"; +import { waitInjectedHereWallet } from "@here-wallet/core"; +import type { + WalletModuleFactory, + InjectedWallet, +} from "@near-wallet-selector/core"; import { initHereWallet } from "./selector"; import icon from "./icon"; @@ -13,16 +12,14 @@ export { icon }; interface Options { deprecated?: boolean; iconUrl?: string; - defaultStrategy?: () => HereStrategy; - defaultProvider?: HereProvider; + walletOptions?: HereInitializeOptions; } export function setupHereWallet({ deprecated = false, iconUrl = icon, - defaultStrategy, - defaultProvider, -}: Options = {}): WalletModuleFactory { + walletOptions, +}: Options = {}): WalletModuleFactory { return async () => { const isInjected = await waitInjectedHereWallet; @@ -39,12 +36,7 @@ export function setupHereWallet({ deprecated, available: true, }, - init: (config) => - initHereWallet({ - ...config, - defaultStrategy, - defaultProvider, - }), + init: (config) => initHereWallet({ ...config, walletOptions }), }; }; } diff --git a/packages/here-wallet/src/lib/selector.ts b/packages/here-wallet/src/lib/selector.ts index eff5a67c4..f57930419 100644 --- a/packages/here-wallet/src/lib/selector.ts +++ b/packages/here-wallet/src/lib/selector.ts @@ -1,18 +1,9 @@ -import type { NetworkId } from "@near-wallet-selector/core"; import { HereWallet, waitInjectedHereWallet } from "@here-wallet/core"; - import type { SelectorInit } from "./types"; export const initHereWallet: SelectorInit = async (config) => { - const { store, logger, emitter, options, defaultProvider, defaultStrategy } = - config; - - const here = new HereWallet({ - networkId: options.network.networkId as NetworkId, - nodeUrl: options.network.nodeUrl, - defaultProvider, - defaultStrategy, - }); + const { store, logger, emitter, options, walletOptions } = config; + const here = await HereWallet.connect(walletOptions); async function getAccounts() { logger.log("HereWallet:getAccounts"); @@ -20,16 +11,13 @@ export const initHereWallet: SelectorInit = async (config) => { const accounts = []; for (let i = 0; i < accountIds.length; i++) { - accounts.push({ - accountId: accountIds[i], - publicKey: ( - await here.signer.getPublicKey( - accountIds[i], - options.network.networkId - ) - ).toString(), - }); + const pub = await here.signer.getPublicKey( + accountIds[i], + options.network.networkId + ); + accounts.push({ accountId: accountIds[i], publicKey: pub.toString() }); } + return accounts; } @@ -42,12 +30,12 @@ export const initHereWallet: SelectorInit = async (config) => { return `https://my.herewallet.app/import?network=${options.network.networkId}`; }, - async account(id) { + async account(id: string) { logger.log("HereWallet:account"); return await here.account(id); }, - async switchAccount(id) { + async switchAccount(id: string) { logger.log("HereWallet:switchAccount"); await here.switchAccount(id); }, @@ -80,16 +68,6 @@ export const initHereWallet: SelectorInit = async (config) => { return await getAccounts(); }, - async getHereBalance() { - logger.log("HereWallet:getHereBalance"); - return await here.getHereBalance(); - }, - - async getAvailableBalance(): Promise { - logger.log("HereWallet:getAvailableBalance"); - return await here.getAvailableBalance(); - }, - async signOut() { logger.log("HereWallet:signOut"); await here.signOut(); diff --git a/packages/here-wallet/src/lib/types.ts b/packages/here-wallet/src/lib/types.ts index 431d26f3e..914201eb1 100644 --- a/packages/here-wallet/src/lib/types.ts +++ b/packages/here-wallet/src/lib/types.ts @@ -1,17 +1,10 @@ -import type { - HereInitializeOptions, - HereWalletProtocol, -} from "@here-wallet/core"; - +import type { HereInitializeOptions } from "@here-wallet/core"; import type { WalletBehaviourFactory, InjectedWallet, } from "@near-wallet-selector/core"; -export type HereWallet = InjectedWallet & - Omit, "signIn">, "signMessage">; - export type SelectorInit = WalletBehaviourFactory< - HereWallet, - HereInitializeOptions + InjectedWallet, + { walletOptions?: HereInitializeOptions } >; diff --git a/packages/modal-ui/src/lib/components/WalletOptions.tsx b/packages/modal-ui/src/lib/components/WalletOptions.tsx index 746053034..fdbd90de2 100644 --- a/packages/modal-ui/src/lib/components/WalletOptions.tsx +++ b/packages/modal-ui/src/lib/components/WalletOptions.tsx @@ -101,6 +101,13 @@ export const WalletOptions: React.FC = ({ } sidebar ${module.id}`} key={module.id} onClick={() => { + if ( + selector.options.network.networkId === "testnet" && + module.id === "here-wallet" + ) { + alert("Here Wallet is not supported on testnet"); + return; + } if (module.id === modulesToRender[index].id) { setActiveWalletId(module.id!); } diff --git a/yarn.lock b/yarn.lock index 8cd962c6f..6b84573ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3290,12 +3290,16 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@here-wallet/core@1.6.6": - version "1.6.6" - resolved "https://registry.yarnpkg.com/@here-wallet/core/-/core-1.6.6.tgz#db31fcd048c4977da3bc6923fcf25113a32b5a49" - integrity sha512-avh/PRNl3CbgrcbqIezVrNPAa4fqKvonl/mguSoUAfTwfA5jWnfq81Udd8QzOAIzBIGx5gSabzEkh9CRDH7yDA== - dependencies: - near-api-js "^3.0.1" +"@here-wallet/core@3.3.1": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@here-wallet/core/-/core-3.3.1.tgz#41af535794903d4ac04ef06ac0bbee7b7bbaef8b" + integrity sha512-UcokwayE9J8HR+QUHotvpFGcZ6Xlpc1sjyzSOOeknkt2se56anJZdIPczhkwwNfYR7qAOj2fo3LTLbnmfj7GwA== + dependencies: + "@near-js/accounts" "^1.2.1" + "@near-js/crypto" "^1.2.4" + "@near-js/types" "^0.2.1" + "@near-js/utils" "^0.2.2" + js-sha256 "^0.11.0" sha1 "^1.1.1" uuid4 "2.0.3" @@ -4238,7 +4242,7 @@ lru_map "0.4.1" near-abi "0.1.1" -"@near-js/accounts@1.2.1": +"@near-js/accounts@1.2.1", "@near-js/accounts@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@near-js/accounts/-/accounts-1.2.1.tgz#6e5c0315a07997bbaacbe7b9021ac23974a80ea0" integrity sha512-j6+9n/p0vVLAahmN3YRFve+j0ammOALC9ZUfFhdE3kqtJESbSWMviC5qF/s2m0JQjpJGDtEv/dTADosIJoanWw== @@ -4267,7 +4271,7 @@ borsh "1.0.0" randombytes "2.1.0" -"@near-js/crypto@1.2.4": +"@near-js/crypto@1.2.4", "@near-js/crypto@^1.2.4": version "1.2.4" resolved "https://registry.yarnpkg.com/@near-js/crypto/-/crypto-1.2.4.tgz#fad977d6a6d2c0c836ef42db8c8d355c1f433ec0" integrity sha512-hcSj0ygvTcXlW9ftwEd9dbvQUWBCHNWNDLou9NLfmZERW9dr0gH8kUJPZUWfpJFlUPicb+jTiMpNwDTvP7VW4A== @@ -4403,7 +4407,7 @@ dependencies: bn.js "5.2.1" -"@near-js/types@0.2.1": +"@near-js/types@0.2.1", "@near-js/types@^0.2.1": version "0.2.1" resolved "https://registry.yarnpkg.com/@near-js/types/-/types-0.2.1.tgz#a298f0e70dbe059ee8c762dfac05c2eae3e0ae0e" integrity sha512-YygQEGMdFe6d2e/6dtNZer9paH396XeAdIKEhY/RPXDUnjDdfiDQ5DK4mM130sEeID2bAH9X1LQ+7vXGRjvyWw== @@ -4419,7 +4423,7 @@ depd "2.0.0" mustache "4.0.0" -"@near-js/utils@0.2.2": +"@near-js/utils@0.2.2", "@near-js/utils@^0.2.2": version "0.2.2" resolved "https://registry.yarnpkg.com/@near-js/utils/-/utils-0.2.2.tgz#a42c29db9ccd5a02ad583319028fdb7231821ab2" integrity sha512-ZAJo/cN6AHY7/gckf8DLHwjAn0z4UwG6rhLxs+QDyNYMMSx9SBg2pOQtBBv7ORWJaPhWD2q7wFhUz4SdTZi43A== @@ -16048,6 +16052,11 @@ js-sha256@0.9.0, js-sha256@^0.9.0: resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966" integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA== +js-sha256@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576" + integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q== + js-sha3@0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" @@ -17769,7 +17778,7 @@ near-api-js@4.0.3, near-api-js@^4.0.0: near-abi "0.1.1" node-fetch "2.6.7" -near-api-js@^3.0.0, near-api-js@^3.0.1: +near-api-js@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/near-api-js/-/near-api-js-3.0.4.tgz#5ee094ce53e30239cc817ca942ec3e9739296dbb" integrity sha512-qKWjnugoB7kSFhzZ5GXyH/eABspCQYWBmWnM4hpV5ctnQBt89LqgEu9yD1z4sa89MvUu8BuCxwb1m00BE8iofg== From 0d39ff26ba62f0aedbeebe3a7244bcfaa9fec076 Mon Sep 17 00:00:00 2001 From: Pavel Ivanov Date: Tue, 6 Aug 2024 14:26:08 +0300 Subject: [PATCH 11/11] [fix] - Use BigInt for nonce calculation in transactions --- packages/my-near-wallet/src/lib/my-near-wallet.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/my-near-wallet/src/lib/my-near-wallet.ts b/packages/my-near-wallet/src/lib/my-near-wallet.ts index 5a3721567..5ac291a8d 100644 --- a/packages/my-near-wallet/src/lib/my-near-wallet.ts +++ b/packages/my-near-wallet/src/lib/my-near-wallet.ts @@ -116,11 +116,13 @@ const MyNearWallet: WalletBehaviourFactory< const block = await provider.block({ finality: "final" }); + const nonce = accessKey.access_key.nonce + BigInt(index + 1); + return nearAPI.transactions.createTransaction( account.accountId, nearAPI.utils.PublicKey.from(accessKey.public_key), transaction.receiverId, - accessKey.access_key.nonce + index + 1, + nonce, actions, nearAPI.utils.serialize.base_decode(block.header.hash) );