Upgrade @solana/web3.js to 2.0.0-rc.0 (#357)

https://x.com/anza_xyz/status/1819093864394764674
solana-labs · Aug 2, 2024 · 1ac3288 · 1ac3288
1 parent 00f541a
commit 1ac3288
Show file tree

Hide file tree

Showing 10 changed files with 483 additions and 142 deletions.
diff --git a/app/address/[address]/entries/page-client.tsx b/app/address/[address]/entries/page-client.tsx
@@ -4,7 +4,7 @@ import { LookupTableEntriesCard } from '@components/account/address-lookup-table
 import { isAddressLookupTableAccount } from '@components/account/address-lookup-table/types';
 import { ParsedAccountRenderer } from '@components/account/ParsedAccountRenderer';
 import React from 'react';
-import { Base58EncodedAddress } from 'web3js-experimental';
+import { Address } from 'web3js-experimental';
 
 type Props = Readonly<{
     params: {
@@ -20,7 +20,7 @@ function AddressLookupTableEntriesRenderer({
     const rawData = account?.data.raw;
     if (parsedData && parsedData.program === 'address-lookup-table' && parsedData.parsed.type === 'lookupTable') {
         return <LookupTableEntriesCard parsedLookupTable={parsedData.parsed.info} />;
-    } else if (rawData && isAddressLookupTableAccount(account.owner.toBase58() as Base58EncodedAddress, rawData)) {
+    } else if (rawData && isAddressLookupTableAccount(account.owner.toBase58() as Address, rawData)) {
         return <LookupTableEntriesCard lookupTableAccountData={rawData} />;
     } else {
         return onNotFound();

diff --git a/app/address/[address]/layout.tsx b/app/address/[address]/layout.tsx
@@ -45,7 +45,7 @@ import React, { PropsWithChildren, Suspense } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { create } from 'superstruct';
 import useSWRImmutable from 'swr/immutable';
-import { Base58EncodedAddress } from 'web3js-experimental';
+import { Address } from 'web3js-experimental';
 
 import { CompressedNftAccountHeader, CompressedNftCard } from '@/app/components/account/CompressedNftCard';
 import { useCompressedNft } from '@/app/providers/compressed-nft';
@@ -441,7 +441,7 @@ function InfoSection({ account, tokenInfo }: { account: Account; tokenInfo?: Ful
         parsedData.parsed.type === 'lookupTable'
     ) {
         return <AddressLookupTableAccountSection account={account} lookupTableAccount={parsedData.parsed.info} />;
-    } else if (rawData && isAddressLookupTableAccount(account.owner.toBase58() as Base58EncodedAddress, rawData)) {
+    } else if (rawData && isAddressLookupTableAccount(account.owner.toBase58() as Address, rawData)) {
         return <AddressLookupTableAccountSection account={account} data={rawData} />;
     } else if (account.owner.toBase58() === FEATURE_PROGRAM_ID) {
         return <FeatureAccountSection account={account} />;
@@ -529,10 +529,7 @@ function getTabs(pubkey: PublicKey, account: Account): TabComponent[] {
     }
 
     // Add the key for address lookup tables
-    if (
-        account.data.raw &&
-        isAddressLookupTableAccount(account.owner.toBase58() as Base58EncodedAddress, account.data.raw)
-    ) {
+    if (account.data.raw && isAddressLookupTableAccount(account.owner.toBase58() as Address, account.data.raw)) {
         tabs.push(...TABS_LOOKUP['address-lookup-table']);
     }
 

diff --git a/app/components/account/address-lookup-table/types.ts b/app/components/account/address-lookup-table/types.ts
@@ -1,10 +1,10 @@
-import { Base58EncodedAddress } from 'web3js-experimental';
+import { Address } from 'web3js-experimental';
 
 const LOOKUP_TABLE_ACCOUNT_TYPE = 1;
 const PROGRAM_ID =
-    'AddressLookupTab1e1111111111111111111111111' as Base58EncodedAddress<'AddressLookupTab1e1111111111111111111111111'>;
+    'AddressLookupTab1e1111111111111111111111111' as Address<'AddressLookupTab1e1111111111111111111111111'>;
 
-export function isAddressLookupTableAccount(accountOwner: Base58EncodedAddress, accountData: Uint8Array): boolean {
+export function isAddressLookupTableAccount(accountOwner: Address, accountData: Uint8Array): boolean {
     if (accountOwner !== PROGRAM_ID) return false;
     if (!accountData || accountData.length === 0) return false;
     return accountData[0] === LOOKUP_TABLE_ACCOUNT_TYPE;

diff --git a/app/providers/accounts/vote-accounts.tsx b/app/providers/accounts/vote-accounts.tsx
@@ -1,15 +1,15 @@
 import { useCluster } from '@providers/cluster';
 import { Cluster } from '@utils/cluster';
 import React from 'react';
-import { createDefaultRpcTransport, createSolanaRpc } from 'web3js-experimental';
+import { createSolanaRpc } from 'web3js-experimental';
 
 type VoteAccountInfo = Readonly<{
-    activatedStake: bigint,
+    activatedStake: bigint;
 }>;
 
 type VoteAccounts = Readonly<{
-    current: VoteAccountInfo[],
-    delinquent: VoteAccountInfo[],
+    current: VoteAccountInfo[];
+    delinquent: VoteAccountInfo[];
 }>;
 
 async function fetchVoteAccounts(
@@ -18,14 +18,13 @@ async function fetchVoteAccounts(
     setVoteAccounts: React.Dispatch<React.SetStateAction<VoteAccounts | undefined>>
 ) {
     try {
-        const transport = createDefaultRpcTransport({ url });
-        const rpc = createSolanaRpc({ transport });
+        const rpc = createSolanaRpc(url);
 
         const voteAccountsResponse = await rpc.getVoteAccounts({ commitment: 'confirmed' }).send();
         const voteAccounts: VoteAccounts = {
             current: voteAccountsResponse.current.map(c => ({ activatedStake: c.activatedStake })),
             delinquent: voteAccountsResponse.delinquent.map(d => ({ activatedStake: d.activatedStake })),
-        }
+        };
 
         setVoteAccounts(voteAccounts);
     } catch (error) {

diff --git a/app/providers/cluster.tsx b/app/providers/cluster.tsx
@@ -4,7 +4,7 @@ import { Cluster, clusterName, ClusterStatus, clusterUrl, DEFAULT_CLUSTER } from
 import { localStorageIsAvailable } from '@utils/local-storage';
 import { ReadonlyURLSearchParams, usePathname, useRouter, useSearchParams } from 'next/navigation';
 import React, { createContext, useContext, useEffect, useReducer, useState } from 'react';
-import { createDefaultRpcTransport, createSolanaRpc } from 'web3js-experimental';
+import { createSolanaRpc } from 'web3js-experimental';
 
 import { EpochSchedule } from '../utils/epoch-schedule';
 
@@ -125,8 +125,7 @@ async function updateCluster(dispatch: Dispatch, cluster: Cluster, customUrl: st
         new URL(customUrl);
 
         const transportUrl = clusterUrl(cluster, customUrl);
-        const transport = createDefaultRpcTransport({ url: transportUrl });
-        const rpc = createSolanaRpc({ transport });
+        const rpc = createSolanaRpc(transportUrl);
 
         const [firstAvailableBlock, epochSchedule, epochInfo] = await Promise.all([
             rpc.getFirstAvailableBlock().send(),

diff --git a/app/providers/stats/solanaClusterStats.tsx b/app/providers/stats/solanaClusterStats.tsx
@@ -4,7 +4,7 @@ import { useCluster } from '@providers/cluster';
 import { Cluster } from '@utils/cluster';
 import React from 'react';
 import useTabVisibility from 'use-tab-visibility';
-import { createDefaultRpcTransport, createSolanaRpc } from 'web3js-experimental';
+import { createSolanaRpc } from 'web3js-experimental';
 
 import { DashboardInfo, DashboardInfoActionType, dashboardInfoReducer, EpochInfo } from './solanaDashboardInfo';
 import { PerformanceInfo, PerformanceInfoActionType, performanceInfoReducer, PerformanceSample } from './solanaPerformanceInfo';
@@ -76,8 +76,7 @@ export function SolanaClusterStatsProvider({ children }: Props) {
     React.useEffect(() => {
         if (!active || !isTabVisible || !url) return;
 
-        const transport = createDefaultRpcTransport({ url });
-        const rpc = createSolanaRpc({ transport });
+        const rpc = createSolanaRpc(url);
 
         let lastSlot: bigint | null = null;
         let stale = false;

diff --git a/app/providers/supply.tsx b/app/providers/supply.tsx
@@ -3,7 +3,7 @@
 import { useCluster } from '@providers/cluster';
 import { Cluster, ClusterStatus } from '@utils/cluster';
 import React from 'react';
-import { createDefaultRpcTransport, createSolanaRpc } from 'web3js-experimental';
+import { createSolanaRpc } from 'web3js-experimental';
 
 export enum Status {
     Idle,
@@ -48,8 +48,7 @@ async function fetch(dispatch: Dispatch, cluster: Cluster, url: string) {
     dispatch(Status.Connecting);
 
     try {
-        const transport = createDefaultRpcTransport({ url });
-        const rpc = createSolanaRpc({ transport });
+        const rpc = createSolanaRpc(url);
 
         const supplyResponse = await rpc
             .getSupply({ commitment: 'finalized', excludeNonCirculatingAccountsList: true })

diff --git a/app/utils/token-search.ts b/app/utils/token-search.ts
@@ -6,12 +6,12 @@
  * So to avoid pulling in extra dependencies we just use the public API directly for search
  */
 
-import { Base58EncodedAddress } from 'web3js-experimental';
+import { Address } from 'web3js-experimental';
 
 import { Cluster } from './cluster';
 
 type TokenSearchApiResponseToken = {
-    address: Base58EncodedAddress;
+    address: Address;
     chainId: number;
     name: string;
     symbol: string;

diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
         "typescript": "5.0.4",
         "use-async-effect": "^2.2.7",
         "use-tab-visibility": "^1.0.9",
-        "web3js-experimental": "npm:@solana/[email protected]experimental.7adc22b"
+        "web3js-experimental": "npm:@solana/[email protected]rc.0"
     },
     "devDependencies": {
         "@solana/eslint-config-solana": "^1.0.1",