From fead2bdb48f240722a319ae107b8473832260461 Mon Sep 17 00:00:00 2001 From: Bryan Date: Thu, 12 Dec 2024 13:28:43 -0600 Subject: [PATCH] Chore/2.10.2 to main (#847) * Add missing sequentially (#837) * fix (#840) * fix * better logic for expired * tweak * bump deps 0.9.18 (#841) * Take a refactor pass on SwapScreen (#845) --------- Co-authored-by: Noah Prince <83885631+ChewingGlass@users.noreply.github.com> --- package.json | 44 +-- src/features/governance/PositionCard.tsx | 28 +- src/features/swaps/SwapScreen.tsx | 190 ++++++------- yarn.lock | 334 +++++++++++------------ 4 files changed, 300 insertions(+), 296 deletions(-) diff --git a/package.json b/package.json index 11b74cdf..a26345f9 100644 --- a/package.json +++ b/package.json @@ -37,34 +37,34 @@ "@graphql-codegen/typescript": "^4.0.1", "@graphql-codegen/typescript-operations": "^4.0.1", "@graphql-codegen/typescript-rtk-query": "^3.1.1", - "@helium/account-fetch-cache": "0.9.14", - "@helium/account-fetch-cache-hooks": "0.9.14", + "@helium/account-fetch-cache": "0.9.18", + "@helium/account-fetch-cache-hooks": "0.9.18", "@helium/address": "4.10.2", - "@helium/circuit-breaker-sdk": "^0.9.14", + "@helium/circuit-breaker-sdk": "^0.9.18", "@helium/crypto-react-native": "4.8.0", - "@helium/currency-utils": "^0.9.14", - "@helium/data-credits-sdk": "^0.9.14", - "@helium/distributor-oracle": "0.9.14", - "@helium/fanout-sdk": "^0.9.14", - "@helium/helium-entity-manager-sdk": "^0.9.14", - "@helium/helium-react-hooks": "0.9.14", - "@helium/helium-sub-daos-sdk": "^0.9.14", + "@helium/currency-utils": "^0.9.18", + "@helium/data-credits-sdk": "^0.9.18", + "@helium/distributor-oracle": "0.9.18", + "@helium/fanout-sdk": "^0.9.18", + "@helium/helium-entity-manager-sdk": "^0.9.18", + "@helium/helium-react-hooks": "0.9.18", + "@helium/helium-sub-daos-sdk": "^0.9.18", "@helium/http": "4.7.5", - "@helium/idls": "0.9.14", - "@helium/lazy-distributor-sdk": "^0.9.14", + "@helium/idls": "0.9.18", + "@helium/lazy-distributor-sdk": "^0.9.18", "@helium/modular-governance-hooks": "^0.0.13", "@helium/modular-governance-idls": "0.0.13", "@helium/onboarding": "4.11.0", "@helium/organization-sdk": "^0.0.13", "@helium/proto-ble": "4.0.0", "@helium/react-native-sdk": "3.0.5", - "@helium/spl-utils": "0.9.14", + "@helium/spl-utils": "0.9.18", "@helium/state-controller-sdk": "^0.0.13", - "@helium/sus": "0.9.14", + "@helium/sus": "0.9.18", "@helium/transactions": "4.8.1", - "@helium/treasury-management-sdk": "^0.9.14", - "@helium/voter-stake-registry-hooks": "0.9.14", - "@helium/voter-stake-registry-sdk": "0.9.14", + "@helium/treasury-management-sdk": "^0.9.18", + "@helium/voter-stake-registry-hooks": "0.9.18", + "@helium/voter-stake-registry-sdk": "0.9.18", "@helium/wallet-link": "4.11.0", "@jup-ag/api": "^6.0.6", "@keystonehq/keystone-sdk": "^0.8.0", @@ -294,11 +294,11 @@ "@types/react": "18", "react": "18.2.0", "@solana/wallet-adapter-react": "0.15.33", - "@helium/account-fetch-cache": "^0.9.14", - "@helium/account-fetch-cache-hooks": "^0.9.14", - "@helium/helium-react-hooks": "^0.9.14", - "@helium/voter-stake-registry-hooks": "^0.9.14", - "@helium/voter-stake-registry-sdk": "^0.9.14", + "@helium/account-fetch-cache": "^0.9.18", + "@helium/account-fetch-cache-hooks": "^0.9.18", + "@helium/helium-react-hooks": "^0.9.18", + "@helium/voter-stake-registry-hooks": "^0.9.18", + "@helium/voter-stake-registry-sdk": "^0.9.18", "@helium/modular-governance-hooks": "^0.0.13", "@helium/onboarding": "4.11.0" }, diff --git a/src/features/governance/PositionCard.tsx b/src/features/governance/PositionCard.tsx index 7b63ef11..38b151c9 100644 --- a/src/features/governance/PositionCard.tsx +++ b/src/features/governance/PositionCard.tsx @@ -58,6 +58,7 @@ import React, { useCallback, useMemo, useRef, useState } from 'react' import { useAsync } from 'react-async-hook' import { useTranslation } from 'react-i18next' import { FadeIn, FadeOut } from 'react-native-reanimated' +import { EPOCH_LENGTH } from '@helium/helium-sub-daos-sdk' import { MessagePreview } from '@features/solana/MessagePreview' import { useSolana } from '@features/solana/SolanaProvider' import { useWalletSign } from '@features/solana/WalletSignProvider' @@ -126,7 +127,7 @@ export const PositionCard = ({ }) }, [position, unixNow, positions]) - const { lockup, hasGenesisMultiplier, votingMint } = position + const { lockup, isDelegated, hasGenesisMultiplier, votingMint } = position const { info: mintAcc } = useMint(votingMint.mint) const { loading: loadingMetadata, @@ -139,8 +140,13 @@ export const PositionCard = ({ ? t('gov.positions.constant') : t('gov.positions.decaying') const hasActiveVotes = position.numActiveVotes > 0 - const lockupExpired = - !isConstant && lockup.endTs.sub(new BN(unixNow || 0)).lt(new BN(0)) + const decayedEpoch = lockup.endTs.div(new BN(EPOCH_LENGTH)) + const currentEpoch = new BN(unixNow).div(new BN(EPOCH_LENGTH)) + const isDecayed = + !isConstant && + (isDelegated + ? currentEpoch.gt(decayedEpoch) + : lockup.endTs.lte(new BN(unixNow))) const lockedTokens = mintAcc && humanReadable(position.amountDepositedNative, mintAcc.decimals) @@ -436,6 +442,7 @@ export const PositionCard = ({ onInstructions: async (ixs, sigs) => { await decideAndExecute({ header: t('gov.transactions.splitPosition'), + sequentially: true, message: t('gov.positions.splitMessage', { amount: values.amount, symbol, @@ -583,7 +590,7 @@ export const PositionCard = ({ ) return ( <> - {position.isDelegated ? ( + {isDelegated ? ( <> ) : ( <> - {lockupExpired ? ( + {isDecayed ? ( )} - {canDelegate && !position.isDelegated && ( + {canDelegate && !isDelegated && ( {isConstant - ? getMinDurationFmt( - position.lockup.startTs, - position.lockup.endTs, + ? getMinDurationFmt(lockup.startTs, lockup.endTs) + : isDelegated + ? getTimeLeftFromNowFmt( + lockup.endTs.add(new BN(EPOCH_LENGTH)), ) - : getTimeLeftFromNowFmt(position.lockup.endTs)} + : getTimeLeftFromNowFmt(lockup.endTs)} {hasGenesisMultiplier && ( diff --git a/src/features/swaps/SwapScreen.tsx b/src/features/swaps/SwapScreen.tsx index 38c38de8..083b36d0 100644 --- a/src/features/swaps/SwapScreen.tsx +++ b/src/features/swaps/SwapScreen.tsx @@ -303,13 +303,23 @@ const SwapScreen = () => { } if (selectorMode === SelectorMode.youReceive) { + setRecipient('') + setRecipientOpen(false) + if (mint.equals(inputMint)) { setInputMint(outputMint) } setOutputMint(mint) } }, - [selectorMode, refresh, inputMint, outputMint], + [ + selectorMode, + inputMint, + outputMint, + refresh, + setRecipient, + setRecipientOpen, + ], ) const tokenData = useMemo(() => { @@ -358,49 +368,54 @@ const SwapScreen = () => { const getOutputAmount = useCallback( async ({ balance }: { balance: BN }) => { setRouteNotFound(false) - if (outputMintAcc && inputMintAcc) { - const { address: input, decimals: inputDecimals } = inputMintAcc - const { address: output, decimals: outputDecimals } = outputMintAcc - - if (!isDevnet && !output.equals(DC_MINT)) { - const route = await getRoute({ - amount: balance.toNumber(), - inputMint: input.toBase58(), - outputMint: output.toBase58(), - slippageBps, - }) - if (!route) { - setRouteNotFound(true) - } - setPriceImpact(Number(route?.priceImpactPct || '0') * 100) + if (!outputMintAcc || !inputMintAcc) return - return setOutputAmount( - toNumber(new BN(Number(route?.outAmount || 0)), outputDecimals), - ) + const { address: input, decimals: inputDecimals } = inputMintAcc + const { address: output, decimals: outputDecimals } = outputMintAcc + const handleDevnetPrice = () => { + if (price && !input.equals(HNT_MINT)) { + return setOutputAmount(price) } - if (output.equals(DC_MINT)) { - if (input.equals(HNT_MINT)) { - return setOutputAmount( - toNumber( - networkTokensToDc(toBN(balance, inputDecimals)) || new BN(0), - inputDecimals, - ), - ) - } + return setOutputAmount(0) + } + + const handleJupiterRoute = async () => { + const route = await getRoute({ + amount: balance.toNumber(), + inputMint: input.toBase58(), + outputMint: output.toBase58(), + slippageBps, + }) + + if (!route) { setRouteNotFound(true) + setPriceImpact(0) return setOutputAmount(0) } - if (isDevnet) { - if (price && !input.equals(HNT_MINT)) { - return setOutputAmount(price) - } + setPriceImpact(Number(route?.priceImpactPct || '0') * 100) + return setOutputAmount( + toNumber(new BN(Number(route?.outAmount || 0)), outputDecimals), + ) + } + const handleDCConversion = () => { + if (!input.equals(HNT_MINT)) { + setRouteNotFound(true) return setOutputAmount(0) } - return setOutputAmount(0) + return setOutputAmount( + toNumber( + networkTokensToDc(toBN(balance, inputDecimals)) || new BN(0), + inputDecimals, + ), + ) } + + if (isDevnet) return handleDevnetPrice() + if (output.equals(DC_MINT)) return handleDCConversion() + return handleJupiterRoute() }, [ getRoute, @@ -414,34 +429,18 @@ const SwapScreen = () => { ) useEffect(() => { - setRecipient('') - setRecipientOpen(false) - setOutputAmount(0) - }, [ - inputMint, - inputAmount, - outputMint, - setRecipient, - setRecipientOpen, - setOutputAmount, - ]) + if ( + !inputMintAcc?.address?.equals(inputMint) || + !outputMintAcc?.address?.equals(outputMint) || + typeof inputAmount === 'undefined' || + inputAmount <= 0 + ) { + return + } - useEffect(() => { - // if changing outputMint ensure we get new routes - ;(async () => { - if ( - !isDevnet && - inputMintAcc?.address === inputMint && - outputMintAcc?.address === outputMint && - typeof inputAmount !== 'undefined' && - inputAmount > 0 && - !outputMintAcc?.address.equals(DC_MINT) - ) { - await getOutputAmount({ - balance: toBN(inputAmount || 0, inputMintAcc.decimals), - }) - } - })() + getOutputAmount({ + balance: toBN(inputAmount, inputMintAcc.decimals), + }) }, [ getOutputAmount, inputMint, @@ -449,53 +448,58 @@ const SwapScreen = () => { inputMintAcc, outputMint, outputMintAcc, - isDevnet, ]) const getInputAmount = useCallback( async ({ balance }: { balance: BN }) => { - if (outputMintAcc && inputMintAcc) { - const { address: input, decimals: inputDecimals } = inputMintAcc - const { address: output, decimals: outputDecimals } = outputMintAcc - - if (!isDevnet && !output.equals(DC_MINT)) { - const route = await getRoute({ - amount: balance.toNumber(), - inputMint: output.toBase58(), - outputMint: input.toBase58(), - slippageBps, - }) + setRouteNotFound(false) + if (!outputMintAcc || !inputMintAcc) return - if (!route) { - setRouteNotFound(true) - return setInputAmount(0) - } + const { address: input, decimals: inputDecimals } = inputMintAcc + const { address: output, decimals: outputDecimals } = outputMintAcc - return setInputAmount( - toNumber(new BN(Number(route?.outAmount || 0)), inputDecimals), - ) + const handleDevnetPrice = () => { + if (price && !input.equals(HNT_MINT)) { + return setInputAmount(price) } - if (output.equals(DC_MINT)) { - if (input.equals(HNT_MINT)) { - return setInputAmount( - toNumber( - dcToNetworkTokens(toBN(balance, outputDecimals)) || new BN(0), - inputDecimals, - ), - ) - } + return setInputAmount(0) + } + + const handleJupiterRoute = async () => { + const route = await getRoute({ + amount: balance.toNumber(), + inputMint: output.toBase58(), + outputMint: input.toBase58(), + slippageBps, + }) + + if (!route) { setRouteNotFound(true) + return setInputAmount(0) } - if (isDevnet) { - if (price && !input.equals(HNT_MINT)) { - return setInputAmount(price) - } - return setInputAmount(0) + return setInputAmount( + toNumber(new BN(Number(route?.outAmount || 0)), inputDecimals), + ) + } + + const handleDCConversion = () => { + if (input.equals(HNT_MINT)) { + return setInputAmount( + toNumber( + dcToNetworkTokens(toBN(balance, outputDecimals)) || new BN(0), + inputDecimals, + ), + ) } + setRouteNotFound(true) return setInputAmount(0) } + + if (isDevnet) return handleDevnetPrice() + if (output.equals(DC_MINT)) return handleDCConversion() + return handleJupiterRoute() }, [ dcToNetworkTokens, diff --git a/yarn.lock b/yarn.lock index 58a68f8f..a1700e0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3778,26 +3778,26 @@ __metadata: languageName: node linkType: hard -"@helium/account-fetch-cache-hooks@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/account-fetch-cache-hooks@npm:0.9.14" +"@helium/account-fetch-cache-hooks@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/account-fetch-cache-hooks@npm:0.9.18" dependencies: - "@helium/account-fetch-cache": ^0.9.14 + "@helium/account-fetch-cache": ^0.9.18 "@solana/web3.js": ^1.78.8 react-async-hook: ^4.0.0 peerDependencies: react: ^16.8 || ^17 || ^18 react-dom: ^16.8 || ^17 || ^18 - checksum: a72612d800ffe5f8127050f8a5c033ac740cd22ba77d9e1091e3f2b77cfcbf02838da7e76042e6a4c0c2405d32ada1372a6bdbf275f8c55e589e58e36b0451af + checksum: cb83f66cb17f1ea1d000e5dfc0085612ae8d9e16cfc572f34e7275018bd0068e7ed581786894c02a978b0b7236ea39f58f34a4480fb4409dc2581cc0de903045 languageName: node linkType: hard -"@helium/account-fetch-cache@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/account-fetch-cache@npm:0.9.14" +"@helium/account-fetch-cache@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/account-fetch-cache@npm:0.9.18" dependencies: "@solana/web3.js": ^1.78.8 - checksum: 519ed605322ed4ea519068d43666df640f899882e258453c11fe1cb83bcb82b8b5be02b38467ddf5b96cd531051dc9d62c22fccb8265c110e2a5653b3032b3d8 + checksum: 07ba1f9f3357e3185a8d730a4b590695ac6dbd864ae415a4daef4652fa638650a533eb5d1a14499645760e8039b0dbf1a0cb7227057971d07b41848b36ed152b languageName: node linkType: hard @@ -3871,15 +3871,15 @@ __metadata: languageName: node linkType: hard -"@helium/anchor-resolvers@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/anchor-resolvers@npm:0.9.14" +"@helium/anchor-resolvers@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/anchor-resolvers@npm:0.9.18" dependencies: "@solana/spl-token": ^0.3.8 "@solana/web3.js": ^1.78.8 peerDependencies: "@coral-xyz/anchor": ^0.28.0 - checksum: 63377b47b92d5839468445d4f3277ade49b62b3ac80986542cf13aa021faef1a1c013f820521a7d3c618ff5a4dae5a91bf7fbcfa88fe30b4057de6169717d15f + checksum: 656399c6a5a00f297b9988661e66728fe444868136eef3d20ab05cc0d1390dd7a11e0d2fb11bc4d902501d6b3d2ad49e4fd171e6ee730392eb16721b9ebc22b5 languageName: node linkType: hard @@ -3909,16 +3909,17 @@ __metadata: languageName: node linkType: hard -"@helium/circuit-breaker-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/circuit-breaker-sdk@npm:0.9.14" +"@helium/circuit-breaker-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/circuit-breaker-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/idls": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: 1ccbf2ca4de833066b63592756ce4cfc0b5135a97d8f3f3a006d948d226e094ab992a80643ee0ef5436540aa38e69a7bbc97070fef983be89e6ea21eff72b498 + checksum: 601383e908026263136030fe7c1c82dab7319fc958800943315a2b0a54b3bc1c8ffe922e9ac20f046b06fae78ba25aa31bfbaec3e195e87d80560533c29e8015 languageName: node linkType: hard @@ -3955,13 +3956,13 @@ __metadata: languageName: node linkType: hard -"@helium/currency-utils@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/currency-utils@npm:0.9.14" +"@helium/currency-utils@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/currency-utils@npm:0.9.18" dependencies: "@solana/spl-token": ^0.3.8 "@solana/web3.js": ^1.78.8 - checksum: 77854dcc5149621ad9b97c54c1419e2f5f0bb7eee6cdacea2c2d56452087627fe4d1323b15eb84ab5f7cf1b58f1fdb051ce94e23edadd6b536f502b08a863480 + checksum: c43f8f0c21123b506a3b04cc085adfeb77924c735e0ab66348d71d6dbc98ff36285abef9e18309651991dd66a352ae80555f21a47b5924d6fa7ecabecb1e5721 languageName: node linkType: hard @@ -4006,36 +4007,37 @@ __metadata: languageName: node linkType: hard -"@helium/data-credits-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/data-credits-sdk@npm:0.9.14" +"@helium/data-credits-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/data-credits-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/circuit-breaker-sdk": ^0.9.14 - "@helium/helium-sub-daos-sdk": ^0.9.14 - "@helium/idls": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/circuit-breaker-sdk": ^0.9.18 + "@helium/helium-sub-daos-sdk": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 crypto-js: ^4.1.1 - checksum: f6f7204a0de8cb40ee75f58407bb34e17d744af08ae649ecf232abfef104564ddc29f31d978f7b6fa2da644d56f4a9f114aa3dfd453019dfbacf81bb94481f37 + checksum: 994260148624e2a1289c88e933309aac400ea421d5a6be558817ed1492ef570d5c23a52c009f811cab7c9946b6bbff815c3f885239a40472996744f928c72c92 languageName: node linkType: hard -"@helium/distributor-oracle@npm:0.9.14": - version: 0.9.14 - resolution: "@helium/distributor-oracle@npm:0.9.14" +"@helium/distributor-oracle@npm:0.9.18": + version: 0.9.18 + resolution: "@helium/distributor-oracle@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 "@fastify/cors": ^8.1.1 - "@helium/account-fetch-cache": ^0.9.14 + "@helium/account-fetch-cache": ^0.9.18 "@helium/address": ^4.10.2 - "@helium/helium-entity-manager-sdk": ^0.9.14 - "@helium/helium-sub-daos-sdk": ^0.9.14 - "@helium/idls": ^0.9.14 - "@helium/lazy-distributor-sdk": ^0.9.14 - "@helium/rewards-oracle-sdk": ^0.9.14 - "@helium/spl-utils": ^0.9.14 + "@helium/helium-entity-manager-sdk": ^0.9.18 + "@helium/helium-sub-daos-sdk": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/lazy-distributor-sdk": ^0.9.18 + "@helium/rewards-oracle-sdk": ^0.9.18 + "@helium/spl-utils": ^0.9.18 "@metaplex-foundation/mpl-bubblegum": ^0.7.0 "@solana/spl-token": ^0.3.8 "@types/sequelize": ^4.28.14 @@ -4051,20 +4053,21 @@ __metadata: prom-client: ^15.0.0 sequelize: ^6.28.0 typescript-collections: ^1.3.3 - checksum: 4cb6a95b24d02f02e5b0620646c1265ef464a551775c302d686f1f620eb1b3baef99eadd4707e6692fa8458784648a57cb27a717699bdf4650bf394ecfa92ab9 + checksum: d283938488e48a9c9860e7c8abe9093bd41240b83afa4cf548e4a2a5ebd6c538cfbdd3beafd61bd7a0912afe871f6f1212d6a1671455dffc3f97dbed6e155f83 languageName: node linkType: hard -"@helium/fanout-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/fanout-sdk@npm:0.9.14" +"@helium/fanout-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/fanout-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/idls": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: 9f84f1e5b141d5cacde952b805ee2a8f18ace52c89bda8dc09a8aba6d675afa5458f7f7d7acf21b69720b159790e6306fe7cf62af992ae6c04a72e64bdf524b5 + checksum: 5f6accd8638b72202353dbdcd9aadeb5f157ea1cd6cb8c6c5fa4ba1ec7020412d45ad8a883590ddfead7f82387e35c2b93debec7cd1508d336b31d77de5ae589 languageName: node linkType: hard @@ -4106,32 +4109,32 @@ __metadata: languageName: node linkType: hard -"@helium/helium-entity-manager-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/helium-entity-manager-sdk@npm:0.9.14" +"@helium/helium-entity-manager-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/helium-entity-manager-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 "@helium/address": ^4.10.2 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/helium-sub-daos-sdk": ^0.9.14 - "@helium/idls": ^0.9.14 - "@helium/no-emit-sdk": ^0.9.14 - "@helium/spl-utils": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/helium-sub-daos-sdk": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/no-emit-sdk": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 crypto-js: ^4.1.1 js-sha256: ^0.9.0 - checksum: 24c6825b2226ba40ad433d1c7ec132effef96f535b5fb34d2abbf94c7dfed218b21cc53fc2ecb151c7152703e3b2c8359e383446fc15d89f6022f1918f6ab9de + checksum: 4c03cae6d77af4acbcdec891b669b40898255805011e536f818e31fef08b9611c7df72fc0754c64f7ffcaa44d923f5ea8c47d1f40c0d47b12b4bb922e31a06c4 languageName: node linkType: hard -"@helium/helium-react-hooks@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/helium-react-hooks@npm:0.9.14" +"@helium/helium-react-hooks@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/helium-react-hooks@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/account-fetch-cache": ^0.9.14 - "@helium/account-fetch-cache-hooks": ^0.9.14 + "@helium/account-fetch-cache": ^0.9.18 + "@helium/account-fetch-cache-hooks": ^0.9.18 "@solana/spl-token": ^0.3.8 "@solana/web3.js": ^1.78.8 bs58: ^4.0.1 @@ -4141,7 +4144,7 @@ __metadata: "@solana/wallet-adapter-react": ^0.15.32 react: ^16.8 || ^17 || ^18 react-dom: ^16.8 || ^17 || ^18 - checksum: cd5106ab16e0003758220609852274415cee1ed10210d291ba66cdefaa904ec73c61a5158b1bb2d859fc73310f7a6de41a348f4c6e1246bae7df56702ea783c3 + checksum: 77088e3184a25327373db663af4e549687f3ad9bf465ee29a365ca70d35041dd523a6fd244f92e1ac00a1b2f8aadbea2926bdd4bd41a15fcd4b3db4c868d070b languageName: node linkType: hard @@ -4175,18 +4178,19 @@ __metadata: languageName: node linkType: hard -"@helium/helium-sub-daos-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/helium-sub-daos-sdk@npm:0.9.14" +"@helium/helium-sub-daos-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/helium-sub-daos-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/circuit-breaker-sdk": ^0.9.14 - "@helium/treasury-management-sdk": ^0.9.14 - "@helium/voter-stake-registry-sdk": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/circuit-breaker-sdk": ^0.9.18 + "@helium/spl-utils": ^0.9.18 + "@helium/treasury-management-sdk": ^0.9.18 + "@helium/voter-stake-registry-sdk": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: 91eef5ad462687c7eeda5cd4692d0450c99f4b8ad6cf1158956c0d8d788883996f82673b93cb3011688ee611d957062a87c965cb73900304587e1a95d20d0f6b + checksum: af0ec342d98671ece5b211bec7eda68a95b7f6c07b3ec5db830a6d192d5364d412e44df97bfc838ece7ad0c1a7278edbdadaaa851c9b934661b12076da9a3ecc languageName: node linkType: hard @@ -4235,16 +4239,16 @@ __metadata: languageName: node linkType: hard -"@helium/idls@npm:0.9.14, @helium/idls@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/idls@npm:0.9.14" +"@helium/idls@npm:0.9.18, @helium/idls@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/idls@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 "@solana/web3.js": ^1.78.8 bn.js: ^5.2.0 borsh: ^0.7.0 bs58: ^4.0.1 - checksum: a3ea8d58c1885d2ec392b6a256c0cd7e89e3b89824810dcbd0c8979f832c8683449895aed1654af08ff3d6ebddc52e34181c89a5a113e62a7b64f377a7574819 + checksum: 06959b002ce88faca3e8fa20efce068a2ee0019d91617ca0b5e4fa07d99b3f911141840fd4258f02c42dc457062eb3fe50377832657c8603dd4f9dd7a7704acd languageName: node linkType: hard @@ -4287,16 +4291,17 @@ __metadata: languageName: node linkType: hard -"@helium/lazy-distributor-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/lazy-distributor-sdk@npm:0.9.14" +"@helium/lazy-distributor-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/lazy-distributor-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/circuit-breaker-sdk": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/circuit-breaker-sdk": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: af6a6ba42e0450c821fe5b971be4c98c27c4ea2b02d8cefcf80bad00b17e42db4b2cd2127d396c5b8bb238be1c5436bdf2f3ee63a9057976ee6ce76293a130a4 + checksum: 81221d28bcbaa592257f190590b5863bb03fcce949bb22942ed89f14d90baa6f81860dcb471528dc7b99e0c660f091425ad08234373dee9fbbdca9112c0d8f85 languageName: node linkType: hard @@ -4338,25 +4343,25 @@ __metadata: languageName: node linkType: hard -"@helium/modular-governance-idls@npm:^0.0.12": - version: 0.0.12 - resolution: "@helium/modular-governance-idls@npm:0.0.12" +"@helium/modular-governance-idls@npm:^0.0.15": + version: 0.0.15 + resolution: "@helium/modular-governance-idls@npm:0.0.15" dependencies: "@coral-xyz/anchor": ^0.28.0 "@solana/web3.js": ^1.78.4 - checksum: 606c888d1f1af24aeae2b3f011ee2db19f17ce78b3bf37fe6bebaccc3e8e040b4e365d3fa32d4a4e42d181efdc35dc53dc0bf701b5b85065cab167e307c7f035 + checksum: cbfaa2a83b074fb24d138de1901acaa7a0cf0de715bdabb3fdad9ab04b59a34e5f6c02216fdb6b6d78d4fa48bf80fe76d2c657107458f9d9b53d64aa532bc547 languageName: node linkType: hard -"@helium/nft-proxy-sdk@npm:^0.0.12": - version: 0.0.12 - resolution: "@helium/nft-proxy-sdk@npm:0.0.12" +"@helium/nft-proxy-sdk@npm:^0.0.15": + version: 0.0.15 + resolution: "@helium/nft-proxy-sdk@npm:0.0.15" dependencies: "@coral-xyz/anchor": ^0.28.0 "@helium/anchor-resolvers": ^0.2.17 "@helium/modular-governance-idls": ^0.0.10 "@solana/spl-token": ^0.3.8 - checksum: e70478c9ed007a1044ff7c76d0e0fdaf1163b489772893b8f4b52dd9d69d194aee71bc63a181a81c766dc459474cdbf3403035cc1f43e2741e89c139e3881b8b + checksum: ce22c3b786b00bb1a64baa33b040b0530d87420b49ab5b0b8a5704fbc184c71d93c01120d4fc8cf9fdc347b2a4a38c422011d86cc3e5e090243ee630f29e9456 languageName: node linkType: hard @@ -4373,16 +4378,17 @@ __metadata: languageName: node linkType: hard -"@helium/no-emit-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/no-emit-sdk@npm:0.9.14" +"@helium/no-emit-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/no-emit-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 "@helium/anchor-resolvers": ^0.5.0 - "@helium/idls": ^0.5.0 + "@helium/idls": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: 56de168dd265582b1e2f680bb790fd77c7f0470704414b5cd2ae3d708da553d5457e4449f96abe57fe723928ecba393cb8acbd8c9ae60a79794f8c61bec9ba1c + checksum: 1dfd4ba31f64c8edcace3df069c4c0a94607df94cf4935d17545003da9751927ef565cade57031c7ce2a84a29d30ab387527d40b16e236285a6e44bb58fbc1ed languageName: node linkType: hard @@ -4429,21 +4435,6 @@ __metadata: languageName: node linkType: hard -"@helium/position-voting-rewards-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/position-voting-rewards-sdk@npm:0.9.14" - dependencies: - "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/idls": ^0.9.14 - "@helium/spl-utils": ^0.9.14 - "@solana/spl-token": ^0.3.8 - bn.js: ^5.2.0 - bs58: ^4.0.1 - checksum: a0790b0165ae67a68b678b2ef850dbbe9e450f5105584ff7d091d1bac40afcf03731fbfdceae039c0f9e01fff506dd6b92d5d3f39ab6390f35b6ab8a37bd5c0a - languageName: node - linkType: hard - "@helium/proposal-sdk@npm:^0.0.13": version: 0.0.13 resolution: "@helium/proposal-sdk@npm:0.0.13" @@ -4548,27 +4539,28 @@ __metadata: languageName: node linkType: hard -"@helium/rewards-oracle-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/rewards-oracle-sdk@npm:0.9.14" +"@helium/rewards-oracle-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/rewards-oracle-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/idls": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: c18999a873a3fe3a00d984736de25dddd2fa9ddab8966898c9bcb3dab7dc70b00e4fb0342ad89bc669e501ec84924c2d827c6559d24f39e2e4cfe5a0976d3e02 + checksum: 5ee2ff2171caee28f2c5416d0380698d77508dea3ca7f95911a8946d204a23e6ca7f5fe6396745510588fc51faf0dca9d7f4dfa7708411d066843223bd74520c languageName: node linkType: hard -"@helium/spl-utils@npm:0.9.14, @helium/spl-utils@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/spl-utils@npm:0.9.14" +"@helium/spl-utils@npm:0.9.18, @helium/spl-utils@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/spl-utils@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/account-fetch-cache": ^0.9.14 + "@helium/account-fetch-cache": ^0.9.18 "@helium/address": ^4.10.2 - "@helium/anchor-resolvers": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 "@metaplex-foundation/mpl-token-metadata": ^2.10.0 "@solana/spl-account-compression": ^0.1.7 "@solana/spl-token": ^0.3.8 @@ -4577,7 +4569,7 @@ __metadata: bn.js: ^5.2.0 borsh: ^0.7.0 bs58: ^4.0.1 - checksum: f604647b63e0432eec4384427d1cd823485d4236a980e2a7f347f286aea3fd21cc3700fd7f58e853e166e17d879967b8776964528f169fb1442529ef839c0521 + checksum: 4ee452a9f424fc0fce51d4a3753af1537dae05884affb8a024b103d483fe323552f87419644b23aef89a44b16d101633f875f0d672c10993ce133a43f4274cee languageName: node linkType: hard @@ -4632,9 +4624,9 @@ __metadata: languageName: node linkType: hard -"@helium/sus@npm:0.9.14": - version: 0.9.14 - resolution: "@helium/sus@npm:0.9.14" +"@helium/sus@npm:0.9.18": + version: 0.9.18 + resolution: "@helium/sus@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 "@metaplex-foundation/mpl-token-metadata": ^2.10.0 @@ -4643,7 +4635,7 @@ __metadata: axios: ^1.6.5 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: ff4be446ea060511924f32ddaac4236bd3db0a0ae59065f4565dec4505e2b31f709ae53322cdb240a85dd9a6daa0c2600f826eeda3a4b306de259660d578581a + checksum: bb4f5fd1e6e22b8f1a9185414da9387cb9a68a6310ce1680ebb77279a57966c4c2a65bca99dba32966e4847d75ff455305edcf7a014751c2fab0362a3d5fa7d5 languageName: node linkType: hard @@ -4701,35 +4693,35 @@ __metadata: languageName: node linkType: hard -"@helium/treasury-management-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/treasury-management-sdk@npm:0.9.14" +"@helium/treasury-management-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/treasury-management-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/circuit-breaker-sdk": ^0.9.14 - "@helium/idls": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/circuit-breaker-sdk": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/spl-utils": ^0.9.18 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: a46291b78876591fac3900ac3784e6fe7427fae56982a2b7830c2a5194c919307ef520e98a1f66b84cec1896c59905f3a917497fa0557f67ff7ae07dff3dfa0f + checksum: 143f4f13ee9461dcd6eb8dd789a65a5468fce6ed1d9c93f0f040eed837fafea3d11df3682d9fa9df3fe5baaf35bae82591fcefa18d16c2cc5eab0d9129311e91 languageName: node linkType: hard -"@helium/voter-stake-registry-hooks@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/voter-stake-registry-hooks@npm:0.9.14" +"@helium/voter-stake-registry-hooks@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/voter-stake-registry-hooks@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/account-fetch-cache": ^0.9.14 - "@helium/account-fetch-cache-hooks": ^0.9.14 - "@helium/circuit-breaker-sdk": ^0.9.14 - "@helium/helium-react-hooks": ^0.9.14 - "@helium/helium-sub-daos-sdk": ^0.9.14 - "@helium/modular-governance-hooks": ^0.0.12 - "@helium/modular-governance-idls": ^0.0.12 - "@helium/position-voting-rewards-sdk": ^0.9.14 - "@helium/spl-utils": ^0.9.14 - "@helium/voter-stake-registry-sdk": ^0.9.14 + "@helium/account-fetch-cache": ^0.9.18 + "@helium/account-fetch-cache-hooks": ^0.9.18 + "@helium/circuit-breaker-sdk": ^0.9.18 + "@helium/helium-react-hooks": ^0.9.18 + "@helium/helium-sub-daos-sdk": ^0.9.18 + "@helium/modular-governance-hooks": ^0.0.15 + "@helium/modular-governance-idls": ^0.0.15 + "@helium/spl-utils": ^0.9.18 + "@helium/voter-stake-registry-sdk": ^0.9.18 "@solana/wallet-adapter-base": ^0.9.22 "@solana/wallet-adapter-react": ^0.15.32 "@solana/web3.js": ^1.78.8 @@ -4740,24 +4732,24 @@ __metadata: peerDependencies: react: ^16.8 || ^17 || ^18 react-dom: ^16.8 || ^17 || ^18 - checksum: 1e8d393afc5db230afc1e42802a136a0bb1c06f5e2b48e6b048ea91122a70df0f0b25c6cd83228b4cf91791a0bd0abcaa926223308a67acc84d6fc8171ac001b + checksum: 1e498a70b5ff6d62e0d5d3909c0c4e096dcbadad40fe2f974cd68b9e12441224fbc256d7e98f19fae42929e7cc4484222468cd9e0f5783b3c69adc7098156955 languageName: node linkType: hard -"@helium/voter-stake-registry-sdk@npm:^0.9.14": - version: 0.9.14 - resolution: "@helium/voter-stake-registry-sdk@npm:0.9.14" +"@helium/voter-stake-registry-sdk@npm:^0.9.18": + version: 0.9.18 + resolution: "@helium/voter-stake-registry-sdk@npm:0.9.18" dependencies: "@coral-xyz/anchor": ^0.28.0 - "@helium/anchor-resolvers": ^0.9.14 - "@helium/idls": ^0.9.14 - "@helium/nft-proxy-sdk": ^0.0.12 - "@helium/spl-utils": ^0.9.14 + "@helium/anchor-resolvers": ^0.9.18 + "@helium/idls": ^0.9.18 + "@helium/nft-proxy-sdk": ^0.0.15 + "@helium/spl-utils": ^0.9.18 "@metaplex-foundation/mpl-token-metadata": ^2.10.0 "@solana/spl-token": ^0.3.8 bn.js: ^5.2.0 bs58: ^4.0.1 - checksum: 855b2dc578adc80e03b799c7fa0a5ca4b7202b63adcd3d96a7a738833a0a102dde2b01825882dbce9c405380066f1a99db58d43e48269307c9b1015eedae8db6 + checksum: 9de2b67c64afd0adcdc5c7372ee80d63b60bac57f73325841e20c8bf30e2b3b046960d860dab92f8793be69ee1d7d542ca298bb3db7faeb9d6c9b9ee6ddd2850 languageName: node linkType: hard @@ -15370,34 +15362,34 @@ __metadata: "@graphql-codegen/typescript": ^4.0.1 "@graphql-codegen/typescript-operations": ^4.0.1 "@graphql-codegen/typescript-rtk-query": ^3.1.1 - "@helium/account-fetch-cache": 0.9.14 - "@helium/account-fetch-cache-hooks": 0.9.14 + "@helium/account-fetch-cache": 0.9.18 + "@helium/account-fetch-cache-hooks": 0.9.18 "@helium/address": 4.10.2 - "@helium/circuit-breaker-sdk": ^0.9.14 + "@helium/circuit-breaker-sdk": ^0.9.18 "@helium/crypto-react-native": 4.8.0 - "@helium/currency-utils": ^0.9.14 - "@helium/data-credits-sdk": ^0.9.14 - "@helium/distributor-oracle": 0.9.14 - "@helium/fanout-sdk": ^0.9.14 - "@helium/helium-entity-manager-sdk": ^0.9.14 - "@helium/helium-react-hooks": 0.9.14 - "@helium/helium-sub-daos-sdk": ^0.9.14 + "@helium/currency-utils": ^0.9.18 + "@helium/data-credits-sdk": ^0.9.18 + "@helium/distributor-oracle": 0.9.18 + "@helium/fanout-sdk": ^0.9.18 + "@helium/helium-entity-manager-sdk": ^0.9.18 + "@helium/helium-react-hooks": 0.9.18 + "@helium/helium-sub-daos-sdk": ^0.9.18 "@helium/http": 4.7.5 - "@helium/idls": 0.9.14 - "@helium/lazy-distributor-sdk": ^0.9.14 + "@helium/idls": 0.9.18 + "@helium/lazy-distributor-sdk": ^0.9.18 "@helium/modular-governance-hooks": ^0.0.13 "@helium/modular-governance-idls": 0.0.13 "@helium/onboarding": 4.11.0 "@helium/organization-sdk": ^0.0.13 "@helium/proto-ble": 4.0.0 "@helium/react-native-sdk": 3.0.5 - "@helium/spl-utils": 0.9.14 + "@helium/spl-utils": 0.9.18 "@helium/state-controller-sdk": ^0.0.13 - "@helium/sus": 0.9.14 + "@helium/sus": 0.9.18 "@helium/transactions": 4.8.1 - "@helium/treasury-management-sdk": ^0.9.14 - "@helium/voter-stake-registry-hooks": 0.9.14 - "@helium/voter-stake-registry-sdk": 0.9.14 + "@helium/treasury-management-sdk": ^0.9.18 + "@helium/voter-stake-registry-hooks": 0.9.18 + "@helium/voter-stake-registry-sdk": 0.9.18 "@helium/wallet-link": 4.11.0 "@jup-ag/api": ^6.0.6 "@keystonehq/keystone-sdk": ^0.8.0