[ENG-3427] fix: allow-404-get-utxos-from-psbt (#709)

* fix: allow 404s when checking psbt utxos for ordinals

* refactor: move detect ordinal if found logic to core

* chore: use beta core version

* chore: bump core version to v5.3.0
This commit is contained in:
Tim Man
2023-12-13 13:14:55 +08:00
committed by GitHub
parent 9836e4c77e
commit 71772d9912
3 changed files with 18 additions and 30 deletions

39
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"@ledgerhq/hw-transport-webusb": "^6.27.13",
"@phosphor-icons/react": "^2.0.10",
"@react-spring/web": "^9.6.1",
"@secretkeylabs/xverse-core": "5.2.0",
"@secretkeylabs/xverse-core": "5.3.0",
"@stacks/connect": "^6.10.2",
"@stacks/encryption": "4.3.5",
"@stacks/stacks-blockchain-api-types": "6.1.1",
@@ -1727,9 +1727,9 @@
}
},
"node_modules/@secretkeylabs/xverse-core": {
"version": "5.2.0",
"resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/5.2.0/f4d46eacac2b7be0b6fb70ce5184d1c10ed7bfa6",
"integrity": "sha512-DhDrTAFYPHf22ThYn+z9DIlxXN6M7jH5JEbAi5I58xE62RsEOcpxfRHDhfNzcNAyWKJEXzChkbOp7OpFHLIF1w==",
"version": "5.3.0",
"resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/5.3.0/368b6b101c6dd5d67497dc047a6305afe3812af3",
"integrity": "sha512-cVJJmDgT6d1urtYFugfo7MAHPLmqyk8kO2s81x/KFQhgU6kqhhfu2Oeu71lAAxRc71jvzCYtxF20zj+P6bqEgw==",
"license": "ISC",
"dependencies": {
"@bitcoinerlab/secp256k1": "^1.0.2",
@@ -1743,7 +1743,7 @@
"@stacks/transactions": "4.3.5",
"@stacks/wallet-sdk": "^5.0.2",
"@zondax/ledger-stacks": "^1.0.4",
"axios": "0.27.2",
"axios": "1.4.0",
"base64url": "^3.0.1",
"bip32": "^4.0.0",
"bip39": "3.0.3",
@@ -1763,6 +1763,9 @@
"uuidv4": "^6.2.13",
"varuint-bitcoin": "^1.1.2"
},
"engines": {
"node": "^18.18.2"
},
"peerDependencies": {
"bignumber.js": "^9.0.0",
"react": ">18.0.0"
@@ -1893,15 +1896,6 @@
"ieee754": "^1.1.13"
}
},
"node_modules/@secretkeylabs/xverse-core/node_modules/axios": {
"version": "0.27.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
"dependencies": {
"follow-redirects": "^1.14.9",
"form-data": "^4.0.0"
}
},
"node_modules/@secretkeylabs/xverse-core/node_modules/base-x": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",
@@ -16046,9 +16040,9 @@
}
},
"@secretkeylabs/xverse-core": {
"version": "5.2.0",
"resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/5.2.0/f4d46eacac2b7be0b6fb70ce5184d1c10ed7bfa6",
"integrity": "sha512-DhDrTAFYPHf22ThYn+z9DIlxXN6M7jH5JEbAi5I58xE62RsEOcpxfRHDhfNzcNAyWKJEXzChkbOp7OpFHLIF1w==",
"version": "5.3.0",
"resolved": "https://npm.pkg.github.com/download/@secretkeylabs/xverse-core/5.3.0/368b6b101c6dd5d67497dc047a6305afe3812af3",
"integrity": "sha512-cVJJmDgT6d1urtYFugfo7MAHPLmqyk8kO2s81x/KFQhgU6kqhhfu2Oeu71lAAxRc71jvzCYtxF20zj+P6bqEgw==",
"requires": {
"@bitcoinerlab/secp256k1": "^1.0.2",
"@noble/secp256k1": "^1.7.1",
@@ -16061,7 +16055,7 @@
"@stacks/transactions": "4.3.5",
"@stacks/wallet-sdk": "^5.0.2",
"@zondax/ledger-stacks": "^1.0.4",
"axios": "0.27.2",
"axios": "1.4.0",
"base64url": "^3.0.1",
"bip32": "^4.0.0",
"bip39": "3.0.3",
@@ -16184,15 +16178,6 @@
}
}
},
"axios": {
"version": "0.27.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
"requires": {
"follow-redirects": "^1.14.9",
"form-data": "^4.0.0"
}
},
"base-x": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",

View File

@@ -10,7 +10,7 @@
"@ledgerhq/hw-transport-webusb": "^6.27.13",
"@phosphor-icons/react": "^2.0.10",
"@react-spring/web": "^9.6.1",
"@secretkeylabs/xverse-core": "5.2.0",
"@secretkeylabs/xverse-core": "5.3.0",
"@stacks/connect": "^6.10.2",
"@stacks/encryption": "4.3.5",
"@stacks/stacks-blockchain-api-types": "6.1.1",

View File

@@ -1,6 +1,6 @@
import {
Bundle,
getUtxoOrdinalBundle,
getUtxoOrdinalBundleIfFound,
mapRareSatsAPIResponseToBundle,
ParsedPSBT,
} from '@secretkeylabs/xverse-core';
@@ -21,10 +21,13 @@ const useDetectOrdinalInSignPsbt = () => {
if (parsedPsbt) {
const inputsRequest = parsedPsbt.inputs.map((input) =>
getUtxoOrdinalBundle(network.type, input.txid, input.index),
getUtxoOrdinalBundleIfFound(network.type, input.txid, input.index),
);
const inputsResponse = await Promise.all(inputsRequest);
inputsResponse.forEach((inputResponse, index) => {
if (!inputResponse) {
return;
}
const bundle = mapRareSatsAPIResponseToBundle(inputResponse);
if (
bundle.inscriptions.length > 0 ||