Skip to content

Commit

Permalink
updated wallet
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlobMaster41
BlobMaster41 committed Sep 26, 2024
1 parent 3f8dc72 commit f52f576
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 66 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"lodash-es": "^4.17.21",
"loglevel": "^1.8.0",
"mini-css-extract-plugin": "^2.4.5",
"opnet": "1.0.54",
"opnet": "1.0.55",
"postcss": "^8.4.39",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-loader": "^6.2.1",
Expand Down
36 changes: 24 additions & 12 deletions src/shared/web3/Web3API.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { ABICoder, Address } from '@btc-vision/bsi-binary';
import {
AddressVerificator,
ChainId,
FetchUTXOParamsMultiAddress,
OPNetLimitedProvider,
OPNetMetadata,
OPNetNetwork,
Expand Down Expand Up @@ -197,18 +196,11 @@ class Web3API {
}

public async getUTXOs(addresses: string[], requiredAmount: bigint): Promise<UTXO[]> {
const utxoSetting: FetchUTXOParamsMultiAddress = {
addresses,
minAmount: 20_000n, // we ensure we are not using Ordinals UTXOs
requestedAmount: requiredAmount,
optimized: true
};

let utxos: UTXO[];
if (this.nextUTXOs.length > 0) {
utxos = this.nextUTXOs;
} else {
utxos = await this.limitedProvider.fetchUTXOMultiAddr(utxoSetting);
utxos = await this.getUTXOsForAddresses(addresses, requiredAmount);
}

shuffle(utxos);
Expand Down Expand Up @@ -273,13 +265,33 @@ class Web3API {
logo
};
} catch (e) {
/*const error = e as Error;
console.log(error.message);*/

return;
}
}

private async getUTXOsForAddresses(addresses: string[], _requiredAmount: bigint): Promise<UTXO[]> {
const promises = addresses.map(async (address) => {
try {
return this.provider.utxoManager.getUTXOs({
address: address,
//amount: requiredAmount,
optimize: false
});
} catch (e) {
return [];
}
});

const results = await Promise.all(promises);
const utxos: UTXO[] = [];

for (const result of results) {
utxos.push(...result);
}

return utxos;
}

private getContractLogo(address: string): string | undefined {
return ContractLogo[address] ?? 'https://raw.githubusercontent.com/Cryptofonts/cryptoicons/master/128/btc.png';
}
Expand Down
59 changes: 6 additions & 53 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1282,23 +1282,6 @@
sha.js "^2.4.11"
ts-node "^10.9.2"

"@btc-vision/bsi-bitcoin-rpc@^1.0.28":
version "1.0.28"
resolved "https://registry.yarnpkg.com/@btc-vision/bsi-bitcoin-rpc/-/bsi-bitcoin-rpc-1.0.28.tgz#44e16c6bccb9321ed926fc8c3435f3c4760a03a7"
integrity sha512-m8OR4qicT8lMqfgaGlDnmZrpuwQfAVgEHtiocN69NxDKPH/iFxTx4QYdbOuaATCoiFupJ+160DKUm7ytSLya4A==
dependencies:
"@btc-vision/bsi-common" "^1.0.22"
"@eslint/js" "^9.10.0"
gulp "^5.0.0"
gulp-cached "^1.1.1"
gulp-clean "^0.4.0"
gulp-eslint-new "^2.3.0"
gulp-logger "^0.0.2"
gulp-typescript "^6.0.0-alpha.1"
rpc-request "^7.1.11"
ts-node "^10.9.2"
undici "^6.19.2"

"@btc-vision/bsi-bitcoin-rpc@^1.0.29":
version "1.0.29"
resolved "https://registry.yarnpkg.com/@btc-vision/bsi-bitcoin-rpc/-/bsi-bitcoin-rpc-1.0.29.tgz#8e2c7bb1b464a4a14b196a32e6fdec53a98259ec"
Expand Down Expand Up @@ -1367,7 +1350,7 @@
dependencies:
"@metamask/utils" "^9.0.0"

