Skip to content

Commit 18d6b56

Browse files
authored
fix: use our version of fast-stable-stringify everywhere (#2504)
1 parent e4475ef commit 18d6b56

File tree

8 files changed

+27
-26
lines changed

8 files changed

+27
-26
lines changed

.changeset/strong-pandas-marry.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@solana/web3.js": patch
3+
"@solana/web3.js-experimental": patch
4+
"@solana/rpc-subscriptions": patch
5+
"@solana/rpc": patch
6+
---
7+
8+
Replaced `fast-stable-stringify` with our fork

packages/library-legacy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959
"@noble/curves": "^1.2.0",
6060
"@noble/hashes": "^1.3.3",
6161
"@solana/buffer-layout": "^4.0.1",
62+
"@solana/fast-stable-stringify": "workspace:*",
6263
"agentkeepalive": "^4.5.0",
6364
"bigint-buffer": "^1.1.5",
6465
"bn.js": "^5.2.1",
6566
"borsh": "^0.7.0",
6667
"bs58": "^4.0.1",
6768
"buffer": "6.0.3",
68-
"fast-stable-stringify": "^1.0.0",
6969
"jayson": "^4.1.0",
7070
"node-fetch": "^2.7.0",
7171
"rpc-websockets": "^7.5.1",

packages/library-legacy/src/connection.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1+
import fastStableStringify from '@solana/fast-stable-stringify';
12
import HttpKeepAliveAgent, {
23
HttpsAgent as HttpsKeepAliveAgent,
34
} from 'agentkeepalive';
45
import bs58 from 'bs58';
56
import {Buffer} from 'buffer';
6-
// @ts-ignore
7-
import fastStableStringify from 'fast-stable-stringify';
87
import type {Agent as NodeHttpAgent} from 'http';
98
import {Agent as NodeHttpsAgent} from 'https';
109
import {
@@ -6291,10 +6290,7 @@ export class Connection {
62916290
args: IWSRequestParams,
62926291
): ClientSubscriptionId {
62936292
const clientSubscriptionId = this._nextClientSubscriptionId++;
6294-
const hash = fastStableStringify(
6295-
[subscriptionConfig.method, args],
6296-
true /* isArrayProp */,
6297-
);
6293+
const hash = fastStableStringify([subscriptionConfig.method, args]);
62986294
const existingSubscription = this._subscriptionsByHash[hash];
62996295
if (existingSubscription === undefined) {
63006296
this._subscriptionsByHash[hash] = {

packages/rpc-subscriptions/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@
6464
],
6565
"dependencies": {
6666
"@solana/errors": "workspace:*",
67+
"@solana/fast-stable-stringify": "workspace:*",
6768
"@solana/functional": "workspace:*",
6869
"@solana/rpc-subscriptions-api": "workspace:*",
6970
"@solana/rpc-subscriptions-spec": "workspace:*",
7071
"@solana/rpc-subscriptions-transport-websocket": "workspace:*",
7172
"@solana/rpc-transformers": "workspace:*",
72-
"@solana/rpc-types": "workspace:*",
73-
"fast-stable-stringify": "^1.0.0"
73+
"@solana/rpc-types": "workspace:*"
7474
},
7575
"bundlewatch": {
7676
"defaultCompression": "gzip",

packages/rpc-subscriptions/src/rpc-subscriptions.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import fastStableStringify from '@solana/fast-stable-stringify';
12
import { pipe } from '@solana/functional';
23
import type { SolanaRpcSubscriptionsApi, SolanaRpcSubscriptionsApiUnstable } from '@solana/rpc-subscriptions-api';
34
import { createSolanaRpcSubscriptionsApi } from '@solana/rpc-subscriptions-api';
@@ -7,9 +8,6 @@ import {
78
type RpcSubscriptionsTransport,
89
} from '@solana/rpc-subscriptions-spec';
910
import { ClusterUrl } from '@solana/rpc-types';
10-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
11-
// @ts-ignore
12-
import fastStableStringify from 'fast-stable-stringify';
1311

1412
import { DEFAULT_RPC_CONFIG } from './rpc-default-config';
1513
import type { RpcSubscriptionsFromTransport } from './rpc-subscriptions-clusters';

packages/rpc/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@
6464
],
6565
"dependencies": {
6666
"@solana/errors": "workspace:*",
67+
"@solana/fast-stable-stringify": "workspace:*",
6768
"@solana/functional": "workspace:*",
6869
"@solana/rpc-api": "workspace:*",
6970
"@solana/rpc-spec": "workspace:*",
7071
"@solana/rpc-transformers": "workspace:*",
7172
"@solana/rpc-transport-http": "workspace:*",
72-
"@solana/rpc-types": "workspace:*",
73-
"fast-stable-stringify": "^1.0.0"
73+
"@solana/rpc-types": "workspace:*"
7474
},
7575
"bundlewatch": {
7676
"defaultCompression": "gzip",

packages/rpc/src/rpc-request-deduplication.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
2-
// @ts-ignore
3-
import fastStableStringify from 'fast-stable-stringify';
1+
import fastStableStringify from '@solana/fast-stable-stringify';
42

53
function isJsonRpcPayload(payload: unknown): payload is Readonly<{ method: string; params: unknown }> {
64
if (payload == null || typeof payload !== 'object' || Array.isArray(payload)) {

pnpm-lock.yaml

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)