diff --git a/package-lock.json b/package-lock.json index ccee8c3ec..25ec2ef82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,9 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.43.1", "@react-spring/web": "^9.6.1", + "@sats-connect/core": "0.0.9", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.7.0", + "@secretkeylabs/xverse-core": "13.7.1", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1", @@ -26,7 +27,7 @@ "@testing-library/user-event": "^13.5.0", "alex-sdk": "0.1.26", "argon2-browser": "^1.18.0", - "axios": "^1.1.3", + "axios": "1.7.0", "bignumber.js": "^9.1.0", "bip39": "^3.0.3", "buffer": "6.0.3", @@ -67,7 +68,6 @@ "redux": "^4.0.5", "redux-persist": "^6.0.0", "redux-state-sync": "^3.1.4", - "sats-connect": "2.1.0", "stream-browserify": "^3.0.0", "string-to-color": "^2.2.2", "styled-components": "^5.3.5", @@ -144,7 +144,7 @@ }, "../xverse-core": { "name": "@secretkeylabs/xverse-core", - "version": "11.2.0", + "version": "12.0.1", "extraneous": true, "license": "ISC", "dependencies": { @@ -178,6 +178,7 @@ "c32check": "^2.0.0", "ecdsa-sig-formatter": "^1.0.11", "ecpair": "^2.1.0", + "json-bigint": "^1.0.0", "jsontokens": "^4.0.1", "ledger-bitcoin": "^0.2.1", "process": "^0.11.10", @@ -186,6 +187,7 @@ "varuint-bitcoin": "^1.1.2" }, "devDependencies": { + "@types/json-bigint": "^1.0.4", "@types/react": "^18.2.18", "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", @@ -215,7 +217,8 @@ }, "peerDependencies": { "bignumber.js": "^9.0.0", - "react": ">18.0.0" + "react": ">18.0.0", + "react-dom": ">18.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1307,6 +1310,28 @@ "linux" ] }, + "node_modules/@sats-connect/core": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9.tgz", + "integrity": "sha512-7/hY7VF9OqNDYcXlADluMKCTDu9f4OENWkWWO8K1LqanuyZhepu3fBRQKSCT6Xr/3KorvSH/e8sSTcJCzuVOAA==", + "dependencies": { + "axios": "1.6.8", + "bitcoin-address-validation": "2.2.3", + "buffer": "6.0.3", + "jsontokens": "4.0.1", + "lodash.omit": "4.5.0" + } + }, + "node_modules/@sats-connect/core/node_modules/axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/@scure/base": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", @@ -1383,9 +1408,9 @@ } }, "node_modules/@secretkeylabs/xverse-core": { - "version": "13.7.0", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.0/7603ccb2d8e66f38fac90a4e16a3ab9cafc5e1d0", - "integrity": "sha512-mx6/pmmQzKhesFo2dZAjlD95vaPJP9VsKy1cMVMiRonSVUj4qAtge5skHJHeX5cDVfnVpzgcm4nzWwvjynV9Iw==", + "version": "13.7.1", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.1/a0d1c4ea750be9bfa448e206b246388c422254e8", + "integrity": "sha512-t+H6kOFBANnD0xrOg8P+bc9VA1WP6W1xc0A7qeS3Yb3MALg4wsiGQ8bEWPuEut+bInMvF98BiUM8rSotyjc2vA==", "license": "ISC", "dependencies": { "@bitcoinerlab/secp256k1": "^1.0.2", @@ -1404,7 +1429,7 @@ "@tanstack/react-query": "^4.29.3", "@zondax/ledger-stacks": "^1.0.4", "async-mutex": "^0.4.0", - "axios": "1.6.2", + "axios": "1.7.0", "base64url": "^3.0.1", "bip32": "^4.0.0", "bip39": "3.0.3", @@ -3733,11 +3758,11 @@ } }, "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", + "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -4356,12 +4381,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5326,6 +5357,22 @@ "node": ">= 10" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -5874,6 +5921,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", @@ -6948,9 +7014,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -7176,15 +7242,6 @@ "node": ">=12" } }, - "node_modules/fs-extra/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/fs-monkey": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.4.tgz", @@ -7197,9 +7254,12 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.5", @@ -7254,14 +7314,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7446,11 +7510,11 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7514,6 +7578,17 @@ "minimalistic-assert": "^1.0.1" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -8773,15 +8848,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jsonfile/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/jsonp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz", @@ -9271,6 +9337,11 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.omit": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", + "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==" + }, "node_modules/lodash.padend": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", @@ -14259,16 +14330,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "node_modules/sats-connect": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sats-connect/-/sats-connect-2.1.0.tgz", - "integrity": "sha512-HCPG3L0GModbC2g4uk+ezpSUr8kfCw1y5kv6LC9N8ZNNSRFTTK/CX9eSStV7bBGk5po+euaLsRy4YlLihRcnnw==", - "dependencies": { - "jsontokens": "^4.0.1", - "process": "^0.11.10", - "util": "^0.12.4" - } - }, "node_modules/scheduler": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", @@ -14500,6 +14561,22 @@ "node": ">= 0.8.0" } }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -15720,6 +15797,15 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/unload": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz", @@ -17529,6 +17615,30 @@ "dev": true, "optional": true }, + "@sats-connect/core": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.9.tgz", + "integrity": "sha512-7/hY7VF9OqNDYcXlADluMKCTDu9f4OENWkWWO8K1LqanuyZhepu3fBRQKSCT6Xr/3KorvSH/e8sSTcJCzuVOAA==", + "requires": { + "axios": "1.6.8", + "bitcoin-address-validation": "2.2.3", + "buffer": "6.0.3", + "jsontokens": "4.0.1", + "lodash.omit": "4.5.0" + }, + "dependencies": { + "axios": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", + "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "requires": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + } + } + }, "@scure/base": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", @@ -17579,9 +17689,9 @@ } }, "@secretkeylabs/xverse-core": { - "version": "13.7.0", - "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.0/7603ccb2d8e66f38fac90a4e16a3ab9cafc5e1d0", - "integrity": "sha512-mx6/pmmQzKhesFo2dZAjlD95vaPJP9VsKy1cMVMiRonSVUj4qAtge5skHJHeX5cDVfnVpzgcm4nzWwvjynV9Iw==", + "version": "13.7.1", + "resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/13.7.1/a0d1c4ea750be9bfa448e206b246388c422254e8", + "integrity": "sha512-t+H6kOFBANnD0xrOg8P+bc9VA1WP6W1xc0A7qeS3Yb3MALg4wsiGQ8bEWPuEut+bInMvF98BiUM8rSotyjc2vA==", "requires": { "@bitcoinerlab/secp256k1": "^1.0.2", "@noble/curves": "^1.2.0", @@ -17599,7 +17709,7 @@ "@tanstack/react-query": "^4.29.3", "@zondax/ledger-stacks": "^1.0.4", "async-mutex": "^0.4.0", - "axios": "1.6.2", + "axios": "1.7.0", "base64url": "^3.0.1", "bip32": "^4.0.0", "bip39": "3.0.3", @@ -19477,11 +19587,11 @@ "dev": true }, "axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.0.tgz", + "integrity": "sha512-IiB0wQeKyPRdsFVhBgIo31FbzOyf2M6wYl7/NVutFwFBRMiAbjNiydJIHKeLmPugF4kJLfA1uWZ82Is2QzqqFA==", "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -19983,12 +20093,15 @@ "dev": true }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" } }, "callsites": { @@ -20728,6 +20841,16 @@ "execa": "^5.0.0" } }, + "define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + } + }, "define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -21170,6 +21293,19 @@ "which-typed-array": "^1.1.10" } }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "es-get-iterator": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", @@ -21994,9 +22130,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==" }, "for-each": { "version": "0.3.3", @@ -22144,14 +22280,6 @@ "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true - } } }, "fs-monkey": { @@ -22166,9 +22294,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "function.prototype.name": { "version": "1.1.5", @@ -22205,14 +22333,15 @@ "dev": true }, "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "get-stream": { @@ -22344,11 +22473,11 @@ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "requires": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" } }, "has-proto": { @@ -22388,6 +22517,14 @@ "minimalistic-assert": "^1.0.1" } }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -23254,14 +23391,6 @@ "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true - } } }, "jsonp": { @@ -23625,6 +23754,11 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.omit": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", + "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==" + }, "lodash.padend": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", @@ -27049,16 +27183,6 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "sats-connect": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sats-connect/-/sats-connect-2.1.0.tgz", - "integrity": "sha512-HCPG3L0GModbC2g4uk+ezpSUr8kfCw1y5kv6LC9N8ZNNSRFTTK/CX9eSStV7bBGk5po+euaLsRy4YlLihRcnnw==", - "requires": { - "jsontokens": "^4.0.1", - "process": "^0.11.10", - "util": "^0.12.4" - } - }, "scheduler": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", @@ -27263,6 +27387,19 @@ "send": "0.18.0" } }, + "set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "requires": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + } + }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -28152,6 +28289,12 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, + "universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true + }, "unload": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz", diff --git a/package.json b/package.json index a46522e2c..40cad3eb3 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,9 @@ "@phosphor-icons/react": "^2.0.10", "@playwright/test": "^1.43.1", "@react-spring/web": "^9.6.1", + "@sats-connect/core": "0.0.9", "@scure/btc-signer": "1.2.1", - "@secretkeylabs/xverse-core": "13.7.0", + "@secretkeylabs/xverse-core": "13.7.1", "@stacks/connect": "7.4.1", "@stacks/stacks-blockchain-api-types": "6.1.1", "@stacks/transactions": "6.13.1", @@ -38,7 +39,7 @@ "@testing-library/user-event": "^13.5.0", "alex-sdk": "0.1.26", "argon2-browser": "^1.18.0", - "axios": "^1.1.3", + "axios": "1.7.0", "bignumber.js": "^9.1.0", "bip39": "^3.0.3", "buffer": "6.0.3", @@ -79,7 +80,6 @@ "redux": "^4.0.5", "redux-persist": "^6.0.0", "redux-state-sync": "^3.1.4", - "sats-connect": "2.1.0", "stream-browserify": "^3.0.0", "string-to-color": "^2.2.2", "styled-components": "^5.3.5", diff --git a/src/app/hooks/useSignBatchPsbtTx.ts b/src/app/hooks/useSignBatchPsbtTx.ts index 98248742b..11c448b3a 100644 --- a/src/app/hooks/useSignBatchPsbtTx.ts +++ b/src/app/hooks/useSignBatchPsbtTx.ts @@ -1,10 +1,10 @@ import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types'; import useWalletSelector from '@hooks/useWalletSelector'; +import { SignMultiplePsbtPayload, SignMultipleTransactionOptions } from '@sats-connect/core'; import { InputToSign, signPsbt } from '@secretkeylabs/xverse-core'; import { decodeToken } from 'jsontokens'; import { useMemo } from 'react'; import { useLocation } from 'react-router-dom'; -import { SignMultiplePsbtPayload, SignMultipleTransactionOptions } from 'sats-connect'; import useSeedVault from './useSeedVault'; const useSignBatchPsbtTx = () => { diff --git a/src/app/hooks/useStxAccountRequest.ts b/src/app/hooks/useStxAccountRequest.ts index 805bbe3af..091540230 100644 --- a/src/app/hooks/useStxAccountRequest.ts +++ b/src/app/hooks/useStxAccountRequest.ts @@ -4,12 +4,12 @@ import { sendUserRejectionMessage, } from '@common/utils/rpc/stx/rpcResponseMessages'; import useWalletSelector from '@hooks/useWalletSelector'; +import { GetAddressOptions } from '@sats-connect/core'; import { bip32, bip39, bs58 } from '@secretkeylabs/xverse-core'; import { GAIA_HUB_URL } from '@secretkeylabs/xverse-core/constant'; import { decodeToken } from 'jsontokens'; import { useCallback, useMemo } from 'react'; import { useLocation } from 'react-router-dom'; -import { GetAddressOptions } from 'sats-connect'; import useSeedVault from './useSeedVault'; const useStxAccountRequest = () => { diff --git a/src/app/hooks/useStxAddressRequest.ts b/src/app/hooks/useStxAddressRequest.ts index 1af610442..7c5f836ac 100644 --- a/src/app/hooks/useStxAddressRequest.ts +++ b/src/app/hooks/useStxAddressRequest.ts @@ -1,10 +1,10 @@ import { MESSAGE_SOURCE } from '@common/types/message-types'; import { sendGetAddressesSuccessResponseMessage } from '@common/utils/rpc/stx/rpcResponseMessages'; import useWalletSelector from '@hooks/useWalletSelector'; +import { GetAddressOptions } from '@sats-connect/core'; import { decodeToken } from 'jsontokens'; import { useCallback, useMemo } from 'react'; import { useLocation } from 'react-router-dom'; -import { GetAddressOptions } from 'sats-connect'; const useStxAddressRequest = () => { // Params diff --git a/src/app/hooks/useWalletReducer.ts b/src/app/hooks/useWalletReducer.ts index 0d655a994..f080bb308 100644 --- a/src/app/hooks/useWalletReducer.ts +++ b/src/app/hooks/useWalletReducer.ts @@ -12,7 +12,6 @@ import { createWalletAccount, decryptSeedPhraseCBC, getBnsName, - newWallet, restoreWalletWithAccounts, walletFromSeedPhrase, } from '@secretkeylabs/xverse-core'; diff --git a/src/app/screens/btcSendScreen/useSendBtcRequest.ts b/src/app/screens/btcSendScreen/useSendBtcRequest.ts index 46dea9439..4fbbf4e89 100644 --- a/src/app/screens/btcSendScreen/useSendBtcRequest.ts +++ b/src/app/screens/btcSendScreen/useSendBtcRequest.ts @@ -1,14 +1,14 @@ +import { + BitcoinNetworkType, + SendBtcTransactionOptions, + SendBtcTransactionPayload, +} from '@sats-connect/core'; import { Recipient, SettingsNetwork, signBtcTransaction } from '@secretkeylabs/xverse-core'; import { useQuery } from '@tanstack/react-query'; import BigNumber from 'bignumber.js'; import { decodeToken } from 'jsontokens'; import { useMemo, useState } from 'react'; import { useLocation } from 'react-router-dom'; -import { - BitcoinNetworkType, - SendBtcTransactionOptions, - SendBtcTransactionPayload, -} from 'sats-connect'; import useBtcClient from '../../hooks/useBtcClient'; import useSeedVault from '../../hooks/useSeedVault'; import useWalletSelector from '../../hooks/useWalletSelector'; diff --git a/src/app/screens/confirmBtcTransaction/index.tsx b/src/app/screens/confirmBtcTransaction/index.tsx index 2896932ef..f7faa1331 100644 --- a/src/app/screens/confirmBtcTransaction/index.tsx +++ b/src/app/screens/confirmBtcTransaction/index.tsx @@ -9,6 +9,7 @@ import useBtcClient from '@hooks/useBtcClient'; import useOrdinalsByAddress from '@hooks/useOrdinalsByAddress'; import { useResetUserFlow } from '@hooks/useResetUserFlow'; import useWalletSelector from '@hooks/useWalletSelector'; +import { Return, RpcErrorCode } from '@sats-connect/core'; import { AnalyticsEvents, BtcTransactionBroadcastResponse, @@ -22,7 +23,6 @@ import BigNumber from 'bignumber.js'; import { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { Return, RpcErrorCode } from 'sats-connect'; import SendLayout from '../../layouts/sendLayout'; function ConfirmBtcTransaction() { diff --git a/src/app/screens/confirmStxTransaction/index.tsx b/src/app/screens/confirmStxTransaction/index.tsx index 9efa173c2..53fa09bab 100644 --- a/src/app/screens/confirmStxTransaction/index.tsx +++ b/src/app/screens/confirmStxTransaction/index.tsx @@ -20,6 +20,7 @@ import useStxWalletData from '@hooks/queries/useStxWalletData'; import useNetworkSelector from '@hooks/useNetwork'; import useOnOriginTabClose from '@hooks/useOnTabClosed'; import useWalletSelector from '@hooks/useWalletSelector'; +import { StxRequests } from '@sats-connect/core'; import { AnalyticsEvents, StacksTransaction, @@ -41,7 +42,6 @@ import BigNumber from 'bignumber.js'; import { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { StxRequests } from 'sats-connect'; import styled from 'styled-components'; const AlertContainer = styled.div((props) => ({ diff --git a/src/app/screens/connect/addressPurposeBox.tsx b/src/app/screens/connect/addressPurposeBox.tsx index 783d46021..f20da1ced 100644 --- a/src/app/screens/connect/addressPurposeBox.tsx +++ b/src/app/screens/connect/addressPurposeBox.tsx @@ -1,5 +1,5 @@ +import { AddressPurpose } from '@sats-connect/core'; import { getTruncatedAddress } from '@utils/helper'; -import { AddressPurpose } from 'sats-connect'; import styled from 'styled-components'; const AddressBox = styled.div((props) => ({ diff --git a/src/app/screens/connect/authenticationRequest/index.tsx b/src/app/screens/connect/authenticationRequest/index.tsx index 8e36c235a..8068df19a 100644 --- a/src/app/screens/connect/authenticationRequest/index.tsx +++ b/src/app/screens/connect/authenticationRequest/index.tsx @@ -11,6 +11,7 @@ import useSeedVault from '@hooks/useSeedVault'; import useWalletSelector from '@hooks/useWalletSelector'; import Transport from '@ledgerhq/hw-transport-webusb'; import { animated, useSpring } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { AnalyticsEvents, @@ -27,7 +28,6 @@ import { decodeToken } from 'jsontokens'; import { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import styled from 'styled-components'; import validUrl from 'valid-url'; import AddressPurposeBox from '../addressPurposeBox'; diff --git a/src/app/screens/connect/btcSelectAddressScreen/index.tsx b/src/app/screens/connect/btcSelectAddressScreen/index.tsx index d59167483..cf1a438b1 100644 --- a/src/app/screens/connect/btcSelectAddressScreen/index.tsx +++ b/src/app/screens/connect/btcSelectAddressScreen/index.tsx @@ -3,6 +3,7 @@ import stxIcon from '@assets/img/dashboard/stx_icon.svg'; import OrdinalsIcon from '@assets/img/nftDashboard/white_ordinals_icon.svg'; import useWalletSelector from '@hooks/useWalletSelector'; import { animated, useTransition } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { AnalyticsEvents, getAppIconFromWebManifest } from '@secretkeylabs/xverse-core'; import Button from '@ui-library/button'; @@ -12,7 +13,6 @@ import { trackMixPanel } from '@utils/mixpanel'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import AddressPurposeBox from '../addressPurposeBox'; import PermissionsList from '../permissionsList'; import { diff --git a/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts b/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts index 3a1a80ae2..977e1c670 100644 --- a/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts +++ b/src/app/screens/connect/btcSelectAddressScreen/useBtcAddressRequest.ts @@ -1,10 +1,6 @@ import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types'; import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers'; import useWalletSelector from '@hooks/useWalletSelector'; -import { SettingsNetwork } from '@secretkeylabs/xverse-core'; -import { decodeToken } from 'jsontokens'; -import { useMemo } from 'react'; -import { useLocation } from 'react-router-dom'; import { Address, AddressPurpose, @@ -15,7 +11,11 @@ import { GetAddressResponse, Return, RpcErrorCode, -} from 'sats-connect'; +} from '@sats-connect/core'; +import { SettingsNetwork } from '@secretkeylabs/xverse-core'; +import { decodeToken } from 'jsontokens'; +import { useMemo } from 'react'; +import { useLocation } from 'react-router-dom'; const useAddressRequestParams = (network: SettingsNetwork) => { const { search } = useLocation(); diff --git a/src/app/screens/connect/stxSelectAccountScreen/index.tsx b/src/app/screens/connect/stxSelectAccountScreen/index.tsx index 0fab995bd..7d148b73b 100644 --- a/src/app/screens/connect/stxSelectAccountScreen/index.tsx +++ b/src/app/screens/connect/stxSelectAccountScreen/index.tsx @@ -3,6 +3,7 @@ import ActionButton from '@components/button'; import useStxAccountRequest from '@hooks/useStxAccountRequest'; import useWalletSelector from '@hooks/useWalletSelector'; import { animated, useTransition } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { getAppIconFromWebManifest } from '@secretkeylabs/xverse-core'; import { StickyHorizontalSplitButtonContainer } from '@ui-library/common.styled'; @@ -10,7 +11,6 @@ import Spinner from '@ui-library/spinner'; import { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import AddressPurposeBox from '../addressPurposeBox'; import { AddressBoxContainer, diff --git a/src/app/screens/connect/stxSelectAddressScreen/index.tsx b/src/app/screens/connect/stxSelectAddressScreen/index.tsx index 1c8613945..99350f99d 100644 --- a/src/app/screens/connect/stxSelectAddressScreen/index.tsx +++ b/src/app/screens/connect/stxSelectAddressScreen/index.tsx @@ -3,6 +3,7 @@ import ActionButton from '@components/button'; import useStxAddressRequest from '@hooks/useStxAddressRequest'; import useWalletSelector from '@hooks/useWalletSelector'; import { animated, useTransition } from '@react-spring/web'; +import { AddressPurpose } from '@sats-connect/core'; import SelectAccount from '@screens/connect/selectAccount'; import { getAppIconFromWebManifest } from '@secretkeylabs/xverse-core'; import { StickyHorizontalSplitButtonContainer } from '@ui-library/common.styled'; @@ -10,7 +11,6 @@ import Spinner from '@ui-library/spinner'; import { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { AddressPurpose } from 'sats-connect'; import AddressPurposeBox from '../addressPurposeBox'; import { AddressBoxContainer, diff --git a/src/app/screens/createInscription/index.tsx b/src/app/screens/createInscription/index.tsx index 1733a44da..89b66690f 100644 --- a/src/app/screens/createInscription/index.tsx +++ b/src/app/screens/createInscription/index.tsx @@ -7,18 +7,18 @@ import { NumericFormat } from 'react-number-format'; import { useLocation } from 'react-router-dom'; import styled from 'styled-components'; +import { CreateInscriptionPayload, CreateRepeatInscriptionsPayload } from '@sats-connect/core'; import { AnalyticsEvents, BtcFeeResponse, + InscriptionErrorCode, + UTXO, currencySymbolMap, fetchBtcFeeRate, getNonOrdinalUtxo, - InscriptionErrorCode, useInscriptionExecute, useInscriptionFees, - UTXO, } from '@secretkeylabs/xverse-core'; -import { CreateInscriptionPayload, CreateRepeatInscriptionsPayload } from 'sats-connect'; import SettingIcon from '@assets/img/dashboard/faders_horizontal.svg'; import OrdinalsIcon from '@assets/img/nftDashboard/white_ordinals_icon.svg'; diff --git a/src/app/screens/signBatchPsbtRequest/index.tsx b/src/app/screens/signBatchPsbtRequest/index.tsx index 9e5c203d1..d65dc5374 100644 --- a/src/app/screens/signBatchPsbtRequest/index.tsx +++ b/src/app/screens/signBatchPsbtRequest/index.tsx @@ -21,6 +21,7 @@ import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed'; import useTransactionContext from '@hooks/useTransactionContext'; import useWalletSelector from '@hooks/useWalletSelector'; import { ArrowLeft, ArrowRight } from '@phosphor-icons/react'; +import { SignMultiplePsbtPayload } from '@sats-connect/core'; import { AnalyticsEvents, RuneSummary, @@ -35,7 +36,6 @@ import BigNumber from 'bignumber.js'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation, useNavigate } from 'react-router-dom'; -import { SignMultiplePsbtPayload } from 'sats-connect'; import styled from 'styled-components'; const OuterContainer = styled.div` diff --git a/src/app/screens/signMessageRequest/index.tsx b/src/app/screens/signMessageRequest/index.tsx index 6c37e3e36..603eb54c5 100644 --- a/src/app/screens/signMessageRequest/index.tsx +++ b/src/app/screens/signMessageRequest/index.tsx @@ -11,6 +11,7 @@ import LedgerConnectionView from '@components/ledger/connectLedgerView'; import RequestError from '@components/requests/requestError'; import useWalletSelector from '@hooks/useWalletSelector'; import Transport from '@ledgerhq/hw-transport-webusb'; +import { Return, RpcErrorCode } from '@sats-connect/core'; import CollapsableContainer from '@screens/signatureRequest/collapsableContainer'; import SignatureRequestMessage from '@screens/signatureRequest/signatureRequestMessage'; import { finalizeMessageSignature } from '@screens/signatureRequest/utils'; @@ -20,7 +21,6 @@ import { getTruncatedAddress, isHardwareAccount } from '@utils/helper'; import { handleBip322LedgerMessageSigning } from '@utils/ledger'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Return, RpcErrorCode } from 'sats-connect'; import styled from 'styled-components'; import { useSignMessageRequest, useSignMessageValidation } from './useSignMessageRequest'; diff --git a/src/app/screens/signMessageRequest/useSignMessageRequest.ts b/src/app/screens/signMessageRequest/useSignMessageRequest.ts index e5bb984d6..a9e810342 100644 --- a/src/app/screens/signMessageRequest/useSignMessageRequest.ts +++ b/src/app/screens/signMessageRequest/useSignMessageRequest.ts @@ -1,13 +1,13 @@ import useSeedVault from '@hooks/useSeedVault'; import useWalletReducer from '@hooks/useWalletReducer'; import useWalletSelector from '@hooks/useWalletSelector'; +import { BitcoinNetworkType, SignMessageOptions, SignMessagePayload } from '@sats-connect/core'; import { SettingsNetwork, signBip322Message } from '@secretkeylabs/xverse-core'; import { isHardwareAccount } from '@utils/helper'; import { decodeToken } from 'jsontokens'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation } from 'react-router-dom'; -import { BitcoinNetworkType, SignMessageOptions, SignMessagePayload } from 'sats-connect'; const useSignMessageRequestParams = (network: SettingsNetwork) => { const { search } = useLocation(); diff --git a/src/app/screens/signPsbtRequest/index.tsx b/src/app/screens/signPsbtRequest/index.tsx index 169e5a6b0..e34a9e3a7 100644 --- a/src/app/screens/signPsbtRequest/index.tsx +++ b/src/app/screens/signPsbtRequest/index.tsx @@ -5,6 +5,7 @@ import useHasFeature from '@hooks/useHasFeature'; import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed'; import useTransactionContext from '@hooks/useTransactionContext'; import useWalletSelector from '@hooks/useWalletSelector'; +import { RpcErrorCode } from '@sats-connect/core'; import { AnalyticsEvents, RuneSummary, @@ -16,7 +17,6 @@ import { trackMixPanel } from '@utils/mixpanel'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { RpcErrorCode } from 'sats-connect'; import useSignPsbt from './useSignPsbt'; import useSignPsbtValidationGate from './useSignPsbtValidationGate'; diff --git a/src/app/screens/signPsbtRequest/useSignPsbt.ts b/src/app/screens/signPsbtRequest/useSignPsbt.ts index 5724bde68..6fdd7a6aa 100644 --- a/src/app/screens/signPsbtRequest/useSignPsbt.ts +++ b/src/app/screens/signPsbtRequest/useSignPsbt.ts @@ -2,6 +2,13 @@ import { MESSAGE_SOURCE, SatsConnectMethods } from '@common/types/message-types' import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers'; import useTransactionContext from '@hooks/useTransactionContext'; import useWalletSelector from '@hooks/useWalletSelector'; +import { + BitcoinNetworkType, + Return, + RpcErrorCode, + SignTransactionOptions, + SignTransactionPayload, +} from '@sats-connect/core'; import { InputToSign, SettingsNetwork, @@ -12,13 +19,6 @@ import { import { decodeToken } from 'jsontokens'; import { useEffect, useMemo, useState } from 'react'; import { useLocation } from 'react-router-dom'; -import { - BitcoinNetworkType, - Return, - RpcErrorCode, - SignTransactionOptions, - SignTransactionPayload, -} from 'sats-connect'; import useBtcClient from '../../hooks/useBtcClient'; import useSeedVault from '../../hooks/useSeedVault'; diff --git a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts index a0dac2140..ac78215bd 100644 --- a/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts +++ b/src/app/screens/signPsbtRequest/useSignPsbtValidationGate.ts @@ -1,8 +1,8 @@ import useWalletSelector from '@hooks/useWalletSelector'; +import { SignTransactionPayload } from '@sats-connect/core'; import { btcTransaction } from '@secretkeylabs/xverse-core'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { SignTransactionPayload } from 'sats-connect'; type Props = { payload: SignTransactionPayload | undefined; diff --git a/src/app/screens/signatureRequest/index.tsx b/src/app/screens/signatureRequest/index.tsx index d7e47b963..93ee71681 100644 --- a/src/app/screens/signatureRequest/index.tsx +++ b/src/app/screens/signatureRequest/index.tsx @@ -17,6 +17,7 @@ import useTrackMixPanelPageViewed from '@hooks/useTrackMixPanelPageViewed'; import useWalletReducer from '@hooks/useWalletReducer'; import useWalletSelector from '@hooks/useWalletSelector'; import Transport from '@ledgerhq/hw-transport-webusb'; +import { Return } from '@sats-connect/core'; import { buf2hex, hashMessage, signStxMessage } from '@secretkeylabs/xverse-core'; import { SignaturePayload, StructuredDataSignaturePayload } from '@stacks/connect'; import { getNetworkType, getTruncatedAddress, isHardwareAccount } from '@utils/helper'; @@ -24,7 +25,6 @@ import { signatureVrsToRsv } from '@utils/ledger'; import { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; -import { Return } from 'sats-connect'; import CollapsableContainer from './collapsableContainer'; import { ActionDisclaimer, diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts index da50595d7..cfed8836d 100644 --- a/src/app/utils/constants.ts +++ b/src/app/utils/constants.ts @@ -1,6 +1,6 @@ /* eslint-disable prefer-destructuring */ +import { Provider } from '@sats-connect/core'; import type { NetworkType } from '@secretkeylabs/xverse-core'; -import { Provider } from 'sats-connect'; export const GAMMA_URL = 'https://gamma.io/'; export const TERMS_LINK = 'https://xverse.app/terms'; diff --git a/src/background/background.ts b/src/background/background.ts index 9b96f1873..b9891f000 100755 --- a/src/background/background.ts +++ b/src/background/background.ts @@ -7,7 +7,7 @@ import { } from '@common/utils/legacy-external-message-handler'; import internalBackgroundMessageHandler from '@common/utils/messageHandlers'; import handleRPCRequest from '@common/utils/rpc'; -import { Requests } from 'sats-connect'; +import { Requests } from '@sats-connect/core'; // Listen for connection to the content-script - port for two-way communication chrome.runtime.onConnect.addListener((port) => { diff --git a/src/common/types/inpage-types.ts b/src/common/types/inpage-types.ts index 3e817d29d..e48354620 100644 --- a/src/common/types/inpage-types.ts +++ b/src/common/types/inpage-types.ts @@ -1,4 +1,4 @@ -import { RpcBase } from 'sats-connect'; +import { RpcBase } from '@sats-connect/core'; /** * Inpage Script (Stacks Provider / BitcoinProvider) <-> Content Script diff --git a/src/common/types/message-types.ts b/src/common/types/message-types.ts index 114fb044d..416c23a6d 100644 --- a/src/common/types/message-types.ts +++ b/src/common/types/message-types.ts @@ -1,4 +1,3 @@ -import { FinishedTxPayload, SignatureData, SponsoredFinishedTxPayload } from '@stacks/connect'; import { CreateInscriptionResponse, CreateRepeatInscriptionsResponse, @@ -8,7 +7,8 @@ import { SignTransactionResponse, type Params, type Requests, -} from 'sats-connect'; +} from '@sats-connect/core'; +import { FinishedTxPayload, SignatureData, SponsoredFinishedTxPayload } from '@stacks/connect'; export const MESSAGE_SOURCE = 'xverse-wallet'; diff --git a/src/common/utils/legacy-external-message-handler.ts b/src/common/utils/legacy-external-message-handler.ts index dcb925e37..c518a9ba3 100644 --- a/src/common/utils/legacy-external-message-handler.ts +++ b/src/common/utils/legacy-external-message-handler.ts @@ -1,5 +1,5 @@ +import { RpcErrorResponse } from '@sats-connect/core'; import { SignatureData } from '@stacks/connect'; -import { RpcErrorResponse } from 'sats-connect'; import { getTabIdFromPort } from '.'; import { InternalMethods, diff --git a/src/common/utils/rpc/btc/getAccounts.ts b/src/common/utils/rpc/btc/getAccounts.ts index 0bec5b8fa..75c028900 100644 --- a/src/common/utils/rpc/btc/getAccounts.ts +++ b/src/common/utils/rpc/btc/getAccounts.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort } from '@common/utils'; -import { AddressPurpose, RpcErrorCode } from 'sats-connect'; +import { AddressPurpose, RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/getAddresses.ts b/src/common/utils/rpc/btc/getAddresses.ts index 40bd5def0..22dc8bb27 100644 --- a/src/common/utils/rpc/btc/getAddresses.ts +++ b/src/common/utils/rpc/btc/getAddresses.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort } from '@common/utils'; -import { AddressPurpose, RpcErrorCode } from 'sats-connect'; +import { AddressPurpose, RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/sendTransfer.ts b/src/common/utils/rpc/btc/sendTransfer.ts index 9f6e67d02..0f2ff081d 100644 --- a/src/common/utils/rpc/btc/sendTransfer.ts +++ b/src/common/utils/rpc/btc/sendTransfer.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort } from '@common/utils'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/signMessage.ts b/src/common/utils/rpc/btc/signMessage.ts index 969545e75..00f326adc 100644 --- a/src/common/utils/rpc/btc/signMessage.ts +++ b/src/common/utils/rpc/btc/signMessage.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/btc/signPsbt.ts b/src/common/utils/rpc/btc/signPsbt.ts index 3f7d62eb4..96444bee6 100644 --- a/src/common/utils/rpc/btc/signPsbt.ts +++ b/src/common/utils/rpc/btc/signPsbt.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { ParamsKeyValueArray, diff --git a/src/common/utils/rpc/getInfo.ts b/src/common/utils/rpc/getInfo.ts index f68003c09..ebfc50c44 100644 --- a/src/common/utils/rpc/getInfo.ts +++ b/src/common/utils/rpc/getInfo.ts @@ -1,4 +1,4 @@ -import { Requests, Return, RpcId } from 'sats-connect'; +import { Requests, Return, RpcId } from '@sats-connect/core'; import { keys } from 'ts-transformer-keys'; import { makeRpcSuccessResponse, sendRpcResponse } from './helpers'; diff --git a/src/common/utils/rpc/helpers.ts b/src/common/utils/rpc/helpers.ts index 355f56237..841387e37 100644 --- a/src/common/utils/rpc/helpers.ts +++ b/src/common/utils/rpc/helpers.ts @@ -6,7 +6,7 @@ import { RpcErrorResponse, RpcId, RpcSuccessResponse, -} from 'sats-connect'; +} from '@sats-connect/core'; export const makeRPCError = (id: RpcId, error: RpcError): RpcErrorResponse => ({ jsonrpc: '2.0', diff --git a/src/common/utils/rpc/index.ts b/src/common/utils/rpc/index.ts index b4b2d8ecc..b90d216d4 100644 --- a/src/common/utils/rpc/index.ts +++ b/src/common/utils/rpc/index.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { Requests, RpcErrorCode } from 'sats-connect'; +import { Requests, RpcErrorCode } from '@sats-connect/core'; import { getTabIdFromPort } from '..'; import { handleGetAccounts, @@ -10,6 +10,7 @@ import { } from './btc'; import handleGetInfo from './getInfo'; import { makeRPCError, sendRpcResponse } from './helpers'; +import handleGetRunesBalance from './runes/getBalance'; import callContract from './stx/callContract/index.ts'; import deployContract from './stx/deployContract/index.ts'; import handleGetStxAccounts from './stx/getAccounts'; @@ -25,25 +26,30 @@ const handleRPCRequest = async ( ) => { try { switch (message.method) { - case 'getInfo': + case 'getInfo': { handleGetInfo(message.id, getTabIdFromPort(port)); break; - case 'getAddresses': + } + case 'getAddresses': { await handleGetAddresses(message as WebBtcMessage<'getAddresses'>, port); break; + } case 'getAccounts': { await handleGetAccounts(message as WebBtcMessage<'getAccounts'>, port); break; } - case 'signMessage': + case 'signMessage': { await handleSignMessage(message as WebBtcMessage<'signMessage'>, port); break; - case 'sendTransfer': + } + case 'sendTransfer': { await handleSendTransfer(message as WebBtcMessage<'sendTransfer'>, port); break; - case 'signPsbt': + } + case 'signPsbt': { await handleSignPsbt(message as WebBtcMessage<'signPsbt'>, port); break; + } // Stacks methods @@ -82,6 +88,10 @@ const handleRPCRequest = async ( ); break; } + case 'runes_getBalance': { + await handleGetRunesBalance(message.id, getTabIdFromPort(port)); + break; + } default: sendRpcResponse( getTabIdFromPort(port), @@ -93,6 +103,7 @@ const handleRPCRequest = async ( break; } } catch (e: any) { + console.log(e); sendRpcResponse( getTabIdFromPort(port), makeRPCError(message.id as string, { diff --git a/src/common/utils/rpc/runes/getBalance.ts b/src/common/utils/rpc/runes/getBalance.ts new file mode 100644 index 000000000..56e070df1 --- /dev/null +++ b/src/common/utils/rpc/runes/getBalance.ts @@ -0,0 +1,31 @@ +import { RpcErrorCode, RpcId } from '@sats-connect/core'; +import { getRunesClient } from '@secretkeylabs/xverse-core'; +import rootStore from '@stores/index'; +import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '../helpers'; + +const handleGetRunesBalance = async (requestId: RpcId, tabId: number) => { + const { ordinalsAddress, network } = rootStore.store.getState().walletState; + const runesApi = getRunesClient(network.type); + try { + const runesBalances = await runesApi.getRuneBalances(ordinalsAddress); + sendRpcResponse( + tabId, + makeRpcSuccessResponse<'runes_getBalance'>(requestId, { + balances: runesBalances.map((runeBalance) => ({ + ...runeBalance, + amount: runeBalance.amount.toString(), + })), + }), + ); + } catch (error) { + sendRpcResponse( + tabId, + makeRPCError(requestId, { + code: RpcErrorCode.INTERNAL_ERROR, + message: (error as any).message, + }), + ); + } +}; + +export default handleGetRunesBalance; diff --git a/src/common/utils/rpc/stx/callContract/index.ts.ts b/src/common/utils/rpc/stx/callContract/index.ts.ts index 23c1c8d87..f59871659 100644 --- a/src/common/utils/rpc/stx/callContract/index.ts.ts +++ b/src/common/utils/rpc/stx/callContract/index.ts.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import { callContractParamsSchema } from './paramsSchema'; diff --git a/src/common/utils/rpc/stx/callContract/paramsSchema.ts b/src/common/utils/rpc/stx/callContract/paramsSchema.ts index aedaa1806..021e2d61a 100644 --- a/src/common/utils/rpc/stx/callContract/paramsSchema.ts +++ b/src/common/utils/rpc/stx/callContract/paramsSchema.ts @@ -1,5 +1,5 @@ /* eslint-disable import/prefer-default-export */ -import { CallContractParams } from 'sats-connect'; +import { CallContractParams } from '@sats-connect/core'; import { z } from 'zod'; export const callContractParamsSchema = z.object({ diff --git a/src/common/utils/rpc/stx/deployContract/index.ts.ts b/src/common/utils/rpc/stx/deployContract/index.ts.ts index 0ba64cfd1..a25f878f3 100644 --- a/src/common/utils/rpc/stx/deployContract/index.ts.ts +++ b/src/common/utils/rpc/stx/deployContract/index.ts.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import { deployContractParamsSchema } from './paramsSchema'; diff --git a/src/common/utils/rpc/stx/deployContract/paramsSchema.ts b/src/common/utils/rpc/stx/deployContract/paramsSchema.ts index 4ce56e714..ac58111df 100644 --- a/src/common/utils/rpc/stx/deployContract/paramsSchema.ts +++ b/src/common/utils/rpc/stx/deployContract/paramsSchema.ts @@ -1,5 +1,5 @@ /* eslint-disable import/prefer-default-export */ -import { DeployContractParams } from 'sats-connect'; +import { DeployContractParams } from '@sats-connect/core'; import { z } from 'zod'; export const deployContractParamsSchema = z.object({ diff --git a/src/common/utils/rpc/stx/getAccounts/index.ts b/src/common/utils/rpc/stx/getAccounts/index.ts index f637d9d74..5bf1cac22 100644 --- a/src/common/utils/rpc/stx/getAccounts/index.ts +++ b/src/common/utils/rpc/stx/getAccounts/index.ts @@ -1,6 +1,6 @@ import { WebBtcMessage } from '@common/types/message-types'; import { getTabIdFromPort, isUndefined } from '@common/utils'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { listenForPopupClose, makeSearchParamsWithDefaults, diff --git a/src/common/utils/rpc/stx/getAddresses/index.ts b/src/common/utils/rpc/stx/getAddresses/index.ts index 1771f492d..5dfc056ed 100644 --- a/src/common/utils/rpc/stx/getAddresses/index.ts +++ b/src/common/utils/rpc/stx/getAddresses/index.ts @@ -1,5 +1,5 @@ import { WebBtcMessage } from '@common/types/message-types'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { listenForPopupClose, makeSearchParamsWithDefaults, diff --git a/src/common/utils/rpc/stx/rpcResponseMessages.ts b/src/common/utils/rpc/stx/rpcResponseMessages.ts index fa7b5a0b5..62bed3b13 100644 --- a/src/common/utils/rpc/stx/rpcResponseMessages.ts +++ b/src/common/utils/rpc/stx/rpcResponseMessages.ts @@ -1,5 +1,5 @@ /* eslint-disable import/prefer-default-export */ -import { Return, RpcErrorCode, RpcId } from 'sats-connect'; +import { Return, RpcErrorCode, RpcId } from '@sats-connect/core'; import { ZodError } from 'zod'; import { makeRPCError, makeRpcSuccessResponse, sendRpcResponse } from '../helpers'; diff --git a/src/common/utils/rpc/stx/signMessage/index.ts b/src/common/utils/rpc/stx/signMessage/index.ts index 4c70b73c0..4ce99f688 100644 --- a/src/common/utils/rpc/stx/signMessage/index.ts +++ b/src/common/utils/rpc/stx/signMessage/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import { rpcParamsSchema } from './paramsSchema'; diff --git a/src/common/utils/rpc/stx/signStructuredMessage/index.ts b/src/common/utils/rpc/stx/signStructuredMessage/index.ts index 24c97ef32..66c5ab013 100644 --- a/src/common/utils/rpc/stx/signStructuredMessage/index.ts +++ b/src/common/utils/rpc/stx/signStructuredMessage/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { z } from 'zod'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; diff --git a/src/common/utils/rpc/stx/signTransaction/index.ts b/src/common/utils/rpc/stx/signTransaction/index.ts index d44ac7194..75e677386 100644 --- a/src/common/utils/rpc/stx/signTransaction/index.ts +++ b/src/common/utils/rpc/stx/signTransaction/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, diff --git a/src/common/utils/rpc/stx/transferStx/index.ts b/src/common/utils/rpc/stx/transferStx/index.ts index 336bc6129..aeba8ad3c 100644 --- a/src/common/utils/rpc/stx/transferStx/index.ts +++ b/src/common/utils/rpc/stx/transferStx/index.ts @@ -6,7 +6,7 @@ import { triggerRequestWindowOpen, } from '@common/utils/legacy-external-message-handler'; import RequestsRoutes from '@common/utils/route-urls'; -import { RpcErrorCode } from 'sats-connect'; +import { RpcErrorCode } from '@sats-connect/core'; import { makeRPCError } from '../../helpers'; import { sendInvalidParametersMessage, sendMissingParametersMessage } from '../rpcResponseMessages'; import paramsSchema from './paramsSchema'; diff --git a/src/inpage/index.ts b/src/inpage/index.ts index 36482678d..cf0561f7e 100644 --- a/src/inpage/index.ts +++ b/src/inpage/index.ts @@ -1,5 +1,5 @@ +import { BitcoinProvider } from '@sats-connect/core'; import { StacksProvider } from '@stacks/connect'; -import { BitcoinProvider } from 'sats-connect'; import { XverseProviderInfo } from '@utils/constants'; import SatsMethodsProvider from './sats.inpage'; diff --git a/src/inpage/sats.inpage.ts b/src/inpage/sats.inpage.ts index ef39f2830..4e3597f64 100644 --- a/src/inpage/sats.inpage.ts +++ b/src/inpage/sats.inpage.ts @@ -18,7 +18,6 @@ import { SignMessageResponseMessage, SignPsbtResponseMessage, } from '@common/types/message-types'; -import { nanoid } from 'nanoid'; import { BitcoinProvider, CreateInscriptionResponse, @@ -30,7 +29,8 @@ import { RpcResponse, SignMultipleTransactionsResponse, SignTransactionResponse, -} from 'sats-connect'; +} from '@sats-connect/core'; +import { nanoid } from 'nanoid'; import { isValidLegacyEvent, isValidRpcEvent } from './utils'; const SatsMethodsProvider: BitcoinProvider = {