"@btc-vision/[email protected]":
"@btc-vision/[email protected]", "@btc-vision/transaction@^1.0.106":
version "1.0.106"
resolved "https://registry.yarnpkg.com/@btc-vision/transaction/-/transaction-1.0.106.tgz#c4502d50efe53a2c9620fbda5fa0431c44a89011"
integrity sha512-cOOb0DNXwV0LJW4p0+raMMu9j0hR53xi5Jso7ursr2zTHZqcG85tTFt/ttBhSz+7mkfD5muMhA0FQP4An86fdQ==
Expand Down Expand Up @@ -1397,36 +1380,6 @@
ts-node "^10.9.2"
typescript "^5.6.2"

"@btc-vision/transaction@^1.0.105":
version "1.0.105"
resolved "https://registry.yarnpkg.com/@btc-vision/transaction/-/transaction-1.0.105.tgz#ee7ba572322831ad8ae84e5c63054169bdd73856"
integrity sha512-B+pRcay+mGza3PbuoP2RHbJccjtRyM98efDjCK+Y1yDXP21jmd2No2jsQl2PIkK9hAujW4bGYNkFea3oTYxh2A==
dependencies:
"@babel/plugin-proposal-object-rest-spread" "^7.20.7"
"@bitcoinerlab/secp256k1" "^1.1.1"
"@btc-vision/bsi-binary" "^1.0.42"
"@btc-vision/bsi-bitcoin-rpc" "^1.0.28"
"@btc-vision/logger" "^1.0.6"
"@eslint/js" "^9.10.0"
assert "^2.1.0"
babel-loader "^9.1.3"
babel-plugin-transform-import-meta "^2.2.1"
babel-preset-react "^6.24.1"
babelify "^10.0.0"
bech32 "^2.0.0"
bignumber.js "^9.1.2"
bip32 "^4.0.0"
bitcoinjs-lib "github:btc-vision/bitcoinjs-lib"
browserify-zlib "^0.2.0"
buffer "^6.0.3"
ecpair "^2.1.0"
gulp-clean "^0.4.0"
gulp-eslint-new "^2.3.0"
process "^0.11.10"
ts-loader "^9.5.1"
ts-node "^10.9.2"
typescript "^5.6.2"

"@btc-vision/[email protected]":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@btc-vision/wallet-sdk/-/wallet-sdk-1.0.0.tgz#f781246cb3a12954ff4f894a84b4cf761b869d3d"
Expand Down Expand Up @@ -11529,15 +11482,15 @@ open@^8.0.9, open@^8.4.0:
is-docker "^2.1.1"
is-wsl "^2.2.0"

[email protected].54:
version "1.0.54"
resolved "https://registry.yarnpkg.com/opnet/-/opnet-1.0.54.tgz#3948d6c1fde9cd248a3faf80e062656167238105"
integrity sha512-uIp+QRsaXyFN1Z8S7Z2Rj0zKVovLK8f+1VRNJ3NpB+JJsMwK9hua9K6xsPr5+9tF/LNv6xdIjAaO61GrrKALJg==
[email protected].55:
version "1.0.55"
resolved "https://registry.yarnpkg.com/opnet/-/opnet-1.0.55.tgz#877a21c4bf4a42da5c2aacbaa7f573c2413b622e"
integrity sha512-LW4HRMkSyEviG7xvsljcGfT7ApzmBFB1u9PaomfFkM0SpDy/qevgzVJadgpKLqgNh5oVd/IgjQUj312GNHwpaQ==
dependencies:
"@babel/plugin-proposal-object-rest-spread" "^7.20.7"
"@bitcoinerlab/secp256k1" "^1.1.1"
"@btc-vision/bsi-binary" "^1.0.42"
"@btc-vision/transaction" "^1.0.105"
"@btc-vision/transaction" "^1.0.106"
"@eslint/js" "^9.10.0"
"@noble/hashes" "^1.4.0"
babel-loader "^9.1.3"
Expand Down

0 comments on commit f52f576

Please sign in to comment.