diff --git a/package.json b/package.json index 8fa559cd5..3d7a65e96 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "workspaces": { "packages": [ "packages/*", - "packages/connect-examples/shared-constants", "packages/connect-examples/expo-example", "packages/connect-examples/electron-example", "packages/connect-examples/expo-playground" @@ -79,15 +78,16 @@ "@rollup/plugin-babel": "^5.3.1", "@rollup/plugin-commonjs": "^22.0.0", "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^16.0.3", "@rollup/plugin-typescript": "^8.3.2", "@types/bchaddrjs": "^0.4.3", "@types/jest": "^27.5.1", "@types/node": "^18.18.8", "@types/shelljs": "^0.8.11", - "electron-builder": "^24.9.1", "babel-jest": "^28.1.3", "babel-loader": "^8.2.5", "cross-env": "^7.0.3", + "electron-builder": "^24.9.1", "eslint": "^8.4.1", "eslint-config-wesbos": "3.2.3", "eslint-plugin-jest": "^26.6.0", diff --git a/packages/connect-examples/expo-example/package.json b/packages/connect-examples/expo-example/package.json index ad1534ea0..1ba9421d5 100644 --- a/packages/connect-examples/expo-example/package.json +++ b/packages/connect-examples/expo-example/package.json @@ -39,6 +39,7 @@ "@tamagui/toast": "1.90.2", "@ton/core": "^0.57.0", "asyncstorage-down": "^4.2.0", + "axios": "1.12.2", "bchaddrjs": "^0.5.2", "bitcoinjs-lib": "^6.1.5", "bn.js": "^5.2.1", @@ -75,7 +76,6 @@ "react-native-screens": "~3.29.0", "react-native-svg": "^14.1.0", "react-native-web": "~0.19.10", - "ripple-keypairs": "^1.1.4", "rlp": "^3.0.0", "stackblur-canvas": "^2.7.0", "stream-browserify": "^3.0.0", @@ -83,7 +83,7 @@ "text-encoding": "^0.7.0", "tonweb": "^0.0.66", "varint": "^6.0.0", - "xrpl": "^4.0.0" + "ripple-address-codec": "^5.0.0" }, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/packages/connect-examples/expo-example/shim-axios.js b/packages/connect-examples/expo-example/shim-axios.js new file mode 100644 index 000000000..68c31af72 --- /dev/null +++ b/packages/connect-examples/expo-example/shim-axios.js @@ -0,0 +1,33 @@ +// Axios wrapper to fix module.exports.default for rollup compatibility +// eslint-disable-next-line @typescript-eslint/no-var-requires +const axios = require('axios'); + +// Create a proper wrapper that satisfies rollup's _interopDefaultLegacy expectations +// The compiled code uses: axios__default["default"].interceptors.request.use() +// So we need to ensure that when webpack resolves this, it has the right structure + +// Ensure axios has a .default property pointing to itself +if (!axios.default) { + axios.default = axios; +} + +// Also ensure interceptors exist +if (!axios.interceptors) { + // This shouldn't happen, but just in case, create a mock + axios.interceptors = { + request: { + use: fn => { + console.warn('axios.interceptors.request.use mock called'); + return 0; + }, + }, + response: { + use: fn => { + console.warn('axios.interceptors.response.use mock called'); + return 0; + }, + }, + }; +} + +module.exports = axios; diff --git a/packages/connect-examples/expo-example/src/constants/connect.ts b/packages/connect-examples/expo-example/src/constants/connect.ts index 8d3d355d0..1c930e0ff 100644 --- a/packages/connect-examples/expo-example/src/constants/connect.ts +++ b/packages/connect-examples/expo-example/src/constants/connect.ts @@ -1,4 +1,3 @@ // eslint-disable-next-line import/no-relative-packages -import { getConnectSrc } from '@onekey-internal/shared-constants'; -export const CONNECT_SRC = getConnectSrc(); +export const CONNECT_SRC = process.env.CONNECT_SRC || `https://jssdk.onekey.so/1.1.17/`; diff --git a/packages/connect-examples/expo-example/src/utils/mockDevice/method/xrpGetAddress.ts b/packages/connect-examples/expo-example/src/utils/mockDevice/method/xrpGetAddress.ts index 1c96992ab..d4c500ffd 100644 --- a/packages/connect-examples/expo-example/src/utils/mockDevice/method/xrpGetAddress.ts +++ b/packages/connect-examples/expo-example/src/utils/mockDevice/method/xrpGetAddress.ts @@ -1,12 +1,14 @@ /* eslint-disable no-bitwise */ import type { Success, Unsuccessful } from '@onekeyfe/hd-core'; -import { bytesToHex } from '@noble/hashes/utils'; -import { deriveAddress } from 'xrpl'; +import { bytesToHex, hexToBytes } from '@noble/hashes/utils'; +import { encodeAccountID } from 'ripple-address-codec'; +import { ripemd160 } from '@noble/hashes/ripemd160'; +import { sha256 } from '@noble/hashes/sha256'; import { deriveKeyPairWithPath, mnemonicToSeed } from '../helper'; function publicKeyToAddress(publicKey: Uint8Array): string { const pub = bytesToHex(publicKey).toUpperCase(); - return deriveAddress(pub); + return encodeAccountID(ripemd160(sha256(hexToBytes(pub)))).toString(); } /** diff --git a/packages/connect-examples/expo-example/webpack.config.js b/packages/connect-examples/expo-example/webpack.config.js index 2014de19c..7fc52b6da 100644 --- a/packages/connect-examples/expo-example/webpack.config.js +++ b/packages/connect-examples/expo-example/webpack.config.js @@ -55,6 +55,13 @@ module.exports = async function (env, argv) { }); }); + // Force axios to use our wrapper which ensures .default exists + config.resolve.alias = { + ...config.resolve.alias, + // Force all axios imports to use our wrapper (no $ to match all imports including from node_modules) + axios: require.resolve('./shim-axios.js'), + }; + // 保持其他配置不变 config.resolve.fallback = { crypto: require.resolve('./shim/crypto'), diff --git a/packages/connect-examples/expo-playground/package.json b/packages/connect-examples/expo-playground/package.json index d2e937adb..ac46329ed 100644 --- a/packages/connect-examples/expo-playground/package.json +++ b/packages/connect-examples/expo-playground/package.json @@ -60,7 +60,6 @@ "react-router-dom": "^7.6.2", "reactflow": "^11.11.4", "rehype-highlight": "^7.0.2", - "ripple-keypairs": "^2.0.0", "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "string_decoder": "^1.3.0", diff --git a/packages/connect-examples/shared-constants/constants.js b/packages/connect-examples/shared-constants/constants.js deleted file mode 100644 index 90a04a325..000000000 --- a/packages/connect-examples/shared-constants/constants.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * OneKey Hardware SDK Connect Source Configuration - * - * Environment-based configuration for SDK connection source: - * - Development: Uses CONNECT_SRC environment variable (typically https://localhost:8087) - * - Production: Falls back to official CDN with current package version - * - * Usage in package.json scripts: - * - "dev": "CONNECT_SRC=https://localhost:8087 webpack serve --mode=development" - * - "start": "webpack serve --mode=development" (uses CDN) - */ -export const getConnectSrc = () => process.env.CONNECT_SRC || `https://jssdk.onekey.so/1.1.17/`; diff --git a/packages/connect-examples/shared-constants/package.json b/packages/connect-examples/shared-constants/package.json deleted file mode 100644 index 2ff8fc53d..000000000 --- a/packages/connect-examples/shared-constants/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "@onekey-internal/shared-constants", - "version": "1.1.15", - "private": true, - "author": "OneKey", - "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme", - "license": "ISC", - "type": "module", - "main": "constants.js" -} diff --git a/packages/core/package.json b/packages/core/package.json index 294728035..81e66be75 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -35,15 +35,13 @@ "semver": "^7.3.7" }, "peerDependencies": { - "@noble/hashes": "^1.1.3", - "ripple-keypairs": "^1.3.1" + "@noble/hashes": "^1.1.3" }, "devDependencies": { "@noble/hashes": "^1.1.3", "@types/parse-uri": "^1.0.0", "@types/semver": "^7.3.9", "@types/w3c-web-usb": "^1.0.10", - "@types/web-bluetooth": "^0.0.21", - "ripple-keypairs": "^1.3.1" + "@types/web-bluetooth": "^0.0.21" } } diff --git a/packages/core/src/api/xrp/XrpGetAddress.ts b/packages/core/src/api/xrp/XrpGetAddress.ts index f00bfd51c..ebd5ab3b4 100644 --- a/packages/core/src/api/xrp/XrpGetAddress.ts +++ b/packages/core/src/api/xrp/XrpGetAddress.ts @@ -1,11 +1,8 @@ -import { deriveAddress } from 'ripple-keypairs'; import { UI_REQUEST } from '../../constants/ui-request'; import { XrpAddress, XrpGetAddressParams } from '../../types/api/xrpGetAddress'; -import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils'; import { BaseMethod } from '../BaseMethod'; import { validateParams, validateResult } from '../helpers/paramsValidator'; import { serializedPath, validatePath } from '../helpers/pathUtils'; -import { batchGetPublickeys } from '../helpers/batchGetPublickeys'; export default class XrpGetAddress extends BaseMethod< { @@ -57,22 +54,6 @@ export default class XrpGetAddress extends BaseMethod< } async run() { - if (this.hasBundle && supportBatchPublicKey(this.device?.features) && !this.shouldConfirm) { - const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 144); - const result = res.public_keys.map((publicKey: string, index: number) => ({ - path: serializedPath((this.params as unknown as any[])[index].address_n), - address: deriveAddress(publicKey), - publicKey, - pub: publicKey, - })); - - validateResult(result, ['address', 'publicKey'], { - expectedLength: this.params.length, - }); - - return Promise.resolve(result); - } - const responses: XrpAddress[] = []; for (let i = 0; i < this.params.length; i++) { const param = this.params[i]; diff --git a/yarn.lock b/yarn.lock index b6a447bcd..0754ef425 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4502,7 +4502,7 @@ dependencies: eslint-scope "5.1.1" -"@noble/curves@^1.0.0", "@noble/curves@^1.3.0", "@noble/curves@~1.6.0": +"@noble/curves@^1.3.0": version "1.6.0" resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.6.0.tgz#be5296ebcd5a1730fccea4786d420f87abfeb40b" integrity sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ== @@ -4531,7 +4531,7 @@ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426" integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg== -"@noble/hashes@1.5.0", "@noble/hashes@^1.0.0", "@noble/hashes@~1.5.0": +"@noble/hashes@1.5.0", "@noble/hashes@^1.0.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.5.0.tgz#abadc5ca20332db2b1b2aa3e496e9af1213570b0" integrity sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA== @@ -6041,6 +6041,17 @@ dependencies: "@rollup/pluginutils" "^3.0.8" +"@rollup/plugin-node-resolve@^16.0.3": + version "16.0.3" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz#0988e6f2cbb13316b0f5e7213f757bc9ed44928f" + integrity sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg== + dependencies: + "@rollup/pluginutils" "^5.0.1" + "@types/resolve" "1.20.2" + deepmerge "^4.2.2" + is-module "^1.0.0" + resolve "^1.22.1" + "@rollup/plugin-typescript@^8.3.2": version "8.3.2" resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.2.tgz#e1b719e2ed3e752bbc092001656c48378f2d15f0" @@ -6058,6 +6069,15 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^5.0.1": + version "5.3.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz#57ba1b0cbda8e7a3c597a4853c807b156e21a7b4" + integrity sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q== + dependencies: + "@types/estree" "^1.0.0" + estree-walker "^2.0.2" + picomatch "^4.0.2" + "@rtsao/scc@^1.1.0": version "1.1.0" resolved "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" @@ -6068,7 +6088,7 @@ resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz#5f1b518ec5fa54437c0b7c4a821546c64fed6922" integrity sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA== -"@scure/base@^1.1.3", "@scure/base@^1.1.7", "@scure/base@~1.1.7", "@scure/base@~1.1.8": +"@scure/base@^1.1.3", "@scure/base@^1.1.7": version "1.1.9" resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.9.tgz#e5e142fbbfe251091f9c5f1dd4c834ac04c3dbd1" integrity sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg== @@ -6078,15 +6098,6 @@ resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.6.tgz#8ce5d304b436e4c84f896e0550c83e4d88cb917d" integrity sha512-ok9AWwhcgYuGG3Zfhyqg+zwl+Wn5uE+dwC0NV/2qQkx4dABbb/bx96vWu8NSj+BNjjSjno+JRYRjle1jV08k3g== -"@scure/bip32@^1.3.1": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.5.0.tgz#dd4a2e1b8a9da60e012e776d954c4186db6328e6" - integrity sha512-8EnFYkqEQdnkuGBVpCzKxyIwDCBLDVj3oiX0EKUFre/tOjL/Hqba1D6n/8RcmaQy4f95qQFrO2A8Sr6ybh4NRw== - dependencies: - "@noble/curves" "~1.6.0" - "@noble/hashes" "~1.5.0" - "@scure/base" "~1.1.7" - "@scure/bip32@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.4.0.tgz#4e1f1e196abedcef395b33b9674a042524e20d67" @@ -6096,14 +6107,6 @@ "@noble/hashes" "~1.4.0" "@scure/base" "~1.1.6" -"@scure/bip39@^1.2.1": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.4.0.tgz#664d4f851564e2e1d4bffa0339f9546ea55960a6" - integrity sha512-BEEm6p8IueV/ZTfQLp/0vhw4NPnT9oWf5+28nvmeUICjP99f4vr2d+qc7AVGDDtwRep6ifR43Yed9ERVmiITzw== - dependencies: - "@noble/hashes" "~1.5.0" - "@scure/base" "~1.1.8" - "@scure/bip39@^1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.3.0.tgz#0f258c16823ddd00739461ac31398b4e7d6a18c3" @@ -8283,6 +8286,11 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/resolve@1.20.2": + version "1.20.2" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975" + integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q== + "@types/responselike@^1.0.0": version "1.0.3" resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50" @@ -9047,7 +9055,7 @@ resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.13.tgz#ff34942667a4e19a9f4a0996a76814daac364cf3" integrity sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g== -"@xrplf/isomorphic@^1.0.0", "@xrplf/isomorphic@^1.0.1": +"@xrplf/isomorphic@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@xrplf/isomorphic/-/isomorphic-1.0.1.tgz#d7676e0ec0e55a39f37ddc1f3cc30eeab52e0739" integrity sha512-0bIpgx8PDjYdrLFeC3csF305QQ1L7sxaWnL5y71mCvhenZzJgku9QsA+9QCXBC1eNYtxWO/xR91zrXJy2T/ixg== @@ -9056,14 +9064,6 @@ eventemitter3 "5.0.1" ws "^8.13.0" -"@xrplf/secret-numbers@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@xrplf/secret-numbers/-/secret-numbers-1.0.0.tgz#cc19ff84236cc2737b38f2e42a29924f2b8ffc0e" - integrity sha512-qsCLGyqe1zaq9j7PZJopK+iGTGRbk6akkg6iZXJJgxKwck0C5x5Gnwlb1HKYGOwPKyrXWpV6a2YmcpNpUFctGg== - dependencies: - "@xrplf/isomorphic" "^1.0.0" - ripple-keypairs "^2.0.0" - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -10145,13 +10145,6 @@ base-64@^0.1.0: resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" integrity sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA== -base-x@3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.9.tgz#6349aaabb58526332de9f60995e548a53fe21320" - integrity sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ== - dependencies: - safe-buffer "^5.0.1" - base-x@4.0.0, base-x@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a" @@ -10164,13 +10157,6 @@ base-x@^3.0.2: dependencies: safe-buffer "^5.0.1" -base-x@^3.0.9: - version "3.0.11" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.11.tgz#40d80e2a1aeacba29792ccc6c5354806421287ff" - integrity sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA== - dependencies: - safe-buffer "^5.0.1" - base64-js@*, base64-js@^1.2.3, base64-js@^1.3.0, base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -10223,16 +10209,16 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== -bignumber.js@^9.0.0, bignumber.js@^9.1.1: - version "9.1.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" - integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== - bignumber.js@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673" integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw== +bignumber.js@^9.1.1: + version "9.1.2" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" + integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== + binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" @@ -10429,7 +10415,7 @@ braces@3.0.3, braces@^3.0.3, braces@~3.0.2: dependencies: fill-range "^7.1.1" -brorand@^1.0.1, brorand@^1.0.5, brorand@^1.1.0: +brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== @@ -11068,7 +11054,7 @@ ci-info@^3.7.0: cipher-base@1.0.5, cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.5" - resolved "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.5.tgz#749f80731c7821e9a5fabd51f6998b696f296686" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.5.tgz#749f80731c7821e9a5fabd51f6998b696f296686" integrity sha512-xq7ICKB4TMHUx7Tz1L9O2SGKOhYMOTR32oir45Bq28/AQTpHogKgHcoYFSdRbMtddl+ozNXfXY9jWcgYKmde0w== dependencies: inherits "^2.0.4" @@ -11758,7 +11744,7 @@ create-ecdh@^4.0.0, create-ecdh@^4.0.4: bn.js "^4.1.0" elliptic "^6.5.3" -create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: +create-hash@^1.1.0, create-hash@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== @@ -12805,7 +12791,7 @@ electron@^28.0.0: "@types/node" "^18.11.18" extract-zip "^2.0.1" -elliptic@6.5.4, elliptic@^6.5.3, elliptic@^6.5.4: +elliptic@6.5.4, elliptic@^6.5.3: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -13827,7 +13813,7 @@ estree-walker@^1.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== -estree-walker@^2.0.1: +estree-walker@^2.0.1, estree-walker@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== @@ -14138,9 +14124,9 @@ expo@^50.0.20: whatwg-url-without-unicode "8.0.0-3" exponential-backoff@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.2.tgz#a8f26adb96bf78e8cd8ad1037928d5e5c0679d91" - integrity sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.3.tgz#51cf92c1c0493c766053f9d3abee4434c244d2f6" + integrity sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA== express@^4.17.3: version "4.18.2" @@ -15742,7 +15728,7 @@ http2-wrapper@^1.0.0-beta.5.2: https-browserify@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg== https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: @@ -16047,9 +16033,9 @@ invariant@^2.2.4: loose-envify "^1.0.0" ip-address@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.0.1.tgz#a8180b783ce7788777d796286d61bce4276818ed" - integrity sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA== + version "10.1.0" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4" + integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q== ip-regex@^2.1.0: version "2.1.0" @@ -16374,6 +16360,11 @@ is-map@^2.0.3: resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== + is-nan@^1.2.1: version "1.3.2" resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" @@ -22495,6 +22486,15 @@ resolve@^1.1.7, resolve@^1.22.10, resolve@^1.22.8: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.22.1: + version "1.22.11" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262" + integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ== + dependencies: + is-core-module "^2.16.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^2.0.0-next.4, resolve@^2.0.0-next.5: version "2.0.0-next.5" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" @@ -22606,22 +22606,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1, ripemd160@^2.0.2: hash-base "^3.0.0" inherits "^2.0.1" -ripple-address-codec@^4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/ripple-address-codec/-/ripple-address-codec-4.2.4.tgz#a56c2168c8bb81269ea4d15ed96d6824c5a866f8" - integrity sha512-roAOjKz94+FboTItey1XRh5qynwt4xvfBLvbbcx+FiR94Yw2x3LrKLF2GVCMCSAh5I6PkcpADg6AbYsUbGN3nA== - dependencies: - base-x "3.0.9" - create-hash "^1.1.2" - -ripple-address-codec@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ripple-address-codec/-/ripple-address-codec-4.3.1.tgz#68fbaf646bb8567f70743af7f1ce4479f73efbf6" - integrity sha512-Qa3+9wKVvpL/xYtT6+wANsn0A1QcC5CT6IMZbRJZ/1lGt7gmwIfsrCuz1X0+LCEO7zgb+3UT1I1dc0k/5dwKQQ== - dependencies: - base-x "^3.0.9" - create-hash "^1.1.2" - ripple-address-codec@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ripple-address-codec/-/ripple-address-codec-5.0.0.tgz#97059f7bba6f9ed7a52843de8aa427723fb529f6" @@ -22630,46 +22614,6 @@ ripple-address-codec@^5.0.0: "@scure/base" "^1.1.3" "@xrplf/isomorphic" "^1.0.0" -ripple-binary-codec@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ripple-binary-codec/-/ripple-binary-codec-2.1.0.tgz#f1ef81f8d1f05a6cecc06fc6d9b13456569cafda" - integrity sha512-q0GAx+hj3UVcDbhXVjk7qeNfgUMehlElYJwiCuIBwqs/51GVTOwLr39Ht3eNsX5ow2xPRaC5mqHwcFDvLRm6cA== - dependencies: - "@xrplf/isomorphic" "^1.0.1" - bignumber.js "^9.0.0" - ripple-address-codec "^5.0.0" - -ripple-keypairs@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/ripple-keypairs/-/ripple-keypairs-1.1.4.tgz#4486fca703b8a2fc4f30cfd568478f3d12c1a911" - integrity sha512-PMMjTOxZmCSBOvHPj6bA+V/HGx7oFgDtGGI8VcZYuaFO2H87UX0X0jhfHy+LA2Xy31WYlD7GaDIDDt2QO+AMtw== - dependencies: - bn.js "^5.1.1" - brorand "^1.0.5" - elliptic "^6.5.4" - hash.js "^1.0.3" - ripple-address-codec "^4.2.4" - -ripple-keypairs@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/ripple-keypairs/-/ripple-keypairs-1.3.1.tgz#7fa531df36b138134afb53555a87d7f5eb465b2e" - integrity sha512-dmPlraWKJciFJxHcoubDahGnoIalG5e/BtV6HNDUs7wLXmtnLMHt6w4ed9R8MTL2zNrVPiIdI/HCtMMo0Tm7JQ== - dependencies: - bn.js "^5.1.1" - brorand "^1.0.5" - elliptic "^6.5.4" - hash.js "^1.0.3" - ripple-address-codec "^4.3.1" - -ripple-keypairs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ripple-keypairs/-/ripple-keypairs-2.0.0.tgz#4a1a8142e9a58c07e61b3cc6cfe7317db718d289" - integrity sha512-b5rfL2EZiffmklqZk1W+dvSy97v3V/C7936WxCCgDynaGPp7GE6R2XO7EU9O2LlM/z95rj870IylYnOQs+1Rag== - dependencies: - "@noble/curves" "^1.0.0" - "@xrplf/isomorphic" "^1.0.0" - ripple-address-codec "^5.0.0" - rlp@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/rlp/-/rlp-3.0.0.tgz#5a60725ca4314a3a165feecca1836e4f2c1e2343" @@ -23633,7 +23577,7 @@ stream-buffers@2.2.x: stream-http@^3.2.0: version "3.2.0" - resolved "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.2.0.tgz#1872dfcf24cb15752677e40e5c3f9cc1926028b5" integrity sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A== dependencies: builtin-status-codes "^3.0.0" @@ -26082,21 +26026,6 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xrpl@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xrpl/-/xrpl-4.0.0.tgz#c031b848c2a3e955b69b1dd438b1156e6826a2d6" - integrity sha512-VZm1lQWHQ6PheAAFGdH+ISXKvqB2hZDQ0w4ZcdAEtmqZQXtSIVQHOKPz95rEgGANbos7+XClxJ73++joPhA8Cw== - dependencies: - "@scure/bip32" "^1.3.1" - "@scure/bip39" "^1.2.1" - "@xrplf/isomorphic" "^1.0.1" - "@xrplf/secret-numbers" "^1.0.0" - bignumber.js "^9.0.0" - eventemitter3 "^5.0.1" - ripple-address-codec "^5.0.0" - ripple-binary-codec "^2.1.0" - ripple-keypairs "^2.0.0" - xtend@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.2.0.tgz#eef6b1f198c1c8deafad8b1765a04dad4a01c5a9"