From c0720db0853713b2c9046d566a9d9d6cf5baab8c Mon Sep 17 00:00:00 2001 From: h0ngcha0 Date: Sat, 13 Jul 2024 19:33:53 +0200 Subject: [PATCH 1/5] Display ANS NFT --- .../ui/features/accountNfts/SendNftScreen.tsx | 14 +++++++---- .../accountNfts/alephium-nft.service.ts | 16 +++++++++++++ .../ui/features/accountTokens/tokens.state.ts | 23 ++++++++++++++++--- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/packages/extension/src/ui/features/accountNfts/SendNftScreen.tsx b/packages/extension/src/ui/features/accountNfts/SendNftScreen.tsx index 7b2c697a..4dc8f319 100644 --- a/packages/extension/src/ui/features/accountNfts/SendNftScreen.tsx +++ b/packages/extension/src/ui/features/accountNfts/SendNftScreen.tsx @@ -223,11 +223,15 @@ export const SendNftScreen: FC = () => { - - - {nft.metadata.name} - - + { + nft.metadata.image ? ( + + + {nft.metadata.name} + + + ) : null + }
{addressBookRecipient && accountName ? ( nftMetadataz.findIndex((m) => m.id == id) == -1) + for (const tokenId of otherNonFungibleTokenIds) { + const nftMetadata = await nodeProvider.fetchNFTMetaData(tokenId) + const collectionId = nftMetadata.collectionId + if (parentAndTokenIds[collectionId]) { + parentAndTokenIds[collectionId].push(tokenId) + } else { + parentAndTokenIds[collectionId] = [tokenId] + } + } + } + return parentAndTokenIds } diff --git a/packages/extension/src/ui/features/accountTokens/tokens.state.ts b/packages/extension/src/ui/features/accountTokens/tokens.state.ts index 6cb9fffe..9681b10c 100644 --- a/packages/extension/src/ui/features/accountTokens/tokens.state.ts +++ b/packages/extension/src/ui/features/accountTokens/tokens.state.ts @@ -1,4 +1,4 @@ -import { ALPH_TOKEN_ID, NodeProvider } from "@alephium/web3" +import { ALPH_TOKEN_ID, HexString, NodeProvider } from "@alephium/web3" import { BigNumber } from "ethers" import { memoize } from "lodash-es" import { useEffect, useMemo, useRef } from "react" @@ -136,7 +136,7 @@ export const useNonFungibleTokensWithBalance = ( const nonFungibleTokens: BaseTokenWithBalance[] = [] for (const token of potentialNonFungibleTokens) { if (nonFungibleTokens.findIndex((t) => t.id == token.id) === -1) { - const tokenType = await fetchImmutable(`${token.id}-token-type`, () => nodeProvider.guessStdTokenType(token.id)) + const tokenType = await fetchImmutable(`${token.id}-token-type`, () => guessTokenType(nodeProvider, token.id)) if (tokenType === 'non-fungible') { nonFungibleTokens.push({ id: token.id, networkId: networkId, balance: token.balance }) } @@ -332,7 +332,7 @@ async function getBalances(nodeProvider: NodeProvider, address: string): Promise async function fetchFungibleTokenFromFullNode(network: Network, tokenId: string): Promise { const nodeProvider = new NodeProvider(network.nodeUrl) try { - const tokenType = await fetchImmutable(`${tokenId}-token-type`, () => nodeProvider.guessStdTokenType(tokenId)) + const tokenType = await fetchImmutable(`${tokenId}-token-type`, () => guessTokenType(nodeProvider, tokenId)) if (tokenType !== 'fungible') { return undefined } @@ -353,3 +353,20 @@ async function fetchFungibleTokenFromFullNode(network: Network, tokenId: string) return undefined } } + +// TODO: Add this to Web3 SDK when `000301` is standardized +async function guessTokenType( + nodeProvider: NodeProvider, + tokenId: HexString +): Promise<'fungible' | 'non-fungible' | undefined> { + const interfaceId = await nodeProvider.guessStdInterfaceId(tokenId) + switch (interfaceId) { + case '0001': + return 'fungible' + case '0003': + case '000301': + return 'non-fungible' + default: + return undefined + } +} From 7a4f332258db9fb05ed3de4319be13695405b52b Mon Sep 17 00:00:00 2001 From: h0ngcha0 Date: Sat, 13 Jul 2024 20:12:46 +0200 Subject: [PATCH 2/5] Upgrade Web3 SDK to 1.2.1 --- packages/dapp/.project.json | 17 +- packages/dapp/artifacts/Destroy.ral.json | 6 +- packages/dapp/artifacts/PresaleToken.ral.json | 85 --- packages/dapp/artifacts/ShinyToken.ral.json | 6 +- packages/dapp/artifacts/Transfer.ral.json | 6 +- packages/dapp/artifacts/ts/PresaleToken.ts | 198 ----- packages/dapp/artifacts/ts/ShinyToken.ts | 176 ++++- packages/dapp/artifacts/ts/contracts.ts | 5 +- packages/dapp/artifacts/ts/index.ts | 1 - packages/dapp/artifacts/ts/scripts.ts | 13 +- packages/dapp/contracts/destroy.ral | 4 +- packages/dapp/contracts/niux-token.ral | 26 - packages/dapp/contracts/transfer.ral | 4 +- packages/dapp/package.json | 6 +- packages/dapp/src/services/token.service.ts | 4 +- packages/extension/package.json | 10 +- yarn.lock | 709 ++++-------------- 17 files changed, 334 insertions(+), 942 deletions(-) delete mode 100644 packages/dapp/artifacts/PresaleToken.ral.json delete mode 100644 packages/dapp/artifacts/ts/PresaleToken.ts delete mode 100644 packages/dapp/contracts/niux-token.ral diff --git a/packages/dapp/.project.json b/packages/dapp/.project.json index f7ae3aec..94a06ff5 100644 --- a/packages/dapp/.project.json +++ b/packages/dapp/.project.json @@ -1,5 +1,5 @@ { - "fullNodeVersion": "v2.8.0", + "fullNodeVersion": "v3.3.0", "compilerOptionsUsed": { "ignoreUnusedConstantsWarnings": false, "ignoreUnusedVariablesWarnings": false, @@ -11,35 +11,28 @@ "infos": { "Destroy": { "sourceFile": "destroy.ral", - "sourceCodeHash": "fd2b5d64b6e4666b13aed5e1ab9b8526f2f222eb26eef69c8781d56ac4ea5340", + "sourceCodeHash": "81d9d935ecd97844aa8bb59687865673567402bdc1b9fa610ce2e435f3f4c87d", "bytecodeDebugPatch": "", "codeHashDebug": "", "warnings": [] }, "IFungibleToken": { "sourceFile": "../../../node_modules/@alephium/web3/std/fungible_token_interface.ral", - "sourceCodeHash": "6809cb06fb20fa7edf529461998beeebd12b1636d439612cca2f84214dbf4a20", + "sourceCodeHash": "62910bf11e1eeb6cb2fd468626ff606a9b06306b2b81590c3b10f6deb5966bde", "bytecodeDebugPatch": "", "codeHashDebug": "", "warnings": [] }, - "PresaleToken": { - "sourceFile": "niux-token.ral", - "sourceCodeHash": "882c5082b87fffa1aa736d5d48bd46391ee5ce4f7f583a436f0bc16275d18960", - "bytecodeDebugPatch": "", - "codeHashDebug": "68b5b8ea856a1bbaf28fb8f2495d8a2b2d13c8c0ef436eebe2880f837ba98d1b", - "warnings": [] - }, "ShinyToken": { "sourceFile": "shiny-token.ral", "sourceCodeHash": "b6fdc5d87df9a51ee1611196216db85f14ee257cf7487ad2d7676f6518336c09", "bytecodeDebugPatch": "", - "codeHashDebug": "5fa5fb7f1345ae13a578f49e9ddced90971c0ca97b6e0bf1ab17e64418d09ea5", + "codeHashDebug": "9bdc139154d4e611dd391a5b262cc081d2519b9a3ccc95df943a98a9e3c67661", "warnings": [] }, "Transfer": { "sourceFile": "transfer.ral", - "sourceCodeHash": "26eb748259ea4fd35370665079a4e953cd049c24b42f07fce73253478a949f2b", + "sourceCodeHash": "2e2589a93623a069b127fd94f27a155d1794a80d1ee5f354457f61814e15bb40", "bytecodeDebugPatch": "", "codeHashDebug": "", "warnings": [] diff --git a/packages/dapp/artifacts/Destroy.ral.json b/packages/dapp/artifacts/Destroy.ral.json index 264844a9..7573456f 100644 --- a/packages/dapp/artifacts/Destroy.ral.json +++ b/packages/dapp/artifacts/Destroy.ral.json @@ -1,14 +1,14 @@ { - "version": "v2.8.0", + "version": "v3.3.0", "name": "Destroy", "bytecodeTemplate": "01010300000005{1}0d0c{0}0105", "fieldsSig": { "names": [ - "shinyTokenId", + "shinyToken", "to" ], "types": [ - "ByteVec", + "ShinyToken", "Address" ], "isMutable": [ diff --git a/packages/dapp/artifacts/PresaleToken.ral.json b/packages/dapp/artifacts/PresaleToken.ral.json deleted file mode 100644 index 00f92227..00000000 --- a/packages/dapp/artifacts/PresaleToken.ral.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "version": "v2.8.0", - "name": "PresaleToken", - "bytecode": "030409121a4022010000000102ce0002010000000102ce01020100000001020e020100000001020e02", - "codeHash": "68b5b8ea856a1bbaf28fb8f2495d8a2b2d13c8c0ef436eebe2880f837ba98d1b", - "fieldsSig": { - "names": [ - "symbol", - "name", - "__stdInterfaceId" - ], - "types": [ - "ByteVec", - "ByteVec", - "ByteVec" - ], - "isMutable": [ - false, - false, - false - ] - }, - "eventsSig": [], - "functions": [ - { - "name": "getSymbol", - "usePreapprovedAssets": false, - "useAssetsInContract": false, - "isPublic": true, - "paramNames": [], - "paramTypes": [], - "paramIsMutable": [], - "returnTypes": [ - "ByteVec" - ] - }, - { - "name": "getName", - "usePreapprovedAssets": false, - "useAssetsInContract": false, - "isPublic": true, - "paramNames": [], - "paramTypes": [], - "paramIsMutable": [], - "returnTypes": [ - "ByteVec" - ] - }, - { - "name": "getDecimals", - "usePreapprovedAssets": false, - "useAssetsInContract": false, - "isPublic": true, - "paramNames": [], - "paramTypes": [], - "paramIsMutable": [], - "returnTypes": [ - "U256" - ] - }, - { - "name": "getTotalSupply", - "usePreapprovedAssets": false, - "useAssetsInContract": false, - "isPublic": true, - "paramNames": [], - "paramTypes": [], - "paramIsMutable": [], - "returnTypes": [ - "U256" - ] - } - ], - "constants": [ - { - "name": "Ap", - "value": { - "type": "U256", - "value": "2" - } - } - ], - "enums": [], - "stdInterfaceId": "0001" -} \ No newline at end of file diff --git a/packages/dapp/artifacts/ShinyToken.ral.json b/packages/dapp/artifacts/ShinyToken.ral.json index 32786f96..e5e59447 100644 --- a/packages/dapp/artifacts/ShinyToken.ral.json +++ b/packages/dapp/artifacts/ShinyToken.ral.json @@ -1,8 +1,8 @@ { - "version": "v2.8.0", + "version": "v3.3.0", "name": "ShinyToken", - "bytecode": "050609121b4024403c4045010000000102ce0002010000000102ce0102010000000102ce0202010000000102ce03020102020200071600b11601ab160013c3038d7ea4c68000a80102010100021600b0", - "codeHash": "5fa5fb7f1345ae13a578f49e9ddced90971c0ca97b6e0bf1ab17e64418d09ea5", + "bytecode": "050609121b40244041404f010000000102ce0002010000000102ce0102010000000102ce0202010000000102ce0302010202020008d36ee15a7b1600b11601ab160013c3038d7ea4c68000a8010201010003d320f98f621600b0", + "codeHash": "9bdc139154d4e611dd391a5b262cc081d2519b9a3ccc95df943a98a9e3c67661", "fieldsSig": { "names": [ "symbol", diff --git a/packages/dapp/artifacts/Transfer.ral.json b/packages/dapp/artifacts/Transfer.ral.json index 4c10fa54..572b452e 100644 --- a/packages/dapp/artifacts/Transfer.ral.json +++ b/packages/dapp/artifacts/Transfer.ral.json @@ -1,15 +1,15 @@ { - "version": "v2.8.0", + "version": "v3.3.0", "name": "Transfer", "bytecodeTemplate": "01010300000006{1}{2}0e0c{0}0104", "fieldsSig": { "names": [ - "shinyTokenId", + "shinyToken", "to", "amount" ], "types": [ - "ByteVec", + "ShinyToken", "Address", "U256" ], diff --git a/packages/dapp/artifacts/ts/PresaleToken.ts b/packages/dapp/artifacts/ts/PresaleToken.ts deleted file mode 100644 index db5bcd2b..00000000 --- a/packages/dapp/artifacts/ts/PresaleToken.ts +++ /dev/null @@ -1,198 +0,0 @@ -/* Autogenerated file. Do not edit manually. */ -/* tslint:disable */ -/* eslint-disable */ - -import { - Address, - CallContractParams, - CallContractResult, - Contract, - ContractEvent, - ContractFactory, - ContractInstance, - ContractState, - EventSubscribeOptions, - EventSubscription, - HexString, - TestContractParams, - TestContractResult, - callMethod, - fetchContractState, - getContractEventsCurrentCount, - multicallMethods, - subscribeContractEvent, - subscribeContractEvents, - testMethod, -} from "@alephium/web3"; - -import { default as PresaleTokenContractJson } from "../PresaleToken.ral.json"; -import { getContractByCodeHash } from "./contracts"; - -// Custom types for the contract -export namespace PresaleTokenTypes { - export type Fields = { - symbol: HexString; - name: HexString; - }; - - export type State = ContractState; - - export interface CallMethodTable { - getSymbol: { - params: Omit, "args">; - result: CallContractResult; - }; - getName: { - params: Omit, "args">; - result: CallContractResult; - }; - getDecimals: { - params: Omit, "args">; - result: CallContractResult; - }; - getTotalSupply: { - params: Omit, "args">; - result: CallContractResult; - }; - } - export type CallMethodParams = - CallMethodTable[T]["params"]; - export type CallMethodResult = - CallMethodTable[T]["result"]; - export type MultiCallParams = Partial<{ - [Name in keyof CallMethodTable]: CallMethodTable[Name]["params"]; - }>; - export type MultiCallResults = { - [MaybeName in keyof T]: MaybeName extends keyof CallMethodTable - ? CallMethodTable[MaybeName]["result"] - : undefined; - }; -} - -class Factory extends ContractFactory< - PresaleTokenInstance, - PresaleTokenTypes.Fields -> { - getInitialFieldsWithDefaultValues() { - return this.contract.getInitialFieldsWithDefaultValues() as PresaleTokenTypes.Fields; - } - - consts = { Ap: BigInt(2) }; - - at(address: string): PresaleTokenInstance { - return new PresaleTokenInstance(address); - } - - tests = { - getSymbol: async ( - params: Omit< - TestContractParams, - "testArgs" - > - ): Promise> => { - return testMethod(this, "getSymbol", params); - }, - getName: async ( - params: Omit< - TestContractParams, - "testArgs" - > - ): Promise> => { - return testMethod(this, "getName", params); - }, - getDecimals: async ( - params: Omit< - TestContractParams, - "testArgs" - > - ): Promise> => { - return testMethod(this, "getDecimals", params); - }, - getTotalSupply: async ( - params: Omit< - TestContractParams, - "testArgs" - > - ): Promise> => { - return testMethod(this, "getTotalSupply", params); - }, - }; -} - -// Use this object to test and deploy the contract -export const PresaleToken = new Factory( - Contract.fromJson( - PresaleTokenContractJson, - "", - "68b5b8ea856a1bbaf28fb8f2495d8a2b2d13c8c0ef436eebe2880f837ba98d1b" - ) -); - -// Use this class to interact with the blockchain -export class PresaleTokenInstance extends ContractInstance { - constructor(address: Address) { - super(address); - } - - async fetchState(): Promise { - return fetchContractState(PresaleToken, this); - } - - methods = { - getSymbol: async ( - params?: PresaleTokenTypes.CallMethodParams<"getSymbol"> - ): Promise> => { - return callMethod( - PresaleToken, - this, - "getSymbol", - params === undefined ? {} : params, - getContractByCodeHash - ); - }, - getName: async ( - params?: PresaleTokenTypes.CallMethodParams<"getName"> - ): Promise> => { - return callMethod( - PresaleToken, - this, - "getName", - params === undefined ? {} : params, - getContractByCodeHash - ); - }, - getDecimals: async ( - params?: PresaleTokenTypes.CallMethodParams<"getDecimals"> - ): Promise> => { - return callMethod( - PresaleToken, - this, - "getDecimals", - params === undefined ? {} : params, - getContractByCodeHash - ); - }, - getTotalSupply: async ( - params?: PresaleTokenTypes.CallMethodParams<"getTotalSupply"> - ): Promise> => { - return callMethod( - PresaleToken, - this, - "getTotalSupply", - params === undefined ? {} : params, - getContractByCodeHash - ); - }, - }; - - async multicall( - calls: Calls - ): Promise> { - return (await multicallMethods( - PresaleToken, - this, - calls, - getContractByCodeHash - )) as PresaleTokenTypes.MultiCallResults; - } -} diff --git a/packages/dapp/artifacts/ts/ShinyToken.ts b/packages/dapp/artifacts/ts/ShinyToken.ts index 249d7dc7..7f59e40a 100644 --- a/packages/dapp/artifacts/ts/ShinyToken.ts +++ b/packages/dapp/artifacts/ts/ShinyToken.ts @@ -4,27 +4,33 @@ import { Address, - CallContractParams, - CallContractResult, Contract, - ContractEvent, - ContractFactory, - ContractInstance, ContractState, + TestContractResult, + HexString, + ContractFactory, EventSubscribeOptions, EventSubscription, - HexString, + CallContractParams, + CallContractResult, TestContractParams, - TestContractResult, - callMethod, - fetchContractState, - getContractEventsCurrentCount, - multicallMethods, + ContractEvent, subscribeContractEvent, subscribeContractEvents, testMethod, + callMethod, + multicallMethods, + fetchContractState, + ContractInstance, + getContractEventsCurrentCount, + TestContractParamsWithoutMaps, + TestContractResultWithoutMaps, + SignExecuteContractMethodParams, + SignExecuteScriptTxResult, + signExecuteMethod, + addStdIdToFields, + encodeContractFields, } from "@alephium/web3"; - import { default as ShinyTokenContractJson } from "../ShinyToken.ral.json"; import { getContractByCodeHash } from "./contracts"; @@ -56,6 +62,14 @@ export namespace ShinyTokenTypes { params: Omit, "args">; result: CallContractResult; }; + transfer: { + params: CallContractParams<{ to: Address; amount: bigint }>; + result: CallContractResult; + }; + destroy: { + params: CallContractParams<{ to: Address }>; + result: CallContractResult; + }; } export type CallMethodParams = CallMethodTable[T]["params"]; @@ -69,12 +83,51 @@ export namespace ShinyTokenTypes { ? CallMethodTable[MaybeName]["result"] : undefined; }; + + export interface SignExecuteMethodTable { + getSymbol: { + params: Omit, "args">; + result: SignExecuteScriptTxResult; + }; + getName: { + params: Omit, "args">; + result: SignExecuteScriptTxResult; + }; + getDecimals: { + params: Omit, "args">; + result: SignExecuteScriptTxResult; + }; + getTotalSupply: { + params: Omit, "args">; + result: SignExecuteScriptTxResult; + }; + transfer: { + params: SignExecuteContractMethodParams<{ to: Address; amount: bigint }>; + result: SignExecuteScriptTxResult; + }; + destroy: { + params: SignExecuteContractMethodParams<{ to: Address }>; + result: SignExecuteScriptTxResult; + }; + } + export type SignExecuteMethodParams = + SignExecuteMethodTable[T]["params"]; + export type SignExecuteMethodResult = + SignExecuteMethodTable[T]["result"]; } class Factory extends ContractFactory< ShinyTokenInstance, ShinyTokenTypes.Fields > { + encodeFields(fields: ShinyTokenTypes.Fields) { + return encodeContractFields( + addStdIdToFields(this.contract, fields), + this.contract.fieldsSig, + [] + ); + } + getInitialFieldsWithDefaultValues() { return this.contract.getInitialFieldsWithDefaultValues() as ShinyTokenTypes.Fields; } @@ -86,48 +139,51 @@ class Factory extends ContractFactory< tests = { getSymbol: async ( params: Omit< - TestContractParams, + TestContractParamsWithoutMaps, "testArgs" > - ): Promise> => { - return testMethod(this, "getSymbol", params); + ): Promise> => { + return testMethod(this, "getSymbol", params, getContractByCodeHash); }, getName: async ( params: Omit< - TestContractParams, + TestContractParamsWithoutMaps, "testArgs" > - ): Promise> => { - return testMethod(this, "getName", params); + ): Promise> => { + return testMethod(this, "getName", params, getContractByCodeHash); }, getDecimals: async ( params: Omit< - TestContractParams, + TestContractParamsWithoutMaps, "testArgs" > - ): Promise> => { - return testMethod(this, "getDecimals", params); + ): Promise> => { + return testMethod(this, "getDecimals", params, getContractByCodeHash); }, getTotalSupply: async ( params: Omit< - TestContractParams, + TestContractParamsWithoutMaps, "testArgs" > - ): Promise> => { - return testMethod(this, "getTotalSupply", params); + ): Promise> => { + return testMethod(this, "getTotalSupply", params, getContractByCodeHash); }, transfer: async ( - params: TestContractParams< + params: TestContractParamsWithoutMaps< ShinyTokenTypes.Fields, { to: Address; amount: bigint } > - ): Promise> => { - return testMethod(this, "transfer", params); + ): Promise> => { + return testMethod(this, "transfer", params, getContractByCodeHash); }, destroy: async ( - params: TestContractParams - ): Promise> => { - return testMethod(this, "destroy", params); + params: TestContractParamsWithoutMaps< + ShinyTokenTypes.Fields, + { to: Address } + > + ): Promise> => { + return testMethod(this, "destroy", params, getContractByCodeHash); }, }; } @@ -137,7 +193,8 @@ export const ShinyToken = new Factory( Contract.fromJson( ShinyTokenContractJson, "", - "5fa5fb7f1345ae13a578f49e9ddced90971c0ca97b6e0bf1ab17e64418d09ea5" + "9bdc139154d4e611dd391a5b262cc081d2519b9a3ccc95df943a98a9e3c67661", + [] ) ); @@ -151,7 +208,7 @@ export class ShinyTokenInstance extends ContractInstance { return fetchContractState(ShinyToken, this); } - methods = { + view = { getSymbol: async ( params?: ShinyTokenTypes.CallMethodParams<"getSymbol"> ): Promise> => { @@ -196,6 +253,61 @@ export class ShinyTokenInstance extends ContractInstance { getContractByCodeHash ); }, + transfer: async ( + params: ShinyTokenTypes.CallMethodParams<"transfer"> + ): Promise> => { + return callMethod( + ShinyToken, + this, + "transfer", + params, + getContractByCodeHash + ); + }, + destroy: async ( + params: ShinyTokenTypes.CallMethodParams<"destroy"> + ): Promise> => { + return callMethod( + ShinyToken, + this, + "destroy", + params, + getContractByCodeHash + ); + }, + }; + + transact = { + getSymbol: async ( + params: ShinyTokenTypes.SignExecuteMethodParams<"getSymbol"> + ): Promise> => { + return signExecuteMethod(ShinyToken, this, "getSymbol", params); + }, + getName: async ( + params: ShinyTokenTypes.SignExecuteMethodParams<"getName"> + ): Promise> => { + return signExecuteMethod(ShinyToken, this, "getName", params); + }, + getDecimals: async ( + params: ShinyTokenTypes.SignExecuteMethodParams<"getDecimals"> + ): Promise> => { + return signExecuteMethod(ShinyToken, this, "getDecimals", params); + }, + getTotalSupply: async ( + params: ShinyTokenTypes.SignExecuteMethodParams<"getTotalSupply"> + ): Promise> => { + return signExecuteMethod(ShinyToken, this, "getTotalSupply", params); + }, + transfer: async ( + params: ShinyTokenTypes.SignExecuteMethodParams<"transfer"> + ): Promise> => { + return signExecuteMethod(ShinyToken, this, "transfer", params); + }, + destroy: async ( + params: ShinyTokenTypes.SignExecuteMethodParams<"destroy"> + ): Promise> => { + return signExecuteMethod(ShinyToken, this, "destroy", params); + }, }; async multicall( diff --git a/packages/dapp/artifacts/ts/contracts.ts b/packages/dapp/artifacts/ts/contracts.ts index 0581e0fe..e8873052 100644 --- a/packages/dapp/artifacts/ts/contracts.ts +++ b/packages/dapp/artifacts/ts/contracts.ts @@ -3,13 +3,12 @@ /* eslint-disable */ import { Contract, ContractFactory } from "@alephium/web3"; - -import { PresaleToken, ShinyToken } from "."; +import { ShinyToken } from "."; let contracts: ContractFactory[] | undefined = undefined; export function getContractByCodeHash(codeHash: string): Contract { if (contracts === undefined) { - contracts = [PresaleToken, ShinyToken]; + contracts = [ShinyToken]; } const c = contracts.find( (c) => diff --git a/packages/dapp/artifacts/ts/index.ts b/packages/dapp/artifacts/ts/index.ts index 77c29aae..daff57de 100644 --- a/packages/dapp/artifacts/ts/index.ts +++ b/packages/dapp/artifacts/ts/index.ts @@ -2,6 +2,5 @@ /* tslint:disable */ /* eslint-disable */ -export * from "./PresaleToken"; export * from "./ShinyToken"; export * from "./scripts"; diff --git a/packages/dapp/artifacts/ts/scripts.ts b/packages/dapp/artifacts/ts/scripts.ts index 44bab594..992e302b 100644 --- a/packages/dapp/artifacts/ts/scripts.ts +++ b/packages/dapp/artifacts/ts/scripts.ts @@ -7,20 +7,21 @@ import { ExecutableScript, ExecuteScriptParams, ExecuteScriptResult, - HexString, Script, SignerProvider, + HexString, } from "@alephium/web3"; - +import { getContractByCodeHash } from "./contracts"; import { default as DestroyScriptJson } from "../Destroy.ral.json"; import { default as TransferScriptJson } from "../Transfer.ral.json"; export const Destroy = new ExecutableScript<{ - shinyTokenId: HexString; + shinyToken: HexString; to: Address; -}>(Script.fromJson(DestroyScriptJson)); +}>(Script.fromJson(DestroyScriptJson, "", []), getContractByCodeHash); + export const Transfer = new ExecutableScript<{ - shinyTokenId: HexString; + shinyToken: HexString; to: Address; amount: bigint; -}>(Script.fromJson(TransferScriptJson)); +}>(Script.fromJson(TransferScriptJson, "", []), getContractByCodeHash); diff --git a/packages/dapp/contracts/destroy.ral b/packages/dapp/contracts/destroy.ral index 16e79fdc..8cc15a76 100644 --- a/packages/dapp/contracts/destroy.ral +++ b/packages/dapp/contracts/destroy.ral @@ -1,3 +1,3 @@ -TxScript Destroy(shinyTokenId: ByteVec, to: Address) { - ShinyToken(shinyTokenId).destroy(to) +TxScript Destroy(shinyToken: ShinyToken, to: Address) { + shinyToken.destroy(to) } \ No newline at end of file diff --git a/packages/dapp/contracts/niux-token.ral b/packages/dapp/contracts/niux-token.ral deleted file mode 100644 index f8f1831c..00000000 --- a/packages/dapp/contracts/niux-token.ral +++ /dev/null @@ -1,26 +0,0 @@ -import "std/fungible_token_interface" - -Contract PresaleToken( - symbol: ByteVec, - name: ByteVec -) implements IFungibleToken { - - const Ap = 2 - // * * * Read Functions * * * // - - pub fn getTotalSupply() -> U256 { - return Ap - } - - pub fn getSymbol() -> ByteVec { - return symbol - } - - pub fn getName() -> ByteVec { - return name - } - - pub fn getDecimals() -> U256 { - return Ap - } -} \ No newline at end of file diff --git a/packages/dapp/contracts/transfer.ral b/packages/dapp/contracts/transfer.ral index bcfe2127..0cdaa112 100644 --- a/packages/dapp/contracts/transfer.ral +++ b/packages/dapp/contracts/transfer.ral @@ -1,3 +1,3 @@ -TxScript Transfer(shinyTokenId: ByteVec, to: Address, amount: U256) { - ShinyToken(shinyTokenId).transfer(to, amount) +TxScript Transfer(shinyToken: ShinyToken, to: Address, amount: U256) { + shinyToken.transfer(to, amount) } \ No newline at end of file diff --git a/packages/dapp/package.json b/packages/dapp/package.json index 4702fc91..7b1f5ad2 100644 --- a/packages/dapp/package.json +++ b/packages/dapp/package.json @@ -10,15 +10,15 @@ "lint": "next lint" }, "dependencies": { - "@alephium/get-extension-wallet": "^0.24.0", - "@alephium/web3": "^0.24.0", + "@alephium/get-extension-wallet": "^1.2.1", + "@alephium/web3": "^1.2.1", "ethers": "^5.5.1", "next": "^13.0.0", "react": "^18.0.0", "react-dom": "^18.0.0" }, "devDependencies": { - "@alephium/cli": "^0.24.0", + "@alephium/cli": "^1.2.1", "@types/node": "18.11.18", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", diff --git a/packages/dapp/src/services/token.service.ts b/packages/dapp/src/services/token.service.ts index 89a29818..9123dcae 100644 --- a/packages/dapp/src/services/token.service.ts +++ b/packages/dapp/src/services/token.service.ts @@ -101,7 +101,7 @@ export const withdrawMintedToken = async ( alephium, { initialFields: { - shinyTokenId: binToHex(contractIdFromAddress(tokenId)), + shinyToken: binToHex(contractIdFromAddress(tokenId)), to: alephium.connectedAccount.address, amount: BigInt(amount) } @@ -145,7 +145,7 @@ export const destroyTokenContract = async ( alephium, { initialFields: { - shinyTokenId: binToHex(contractIdFromAddress(tokenId)), + shinyToken: binToHex(contractIdFromAddress(tokenId)), to: alephium.connectedAccount.address, } } diff --git a/packages/extension/package.json b/packages/extension/package.json index f688f766..069117c0 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -4,12 +4,12 @@ "main": "index.js", "license": "MIT", "devDependencies": { - "@alephium/get-extension-wallet": "^0.39.1", + "@alephium/get-extension-wallet": "^1.2.1", "@alephium/ledger-app": "^0.2.1", - "@alephium/token-list": "0.0.12", - "@alephium/web3": "^0.39.1", - "@alephium/web3-test": "^0.39.1", - "@alephium/web3-wallet": "^0.39.1", + "@alephium/token-list": "0.0.19", + "@alephium/web3": "^1.2.1", + "@alephium/web3-test": "^1.2.1", + "@alephium/web3-wallet": "^1.2.1", "@ledgerhq/hw-transport-webusb": "6.27.17", "@ledgerhq/hw-transport-webhid": "6.27.17", "@playwright/test": "^1.23.0", diff --git a/yarn.lock b/yarn.lock index 3e045e40..084d115d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,38 +16,28 @@ jest "^28.1.3" prettier "^2.8.7" -"@alephium/cli@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@alephium/cli/-/cli-0.24.0.tgz#2bab66f3604016839fc193b00168eaff6df45c83" - integrity sha512-oCbrXy89cbLIJOGx4zXvNY9FTozPeRnzJaSHmBjKZvI17FprMfHbOQgVNDXpcEr8nBqL2Ouez71jQlRPUYTk3Q== +"@alephium/cli@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@alephium/cli/-/cli-1.2.1.tgz#df7f94dd7a0db2582915391f66d6804c47afd544" + integrity sha512-0mQ1SZ3xBUQbMA3wZq6IX7TqdiZFMqqzmLVp+dhgzqqr6de3dHlCRZZHUohhleIkbLPvvQ0IKWlcStGYjP69wA== dependencies: - "@alephium/web3" "^0.24.0" - "@alephium/web3-wallet" "^0.24.0" + "@alephium/web3" "^1.2.1" + "@alephium/web3-wallet" "^1.2.1" + "@swc/core" "^1.4.1" commander "^9.5.0" cross-fetch "^3.1.5" - crypto-js "^4.1.1" + crypto-js "^4.2.0" fetch-retry "^5.0.6" fs-extra "^10.1.0" - ipfs-http-client "^56.0.0" jest "^28.1.3" - openai "^3.3.0" prettier "^2.8.7" - yaml "^2.3.1" - -"@alephium/get-extension-wallet@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@alephium/get-extension-wallet/-/get-extension-wallet-0.24.0.tgz#bcd7e8796bc8900ce0d374023aadd4c953d2b308" - integrity sha512-jo7U70/a8mFsmncZSFqVpQy3CSKeGYXwlLAKZ1zj66WfnWR3iNCU3SjbhoBxaYJr6Wu1gGmP6FwoLe4408GeAQ== - dependencies: - "@alephium/web3" "^0.24.0" - bowser "^2.11.0" -"@alephium/get-extension-wallet@^0.39.1": - version "0.39.1" - resolved "https://registry.yarnpkg.com/@alephium/get-extension-wallet/-/get-extension-wallet-0.39.1.tgz#41a836e3abc1f3e51e09ac068ed81b299b58758d" - integrity sha512-p11TdPzbdozSH7Xk9nV3Z6TSTNesSAmEKrJTH6qEXGRTfmdoX3IrrK6urMBQ89cFt2BacJTw/QuKjwO15ZeadQ== +"@alephium/get-extension-wallet@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@alephium/get-extension-wallet/-/get-extension-wallet-1.2.1.tgz#6208177f05600fd8a3eb12d93335c62024d075a9" + integrity sha512-UkHb8euh+CF218VDUM7O0jAfLZQdqC8WISN6YzXs4/OkojRF+4QkfOdUPmHqrv+K5Dw8mv0opz9VK5fwDKPWWw== dependencies: - "@alephium/web3" "^0.39.1" + "@alephium/web3" "^1.2.1" bowser "^2.11.0" "@alephium/ledger-app@^0.2.1": @@ -61,10 +51,10 @@ "@alephium/web3-wallet" "^0.14.0" "@ledgerhq/hw-transport" "6.27.10" -"@alephium/token-list@0.0.12": - version "0.0.12" - resolved "https://registry.yarnpkg.com/@alephium/token-list/-/token-list-0.0.12.tgz#b3148d1985b945068b090d946356c2c9fafb3649" - integrity sha512-4/hEmkHpnvl3ttkc8Z5sW97uf4Y/5MLqDFeUKSoB3EDdCmHb6Soa3tc1XkS0rexT92aYf0Bvrwh70V1uia9scw== +"@alephium/token-list@0.0.19": + version "0.0.19" + resolved "https://registry.yarnpkg.com/@alephium/token-list/-/token-list-0.0.19.tgz#caf6b3c5fcf69495373b9d6ed9e0850f779f52f9" + integrity sha512-5DJjIue90c1zEXdqSICBbzi4nCQEx/VX85Elcbi3wP2UIBwaR9TH7gQDqPR1/OABXYgh+hMhnke6K/Yk0QVUgQ== dependencies: cross-fetch "^3.1.8" @@ -76,13 +66,13 @@ "@alephium/web3" "^0.14.0" "@alephium/web3-wallet" "^0.14.0" -"@alephium/web3-test@^0.39.1": - version "0.39.1" - resolved "https://registry.yarnpkg.com/@alephium/web3-test/-/web3-test-0.39.1.tgz#6bd8a6b57abfc56a897d7d83dc570fcc143ba82c" - integrity sha512-Cc8Kuer9rT7LMZDBk3Fx0O+5tnS8SNLP3DOY+aLR4GX3Ou1Zqislgbxz8bNclhZDguP7qfDRn7J3ndQYSSuc5Q== +"@alephium/web3-test@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@alephium/web3-test/-/web3-test-1.2.1.tgz#722f8ae853c19929e403ea9e021743e7441fc770" + integrity sha512-ihwRaiZlkKpnc5KhYXtmWUtVv62CRFjEfNEGAq02kDo2gt1aW585LrQkahc0LGnO2C/k67dmBH/3vO33RGskng== dependencies: - "@alephium/web3" "^0.39.1" - "@alephium/web3-wallet" "^0.39.1" + "@alephium/web3" "^1.2.1" + "@alephium/web3-wallet" "^1.2.1" "@alephium/web3-wallet@^0.14.0": version "0.14.0" @@ -98,31 +88,16 @@ elliptic "6.5.4" fs-extra "10.0.1" -"@alephium/web3-wallet@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@alephium/web3-wallet/-/web3-wallet-0.24.0.tgz#90e589602da854ccbef5af09839fb7a39fd11283" - integrity sha512-4s3Q5C9WtvFamgyjeJqrwlNDfxrMxMnrxWHI6NjD0CpOSq5EhUNGraOqtvOzFgfQQGMe04dZ6ZWl4MCn8kmPCA== - dependencies: - "@alephium/web3" "^0.24.0" - "@noble/secp256k1" "1.7.1" - "@types/node" "^16.18.23" - bip32 "3.1.0" - bip39 "3.0.4" - buffer "^6.0.3" - elliptic "6.5.4" - fs-extra "10.0.1" - -"@alephium/web3-wallet@^0.39.1": - version "0.39.1" - resolved "https://registry.yarnpkg.com/@alephium/web3-wallet/-/web3-wallet-0.39.1.tgz#4cbb029a21cc050069ae2f99a568faafe5ee2f8d" - integrity sha512-sZAF45GuYc/G2L9I+tg76m9rORD0aS2LpUZZ/jwKLz8MecFAGEprvzxdJTXBiGc+n4TzR3C07+DcEYCq4TiqJw== +"@alephium/web3-wallet@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@alephium/web3-wallet/-/web3-wallet-1.2.1.tgz#0562ac58434fbd9db9484be4043cae9aae419ed4" + integrity sha512-U2BKdHZNJXuytCBcfSslLkjei69HbUKf8TsouIqp9tdriHJyDD6qTimxrczrkpy5kDvNgiA4dfh3bFtA1KHAnA== dependencies: - "@alephium/web3" "^0.39.1" + "@alephium/web3" "^1.2.1" "@noble/secp256k1" "1.7.1" "@types/node" "^16.18.23" bip32 "3.1.0" bip39 "3.0.4" - buffer "^6.0.3" elliptic "6.5.4" fs-extra "10.0.1" @@ -144,28 +119,10 @@ eventemitter3 "^4.0.7" path-browserify "^1.0.1" -"@alephium/web3@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@alephium/web3/-/web3-0.24.0.tgz#8146e2f9acc1f6723086d038926dd9e1f7476511" - integrity sha512-aCBIpcpXiYQoL3c9wRLD1yAQO6LetqTHyEdUoxI2HdGlht2LFQJfyZkdZlEfdOK0NvBmZgp+zJLDD6J0ONAfZg== - dependencies: - "@noble/secp256k1" "1.7.1" - base-x "4.0.0" - bignumber.js "^9.1.1" - blakejs "1.2.1" - bn.js "5.2.1" - buffer "^6.0.3" - cross-fetch "^3.1.5" - crypto-browserify "^3.12.0" - elliptic "6.5.4" - eventemitter3 "^4.0.7" - path-browserify "^1.0.1" - stream-browserify "^3.0.0" - -"@alephium/web3@^0.39.1": - version "0.39.1" - resolved "https://registry.yarnpkg.com/@alephium/web3/-/web3-0.39.1.tgz#d26e3f418e61bea631b8f93b9b1d825925dbad5c" - integrity sha512-45F4yrFOkEsOjpDpQY/eg3uhi5kE2yU63CkMiMc6L9cChyn7VaaD6bsugrFTUa2gieXgkAqy4v7y5qhkQOuXHA== +"@alephium/web3@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@alephium/web3/-/web3-1.2.1.tgz#1a7155efb1ca5900baecb159294381c9e5fc35db" + integrity sha512-YrlSqMIwd9zh1L/4oTGxONMJXijzb+JX6ZFtSPite9FM1I9Zdle9Fc4BFRHRpAujpIyH9ECcfuGvzMCYaHLxGw== dependencies: "@noble/secp256k1" "1.7.1" base-x "4.0.0" @@ -173,7 +130,6 @@ binary-parser "2.2.1" blakejs "1.2.1" bn.js "5.2.1" - buffer "^6.0.3" cross-fetch "^3.1.5" crypto-browserify "^3.12.0" elliptic "6.5.4" @@ -3199,37 +3155,6 @@ resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q== -"@ipld/dag-cbor@^6.0.3": - version "6.0.15" - resolved "https://registry.yarnpkg.com/@ipld/dag-cbor/-/dag-cbor-6.0.15.tgz#aebe7a26c391cae98c32faedb681b1519e3d2372" - integrity sha512-Vm3VTSTwlmGV92a3C5aeY+r2A18zbH2amehNhsX8PBa3muXICaWrN8Uri85A5hLH7D7ElhE8PdjxD6kNqUmTZA== - dependencies: - cborg "^1.5.4" - multiformats "^9.5.4" - -"@ipld/dag-cbor@^7.0.0": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@ipld/dag-cbor/-/dag-cbor-7.0.3.tgz#aa31b28afb11a807c3d627828a344e5521ac4a1e" - integrity sha512-1VVh2huHsuohdXC1bGJNE8WR72slZ9XE2T3wbBBq31dm7ZBatmKLLxrB+XAqafxfRFjv08RZmj/W/ZqaM13AuA== - dependencies: - cborg "^1.6.0" - multiformats "^9.5.4" - -"@ipld/dag-json@^8.0.1": - version "8.0.11" - resolved "https://registry.yarnpkg.com/@ipld/dag-json/-/dag-json-8.0.11.tgz#8d30cc2dfacb0aef04d327465d3df91e79e8b6ce" - integrity sha512-Pea7JXeYHTWXRTIhBqBlhw7G53PJ7yta3G/sizGEZyzdeEwhZRr0od5IQ0r2ZxOt1Do+2czddjeEPp+YTxDwCA== - dependencies: - cborg "^1.5.4" - multiformats "^9.5.4" - -"@ipld/dag-pb@^2.1.3": - version "2.1.18" - resolved "https://registry.yarnpkg.com/@ipld/dag-pb/-/dag-pb-2.1.18.tgz#12d63e21580e87c75fd1a2c62e375a78e355c16f" - integrity sha512-ZBnf2fuX9y3KccADURG5vb9FaOeMjFkCrNysB0PtftME/4iCTjxfaLoNq/IAh5fTqUOMXvryN6Jyka4ZGuMLIg== - dependencies: - multiformats "^9.5.4" - "@isaacs/cliui@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" @@ -4712,59 +4637,6 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.7.tgz#ccab5c8f7dc557a52ca3288c10075c9ccd37fff7" integrity sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw== -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" - integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== - -"@protobufjs/base64@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" - integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== - -"@protobufjs/codegen@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" - integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== - -"@protobufjs/eventemitter@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" - integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== - -"@protobufjs/fetch@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" - integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== - dependencies: - "@protobufjs/aspromise" "^1.1.1" - "@protobufjs/inquire" "^1.1.0" - -"@protobufjs/float@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" - integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== - -"@protobufjs/inquire@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" - integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== - -"@protobufjs/path@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== - -"@protobufjs/pool@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" - integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== - -"@protobufjs/utf8@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" - integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== - "@remix-run/router@1.6.2": version "1.6.2" resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.6.2.tgz#bbe75f8c59e0b7077584920ce2cc76f8f354934d" @@ -6251,51 +6123,101 @@ resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.60.tgz#5ff6442e32d8c285d728b34a56af226af552cdfa" integrity sha512-oCDKWGdSO1WyErduGfiITRDoq7ZBt9PXETlhi8BGKH/wCc/3mfSNI9wXAg3Stn8mrT0lUJtdsnwMI/eZp6dK+A== +"@swc/core-darwin-arm64@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.6.13.tgz#dba8f8f747ad32fdb58d5b3aec4f740354d32d1b" + integrity sha512-SOF4buAis72K22BGJ3N8y88mLNfxLNprTuJUpzikyMGrvkuBFNcxYtMhmomO0XHsgLDzOJ+hWzcgjRNzjMsUcQ== + "@swc/core-darwin-x64@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.60.tgz#99a78e92c7f18d46e3bc48b589c62e55c5d98ce2" integrity sha512-pcE/1oUlmN/BkKndOPtViqTkaM5pomagXATo+Muqn4QNMnkSOEVcmF9T3Lr3nB1A7O/fwCew3/aHwZ5B2TZ1tA== +"@swc/core-darwin-x64@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.6.13.tgz#c120207a9ced298f7382ff711bac10f6541c1c82" + integrity sha512-AW8akFSC+tmPE6YQQvK9S2A1B8pjnXEINg+gGgw0KRUUXunvu1/OEOeC5L2Co1wAwhD7bhnaefi06Qi9AiwOag== + "@swc/core-linux-arm-gnueabihf@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.60.tgz#53a4e44fd7a81cd6887cb04abb282612986734a8" integrity sha512-Moc+86SWcbPr06PaQYUb0Iwli425F7QgjwTCNEPYA6OYUsjaJhXMaHViW2WdGIXue2+eaQbg31BHQd14jXcoBg== +"@swc/core-linux-arm-gnueabihf@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.6.13.tgz#7b15a1fd32c18dfaf76706632cf8d19146df0d5f" + integrity sha512-f4gxxvDXVUm2HLYXRd311mSrmbpQF2MZ4Ja6XCQz1hWAxXdhRl1gpnZ+LH/xIfGSwQChrtLLVrkxdYUCVuIjFg== + "@swc/core-linux-arm64-gnu@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.60.tgz#ee80faccb9bb3f19372d8b4d862ec7789fa30501" integrity sha512-pPGZrTgSXBvp6IrXPXz8UJr82AElf8hMuK4rNHmLGDCqrWnRIFLUpiAsc2WCFIgdwqitZNQoM+F2vbceA/bkKg== +"@swc/core-linux-arm64-gnu@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.6.13.tgz#066b6e3c805110edb98e5125a222e3d866bf8f68" + integrity sha512-Nf/eoW2CbG8s+9JoLtjl9FByBXyQ5cjdBsA4efO7Zw4p+YSuXDgc8HRPC+E2+ns0praDpKNZtLvDtmF2lL+2Gg== + "@swc/core-linux-arm64-musl@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.60.tgz#4db4bbb1c32a00adfd79ba787bc5217d23dd1e4f" integrity sha512-HSFQaVUkjWYNsQeymAQ3IPX3csRQvHe6MFyqPfvCCQ4dFlxPvlS7VvNaLnGG+ZW1ek7Lc+hEX+4NGzZKsxDIHA== +"@swc/core-linux-arm64-musl@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.6.13.tgz#43a08bc118f117e485e8a9a23d3cb51fe8b4e301" + integrity sha512-2OysYSYtdw79prJYuKIiux/Gj0iaGEbpS2QZWCIY4X9sGoETJ5iMg+lY+YCrIxdkkNYd7OhIbXdYFyGs/w5LDg== + "@swc/core-linux-x64-gnu@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.60.tgz#998850b1ad8c5eb137a3c914ce9e62e4ac006dbb" integrity sha512-WJt/X6HHM3/TszckRA7UKMXec3FHYsB9xswQbIYxN4bfTQodu3Rc8bmpHYtFO7ScMLrhY+RljHLK6wclPvaEXw== +"@swc/core-linux-x64-gnu@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.6.13.tgz#0f7358c95f566db6ed8a4249a190043497f41323" + integrity sha512-PkR4CZYJNk5hcd2+tMWBpnisnmYsUzazI1O5X7VkIGFcGePTqJ/bWlfUIVVExWxvAI33PQFzLbzmN5scyIUyGQ== + "@swc/core-linux-x64-musl@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.60.tgz#7aff3519397f42b5255718bc5000970bb3a28be4" integrity sha512-DGGBqAPUXy/aPMBKokL3osZC9kM97HchiDPuprzwgTMP40YQ3hGCzNJ5jK7sOk9Tc4PEdZ2Igfr9sBHmCrxxQw== +"@swc/core-linux-x64-musl@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.6.13.tgz#6e11994ccf858edb3e70d2e8d700a5b1907a68fb" + integrity sha512-OdsY7wryTxCKwGQcwW9jwWg3cxaHBkTTHi91+5nm7hFPpmZMz1HivJrWAMwVE7iXFw+M4l6ugB/wCvpYrUAAjA== + "@swc/core-win32-arm64-msvc@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.60.tgz#f6fc2ad36eaf4e1a0d7783f1095b28092e9c5a7a" integrity sha512-wQg/BZPJvp5WpUbsBp7VHjhUh0DfYOPhP6dH67WO9QQ07+DvOk2DR2Bfh0z0ts1k7H/FsAqExWtTDCWMCRJiRQ== +"@swc/core-win32-arm64-msvc@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.6.13.tgz#b9744644f02eb6519b0fe09031080cbf32174fb1" + integrity sha512-ap6uNmYjwk9M/+bFEuWRNl3hq4VqgQ/Lk+ID/F5WGqczNr0L7vEf+pOsRAn0F6EV+o/nyb3ePt8rLhE/wjHpPg== + "@swc/core-win32-ia32-msvc@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.60.tgz#8ab8e2c5520d6a9d5d043c25c6cafb156c5c419a" integrity sha512-nqkd0XIVyGbnBwAxP4GIfx6n45/hAPETpmQYpDSGnucOKFJfvGdFGL81GDG1acPCq/oFtR3tIyTbPpKmJ0N6xQ== +"@swc/core-win32-ia32-msvc@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.6.13.tgz#047302065096883f52b90052d93f9c7e63cdc67b" + integrity sha512-IJ8KH4yIUHTnS/U1jwQmtbfQals7zWPG0a9hbEfIr4zI0yKzjd83lmtS09lm2Q24QBWOCFGEEbuZxR4tIlvfzA== + "@swc/core-win32-x64-msvc@1.3.60": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.60.tgz#5b53fd84ab74bfcfc6e691f9ac07f4373e37ca14" integrity sha512-ouw+s22i9PYQpSE7Xc+ZittEyA87jElXABesviSpP+jgHt10sM5KFUpVAeV8DRlxJCXMJJ5AhOdCf4TAtFr+6A== +"@swc/core-win32-x64-msvc@1.6.13": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.6.13.tgz#efd9706c38aa7dc3515acfa823b8ffa9f4a3c1a6" + integrity sha512-f6/sx6LMuEnbuxtiSL/EkR0Y6qUHFw1XVrh6rwzKXptTipUdOY+nXpKoh+1UsBm/r7H0/5DtOdrn3q5ZHbFZjQ== + "@swc/core@^1.2.177": version "1.3.60" resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.60.tgz#57f75930d3deafac3215e8cdda44ce11895d0894" @@ -6312,6 +6234,30 @@ "@swc/core-win32-ia32-msvc" "1.3.60" "@swc/core-win32-x64-msvc" "1.3.60" +"@swc/core@^1.4.1": + version "1.6.13" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.6.13.tgz#a583f614203d2350e6bb7f7c3c9c36c0e6f2a1da" + integrity sha512-eailUYex6fkfaQTev4Oa3mwn0/e3mQU4H8y1WPuImYQESOQDtVrowwUGDSc19evpBbHpKtwM+hw8nLlhIsF+Tw== + dependencies: + "@swc/counter" "^0.1.3" + "@swc/types" "^0.1.9" + optionalDependencies: + "@swc/core-darwin-arm64" "1.6.13" + "@swc/core-darwin-x64" "1.6.13" + "@swc/core-linux-arm-gnueabihf" "1.6.13" + "@swc/core-linux-arm64-gnu" "1.6.13" + "@swc/core-linux-arm64-musl" "1.6.13" + "@swc/core-linux-x64-gnu" "1.6.13" + "@swc/core-linux-x64-musl" "1.6.13" + "@swc/core-win32-arm64-msvc" "1.6.13" + "@swc/core-win32-ia32-msvc" "1.6.13" + "@swc/core-win32-x64-msvc" "1.6.13" + +"@swc/counter@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9" + integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ== + "@swc/helpers@0.5.1": version "0.5.1" resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.1.tgz#e9031491aa3f26bfcc974a67f48bd456c8a5357a" @@ -6319,6 +6265,13 @@ dependencies: tslib "^2.4.0" +"@swc/types@^0.1.9": + version "0.1.9" + resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.9.tgz#e67cdcc2e4dd74a3cef4474b465eb398e7ae83e2" + integrity sha512-qKnCno++jzcJ4lM4NTfYifm1EFSCeIfKiAHAfkENZAV5Kl9PjJIyd2yeeVv6c/2CckuLyv2NmRC5pv6pm2WQBg== + dependencies: + "@swc/counter" "^0.1.3" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -6731,11 +6684,6 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.195.tgz#bafc975b252eb6cea78882ce8a7b6bf22a6de632" integrity sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg== -"@types/long@^4.0.1": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" - integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== - "@types/mdast@^3.0.0": version "3.0.11" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.11.tgz#dc130f7e7d9306124286f6d6cee40cf4d14a3dc0" @@ -6758,7 +6706,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== -"@types/minimatch@^3.0.3", "@types/minimatch@^3.0.4": +"@types/minimatch@^3.0.3": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== @@ -6791,11 +6739,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== -"@types/node@>=13.7.0": - version "20.4.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.5.tgz#9dc0a5cb1ccce4f7a731660935ab70b9c00a5d69" - integrity sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg== - "@types/node@^13.7.0", "@types/node@^13.9.0": version "13.13.52" resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.52.tgz#03c13be70b9031baaed79481c0c0cfb0045e53f7" @@ -7872,11 +7815,6 @@ any-promise@^1.0.0, any-promise@^1.1.0, any-promise@~1.3.0: resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== -any-signal@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/any-signal/-/any-signal-3.0.1.tgz#49cae34368187a3472e31de28fb5cb1430caa9a6" - integrity sha512-xgZgJtKEa9YmDqXodIgl7Fl1C8yNXr8w6gXjqK3LW4GcEiYT+6AQfJSE/8SPsEpLLmcvbv8YU+qet94UewHxqg== - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -8239,13 +8177,6 @@ axios@^0.24.0: dependencies: follow-redirects "^1.14.4" -axios@^0.26.0: - version "0.26.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" - integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== - dependencies: - follow-redirects "^1.14.8" - axios@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" @@ -8647,13 +8578,6 @@ blakejs@1.2.1: resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814" integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ== -blob-to-it@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/blob-to-it/-/blob-to-it-1.0.4.tgz#f6caf7a4e90b7bb9215fa6a318ed6bd8ad9898cb" - integrity sha512-iCmk0W4NdbrWgRRuxOriU8aM5ijeVLI61Zulsmg/lUHNr7pYjoj+U77opLefNagevtrrbMt3JQ5Qip7ar178kA== - dependencies: - browser-readablestream-to-it "^1.0.3" - bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" @@ -8788,11 +8712,6 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browser-readablestream-to-it@^1.0.0, browser-readablestream-to-it@^1.0.1, browser-readablestream-to-it@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz#ac3e406c7ee6cdf0a502dd55db33bab97f7fba76" - integrity sha512-+12sHB+Br8HIh6VAMVEG5r3UXCyESIgDW7kzk3BjIXa43DVqVwL7GC5TW3jeh+72dtcH99pPVpw0X8i0jt+/kw== - browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -8914,7 +8833,7 @@ buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -buffer@^6.0.1, buffer@^6.0.3: +buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== @@ -9259,11 +9178,6 @@ case-sensitive-paths-webpack-plugin@^2.3.0, case-sensitive-paths-webpack-plugin@ resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== -cborg@^1.5.4, cborg@^1.6.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/cborg/-/cborg-1.10.2.tgz#83cd581b55b3574c816f82696307c7512db759a1" - integrity sha512-b3tFPA9pUr2zCUiCfRd2+wok2/LBSNUMKOuRRok+WlvvAgEt/PlbgPTsZUcwCOs53IJvLgTp0eotwtosE6njug== - ccount@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" @@ -10268,6 +10182,11 @@ crypto-js@^4.1.1: resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== +crypto-js@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" + integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== + crypto-random-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" @@ -10538,14 +10457,6 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A== -dag-jose@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dag-jose/-/dag-jose-1.0.0.tgz#52e42d70cb5bee31ae4e8e3ab860615568d7ad73" - integrity sha512-U0b/YsIPBp6YZNTFrVjwLZAlY3qGRxZTIEcM/CcQmrVrCWq9MWQq9pheXVSPLIhF4SNwzp2SikPva4/BIrJY+g== - dependencies: - "@ipld/dag-cbor" "^6.0.3" - multiformats "^9.0.2" - damerau-levenshtein@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" @@ -10593,7 +10504,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -10946,15 +10857,6 @@ dns-equal@^1.0.0: resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== -dns-over-http-resolver@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/dns-over-http-resolver/-/dns-over-http-resolver-1.2.3.tgz#194d5e140a42153f55bb79ac5a64dd2768c36af9" - integrity sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA== - dependencies: - debug "^4.3.1" - native-fetch "^3.0.0" - receptacle "^1.3.2" - dns-packet@^5.2.2: version "5.6.0" resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" @@ -11159,13 +11061,6 @@ ejs@^3.1.6, ejs@^3.1.7: dependencies: jake "^10.8.5" -electron-fetch@^1.7.2: - version "1.9.1" - resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.9.1.tgz#e28bfe78d467de3f2dec884b1d72b8b05322f30f" - integrity sha512-M9qw6oUILGVrcENMSRRefE1MbHPIz0h79EKIeJWK9v563aT9Qkh8aEHPO1H5vi970wPirNY+jO9OpFoLiMsMGA== - dependencies: - encoding "^0.1.13" - electron-to-chromium@^1.4.284: version "1.4.408" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.408.tgz#73e657a24bd0b7481d68c943dded0d097b0d0a52" @@ -11301,11 +11196,6 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -err-code@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" - integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA== - errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -12123,11 +12013,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-fifo@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.0.tgz#03e381bcbfb29932d7c3afde6e15e83e05ab4d8b" - integrity sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw== - fast-glob@3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" @@ -12425,7 +12310,7 @@ focus-lock@^0.8.0: dependencies: tslib "^1.9.3" -follow-redirects@^1.0.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8, follow-redirects@^1.15.0: +follow-redirects@^1.0.0, follow-redirects@^1.14.4, follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -12765,11 +12650,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@ has-proto "^1.0.1" has-symbols "^1.0.3" -get-iterator@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-iterator/-/get-iterator-1.0.2.tgz#cd747c02b4c084461fac14f48f6b45a80ed25c82" - integrity sha512-v+dm9bNVfOYsY1OrhaCrmyOcYoSeVvbt+hHZ0Au+T+p1y+0Uyj9aMaGIeUTT6xdpRbWzDeYKvfOslPhggQMcsg== - get-node-dimensions@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/get-node-dimensions/-/get-node-dimensions-1.2.1.tgz#fb7b4bb57060fb4247dd51c9d690dfbec56b0823" @@ -13981,20 +13861,6 @@ inquirer@^8.2.4: through "^2.3.6" wrap-ansi "^7.0.0" -interface-datastore@^6.0.2: - version "6.1.1" - resolved "https://registry.yarnpkg.com/interface-datastore/-/interface-datastore-6.1.1.tgz#5150a00de2e7513eaadba58bcafd059cb50004c1" - integrity sha512-AmCS+9CT34pp2u0QQVXjKztkuq3y5T+BIciuiHDDtDZucZD8VudosnSdUyXJV6IsRkN5jc4RFDhCk1O6Q3Gxjg== - dependencies: - interface-store "^2.0.2" - nanoid "^3.0.2" - uint8arrays "^3.0.0" - -interface-store@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/interface-store/-/interface-store-2.0.2.tgz#83175fd2b0c501585ed96db54bb8ba9d55fce34c" - integrity sha512-rScRlhDcz6k199EkHqT8NpM87ebN89ICOzILoBHgaG36/WX50N32BnU/kpZgCGPLhARRAWUUX5/cyaIjt7Kipg== - internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" @@ -14021,11 +13887,6 @@ invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip-regex@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" - integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== - ip@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" @@ -14041,97 +13902,6 @@ ipaddr.js@^2.0.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== -ipfs-core-types@^0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.10.3.tgz#89ebe98199d4d829f2b20104bfa3299f808c80fe" - integrity sha512-GNid2lRBjR5qgScCglgk7w9Hk3TZAwPHQXxOLQx72wgyc0jF2U5NXRoKW0GRvX8NPbHmsrFszForIqxd23I1Gw== - dependencies: - "@ipld/dag-pb" "^2.1.3" - interface-datastore "^6.0.2" - ipfs-unixfs "^6.0.3" - multiaddr "^10.0.0" - multiformats "^9.5.1" - -ipfs-core-utils@^0.14.3: - version "0.14.3" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.14.3.tgz#d04c631c472507bdefc58d4e8d1d9109efbb411c" - integrity sha512-aBkewVhgAj3NWXPwu6imj0wADGiGVZmJzqKzODOJsibDjkx6FGdMv8kvvqtLnK8LS/dvSk9yk32IDtuDyYoV7Q== - dependencies: - any-signal "^3.0.0" - blob-to-it "^1.0.1" - browser-readablestream-to-it "^1.0.1" - debug "^4.1.1" - err-code "^3.0.1" - ipfs-core-types "^0.10.3" - ipfs-unixfs "^6.0.3" - ipfs-utils "^9.0.6" - it-all "^1.0.4" - it-map "^1.0.4" - it-peekable "^1.0.2" - it-to-stream "^1.0.0" - merge-options "^3.0.4" - multiaddr "^10.0.0" - multiaddr-to-uri "^8.0.0" - multiformats "^9.5.1" - nanoid "^3.1.23" - parse-duration "^1.0.0" - timeout-abort-controller "^3.0.0" - uint8arrays "^3.0.0" - -ipfs-http-client@^56.0.0: - version "56.0.3" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-56.0.3.tgz#45bbea55347ef13524769d5919cbed84d9d022d6" - integrity sha512-E3L5ylVl6BjyRUsNehvfuRBYp1hj8vQ8in4zskVPMNzXs6JiCFUbif5a6BtcAlSK4xPQyJCeLNNAWLUeFQTLNA== - dependencies: - "@ipld/dag-cbor" "^7.0.0" - "@ipld/dag-json" "^8.0.1" - "@ipld/dag-pb" "^2.1.3" - any-signal "^3.0.0" - dag-jose "^1.0.0" - debug "^4.1.1" - err-code "^3.0.1" - ipfs-core-types "^0.10.3" - ipfs-core-utils "^0.14.3" - ipfs-utils "^9.0.6" - it-first "^1.0.6" - it-last "^1.0.4" - merge-options "^3.0.4" - multiaddr "^10.0.0" - multiformats "^9.5.1" - parse-duration "^1.0.0" - stream-to-it "^0.2.2" - uint8arrays "^3.0.0" - -ipfs-unixfs@^6.0.3: - version "6.0.9" - resolved "https://registry.yarnpkg.com/ipfs-unixfs/-/ipfs-unixfs-6.0.9.tgz#f6613b8e081d83faa43ed96e016a694c615a9374" - integrity sha512-0DQ7p0/9dRB6XCb0mVCTli33GzIzSVx5udpJuVM47tGcD+W+Bl4LsnoLswd3ggNnNEakMv1FdoFITiEnchXDqQ== - dependencies: - err-code "^3.0.1" - protobufjs "^6.10.2" - -ipfs-utils@^9.0.6: - version "9.0.14" - resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-9.0.14.tgz#24f5fda1f4567685eb32bca2543d518f95fd8704" - integrity sha512-zIaiEGX18QATxgaS0/EOQNoo33W0islREABAcxXE8n7y2MGAlB+hdsxXn4J0hGZge8IqVQhW8sWIb+oJz2yEvg== - dependencies: - any-signal "^3.0.0" - browser-readablestream-to-it "^1.0.0" - buffer "^6.0.1" - electron-fetch "^1.7.2" - err-code "^3.0.1" - is-electron "^2.2.0" - iso-url "^1.1.5" - it-all "^1.0.4" - it-glob "^1.0.1" - it-to-stream "^1.0.0" - merge-options "^3.0.4" - nanoid "^3.1.20" - native-fetch "^3.0.0" - node-fetch "^2.6.8" - react-native-fetch-api "^3.0.0" - stream-to-it "^0.2.2" - is-absolute-url@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" @@ -14320,11 +14090,6 @@ is-dom@^1.0.0: is-object "^1.0.1" is-window "^1.0.2" -is-electron@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.2.tgz#3778902a2044d76de98036f5dc58089ac4d80bb9" - integrity sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg== - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -14406,13 +14171,6 @@ is-interactive@^1.0.0: resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== -is-ip@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8" - integrity sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q== - dependencies: - ip-regex "^4.0.0" - is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" @@ -14487,7 +14245,7 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: +is-plain-obj@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== @@ -14695,11 +14453,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -iso-url@^1.1.5: - version "1.2.1" - resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-1.2.1.tgz#db96a49d8d9a64a1c889fc07cc525d093afb1811" - integrity sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng== - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -14775,51 +14528,6 @@ istanbul-reports@^3.1.3, istanbul-reports@^3.1.4: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -it-all@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/it-all/-/it-all-1.0.6.tgz#852557355367606295c4c3b7eff0136f07749335" - integrity sha512-3cmCc6Heqe3uWi3CVM/k51fa/XbMFpQVzFoDsV0IZNHSQDyAXl3c4MjHkFX5kF3922OGj7Myv1nSEUgRtcuM1A== - -it-first@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/it-first/-/it-first-1.0.7.tgz#a4bef40da8be21667f7d23e44dae652f5ccd7ab1" - integrity sha512-nvJKZoBpZD/6Rtde6FXqwDqDZGF1sCADmr2Zoc0hZsIvnE449gRFnGctxDf09Bzc/FWnHXAdaHVIetY6lrE0/g== - -it-glob@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/it-glob/-/it-glob-1.0.2.tgz#bab9b04d6aaac42884502f3a0bfee84c7a29e15e" - integrity sha512-Ch2Dzhw4URfB9L/0ZHyY+uqOnKvBNeS/SMcRiPmJfpHiM0TsUZn+GkpcZxAoF3dJVdPm/PuIk3A4wlV7SUo23Q== - dependencies: - "@types/minimatch" "^3.0.4" - minimatch "^3.0.4" - -it-last@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/it-last/-/it-last-1.0.6.tgz#4106232e5905ec11e16de15a0e9f7037eaecfc45" - integrity sha512-aFGeibeiX/lM4bX3JY0OkVCFkAw8+n9lkukkLNivbJRvNz8lI3YXv5xcqhFUV2lDJiraEK3OXRDbGuevnnR67Q== - -it-map@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/it-map/-/it-map-1.0.6.tgz#6aa547e363eedcf8d4f69d8484b450bc13c9882c" - integrity sha512-XT4/RM6UHIFG9IobGlQPFQUrlEKkU4eBUFG3qhWhfAdh1JfF2x11ShCrKCdmZ0OiZppPfoLuzcfA4cey6q3UAQ== - -it-peekable@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/it-peekable/-/it-peekable-1.0.3.tgz#8ebe933767d9c5aa0ae4ef8e9cb3a47389bced8c" - integrity sha512-5+8zemFS+wSfIkSZyf0Zh5kNN+iGyccN02914BY4w/Dj+uoFEoPSvj5vaWn8pNZJNSxzjW0zHRxC3LUb2KWJTQ== - -it-to-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/it-to-stream/-/it-to-stream-1.0.0.tgz#6c47f91d5b5df28bda9334c52782ef8e97fe3a4a" - integrity sha512-pLULMZMAB/+vbdvbZtebC0nWBTbG581lk6w8P7DfIIIKUfa8FbY7Oi0FxZcFPbxvISs7A9E+cMpLDBc1XhpAOA== - dependencies: - buffer "^6.0.3" - fast-fifo "^1.0.0" - get-iterator "^1.0.2" - p-defer "^3.0.0" - p-fifo "^1.0.0" - readable-stream "^3.6.0" - iterate-iterator@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.2.tgz#551b804c9eaa15b847ea6a7cdc2f5bf1ec150f91" @@ -16524,11 +16232,6 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -16868,13 +16571,6 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== -merge-options@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" - integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== - dependencies: - is-plain-obj "^2.1.0" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -17254,25 +16950,6 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multiaddr-to-uri@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/multiaddr-to-uri/-/multiaddr-to-uri-8.0.0.tgz#65efe4b1f9de5f6b681aa42ff36a7c8db7625e58" - integrity sha512-dq4p/vsOOUdVEd1J1gl+R2GFrXJQH8yjLtz4hodqdVbieg39LvBOdMQRdQnfbg5LSM/q1BYNVf5CBbwZFFqBgA== - dependencies: - multiaddr "^10.0.0" - -multiaddr@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-10.0.1.tgz#0d15848871370860a4d266bb44d93b3dac5d90ef" - integrity sha512-G5upNcGzEGuTHkzxezPrrD6CaIHR9uo+7MwqhNVcXTs33IInon4y7nMiGxl2CY5hG7chvYQUQhz5V52/Qe3cbg== - dependencies: - dns-over-http-resolver "^1.2.3" - err-code "^3.0.1" - is-ip "^3.1.0" - multiformats "^9.4.5" - uint8arrays "^3.0.0" - varint "^6.0.0" - multicast-dns@^7.2.5: version "7.2.5" resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" @@ -17281,11 +16958,6 @@ multicast-dns@^7.2.5: dns-packet "^5.2.2" thunky "^1.0.2" -multiformats@^9.0.2, multiformats@^9.4.2, multiformats@^9.4.5, multiformats@^9.5.1, multiformats@^9.5.4: - version "9.9.0" - resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-9.9.0.tgz#c68354e7d21037a8f1f8833c8ccd68618e8f1d37" - integrity sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg== - multimatch@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6" @@ -17316,7 +16988,7 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== -nanoid@^3.0.2, nanoid@^3.1.20, nanoid@^3.1.23, nanoid@^3.3.1, nanoid@^3.3.4, nanoid@^3.3.6: +nanoid@^3.3.1, nanoid@^3.3.4, nanoid@^3.3.6: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== @@ -17343,11 +17015,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -native-fetch@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-3.0.0.tgz#06ccdd70e79e171c365c75117959cf4fe14a09bb" - integrity sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw== - natural-compare-lite@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" @@ -17440,7 +17107,7 @@ node-fetch@^2.6.1, node-fetch@^2.6.11, node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" -node-fetch@^2.6.12, node-fetch@^2.6.8: +node-fetch@^2.6.12: version "2.6.12" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba" integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g== @@ -18054,14 +17721,6 @@ open@^9.1.0: is-inside-container "^1.0.0" is-wsl "^2.2.0" -openai@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/openai/-/openai-3.3.0.tgz#a6408016ad0945738e1febf43f2fccca83a3f532" - integrity sha512-uqxI/Au+aPRnsaQRe8CojU0eCR7I0mBiKjD3sNMzY6DaC1ZVrc85u98mtJW6voDug8fgGN+DIZmTDxTthxb7dQ== - dependencies: - axios "^0.26.0" - form-data "^4.0.0" - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -18138,11 +17797,6 @@ p-defer@^1.0.0: resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw== -p-defer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" - integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== - p-event@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5" @@ -18150,14 +17804,6 @@ p-event@^4.1.0: dependencies: p-timeout "^3.1.0" -p-fifo@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-fifo/-/p-fifo-1.0.0.tgz#e29d5cf17c239ba87f51dde98c1d26a9cfe20a63" - integrity sha512-IjoCxXW48tqdtDFz6fqo5q1UfFVjjVZe8TC1QRflvNUJtNfCUhxOUw6MOVZhDPjqhSzc26xKdugsO17gmzd5+A== - dependencies: - fast-fifo "^1.0.0" - p-defer "^3.0.0" - p-filter@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-2.1.0.tgz#1b1472562ae7a0f742f0f3d3d3718ea66ff9c09c" @@ -18410,11 +18056,6 @@ parse-conflict-json@^3.0.0: just-diff "^6.0.0" just-diff-apply "^5.2.0" -parse-duration@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-1.1.0.tgz#5192084c5d8f2a3fd676d04a451dbd2e05a1819c" - integrity sha512-z6t9dvSJYaPoQq7quMzdEagSFtpGu+utzHqqxmpVWNNZRIXnvqyCvn9XsTdh7c/w0Bqmdz3RB3YnRaKtpRtEXQ== - parse-entities@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" @@ -19611,25 +19252,6 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -protobufjs@^6.10.2: - version "6.11.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" - integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" ">=13.7.0" - long "^4.0.0" - protocols@^2.0.0, protocols@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86" @@ -20026,13 +19648,6 @@ react-merge-refs@^1.0.0: resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-1.1.0.tgz#73d88b892c6c68cbb7a66e0800faa374f4c38b06" integrity sha512-alTKsjEL0dKH/ru1Iyn7vliS2QRcBp9zZPGoWxUOvRGWPUYgjo+V01is7p04It6KhgrzhJGnIj9GgX8W4bZoCQ== -react-native-fetch-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/react-native-fetch-api/-/react-native-fetch-api-3.0.0.tgz#81e1bb6562c292521bc4eca52fe1097f4c1ebab5" - integrity sha512-g2rtqPjdroaboDKTsJCTlcmtw54E25OjyaunUP0anOZn4Fuo2IKs8BVfe02zVggA/UysbmfSnRJIqtNkAgggNA== - dependencies: - p-defer "^3.0.0" - react-refresh@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046" @@ -20362,13 +19977,6 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -receptacle@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/receptacle/-/receptacle-1.3.2.tgz#a7994c7efafc7a01d0e2041839dab6c4951360d2" - integrity sha512-HrsFvqZZheusncQRiEE7GatOAETrARKV/lnfYicIm8lbvp/JQOdADOfhjBd2DajvoszEyxSM6RlAAIZgEoeu/A== - dependencies: - ms "^2.1.1" - rechoir@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" @@ -20726,11 +20334,6 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -retimer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/retimer/-/retimer-3.0.0.tgz#98b751b1feaf1af13eb0228f8ea68b8f9da530df" - integrity sha512-WKE0j11Pa0ZJI5YIk0nflGI7SQsfl2ljihVy7ogh7DeQSeYAUi0ubZ/yEueGtDfUPk6GH5LRw1hBdLq4IwUBWA== - retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -21723,13 +21326,6 @@ stream-to-array@~2.3.0: dependencies: any-promise "^1.1.0" -stream-to-it@^0.2.2: - version "0.2.4" - resolved "https://registry.yarnpkg.com/stream-to-it/-/stream-to-it-0.2.4.tgz#d2fd7bfbd4a899b4c0d6a7e6a533723af5749bd0" - integrity sha512-4vEbkSs83OahpmBybNJXlJd7d6/RxzkkSdT3I0mnGt79Xd2Kk+e1JqbvAvsQfCeKj3aKb0QIWkyK3/n0j506vQ== - dependencies: - get-iterator "^1.0.2" - stream-to-promise@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/stream-to-promise/-/stream-to-promise-2.2.0.tgz#b1edb2e1c8cb11289d1b503c08d3f2aef51e650f" @@ -21775,7 +21371,16 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -21875,7 +21480,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -21889,6 +21494,13 @@ strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -22427,13 +22039,6 @@ thunky@^1.0.2: resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== -timeout-abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/timeout-abort-controller/-/timeout-abort-controller-3.0.0.tgz#dd57ffca041652c03769904f8d95afd93fb95595" - integrity sha512-O3e+2B8BKrQxU2YRyEjC/2yFdb33slI22WRdUaDx6rvysfi9anloNZyR2q0l6LnePo5qH7gSM7uZtvvwZbc2yA== - dependencies: - retimer "^3.0.0" - timers-browserify@^2.0.4: version "2.0.12" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" @@ -22890,13 +22495,6 @@ uglify-js@^3.1.4: resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== -uint8arrays@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.1.tgz#2d8762acce159ccd9936057572dade9459f65ae0" - integrity sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg== - dependencies: - multiformats "^9.4.2" - unbox-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" @@ -23375,11 +22973,6 @@ validator@^13.7.0: resolved "https://registry.yarnpkg.com/validator/-/validator-13.9.0.tgz#33e7b85b604f3bbce9bb1a05d5c3e22e1c2ff855" integrity sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA== -varint@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" - integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== - vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -24227,7 +23820,7 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -24245,6 +23838,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -24400,11 +24002,6 @@ yaml@^2.1.1, yaml@^2.2.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.0.tgz#47ebe58ee718f772ce65862beb1db816210589a0" integrity sha512-8/1wgzdKc7bc9E6my5wZjmdavHLvO/QOmLG1FBugblEvY4IXrLjlViIOmL24HthU042lWTDRO90Fz1Yp66UnMw== -yaml@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" - integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== - yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" From 09252b3a483727c5f92c440fb80109b72b3fe042 Mon Sep 17 00:00:00 2001 From: h0ngcha0 Date: Mon, 15 Jul 2024 17:30:16 +0200 Subject: [PATCH 3/5] Upgrade web3 sdk version to 1.2.2 --- packages/dapp/package.json | 6 +-- packages/extension/package.json | 8 +-- .../ui/features/accountTokens/tokens.state.ts | 21 +------- yarn.lock | 52 +++++++++---------- 4 files changed, 35 insertions(+), 52 deletions(-) diff --git a/packages/dapp/package.json b/packages/dapp/package.json index 7b1f5ad2..eaddb900 100644 --- a/packages/dapp/package.json +++ b/packages/dapp/package.json @@ -10,15 +10,15 @@ "lint": "next lint" }, "dependencies": { - "@alephium/get-extension-wallet": "^1.2.1", - "@alephium/web3": "^1.2.1", + "@alephium/get-extension-wallet": "^1.2.2", + "@alephium/web3": "^1.2.2", "ethers": "^5.5.1", "next": "^13.0.0", "react": "^18.0.0", "react-dom": "^18.0.0" }, "devDependencies": { - "@alephium/cli": "^1.2.1", + "@alephium/cli": "^1.2.2", "@types/node": "18.11.18", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", diff --git a/packages/extension/package.json b/packages/extension/package.json index 069117c0..ad97d77c 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -4,12 +4,12 @@ "main": "index.js", "license": "MIT", "devDependencies": { - "@alephium/get-extension-wallet": "^1.2.1", + "@alephium/get-extension-wallet": "^1.2.2", "@alephium/ledger-app": "^0.2.1", "@alephium/token-list": "0.0.19", - "@alephium/web3": "^1.2.1", - "@alephium/web3-test": "^1.2.1", - "@alephium/web3-wallet": "^1.2.1", + "@alephium/web3": "^1.2.2", + "@alephium/web3-test": "^1.2.2", + "@alephium/web3-wallet": "^1.2.2", "@ledgerhq/hw-transport-webusb": "6.27.17", "@ledgerhq/hw-transport-webhid": "6.27.17", "@playwright/test": "^1.23.0", diff --git a/packages/extension/src/ui/features/accountTokens/tokens.state.ts b/packages/extension/src/ui/features/accountTokens/tokens.state.ts index 9681b10c..1729126e 100644 --- a/packages/extension/src/ui/features/accountTokens/tokens.state.ts +++ b/packages/extension/src/ui/features/accountTokens/tokens.state.ts @@ -136,7 +136,7 @@ export const useNonFungibleTokensWithBalance = ( const nonFungibleTokens: BaseTokenWithBalance[] = [] for (const token of potentialNonFungibleTokens) { if (nonFungibleTokens.findIndex((t) => t.id == token.id) === -1) { - const tokenType = await fetchImmutable(`${token.id}-token-type`, () => guessTokenType(nodeProvider, token.id)) + const tokenType = await fetchImmutable(`${token.id}-token-type`, () => nodeProvider.guessStdInterfaceId(token.id)) if (tokenType === 'non-fungible') { nonFungibleTokens.push({ id: token.id, networkId: networkId, balance: token.balance }) } @@ -332,7 +332,7 @@ async function getBalances(nodeProvider: NodeProvider, address: string): Promise async function fetchFungibleTokenFromFullNode(network: Network, tokenId: string): Promise { const nodeProvider = new NodeProvider(network.nodeUrl) try { - const tokenType = await fetchImmutable(`${tokenId}-token-type`, () => guessTokenType(nodeProvider, tokenId)) + const tokenType = await fetchImmutable(`${tokenId}-token-type`, () => nodeProvider.guessStdInterfaceId(tokenId)) if (tokenType !== 'fungible') { return undefined } @@ -353,20 +353,3 @@ async function fetchFungibleTokenFromFullNode(network: Network, tokenId: string) return undefined } } - -// TODO: Add this to Web3 SDK when `000301` is standardized -async function guessTokenType( - nodeProvider: NodeProvider, - tokenId: HexString -): Promise<'fungible' | 'non-fungible' | undefined> { - const interfaceId = await nodeProvider.guessStdInterfaceId(tokenId) - switch (interfaceId) { - case '0001': - return 'fungible' - case '0003': - case '000301': - return 'non-fungible' - default: - return undefined - } -} diff --git a/yarn.lock b/yarn.lock index 084d115d..812ec472 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,13 +16,13 @@ jest "^28.1.3" prettier "^2.8.7" -"@alephium/cli@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@alephium/cli/-/cli-1.2.1.tgz#df7f94dd7a0db2582915391f66d6804c47afd544" - integrity sha512-0mQ1SZ3xBUQbMA3wZq6IX7TqdiZFMqqzmLVp+dhgzqqr6de3dHlCRZZHUohhleIkbLPvvQ0IKWlcStGYjP69wA== +"@alephium/cli@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@alephium/cli/-/cli-1.2.2.tgz#3e2ef490a7f7d1d747fca1b2c264c437c0f21fb2" + integrity sha512-wQqEzLj+4ULbIt8mm09BCNMoUuY5i+94aSsPs4RAPuzrX7qLEMcRLhG7Jubu5tWZ9oTuf9AJjog9oLH7qH5wkw== dependencies: - "@alephium/web3" "^1.2.1" - "@alephium/web3-wallet" "^1.2.1" + "@alephium/web3" "^1.2.2" + "@alephium/web3-wallet" "^1.2.2" "@swc/core" "^1.4.1" commander "^9.5.0" cross-fetch "^3.1.5" @@ -32,12 +32,12 @@ jest "^28.1.3" prettier "^2.8.7" -"@alephium/get-extension-wallet@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@alephium/get-extension-wallet/-/get-extension-wallet-1.2.1.tgz#6208177f05600fd8a3eb12d93335c62024d075a9" - integrity sha512-UkHb8euh+CF218VDUM7O0jAfLZQdqC8WISN6YzXs4/OkojRF+4QkfOdUPmHqrv+K5Dw8mv0opz9VK5fwDKPWWw== +"@alephium/get-extension-wallet@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@alephium/get-extension-wallet/-/get-extension-wallet-1.2.2.tgz#129bfcfefe520d56281940ca6d11d9476535e00a" + integrity sha512-ETZO2EILVqsKSQyc9HIEs8B1d5Plw7fC/R6R9jsSbORBdmDg6strubKkRH6RB+ciRMgDakumeAfRyvJJEZi2Qg== dependencies: - "@alephium/web3" "^1.2.1" + "@alephium/web3" "^1.2.2" bowser "^2.11.0" "@alephium/ledger-app@^0.2.1": @@ -66,13 +66,13 @@ "@alephium/web3" "^0.14.0" "@alephium/web3-wallet" "^0.14.0" -"@alephium/web3-test@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@alephium/web3-test/-/web3-test-1.2.1.tgz#722f8ae853c19929e403ea9e021743e7441fc770" - integrity sha512-ihwRaiZlkKpnc5KhYXtmWUtVv62CRFjEfNEGAq02kDo2gt1aW585LrQkahc0LGnO2C/k67dmBH/3vO33RGskng== +"@alephium/web3-test@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@alephium/web3-test/-/web3-test-1.2.2.tgz#6354992a6d93c4aa0425abbd5cbaffbb8e8e93bd" + integrity sha512-uo3HrmdZXINk6J5C3Sf383KQbbxCX2KhFP+JihypxeOcenQLlLoTFC3BAjSiFO3s17FtABTbft2QOaBUqvF9/w== dependencies: - "@alephium/web3" "^1.2.1" - "@alephium/web3-wallet" "^1.2.1" + "@alephium/web3" "^1.2.2" + "@alephium/web3-wallet" "^1.2.2" "@alephium/web3-wallet@^0.14.0": version "0.14.0" @@ -88,12 +88,12 @@ elliptic "6.5.4" fs-extra "10.0.1" -"@alephium/web3-wallet@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@alephium/web3-wallet/-/web3-wallet-1.2.1.tgz#0562ac58434fbd9db9484be4043cae9aae419ed4" - integrity sha512-U2BKdHZNJXuytCBcfSslLkjei69HbUKf8TsouIqp9tdriHJyDD6qTimxrczrkpy5kDvNgiA4dfh3bFtA1KHAnA== +"@alephium/web3-wallet@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@alephium/web3-wallet/-/web3-wallet-1.2.2.tgz#8ec56009830d96a883f21d0f9df4722ba570d3dd" + integrity sha512-UDhqvyWwZ4A31yakdIb2dBN74tRgfFoZznjzWFBTruGKex+h47HX7jC9f+AsZ+JxOOX8A9pkZ60v4TYIvGfeWw== dependencies: - "@alephium/web3" "^1.2.1" + "@alephium/web3" "^1.2.2" "@noble/secp256k1" "1.7.1" "@types/node" "^16.18.23" bip32 "3.1.0" @@ -119,10 +119,10 @@ eventemitter3 "^4.0.7" path-browserify "^1.0.1" -"@alephium/web3@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@alephium/web3/-/web3-1.2.1.tgz#1a7155efb1ca5900baecb159294381c9e5fc35db" - integrity sha512-YrlSqMIwd9zh1L/4oTGxONMJXijzb+JX6ZFtSPite9FM1I9Zdle9Fc4BFRHRpAujpIyH9ECcfuGvzMCYaHLxGw== +"@alephium/web3@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@alephium/web3/-/web3-1.2.2.tgz#2327c97de039f9147f289db107a63d85c00a669e" + integrity sha512-T/WYEELWX1qhFETPYiWXaeVTxNmDkrFW9G+zH998W+g9TzZoR0BBj/RVvy+FPWxaYbWvkrv+ykB78z5U4xYsnA== dependencies: "@noble/secp256k1" "1.7.1" base-x "4.0.0" From 475cbb85ecb3a3f210969c4e0d22a928d174edb1 Mon Sep 17 00:00:00 2001 From: h0ngcha0 Date: Mon, 15 Jul 2024 19:18:03 +0200 Subject: [PATCH 4/5] Use guessStdTokenType --- .../extension/src/ui/features/accountTokens/tokens.state.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/extension/src/ui/features/accountTokens/tokens.state.ts b/packages/extension/src/ui/features/accountTokens/tokens.state.ts index 1729126e..20f23e23 100644 --- a/packages/extension/src/ui/features/accountTokens/tokens.state.ts +++ b/packages/extension/src/ui/features/accountTokens/tokens.state.ts @@ -136,7 +136,7 @@ export const useNonFungibleTokensWithBalance = ( const nonFungibleTokens: BaseTokenWithBalance[] = [] for (const token of potentialNonFungibleTokens) { if (nonFungibleTokens.findIndex((t) => t.id == token.id) === -1) { - const tokenType = await fetchImmutable(`${token.id}-token-type`, () => nodeProvider.guessStdInterfaceId(token.id)) + const tokenType = await fetchImmutable(`${token.id}-token-type`, () => nodeProvider.guessStdTokenType(token.id)) if (tokenType === 'non-fungible') { nonFungibleTokens.push({ id: token.id, networkId: networkId, balance: token.balance }) } @@ -332,7 +332,7 @@ async function getBalances(nodeProvider: NodeProvider, address: string): Promise async function fetchFungibleTokenFromFullNode(network: Network, tokenId: string): Promise { const nodeProvider = new NodeProvider(network.nodeUrl) try { - const tokenType = await fetchImmutable(`${tokenId}-token-type`, () => nodeProvider.guessStdInterfaceId(tokenId)) + const tokenType = await fetchImmutable(`${tokenId}-token-type`, () => nodeProvider.guessStdTokenType(tokenId)) if (tokenType !== 'fungible') { return undefined } From de7fb9c08ab153cb0db21155a2d1b73a6fa44885 Mon Sep 17 00:00:00 2001 From: h0ngcha0 Date: Tue, 16 Jul 2024 09:48:58 +0200 Subject: [PATCH 5/5] Fix typo --- .../extension/src/ui/features/actions/feeEstimation/utils.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx b/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx index ed98cf82..a9aa9980 100644 --- a/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx +++ b/packages/extension/src/ui/features/actions/feeEstimation/utils.tsx @@ -10,5 +10,5 @@ export function getTooltipText(maxFee?: string, feeTokenBalance?: BigNumber) { } return `Insufficient balance to pay network fees. You need at least ${utils.formatEther( BigNumber.from(maxFee).sub(feeTokenBalance), - )} ETH more.` + )} ALPH more.` }