Upgrade blockchain api (#1005)

Author: ChewingGlass

package.json

@@ -34,7 +34,7 @@
     "@helium/account-fetch-cache-hooks": "0.11.4",
     "@helium/address": "^5.0.4",
     "@helium/automation-hooks": "^0.11.4",
-    "@helium/blockchain-api": "^0.2.4",
+    "@helium/blockchain-api": "^0.3.2",
     "@helium/circuit-breaker-sdk": "0.11.4",
     "@helium/cron-sdk": "^0.0.8",
     "@helium/crypto-react-native": "^5.0.4",

src/hooks/useSubmitTxn.tsx

@@ -1,3 +1,4 @@
+import type { AnchorProvider, Program } from '@coral-xyz/anchor'
 import * as distributorOracle from '@helium/distributor-oracle'
 import {
   decodeEntityKey,
@@ -13,45 +14,43 @@ import {
   populateMissingDraftInfo,
   toVersionedTx,
 } from '@helium/spl-utils'
-import type { AnchorProvider, Program } from '@coral-xyz/anchor'
-import { getMint } from '@solana/spl-token'
 import { PublicKey, VersionedTransaction } from '@solana/web3.js'
 import { useAccountStorage } from '@storage/AccountStorageProvider'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { WrappedConnection } from '@utils/WrappedConnection'
+import { ellipsizeAddress } from '@utils/accountUtils'
 import {
   DAO_KEY,
   HNT_LAZY_KEY,
   IOT_LAZY_KEY,
-  MOBILE_LAZY_KEY,
   MAX_TRANSACTIONS_PER_SIGNATURE_BATCH,
   Mints,
+  MOBILE_LAZY_KEY,
 } from '@utils/constants'
-import { toAsset, getCachedKeyToAssets } from '@utils/solanaUtils'
-import { WrappedConnection } from '@utils/WrappedConnection'
+import { humanReadable } from '@utils/formatting'
 import i18n from '@utils/i18n'
 import * as solUtils from '@utils/solanaUtils'
+import { getCachedKeyToAssets, toAsset } from '@utils/solanaUtils'
 import BN from 'bn.js'
 import React, { useCallback } from 'react'
-import { ellipsizeAddress } from '@utils/accountUtils'
-import { humanReadable } from '@utils/formatting'
-import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { SwapPreview } from '../solana/SwapPreview'
 import { CollectablePreview } from '../solana/CollectablePreview'
 import { MessagePreview } from '../solana/MessagePreview'
 import { PaymentPreivew } from '../solana/PaymentPreview'
 import { useSolana } from '../solana/SolanaProvider'
+import { SwapPreview } from '../solana/SwapPreview'
 import { useWalletSign } from '../solana/WalletSignProvider'
 import { WalletStandardMessageTypes } from '../solana/walletSignBottomSheetTypes'
 import { useBlockchainApi } from '../storage/BlockchainApiProvider'
-import {
-  signTransactionData,
-  toTransactionData,
-  hashTagParams,
-} from '../utils/transactionUtils'
 import {
   Collectable,
   CompressedNFT,
   HotspotWithPendingRewards,
 } from '../types/solana'
+import {
+  hashTagParams,
+  signTransactionData,
+  toTransactionData,
+} from '../utils/transactionUtils'
 
 // Helper to get entityKey from a CompressedNFT
 async function getEntityKeyFromCompressedNFT(
@@ -145,30 +144,18 @@ export default () => {
         throw new Error(t('errors.account'))
       }
 
-      // Get mint decimals
-      const mintInfo = await getMint(anchorProvider.connection, mint)
-
       // For each payment, get transaction data from API
       const txnDataPromises = payments.map(async (payment) => {
         // Convert BN amount to decimal string
         const amountStr = payment.balanceAmount.toString()
-        const paddedAmount =
-          amountStr.length < mintInfo.decimals
-            ? amountStr.padStart(mintInfo.decimals, '0')
-            : amountStr
-        const integerPart =
-          paddedAmount.length > mintInfo.decimals
-            ? paddedAmount.slice(0, paddedAmount.length - mintInfo.decimals)
-            : '0'
-        const decimalPart = paddedAmount.slice(-mintInfo.decimals)
-        const decimalAmount = `${integerPart}.${decimalPart}`
-
         const { transactionData } = await client.tokens.transfer({
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           walletAddress: currentAccount.solanaAddress!,
-          mint: mint.toBase58(),
+          tokenAmount: {
+            amount: amountStr,
+            mint: mint.toBase58(),
+          },
           destination: payment.payee,
-          amount: decimalAmount,
-          decimals: mintInfo.decimals,
         })
         return transactionData
       })

yarn.lock

@@ -2533,15 +2533,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@helium/blockchain-api@npm:^0.2.4":
-  version: 0.2.4
-  resolution: "@helium/blockchain-api@npm:0.2.4"
+"@helium/blockchain-api@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "@helium/blockchain-api@npm:0.3.2"
   dependencies:
-    "@orpc/client": "npm:^1.13.2"
     "@orpc/contract": "npm:^1.13.2"
-    "@orpc/server": "npm:^1.13.2"
     zod: "npm:^4.3.5"
-  checksum: 10/9851ce6c71946a44b778ec4e7bf2836bd9658368f70abb67e86e6a54aa53a045d56c6c9fa27b7023865a5179b203178f9ed639dbeabe2f9d11deeaba06dfd4db
+  checksum: 10/9dc9061a867c8a097dc4a734d44fb2cf0db3971de569649d7a62b0e42b9ac28539116446df49360bd6724280f46c419578dcfdf448346b3e1de2ec79d3f1396a
   languageName: node
   linkType: hard
 
@@ -4223,7 +4221,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@orpc/client@npm:1.13.4, @orpc/client@npm:^1.13.2":
+"@orpc/client@npm:1.13.4":
   version: 1.13.4
   resolution: "@orpc/client@npm:1.13.4"
   dependencies:
@@ -4235,7 +4233,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@orpc/contract@npm:1.13.4, @orpc/contract@npm:^1.13.2":
+"@orpc/contract@npm:^1.13.2":
   version: 1.13.4
   resolution: "@orpc/contract@npm:1.13.4"
   dependencies:
@@ -4247,40 +4245,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@orpc/interop@npm:1.13.4":
-  version: 1.13.4
-  resolution: "@orpc/interop@npm:1.13.4"
-  checksum: 10/58ee50a8b5322574816a7463ece6b4b90e0b49f05cfad846e326b9ba8d34d5b957f76cb0a2acbc55e2d079eb920199f8303afed28c693d265c18a9277ee9a2fb
-  languageName: node
-  linkType: hard
-
-"@orpc/server@npm:^1.13.2":
-  version: 1.13.4
-  resolution: "@orpc/server@npm:1.13.4"
-  dependencies:
-    "@orpc/client": "npm:1.13.4"
-    "@orpc/contract": "npm:1.13.4"
-    "@orpc/interop": "npm:1.13.4"
-    "@orpc/shared": "npm:1.13.4"
-    "@orpc/standard-server": "npm:1.13.4"
-    "@orpc/standard-server-aws-lambda": "npm:1.13.4"
-    "@orpc/standard-server-fastify": "npm:1.13.4"
-    "@orpc/standard-server-fetch": "npm:1.13.4"
-    "@orpc/standard-server-node": "npm:1.13.4"
-    "@orpc/standard-server-peer": "npm:1.13.4"
-    cookie: "npm:^1.1.1"
-  peerDependencies:
-    crossws: ">=0.3.4"
-    ws: ">=8.18.1"
-  peerDependenciesMeta:
-    crossws:
-      optional: true
-    ws:
-      optional: true
-  checksum: 10/fe86117c240290efec518b42791b181c7d6498eba9e46a85878e9b9262dffcd4877db6c1fd9341588aa8f2dd636f67b6ad770c16526c29627950bd34666a17f6
-  languageName: node
-  linkType: hard
-
 "@orpc/shared@npm:1.13.4":
   version: 1.13.4
   resolution: "@orpc/shared@npm:1.13.4"
@@ -4296,34 +4260,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@orpc/standard-server-aws-lambda@npm:1.13.4":
-  version: 1.13.4
-  resolution: "@orpc/standard-server-aws-lambda@npm:1.13.4"
-  dependencies:
-    "@orpc/shared": "npm:1.13.4"
-    "@orpc/standard-server": "npm:1.13.4"
-    "@orpc/standard-server-fetch": "npm:1.13.4"
-    "@orpc/standard-server-node": "npm:1.13.4"
-  checksum: 10/8532c591068dc12ca6b6df009fbecb3d7cc0b36f734c2888b336dc563f581f47b88b338b00d62983f4cb89f489773260d41a9c40c9c4a49f8abda8ba01e59ecf
-  languageName: node
-  linkType: hard
-
-"@orpc/standard-server-fastify@npm:1.13.4":
-  version: 1.13.4
-  resolution: "@orpc/standard-server-fastify@npm:1.13.4"
-  dependencies:
-    "@orpc/shared": "npm:1.13.4"
-    "@orpc/standard-server": "npm:1.13.4"
-    "@orpc/standard-server-node": "npm:1.13.4"
-  peerDependencies:
-    fastify: ">=5.6.1"
-  peerDependenciesMeta:
-    fastify:
-      optional: true
-  checksum: 10/b2c7cd995a4f6cdc52013dba30988ca9704a97ecd000acc06af73b24ba96f7929244af266c3c81588a8bbad555968b943640c4ef35306e7d183d17f97562d901
-  languageName: node
-  linkType: hard
-
 "@orpc/standard-server-fetch@npm:1.13.4":
   version: 1.13.4
   resolution: "@orpc/standard-server-fetch@npm:1.13.4"
@@ -4334,17 +4270,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@orpc/standard-server-node@npm:1.13.4":
-  version: 1.13.4
-  resolution: "@orpc/standard-server-node@npm:1.13.4"
-  dependencies:
-    "@orpc/shared": "npm:1.13.4"
-    "@orpc/standard-server": "npm:1.13.4"
-    "@orpc/standard-server-fetch": "npm:1.13.4"
-  checksum: 10/70c69fd4cb9f567427e5d269614a87a7b288744ba287cc73a52060db4ee9a2c6335cfd474bb0737ff6c4b857112af6e71c450548e7833f31c5d8ce848b7ebc9e
-  languageName: node
-  linkType: hard
-
 "@orpc/standard-server-peer@npm:1.13.4":
   version: 1.13.4
   resolution: "@orpc/standard-server-peer@npm:1.13.4"
@@ -9585,13 +9510,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "cookie@npm:1.1.1"
-  checksum: 10/85538153054791155cf4d38d2e807e3b9382d71bf71d92fc46fca348515ea574049d0d9ef8eb84d2d54a681ad1d7a7316b1989b901dace50a6c0f4c3858dbdb2
-  languageName: node
-  linkType: hard
-
 "copy-descriptor@npm:^0.1.0":
   version: 0.1.1
   resolution: "copy-descriptor@npm:0.1.1"
@@ -12678,7 +12596,7 @@ __metadata:
     "@helium/account-fetch-cache-hooks": "npm:0.11.4"
     "@helium/address": "npm:^5.0.4"
     "@helium/automation-hooks": "npm:^0.11.4"
-    "@helium/blockchain-api": "npm:^0.2.4"
+    "@helium/blockchain-api": "npm:^0.3.2"
     "@helium/circuit-breaker-sdk": "npm:0.11.4"
     "@helium/cron-sdk": "npm:^0.0.8"
     "@helium/crypto-react-native": "npm:^5.0.4"