From 0727b1d54f5d639aae4a00ddca43f066cb44904b Mon Sep 17 00:00:00 2001 From: colinmfoster4723 Date: Wed, 16 Aug 2023 09:19:21 -0500 Subject: [PATCH] Adjustments to lock page and refactor --- .../dashboard/announcements/Announcement.tsx | 4 +- .../announcements/AnnouncementContent.tsx | 19 +- .../announcements/AnnouncementSkeletons.tsx | 36 +- ui/const/abis/ERC20.json | 499 ++++++++++++------ ui/lib/thirdweb/hooks/useHandleError.ts | 6 +- ui/lib/thirdweb/hooks/useHandleRead.ts | 1 - ui/lib/thirdweb/hooks/useL2Toggle.ts | 4 - ui/lib/tokens/approve.ts | 2 - ui/lib/tokens/ve-token.ts | 5 - ui/package.json | 5 +- ui/pages/dashboard/announcements.tsx | 4 +- ui/pages/index.tsx | 1 - ui/pages/lock.tsx | 50 +- ui/yarn.lock | 166 ++---- 14 files changed, 461 insertions(+), 341 deletions(-) diff --git a/ui/components/dashboard/announcements/Announcement.tsx b/ui/components/dashboard/announcements/Announcement.tsx index 194b9ffb..7a49de0a 100644 --- a/ui/components/dashboard/announcements/Announcement.tsx +++ b/ui/components/dashboard/announcements/Announcement.tsx @@ -76,7 +76,7 @@ const Announcement = React.forwardRef( attachments.map((attachment: any, i: number) => ( ))} @@ -87,7 +87,7 @@ const Announcement = React.forwardRef( {reactions && reactions.map((reaction: any, i: number) => ( { const textSeparatedFromLinks = parseAnnouncementText(text, linkRegex) return ( -

{ >{`${str} `} ) )} -

+ ) } @@ -48,21 +48,24 @@ const TextContent = ({ sentence, mentions }: any) => { <> {sentenceSeparatedFromMentions.map((e, i) => e.startsWith('<@&') ? ( - + ) : e.startsWith('<#') ? ( - + ) : e.startsWith('<@') ? ( ) : e.includes('<:MoonDAO:1047902000601383013>') ? ( - <> +
{e.slice(0, e.indexOf('<:MoonDAO:1047902000601383013>'))}{' '} - + {e.slice(e.indexOf('<:MoonDAO:1047902000601383013>') + 30)} - +
) : ( e ) diff --git a/ui/components/dashboard/announcements/AnnouncementSkeletons.tsx b/ui/components/dashboard/announcements/AnnouncementSkeletons.tsx index 1b791add..542998d6 100644 --- a/ui/components/dashboard/announcements/AnnouncementSkeletons.tsx +++ b/ui/components/dashboard/announcements/AnnouncementSkeletons.tsx @@ -1,19 +1,37 @@ -import Announcement from "./Announcement" +import Announcement from './Announcement' const AnnouncementSkeletons = () => { const skeletonData = { - content : Array(8).fill("Loading, if this takes too long contact MoonDao Discord ").join(" "), + content: Array(8) + .fill('Loading, if this takes too long contact MoonDao Discord ') + .join(' '), mentions: [], - author: {username:"MoonDAO"}, - timestamp: new Date() , - reactions: [{emoji:{name:"🚀"}, count:"10"},{emoji:{name:"🚀"}, count:"10"},{emoji:{name:"🚀"}, count:"10"}] + author: { username: 'MoonDAO' }, + timestamp: new Date(), + reactions: [ + { emoji: { name: '🚀' }, count: '10' }, + { emoji: { name: '🚀' }, count: '10' }, + { emoji: { name: '🚀' }, count: '10' }, + ], } - - return ( + + return ( <> -{Array(10).fill(skeletonData).map((e,i) => )} + {Array(10) + .fill(skeletonData) + .map((e, i) => ( + + ))} ) } -export default AnnouncementSkeletons \ No newline at end of file +export default AnnouncementSkeletons diff --git a/ui/const/abis/ERC20.json b/ui/const/abis/ERC20.json index 43f0d8c3..b9e9fa78 100644 --- a/ui/const/abis/ERC20.json +++ b/ui/const/abis/ERC20.json @@ -1,267 +1,458 @@ { "abi": [ - { "inputs": [], "stateMutability": "nonpayable", "type": "constructor" }, - { "inputs": [], "name": "CallerIsNotAuthorized", "type": "error" }, - { "inputs": [], "name": "TargetIsZeroAddress", "type": "error" }, { - "anonymous": false, + "type": "constructor", + "name": "", "inputs": [ { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "spender", - "type": "address" + "type": "string", + "name": "_name", + "internalType": "string" }, { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" + "type": "string", + "name": "_symbol", + "internalType": "string" } ], - "name": "Approval", - "type": "event" + "outputs": [], + "stateMutability": "nonpayable" }, { - "anonymous": false, + "type": "event", + "name": "Approval", "inputs": [ { + "type": "address", + "name": "owner", "indexed": true, - "internalType": "address", - "name": "previousController", - "type": "address" + "internalType": "address" }, { + "type": "address", + "name": "spender", "indexed": true, - "internalType": "address", - "name": "newController", - "type": "address" + "internalType": "address" + }, + { + "type": "uint256", + "name": "value", + "indexed": false, + "internalType": "uint256" } ], - "name": "ControlTransferred", - "type": "event" + "outputs": [], + "anonymous": false }, { - "anonymous": false, + "type": "event", + "name": "OwnershipTransferred", "inputs": [ { - "indexed": true, - "internalType": "address", + "type": "address", "name": "previousOwner", - "type": "address" + "indexed": true, + "internalType": "address" }, { - "indexed": true, - "internalType": "address", + "type": "address", "name": "newOwner", - "type": "address" + "indexed": true, + "internalType": "address" } ], - "name": "OwnershipTransferred", - "type": "event" + "outputs": [], + "anonymous": false }, { - "anonymous": false, + "type": "event", + "name": "Transfer", "inputs": [ { - "indexed": true, - "internalType": "address", + "type": "address", "name": "from", - "type": "address" + "indexed": true, + "internalType": "address" }, { - "indexed": true, - "internalType": "address", + "type": "address", "name": "to", - "type": "address" + "indexed": true, + "internalType": "address" }, { + "type": "uint256", + "name": "value", "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" + "internalType": "uint256" } ], - "name": "Transfer", - "type": "event" + "outputs": [], + "anonymous": false }, { - "inputs": [], + "type": "function", "name": "DOMAIN_SEPARATOR", - "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], - "stateMutability": "view", - "type": "function" - }, - { "inputs": [], - "name": "PERMIT_TYPEHASH", - "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }], - "stateMutability": "view", - "type": "function" + "outputs": [ + { + "type": "bytes32", + "name": "", + "internalType": "bytes32" + } + ], + "stateMutability": "view" }, { + "type": "function", + "name": "allowance", "inputs": [ - { "internalType": "address", "name": "", "type": "address" }, - { "internalType": "address", "name": "", "type": "address" } + { + "type": "address", + "name": "owner", + "internalType": "address" + }, + { + "type": "address", + "name": "spender", + "internalType": "address" + } ], - "name": "allowance", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" + "outputs": [ + { + "type": "uint256", + "name": "", + "internalType": "uint256" + } + ], + "stateMutability": "view" }, { + "type": "function", + "name": "approve", "inputs": [ - { "internalType": "address", "name": "spender", "type": "address" }, - { "internalType": "uint256", "name": "amount", "type": "uint256" } + { + "type": "address", + "name": "spender", + "internalType": "address" + }, + { + "type": "uint256", + "name": "amount", + "internalType": "uint256" + } ], - "name": "approve", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" + "outputs": [ + { + "type": "bool", + "name": "", + "internalType": "bool" + } + ], + "stateMutability": "nonpayable" }, { - "inputs": [{ "internalType": "address", "name": "", "type": "address" }], + "type": "function", "name": "balanceOf", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" + "inputs": [ + { + "type": "address", + "name": "account", + "internalType": "address" + } + ], + "outputs": [ + { + "type": "uint256", + "name": "", + "internalType": "uint256" + } + ], + "stateMutability": "view" }, { + "type": "function", + "name": "decimals", "inputs": [], - "name": "controller", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], - "stateMutability": "view", - "type": "function" + "outputs": [ + { + "type": "uint8", + "name": "", + "internalType": "uint8" + } + ], + "stateMutability": "view" }, { - "inputs": [], - "name": "decimals", - "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }], - "stateMutability": "view", - "type": "function" + "type": "function", + "name": "decreaseAllowance", + "inputs": [ + { + "type": "address", + "name": "spender", + "internalType": "address" + }, + { + "type": "uint256", + "name": "subtractedValue", + "internalType": "uint256" + } + ], + "outputs": [ + { + "type": "bool", + "name": "", + "internalType": "bool" + } + ], + "stateMutability": "nonpayable" }, { + "type": "function", + "name": "increaseAllowance", "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256", "name": "amount", "type": "uint256" } + { + "type": "address", + "name": "spender", + "internalType": "address" + }, + { + "type": "uint256", + "name": "addedValue", + "internalType": "uint256" + } ], - "name": "mint", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "outputs": [ + { + "type": "bool", + "name": "", + "internalType": "bool" + } + ], + "stateMutability": "nonpayable" }, { - "inputs": [], + "type": "function", "name": "name", - "outputs": [{ "internalType": "string", "name": "", "type": "string" }], - "stateMutability": "view", - "type": "function" + "inputs": [], + "outputs": [ + { + "type": "string", + "name": "", + "internalType": "string" + } + ], + "stateMutability": "view" }, { - "inputs": [{ "internalType": "address", "name": "", "type": "address" }], + "type": "function", "name": "nonces", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" + "inputs": [ + { + "type": "address", + "name": "owner", + "internalType": "address" + } + ], + "outputs": [ + { + "type": "uint256", + "name": "", + "internalType": "uint256" + } + ], + "stateMutability": "view" }, { - "inputs": [], + "type": "function", "name": "owner", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], - "stateMutability": "view", - "type": "function" + "inputs": [], + "outputs": [ + { + "type": "address", + "name": "", + "internalType": "address" + } + ], + "stateMutability": "view" }, { + "type": "function", + "name": "permit", "inputs": [ - { "internalType": "address", "name": "owner", "type": "address" }, - { "internalType": "address", "name": "spender", "type": "address" }, - { "internalType": "uint256", "name": "value", "type": "uint256" }, - { "internalType": "uint256", "name": "deadline", "type": "uint256" }, - { "internalType": "uint8", "name": "v", "type": "uint8" }, - { "internalType": "bytes32", "name": "r", "type": "bytes32" }, - { "internalType": "bytes32", "name": "s", "type": "bytes32" } + { + "type": "address", + "name": "owner", + "internalType": "address" + }, + { + "type": "address", + "name": "spender", + "internalType": "address" + }, + { + "type": "uint256", + "name": "value", + "internalType": "uint256" + }, + { + "type": "uint256", + "name": "deadline", + "internalType": "uint256" + }, + { + "type": "uint8", + "name": "v", + "internalType": "uint8" + }, + { + "type": "bytes32", + "name": "r", + "internalType": "bytes32" + }, + { + "type": "bytes32", + "name": "s", + "internalType": "bytes32" + } ], - "name": "permit", "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "nonpayable" }, { - "inputs": [], - "name": "removeControl", + "type": "function", + "name": "print", + "inputs": [ + { + "type": "address", + "name": "_account", + "internalType": "address" + }, + { + "type": "uint256", + "name": "_amount", + "internalType": "uint256" + } + ], "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "nonpayable" }, { - "inputs": [], - "name": "renounceOwnership", + "type": "function", + "name": "redeem", + "inputs": [ + { + "type": "address", + "name": "_account", + "internalType": "address" + }, + { + "type": "uint256", + "name": "_amount", + "internalType": "uint256" + } + ], "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "nonpayable" }, { + "type": "function", + "name": "renounceOwnership", "inputs": [], - "name": "symbol", - "outputs": [{ "internalType": "string", "name": "", "type": "string" }], - "stateMutability": "view", - "type": "function" + "outputs": [], + "stateMutability": "nonpayable" }, { + "type": "function", + "name": "symbol", "inputs": [], - "name": "totalSupply", - "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], - "stateMutability": "view", - "type": "function" + "outputs": [ + { + "type": "string", + "name": "", + "internalType": "string" + } + ], + "stateMutability": "view" }, { - "inputs": [ - { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256", "name": "amount", "type": "uint256" } + "type": "function", + "name": "totalSupply", + "inputs": [], + "outputs": [ + { + "type": "uint256", + "name": "", + "internalType": "uint256" + } ], - "name": "transfer", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "view" }, { + "type": "function", + "name": "transfer", "inputs": [ { - "internalType": "address", - "name": "newController", - "type": "address" + "type": "address", + "name": "recipient", + "internalType": "address" + }, + { + "type": "uint256", + "name": "amount", + "internalType": "uint256" } ], - "name": "transferControl", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "outputs": [ + { + "type": "bool", + "name": "", + "internalType": "bool" + } + ], + "stateMutability": "nonpayable" }, { + "type": "function", + "name": "transferFrom", "inputs": [ - { "internalType": "address", "name": "from", "type": "address" }, - { "internalType": "address", "name": "to", "type": "address" }, - { "internalType": "uint256", "name": "amount", "type": "uint256" } + { + "type": "address", + "name": "sender", + "internalType": "address" + }, + { + "type": "address", + "name": "recipient", + "internalType": "address" + }, + { + "type": "uint256", + "name": "amount", + "internalType": "uint256" + } ], - "name": "transferFrom", - "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], - "stateMutability": "nonpayable", - "type": "function" + "outputs": [ + { + "type": "bool", + "name": "", + "internalType": "bool" + } + ], + "stateMutability": "nonpayable" }, { + "type": "function", + "name": "transferOwnership", "inputs": [ - { "internalType": "address", "name": "newOwner", "type": "address" } + { + "type": "address", + "name": "newOwner", + "internalType": "address" + } ], - "name": "transferOwnership", "outputs": [], - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "nonpayable" } ] } diff --git a/ui/lib/thirdweb/hooks/useHandleError.ts b/ui/lib/thirdweb/hooks/useHandleError.ts index 9264c901..1dc59150 100644 --- a/ui/lib/thirdweb/hooks/useHandleError.ts +++ b/ui/lib/thirdweb/hooks/useHandleError.ts @@ -1,7 +1,9 @@ import { useEffect } from 'react' -export function useHandleError(method: string, error: any) { +export function useHandleError(method: string, error: any, args?: any[]) { useEffect(() => { - console.log('Method:' + method, error) + if (args && args.length > 0) { + if (method && error) console.log('Method:' + method, error) + } }, [error]) } diff --git a/ui/lib/thirdweb/hooks/useHandleRead.ts b/ui/lib/thirdweb/hooks/useHandleRead.ts index 9fb9054e..3dbc29ea 100644 --- a/ui/lib/thirdweb/hooks/useHandleRead.ts +++ b/ui/lib/thirdweb/hooks/useHandleRead.ts @@ -1,5 +1,4 @@ import { useContractRead } from '@thirdweb-dev/react' -import { SmartContract } from '@thirdweb-dev/sdk' import { useHandleError } from './useHandleError' export function useHandleRead( diff --git a/ui/lib/thirdweb/hooks/useL2Toggle.ts b/ui/lib/thirdweb/hooks/useL2Toggle.ts index 01d3eed3..c82bc8af 100644 --- a/ui/lib/thirdweb/hooks/useL2Toggle.ts +++ b/ui/lib/thirdweb/hooks/useL2Toggle.ts @@ -1,10 +1,7 @@ import { Ethereum, Goerli, Mumbai, Polygon } from '@thirdweb-dev/chains' -import { useRouter } from 'next/router' import { useContext, useState } from 'react' import ChainContext from '../chain-context' -const isMainnet: boolean = process.env.NEXT_PUBLIC_CHAIN === 'mainnet' - export function useL2Toggle() { const [isL2, setIsL2] = useState(false) const { selectedChain, setSelectedChain }: any = useContext(ChainContext) @@ -24,6 +21,5 @@ export function useL2Toggle() { return { isL2, toggleLayer, - layers: [isMainnet ? Ethereum : Goerli, isMainnet ? Polygon : Mumbai], } } diff --git a/ui/lib/tokens/approve.ts b/ui/lib/tokens/approve.ts index 5ac290a2..98a2b7aa 100644 --- a/ui/lib/tokens/approve.ts +++ b/ui/lib/tokens/approve.ts @@ -16,7 +16,5 @@ export function useTokenApproval( amountNeeded: any, spender: string ) { - const lockAmount = - amountNeeded && amountNeeded !== '' ? amountNeeded : BigNumber.from(0) return useHandleWrite(tokenContract, 'approve', [spender, amountNeeded]) } diff --git a/ui/lib/tokens/ve-token.ts b/ui/lib/tokens/ve-token.ts index 5782f885..e7d7f84e 100644 --- a/ui/lib/tokens/ve-token.ts +++ b/ui/lib/tokens/ve-token.ts @@ -42,7 +42,6 @@ export function useVMOONEYIncreaseLock({ currentTime, newTime, }: any) { - const signer: any = useSigner() const { mutateAsync: increaseLockAmount } = useVMOONEYIncreaseLockAmount( votingEscrowContract, newAmount @@ -51,10 +50,6 @@ export function useVMOONEYIncreaseLock({ votingEscrowContract, newTime ) - const { data: lockData } = useVMOONEYLock( - votingEscrowContract, - signer?.address - ) const action = useCallback(() => { if (newAmount && newAmount.gt(0)) { diff --git a/ui/package.json b/ui/package.json index b4d6662a..827eed63 100644 --- a/ui/package.json +++ b/ui/package.json @@ -17,9 +17,8 @@ "@heroicons/react": "^2.0.18", "@shopify/shopify-api": "^6.2.0", "@thirdweb-dev/chains": "^0.1.39", - "@thirdweb-dev/react": "^3.14.27", - "@thirdweb-dev/sdk": "^3.10.46", - "@thirdweb-dev/wallets": "^1.1.4", + "@thirdweb-dev/react": "^3.14.31", + "@thirdweb-dev/sdk": "^3.10.50", "axios": "^1.4.0", "chart.js": "^4.3.2", "chartjs-adapter-moment": "^1.0.1", diff --git a/ui/pages/dashboard/announcements.tsx b/ui/pages/dashboard/announcements.tsx index b458e9be..b91c6db6 100644 --- a/ui/pages/dashboard/announcements.tsx +++ b/ui/pages/dashboard/announcements.tsx @@ -60,7 +60,7 @@ export default function Announcements() { i + 1 === announcements.length ? ( ) : ( { + if (selectedChain?.slug && sdk) { + sdk + .getContract(MOONEY_ADDRESSES[selectedChain?.slug], ERC20ABI.abi) + .then((contract: any) => { + setMooneyContract(contract) + }) + } + }, [selectedChain?.slug]) const { contract: vMooneyContract }: any = useContract( VMOONEY_ADDRESSES[selectedChain?.slug], VotingEscrow.abi ) + const { data: MOONEYBalance, isLoading: MOONEYBalanceLoading } = useMOONEYBalance(mooneyContract, address) @@ -145,7 +161,7 @@ export default function Lock() { const { mutateAsync: createLock } = useVMOONEYCreateLock( vMooneyContract, lockAmount && ethers.utils.parseEther(lockAmount), - lockTime.value.div(1000) + lockTime?.value.div(1000) ) const { mutateAsync: increaseLock } = useVMOONEYIncreaseLock({ @@ -511,24 +527,8 @@ export default function Lock() { {/*Web3 button with actions according context*/}
- parseFloat( - ethers.utils.formatEther( - VMOONEYLock?.[0]?.add(MOONEYBalance?.toString()) - ) - )) || - !lockAmount - ? 'border-disabled btn-disabled bg-transparent' - : 'bg-primary' - }`} + contractAddress={MOONEY_ADDRESSES[selectedChain.slug]} + className={`hover:!text-title-light dark:!text-dark-text dark:!bg-slate-600 dark:hover:!bg-slate-700 dark:hover:!text-title-dark`} isDisabled={ (!canIncrease.amount && !canIncrease.time && @@ -536,7 +536,7 @@ export default function Lock() { Number(VMOONEYLock?.[0].toString() / 10 ** 18)) || (!canIncrease.amount && !canIncrease.time && - Date.parse(lockTime.formatted) < + Date.parse(lockTime?.formatted) < Date.parse( dateToReadable(bigNumberToDate(VMOONEYLock?.[1])) )) diff --git a/ui/yarn.lock b/ui/yarn.lock index c4403e97..5c4bda13 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2816,33 +2816,26 @@ "@tanstack/query-core" "4.32.6" use-sync-external-store "^1.2.0" -"@thirdweb-dev/auth@3.2.27": - version "3.2.27" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/auth/-/auth-3.2.27.tgz#c01124e26d8f89a28c17659a40306030ae68fd83" - integrity sha512-R5iWQy9WyKTXlNzLvJj1lvf4r+lIAeM+q8OcjyeVeRBuBCrifCZXumIs0Lx41LwUoiwgWsXNYZqNB4CSkyMduw== +"@thirdweb-dev/auth@3.2.31": + version "3.2.31" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/auth/-/auth-3.2.31.tgz#e2907336bd86f551c94f68c5a52808cf87e7ac33" + integrity sha512-DSAPMTiPVQ0iPml1SKGZ7/aDUCeElPPscPudlnwfS4JL1Gb+E2SC67G8/WdXJGyqgI9ol98EivEEH9pTC/A5Rg== dependencies: - "@thirdweb-dev/wallets" "1.1.10" + "@thirdweb-dev/wallets" "1.1.14" cookie "^0.5.0" uuid "^9.0.0" zod "^3.20.2" -"@thirdweb-dev/chains@0.1.39", "@thirdweb-dev/chains@^0.1.39": +"@thirdweb-dev/chains@0.1.43": + version "0.1.43" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.43.tgz#4366c10450227624a83d1c9723733f2a94af1d13" + integrity sha512-Iks15g6+06YZTtdROKWx+jQt3Nte/ztuZZuVHK8pSisbiNMAy3Ga3XNdJLmcfCTXTanwF4y5JhRFQAtNKLDHSA== + +"@thirdweb-dev/chains@^0.1.39": version "0.1.39" resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.39.tgz#63d9129068946085b40eda45890c6459d44e9906" integrity sha512-wDoiuuN+ooYjQPAc0ibsOKw5n4dSwONa4DsBtHRAiix17yqsom/sWNzJiRW8WV+PbEKdRfD0/+RdnKKevXn+bA== -"@thirdweb-dev/chains@0.1.42": - version "0.1.42" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.42.tgz#8651100b97e38603c4f2db882482b66f6cf49771" - integrity sha512-wnjj6YwEZs+i6gPDQQUDd5TJmUEXxBReS85Cg4DFnJB4nFWQSMx3z6BZiOEm35oK82I8p5ILP2cgYHzzzpsvMw== - -"@thirdweb-dev/contracts-js@1.3.10": - version "1.3.10" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts-js/-/contracts-js-1.3.10.tgz#2f52bac8cd5157fd28c6561963cfd191e734d450" - integrity sha512-InJyj/b6TzIqoVLayoY63qfrpCxYbEhMmtK3SaThF9GMWPhgQ6/gPx+SGC4kf5Phd4pHwnMT048boAh0QUJIww== - dependencies: - "@thirdweb-dev/contracts" "3.8.1-0" - "@thirdweb-dev/contracts-js@1.3.11": version "1.3.11" resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts-js/-/contracts-js-1.3.11.tgz#12bffe133228436487d0a1298657242e137f08d5" @@ -2850,11 +2843,6 @@ dependencies: "@thirdweb-dev/contracts" "3.8.3" -"@thirdweb-dev/contracts@3.8.1-0": - version "3.8.1-0" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.8.1-0.tgz#936d13701927a995770aa302e0f918beba9a2867" - integrity sha512-yb2W403bh4STD2XujBjK37/rzkF24Y0cdHvgrdl5TKSjt3tR0qTrtRI8m46+E+AmuL64d+nCw+5DNDBqXPypDA== - "@thirdweb-dev/contracts@3.8.3": version "3.8.3" resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.8.3.tgz#2424e5179e4cab56fe73fb74a529ea5d559287f9" @@ -2865,25 +2853,25 @@ resolved "https://registry.yarnpkg.com/@thirdweb-dev/generated-abis/-/generated-abis-0.0.1.tgz#0d788d6aff0ac08f11e9eeb9ae4c8321845272a8" integrity sha512-vO9/3lSLO8smyyH1QVeYravSTzFwV1nf1C/Im1NBDPdH8//YvcbhtETGGiNfHWpyCvSi0vRYwvf+/7FKdwpDGQ== -"@thirdweb-dev/react-core@3.14.27": - version "3.14.27" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/react-core/-/react-core-3.14.27.tgz#59e0159cd88da10d715496324df6dcbbac0ea639" - integrity sha512-Uz6YLDmbBDjzr+chE4IYloZ8Bxor7D5oFI2AwIoDUXaCMFWFKHZ+pI7JDgcrA4VtQasAdQosbnGsnCEDT6WsvQ== +"@thirdweb-dev/react-core@3.14.31": + version "3.14.31" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/react-core/-/react-core-3.14.31.tgz#2515e042f378232a49fbcf6a8de23ea5d6aae789" + integrity sha512-nMECk67hZCFahRXXzdGGQ4rZ0tI+rEkUSJbLuZnR9fLuoSrP+J8smeychWERZaKjpKDEEhoiZ5w8eVhOYoMRGg== dependencies: "@tanstack/react-query" "^4.32.0" - "@thirdweb-dev/auth" "3.2.27" - "@thirdweb-dev/chains" "0.1.42" + "@thirdweb-dev/auth" "3.2.31" + "@thirdweb-dev/chains" "0.1.43" "@thirdweb-dev/generated-abis" "^0.0.1" - "@thirdweb-dev/sdk" "3.10.46" - "@thirdweb-dev/storage" "1.2.3" - "@thirdweb-dev/wallets" "1.1.10" + "@thirdweb-dev/sdk" "3.10.50" + "@thirdweb-dev/storage" "1.2.5" + "@thirdweb-dev/wallets" "1.1.14" mime "3.0.0" tiny-invariant "^1.2.0" -"@thirdweb-dev/react@^3.14.27": - version "3.14.27" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/react/-/react-3.14.27.tgz#b6fe155431c1bc4a029ddd609ed441b930bf60e9" - integrity sha512-aPgDvGwt3V5nr3iKFRFiwEotU3eb0LdpkhN4QZtGscFkkqro90WKG/S2vgrq3/fcMskrmPB0i+EyBbxn+HnmYA== +"@thirdweb-dev/react@^3.14.31": + version "3.14.31" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/react/-/react-3.14.31.tgz#5e3220cd3372b6e3f832c0a05958f31912f8efcf" + integrity sha512-bA1C+8TryC2NMdbvO8vePnvqgoXCB5UfRc3HGiU+sYH1TKQC1VdSPEad1cXTqS1eBWNky9vaYm1c9XjouLG30Q== dependencies: "@emotion/react" "^11.11.1" "@emotion/styled" "^11.11.0" @@ -2897,9 +2885,9 @@ "@radix-ui/react-tooltip" "^1.0.6" "@react-icons/all-files" "^4.1.0" "@tanstack/react-query" "^4.32.0" - "@thirdweb-dev/chains" "0.1.42" - "@thirdweb-dev/react-core" "3.14.27" - "@thirdweb-dev/wallets" "1.1.10" + "@thirdweb-dev/chains" "0.1.43" + "@thirdweb-dev/react-core" "3.14.31" + "@thirdweb-dev/wallets" "1.1.14" buffer "^6.0.3" copy-to-clipboard "^3.3.2" detect-browser "^5.3.0" @@ -2907,38 +2895,15 @@ react-qr-code "^2.0.11" tiny-invariant "^1.2.0" -"@thirdweb-dev/sdk@3.10.41": - version "3.10.41" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-3.10.41.tgz#b404393934c223737fbcbc6e7fde9717b91742ac" - integrity sha512-lFcM/tvQuSp1uaB+WwxPOV/o8/ItiVnXajznb3tOvNR2M/A/+wsaMBlgLKF8ZX0fTWoj7fDmGaxta+ujOZRwcA== +"@thirdweb-dev/sdk@3.10.50", "@thirdweb-dev/sdk@^3.10.50": + version "3.10.50" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-3.10.50.tgz#9115048df29a3a48b6721ce002cc1282e632e99f" + integrity sha512-LaH8cauaCa+ngCt4VYmKz5k0mHaf4MG7ePoGeND86RP+LWv7j7lBIeg4XcCbbp3nIrBgtS9+5wZZrmU1ceSYZg== dependencies: - "@thirdweb-dev/chains" "0.1.39" - "@thirdweb-dev/contracts-js" "1.3.10" - "@thirdweb-dev/generated-abis" "0.0.1" - "@thirdweb-dev/storage" "1.2.1" - abitype "^0.2.5" - bn.js "^5.2.1" - bs58 "^5.0.0" - buffer "^6.0.3" - cross-fetch "^3.1.8" - eventemitter3 "^5.0.1" - fast-deep-equal "^3.1.3" - merkletreejs "^0.2.24" - tiny-invariant "^1.2.0" - tweetnacl "^1.0.3" - uuid "^9.0.0" - yaml "^2.3.1" - zod "^3.20.2" - -"@thirdweb-dev/sdk@3.10.46", "@thirdweb-dev/sdk@^3.10.46": - version "3.10.46" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-3.10.46.tgz#eed498ead6d7d0c5036a086102ef0fd1bafec289" - integrity sha512-7/eRlYAo4qohkjF5u/+QqXWa7oddP5/ZNxlj+uLOws4XEmc9fJtWJIPbK1SpsV7tz2/G7baFM3+hdXfNTM+VyA== - dependencies: - "@thirdweb-dev/chains" "0.1.42" + "@thirdweb-dev/chains" "0.1.43" "@thirdweb-dev/contracts-js" "1.3.11" "@thirdweb-dev/generated-abis" "0.0.1" - "@thirdweb-dev/storage" "1.2.3" + "@thirdweb-dev/storage" "1.2.5" abitype "^0.2.5" bn.js "^5.2.1" bs58 "^5.0.0" @@ -2953,30 +2918,20 @@ yaml "^2.3.1" zod "^3.20.2" -"@thirdweb-dev/storage@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/storage/-/storage-1.2.1.tgz#133adee2de5b018a533fd8dedddc6f354283afe1" - integrity sha512-pBeUZ30UTsTi2mib6rsKyutXeGvLv6IpGnS2Saoyk21vTeF4UavNJtYAsFLCFvh1OPewFThYMtYuqp1Pk/Wv6Q== - dependencies: - cid-tool "^3.0.0" - cross-fetch "^3.1.8" - form-data "^4.0.0" - uuid "^9.0.0" - -"@thirdweb-dev/storage@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/storage/-/storage-1.2.3.tgz#1d57844a4479ef4ab3692b59a0f1c2112ae15840" - integrity sha512-/6IGCQ1LP76X+cTvh3NQuZ+jYg3iqbuDZjvMxvkbPFfQzTJ91ONzzoErVkjLg7Y+CNHQPmCYsLHmE0d5TjyaSQ== +"@thirdweb-dev/storage@1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/storage/-/storage-1.2.5.tgz#8493c9ca0d9fa32d286f90c0f134543e7b6a44ae" + integrity sha512-eZlcNe6mS9JaH25+BgZERkoQRkaX4yB6Qv3frnohJiMYeWvz0zCcTmgcYC5pIZhD/iGFct7mD6N0IY6+eysrwQ== dependencies: cid-tool "^3.0.0" cross-fetch "^3.1.8" form-data "^4.0.0" uuid "^9.0.0" -"@thirdweb-dev/wallets@1.1.10": - version "1.1.10" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/wallets/-/wallets-1.1.10.tgz#12d4a89087545e3d84dd97da4a70a814b354ee9c" - integrity sha512-sble45fq5v9cExFlCG1Gh/NGu2UBrimuj4yTxWOO+qOC2P0hFYl5ea8Yyi3HR7k4wvC1VB0xJnNibd4qpFpNFQ== +"@thirdweb-dev/wallets@1.1.14": + version "1.1.14" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/wallets/-/wallets-1.1.14.tgz#6aec70e364b0feb0a34c09484603afe1a6dba59b" + integrity sha512-8lAB4AJYdEdMUnDNzaOf+JICNjdvtb2+8hdSSCoGIPA/F11HyIwfXgRL5fGHf9D3H9li4pclUJt89TxIJHRL0Q== dependencies: "@account-abstraction/contracts" "^0.5.0" "@account-abstraction/sdk" "^0.5.0" @@ -2990,44 +2945,9 @@ "@safe-global/safe-core-sdk" "^3.3.4" "@safe-global/safe-ethers-adapters" "0.1.0-alpha.17" "@safe-global/safe-ethers-lib" "^1.9.4" - "@thirdweb-dev/chains" "0.1.42" + "@thirdweb-dev/chains" "0.1.43" "@thirdweb-dev/contracts-js" "1.3.11" - "@thirdweb-dev/sdk" "3.10.46" - "@walletconnect/core" "^2.9.1" - "@walletconnect/ethereum-provider" "^2.9.1" - "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/modal" "^2.6.1" - "@walletconnect/types" "^2.9.1" - "@walletconnect/utils" "^2.9.1" - "@walletconnect/web3wallet" "^1.8.7" - buffer "^6.0.3" - cross-fetch "^3.1.8" - crypto-js "^4.1.1" - eth-provider "^0.13.6" - eventemitter3 "^5.0.1" - magic-sdk "^13.6.2" - web3-core "1.5.2" - -"@thirdweb-dev/wallets@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/wallets/-/wallets-1.1.4.tgz#b8a89647a1d8e9bce213e9c5ed3f5da39899929a" - integrity sha512-jJYHvbblPGP/Y+VhIjFDveHUOt0WCveA605olAiuk0GwrHIU8Sh+Pth2Lq6DqQ/RzMnJGgWEGDCRuz6/K2tYig== - dependencies: - "@account-abstraction/contracts" "^0.5.0" - "@account-abstraction/sdk" "^0.5.0" - "@account-abstraction/utils" "^0.5.0" - "@blocto/sdk" "^0.5.4" - "@coinbase/wallet-sdk" "^3.7.1" - "@magic-ext/connect" "^6.7.2" - "@magic-ext/oauth" "^7.6.2" - "@magic-sdk/provider" "^13.6.2" - "@paperxyz/embedded-wallet-service-sdk" "^1.1.3" - "@safe-global/safe-core-sdk" "^3.3.4" - "@safe-global/safe-ethers-adapters" "0.1.0-alpha.17" - "@safe-global/safe-ethers-lib" "^1.9.4" - "@thirdweb-dev/chains" "0.1.39" - "@thirdweb-dev/contracts-js" "1.3.10" - "@thirdweb-dev/sdk" "3.10.41" + "@thirdweb-dev/sdk" "3.10.50" "@walletconnect/core" "^2.9.1" "@walletconnect/ethereum-provider" "^2.9.1" "@walletconnect/jsonrpc-utils" "^1.0.8"