From 103920f18ee5b10ecb387640e439c06458fa51ae Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Thu, 28 Mar 2024 04:03:16 +0200 Subject: [PATCH] update sats-connect-core and implement wallet action loading --- README.md | 14 ++++++++- package-lock.json | 72 ++++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- src/index.ts | 23 +++++++++------ 4 files changed, 94 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ccf5dab..e095a07 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,17 @@ # Sats Connect +![Banner](data:image/svg+xml;base64,<svg width="1920" height="600" viewBox="0 0 1920 600" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="1920" height="600" fill="#FF4D00"/>
<g clip-path="url(#clip0_11_4330)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M642.267 244.242C642.267 239.138 646.356 235 651.4 235H660.533H678.8H687.933C692.977 235 697.067 239.138 697.067 244.242V253.484H678.8H660.533H642.267V244.242ZM642.267 290.452H633.133C628.089 290.452 624 286.314 624 281.21V271.968V262.726C624 257.622 628.089 253.484 633.133 253.484H642.267V271.968V290.452ZM697.067 308.936L678.8 308.936H660.533H651.4C646.356 308.936 642.267 304.799 642.267 299.694V290.452H660.533H678.8H687.933C692.977 290.452 697.067 294.59 697.067 299.694V308.936ZM697.067 345.905V327.42V308.936H706.2C711.244 308.936 715.333 313.074 715.333 318.178V327.42V336.663C715.333 341.767 711.244 345.905 706.2 345.905H697.067ZM642.267 345.905V355.147C642.267 360.251 646.356 364.389 651.4 364.389H660.533H678.8H687.933C692.977 364.389 697.067 360.251 697.067 355.147V345.905H678.8H660.533H642.267ZM642.267 345.905H633.133C628.089 345.905 624 341.767 624 336.663C624 331.558 628.089 327.42 633.133 327.42C638.178 327.42 642.267 331.558 642.267 336.662V345.905ZM697.067 253.484H706.2C711.244 253.484 715.333 257.622 715.333 262.726C715.333 267.83 711.244 271.968 706.2 271.968C701.156 271.968 697.067 267.83 697.067 262.726V253.484ZM660.533 327.42C660.533 322.316 664.622 318.178 669.667 318.178C674.711 318.178 678.8 322.316 678.8 327.42C678.8 332.525 674.711 336.663 669.667 336.663C664.622 336.663 660.533 332.525 660.533 327.42ZM678.8 271.968C678.8 266.864 674.711 262.726 669.667 262.726C664.622 262.726 660.533 266.864 660.533 271.968C660.533 277.072 664.622 281.21 669.667 281.21C674.711 281.21 678.8 277.072 678.8 271.968Z" fill="black"/>
<path d="M1262.64 290.126V282.08H1265.94C1269.14 282.08 1271.51 279.398 1271.51 275.685V268.877H1279.35V282.08H1290.7V290.126H1279.35V320.039C1279.35 323.856 1282.13 326.434 1286.36 326.434C1287.81 326.434 1289.46 326.228 1290.7 325.815L1290.9 334.067C1289.25 334.583 1287.09 334.893 1285.13 334.893C1276.77 334.893 1271.1 329.632 1271.1 321.689V290.126H1262.64Z" fill="black"/>
<path d="M1263.84 315.914C1261.98 327.054 1252.08 334.893 1240.12 334.893C1225.99 334.893 1214.74 324.062 1214.74 307.868C1214.74 291.983 1225.68 280.843 1239.7 280.843C1251.36 280.843 1260.95 288.476 1263.02 298.997L1253.94 301.885C1253.11 294.459 1247.23 288.888 1239.7 288.888C1230.63 288.888 1223.61 296.728 1223.61 307.868C1223.61 319.214 1230.63 326.641 1239.7 326.641C1247.54 326.641 1253.73 321.277 1254.35 313.025L1263.84 315.914Z" fill="black"/>
<path d="M1188.33 334.893C1173.48 334.893 1163.16 323.65 1163.16 308.074C1163.16 292.292 1173.48 280.843 1187.92 280.843C1202.77 280.843 1212.26 292.808 1212.26 309.312C1212.26 309.725 1212.26 310.24 1212.16 311.066H1172.24C1173.48 320.246 1179.87 326.641 1188.33 326.641C1195.14 326.641 1201.33 322.309 1202.57 316.326L1211.85 319.214C1209.58 328.292 1199.89 334.893 1188.33 334.893ZM1172.45 303.02H1203.39C1201.74 293.943 1194.93 288.888 1187.51 288.888C1179.87 288.888 1173.99 294.562 1172.45 303.02Z" fill="black"/>
<path d="M1150.39 302.917C1150.39 294.871 1145.13 289.095 1137.4 289.095C1128.83 289.095 1121.72 296.212 1121.72 306.011V333.655H1113.46V282.081H1120.48L1121.61 291.57C1124.3 285.175 1130.38 280.843 1138.63 280.843C1150.29 280.843 1158.64 289.817 1158.64 302.298V333.655H1150.39V302.917Z" fill="black"/>
<path d="M1097.81 302.917C1097.81 294.871 1092.55 289.095 1084.81 289.095C1076.25 289.095 1069.13 296.212 1069.13 306.011V333.655H1060.88V282.081H1067.9L1069.03 291.57C1071.71 285.175 1077.8 280.843 1086.05 280.843C1097.71 280.843 1106.06 289.817 1106.06 302.298V333.655H1097.81V302.917Z" fill="black"/>
<path d="M1029.68 334.893C1014.73 334.893 1003.9 323.547 1003.9 307.868C1003.9 292.189 1014.73 280.843 1029.68 280.843C1044.64 280.843 1055.47 292.189 1055.47 307.868C1055.47 323.547 1044.64 334.893 1029.68 334.893ZM1012.56 307.868C1012.56 318.802 1019.78 326.641 1029.68 326.641C1039.59 326.641 1046.81 318.802 1046.81 307.868C1046.81 296.831 1039.59 288.888 1029.68 288.888C1019.78 288.888 1012.56 296.831 1012.56 307.868Z" fill="black"/>
<path d="M1001.02 310.55C998.547 325.197 986.788 334.893 971.522 334.893C952.749 334.893 939.133 320.246 939.133 300.131C939.133 280.017 952.439 265.37 970.903 265.37C985.447 265.37 997.722 274.963 1000.2 288.269L990.708 291.57C989.057 281.255 980.702 273.828 970.903 273.828C957.906 273.828 948.416 284.865 948.416 300.131C948.416 315.294 958.112 326.228 971.522 326.228C982.146 326.228 990.089 318.802 991.326 307.661L1001.02 310.55Z" fill="black"/>
<path d="M885.517 315.914C885.929 322.412 892.221 327.054 899.339 327.054C905.115 327.054 909.447 323.959 909.447 319.627C909.447 307.868 878.915 312.922 878.915 294.871C878.915 285.794 887.064 280.843 897.276 280.843C907.9 280.843 915.739 286.722 916.874 294.871L908.209 297.14C908.003 292.086 903.258 288.476 897.276 288.476C892.118 288.476 887.786 291.158 887.786 295.284C887.786 306.424 918.524 301.576 918.524 319.627C918.524 328.704 910.479 334.893 898.72 334.893C886.445 334.893 877.161 327.982 876.439 318.389L885.517 315.914Z" fill="black"/>
<path d="M846.982 290.126V282.08H850.283C853.481 282.08 855.853 279.398 855.853 275.685V268.877H863.693V282.08H875.039V290.126H863.693V320.039C863.693 323.856 866.478 326.434 870.707 326.434C872.151 326.434 873.801 326.228 875.039 325.815L875.245 334.067C873.595 334.583 871.429 334.893 869.469 334.893C861.114 334.893 855.441 329.632 855.441 321.689V290.126H846.982Z" fill="black"/>
<path d="M837.439 308.899C836.717 309.209 835.376 309.415 833.932 309.725L820.316 312.2C815.365 313.129 812.89 316.223 812.89 320.04C812.89 324.062 816.19 326.847 821.967 326.847C830.528 326.847 837.439 320.452 837.439 312.2V308.899ZM803.812 320.04C803.812 312.613 808.764 307.352 818.253 305.599L834.138 302.71C836.098 302.401 837.439 301.266 837.439 299.822V299.41C837.439 292.911 832.694 288.27 826.093 288.27C819.285 288.27 814.746 293.427 814.54 300.647L805.463 299.203C806.494 288.579 814.849 280.843 825.886 280.843C837.027 280.843 845.691 288.166 845.691 299.41V323.34L845.897 333.655H839.09L837.749 325.197C834.757 331.18 828.568 334.893 820.316 334.893C810.414 334.893 803.812 328.704 803.812 320.04Z" fill="black"/>
<path d="M759.232 310.137C759.645 319.627 766.968 326.435 777.18 326.435C785.432 326.435 791.827 321.896 791.827 315.501C791.827 299.513 752.63 305.083 752.63 283.318C752.63 272.384 762.533 265.37 775.117 265.37C787.907 265.37 797.604 272.591 798.841 283.318L789.352 286C788.526 278.986 783.369 273.622 775.117 273.622C768.103 273.622 761.914 277.335 761.914 282.906C761.914 297.243 801.317 292.705 801.317 315.501C801.317 326.95 791.518 334.893 776.974 334.893C761.811 334.893 750.567 325.816 749.742 312.613L759.232 310.137Z" fill="black"/>
</g>
<defs>
<clipPath id="clip0_11_4330">
<rect width="672.314" height="129.389" fill="white" transform="translate(624 235)"/>
</clipPath>
</defs>
</svg>
) + Sats connect is a simple javascript library that connects apps to Bitcoin wallets like Xverse to retrieve user wallet addresses and sign transactions (PSBTs). -[Read the docs](https://docs.xverse.app/sats-connect/) +## Quick start + +```bash +npm i sats-connect +``` + + +## Documentation + +For full documentation, visit [docs.xverse.app](https://docs.xverse.app/sats-connect/). + diff --git a/package-lock.json b/package-lock.json index aabf57c..2396deb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.1.0", "license": "ISC", "dependencies": { - "@sats-connect/core": "0.0.1-80ec315", + "@sats-connect/core": "0.0.2-7d8cb11", "@sats-connect/ui": "0.0.2-fa73f78" }, "devDependencies": { @@ -1046,11 +1046,12 @@ ] }, "node_modules/@sats-connect/core": { - "version": "0.0.1-80ec315", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.1-80ec315.tgz", - "integrity": "sha512-SoChwCTEClawqIHMOByW7SWcZpNeWCJ9lCsVZz6dSw6kB96ZsCmTfyoe/jDlDfCXPR0Sn5XkPSYjDRfNtSByDw==", + "version": "0.0.2-7d8cb11", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.2-7d8cb11.tgz", + "integrity": "sha512-v0fiGZ89Yxg8dQjKFx558yUHHxbkxBWvtF0QtiX37roRtXasp9WphV61Q39+8FriUJQpTbgobzmuePpMl30FKA==", "dependencies": { "bitcoin-address-validation": "2.2.3", + "buffer": "6.0.3", "jsontokens": "4.0.1", "lodash.omit": "4.5.0" } @@ -1485,6 +1486,29 @@ "node-int64": "^0.4.0" } }, + "node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -2132,6 +2156,25 @@ "url": "https://github.com/sponsors/typicode" } }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -5313,11 +5356,12 @@ "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==" }, "@sats-connect/core": { - "version": "0.0.1-80ec315", - "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.1-80ec315.tgz", - "integrity": "sha512-SoChwCTEClawqIHMOByW7SWcZpNeWCJ9lCsVZz6dSw6kB96ZsCmTfyoe/jDlDfCXPR0Sn5XkPSYjDRfNtSByDw==", + "version": "0.0.2-7d8cb11", + "resolved": "https://registry.npmjs.org/@sats-connect/core/-/core-0.0.2-7d8cb11.tgz", + "integrity": "sha512-v0fiGZ89Yxg8dQjKFx558yUHHxbkxBWvtF0QtiX37roRtXasp9WphV61Q39+8FriUJQpTbgobzmuePpMl30FKA==", "requires": { "bitcoin-address-validation": "2.2.3", + "buffer": "6.0.3", "jsontokens": "4.0.1", "lodash.omit": "4.5.0" } @@ -5674,6 +5718,15 @@ "node-int64": "^0.4.0" } }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -6143,6 +6196,11 @@ "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", "dev": true }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + }, "import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", diff --git a/package.json b/package.json index db33cc0..86edf16 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ ] }, "dependencies": { - "@sats-connect/core": "0.0.1-80ec315", + "@sats-connect/core": "0.0.2-7d8cb11", "@sats-connect/ui": "0.0.2-fa73f78" }, "devDependencies": { diff --git a/src/index.ts b/src/index.ts index f7330b2..026ac8a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -13,7 +13,14 @@ import { BaseAdapter, createDefaultConfig, } from '@sats-connect/core'; -import { Config, loadSelector, selectWalletProvider, close } from '@sats-connect/ui'; +import { + Config, + loadSelector, + selectWalletProvider, + close, + walletOpen, + walletClose, +} from '@sats-connect/ui'; loadSelector(); @@ -46,7 +53,6 @@ class Wallet { : createDefaultConfig(providers); const nextProviderId = await selectWalletProvider(selectorConfig); this.providerId = nextProviderId; - close(); } static async disconnect() { @@ -67,18 +73,19 @@ class Wallet { } } const adapter = { ...this.defaultAdapters, ...this.userAdapters }[this.providerId as string]; + walletOpen(this.providerId as string); const response = adapter ? await new adapter().request(method, params) : await new BaseAdapter(this.providerId as string).request(method, params); - if ( - !defaultProvider && - response?.status === 'error' && - response.error?.code === RpcErrorCode.USER_REJECTION - ) { - this.providerId = undefined; + walletClose(); + if (response?.status === 'error' && response.error?.code === RpcErrorCode.USER_REJECTION) { + if (!defaultProvider) { + this.providerId = undefined; + } } else { setDefaultProvider(this.providerId as string); } + close(); if (!response) { return { status: 'error',