refactor(experimental): Add Nonce and Token JSON parsed account types (#2031)

* Move Blockhash from transactions to rpc-types

* Move assertIsBlockhash from transactions to rpc-types

* Add nonce JSON parsed account type

* Add remaining JSON parsed token accounts

Author: mcintyre94

packages/compat/package.json

@@ -66,14 +66,15 @@
     },
     "dependencies": {
         "@solana/functional": "workspace:*",
-        "@solana/keys": "workspace:*",
         "@solana/instructions": "workspace:*",
+        "@solana/keys": "workspace:*",
         "@solana/transactions": "workspace:*"
     },
     "devDependencies": {
         "@solana/addresses": "workspace:*",
         "@solana/eslint-config-solana": "^1.0.2",
         "@solana/keys": "workspace:*",
+        "@solana/rpc-types": "workspace:*",
         "@solana/web3.js": "workspace:*",
         "@swc/jest": "^0.2.29",
         "@types/jest": "^29.5.11",

packages/compat/src/transaction.ts

@@ -3,9 +3,9 @@ import { pipe } from '@solana/functional';
 import type { IAccountMeta, IInstruction } from '@solana/instructions';
 import { AccountRole } from '@solana/instructions';
 import type { SignatureBytes } from '@solana/keys';
+import type { Blockhash } from '@solana/rpc-types';
 import {
     appendTransactionInstruction,
-    type Blockhash,
     createTransaction,
     type IDurableNonceTransaction,
     isAdvanceNonceAccountInstruction,

packages/library-legacy-sham/package.json

@@ -72,6 +72,7 @@
     },
     "devDependencies": {
         "@solana/eslint-config-solana": "^1.0.2",
+        "@solana/rpc-types": "workspace:*",
         "@solana/web3.js-legacy": "workspace:../library-legacy",
         "@swc/jest": "^0.2.29",
         "@types/jest": "^29.5.11",
@@ -80,13 +81,13 @@
         "@typescript-eslint/parser": "^6.3.0",
         "agadoo": "^3.0.0",
         "build-scripts": "workspace:*",
+        "eslint": "^8.45.0",
         "eslint-plugin-jest": "^27.4.2",
         "eslint-plugin-sort-keys-fix": "^1.1.2",
-        "eslint": "^8.45.0",
+        "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "jest-runner-eslint": "^2.1.2",
         "jest-runner-prettier": "^1.0.0",
-        "jest": "^29.7.0",
         "prettier": "^3.1",
         "test-config": "workspace:*",
         "tsconfig": "workspace:*",

packages/library-legacy-sham/src/transaction.ts

@@ -1,9 +1,8 @@
 import { Address } from '@solana/addresses';
+import { assertIsBlockhash, type Blockhash } from '@solana/rpc-types';
 import {
-    assertIsBlockhash,
     assertTransactionIsFullySigned,
     BaseTransaction,
-    Blockhash,
     CompilableTransaction,
     createTransaction,
     getTransactionDecoder,

packages/library/package.json

@@ -107,4 +107,4 @@
             }
         ]
     }
-}
+}

packages/library/src/__tests__/decode-transaction-test.ts

@@ -2,7 +2,8 @@ import { FetchAccountsConfig, fetchJsonParsedAccounts } from '@solana/accounts';
 import type { Address } from '@solana/addresses';
 import { GetMultipleAccountsApi } from '@solana/rpc-core';
 import { Rpc } from '@solana/rpc-transport';
-import { type Blockhash, decompileTransaction, getCompiledTransactionDecoder } from '@solana/transactions';
+import type { Blockhash } from '@solana/rpc-types';
+import { decompileTransaction, getCompiledTransactionDecoder } from '@solana/transactions';
 import { CompiledTransaction } from '@solana/transactions/dist/types/compile-transaction';
 
 import { LamportsUnsafeBeyond2Pow53Minus1 } from '..';

packages/library/src/__tests__/transaction-confirmation-test.ts

@@ -1,7 +1,8 @@
 import { Address } from '@solana/addresses';
 import { AccountRole, ReadonlySignerAccount, WritableAccount } from '@solana/instructions';
 import { Signature, SignatureBytes } from '@solana/keys';
-import { Blockhash, IDurableNonceTransaction, Nonce } from '@solana/transactions';
+import type { Blockhash } from '@solana/rpc-types';
+import { IDurableNonceTransaction, Nonce } from '@solana/transactions';
 
 import {
     waitForDurableNonceTransactionConfirmation,

packages/rpc-core/src/rpc-methods/__tests__/get-fee-for-message-test.ts

@@ -1,8 +1,8 @@
 import { fixEncoder } from '@solana/codecs-core';
 import { getBase58Encoder, getBase64Decoder } from '@solana/codecs-strings';
 import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
-import { Blockhash, SerializedMessageBytesBase64 } from '@solana/transactions';
+import type { Blockhash, Commitment } from '@solana/rpc-types';
+import { SerializedMessageBytesBase64 } from '@solana/transactions';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetFeeForMessageApi, GetLatestBlockhashApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/is-blockhash-valid-test.ts

@@ -1,6 +1,5 @@
 import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
-import { Blockhash } from '@solana/transactions';
+import type { Blockhash, Commitment } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, IsBlockhashValidApi } from '../index';

packages/rpc-core/src/rpc-methods/__typetests__/get-block-type-test.ts

@@ -4,9 +4,10 @@ import type {
     Base58EncodedBytes,
     Base58EncodedDataResponse,
     Base64EncodedDataResponse,
+    Blockhash,
     LamportsUnsafeBeyond2Pow53Minus1,
 } from '@solana/rpc-types';
-import { Blockhash, TransactionVersion } from '@solana/transactions';
+import { TransactionVersion } from '@solana/transactions';
 
 import { TransactionError } from '../../transaction-error';
 import { GetBlockApi } from '..';