Skip to content

Commit 4444e62

Browse files
committed
remove connect dep in solana
1 parent df56a31 commit 4444e62

File tree

9 files changed

+31
-469
lines changed

9 files changed

+31
-469
lines changed

package-lock.json

+9-453
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/definitions/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"test": "jest --config ./jest.config.ts"
5050
},
5151
"dependencies": {
52-
"@noble/hashes": "^1.3.1",
5352
"@wormhole-foundation/sdk-base": "^0.7",
5453
"@wormhole-foundation/sdk-definitions": "^0.7"
5554
},

solana/package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@
5555
"@solana/spl-token": "0.4.0",
5656
"@solana/web3.js": "1.91.7",
5757
"bn.js": "5.2.1",
58-
"@wormhole-foundation/sdk-connect": "^0.7",
58+
"@wormhole-foundation/sdk-base": "^0.7",
59+
"@wormhole-foundation/sdk-definitions": "^0.7",
5960
"@wormhole-foundation/sdk-solana": "^0.7",
6061
"@wormhole-foundation/sdk-solana-core": "^0.7"
6162
},
6263
"peerDependencies": {
63-
"@wormhole-foundation/sdk-connect": "^0.7",
64+
"@wormhole-foundation/sdk-base": "^0.7",
65+
"@wormhole-foundation/sdk-definitions": "^0.7",
6466
"@wormhole-foundation/sdk-solana": "^0.7",
6567
"@wormhole-foundation/sdk-solana-core": "^0.7"
6668
},

solana/tests/anchor.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
serializePayload,
1515
signSendWait as ssw,
1616
AccountAddress,
17-
} from "@wormhole-foundation/sdk-connect";
17+
} from "@wormhole-foundation/sdk";
1818
import * as testing from "@wormhole-foundation/sdk-definitions/testing";
1919
import {
2020
SolanaAddress,

solana/ts/lib/ntt.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,18 @@ import {
2323
} from "@solana/web3.js";
2424
import {
2525
Chain,
26-
ChainAddress,
2726
ChainId,
28-
VAA,
2927
deserializeLayout,
3028
encoding,
31-
keccak256,
3229
rpc,
3330
toChain,
3431
toChainId,
35-
} from "@wormhole-foundation/sdk-connect";
32+
} from "@wormhole-foundation/sdk-base";
33+
import {
34+
ChainAddress,
35+
VAA,
36+
keccak256,
37+
} from "@wormhole-foundation/sdk-definitions";
3638

3739
import { Ntt } from "@wormhole-foundation/sdk-definitions-ntt";
3840

solana/ts/lib/utils.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
import { BN } from "@coral-xyz/anchor";
2+
import { PublicKey, PublicKeyInitData } from "@solana/web3.js";
13
import {
4+
Chain,
5+
ChainId,
26
CustomConversion,
37
Layout,
48
encoding,
9+
toChainId,
510
} from "@wormhole-foundation/sdk-base";
6-
import { BN } from "@coral-xyz/anchor";
7-
import { PublicKey, PublicKeyInitData } from "@solana/web3.js";
8-
import { Chain, ChainId, toChainId } from "@wormhole-foundation/sdk-connect";
911

1012
export const BPF_LOADER_UPGRADEABLE_PROGRAM_ID = new PublicKey(
1113
"BPFLoaderUpgradeab1e11111111111111111111111"

solana/ts/sdk/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { registerProtocol } from "@wormhole-foundation/sdk-connect";
1+
import { registerProtocol } from "@wormhole-foundation/sdk-definitions";
22
import { _platform } from "@wormhole-foundation/sdk-solana";
33
import { SolanaNtt } from "./ntt.js";
44
import "@wormhole-foundation/sdk-definitions-ntt";

solana/ts/sdk/ntt.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ import {
1111
TransactionMessage,
1212
VersionedTransaction,
1313
} from "@solana/web3.js";
14+
15+
import { Chain, Network } from "@wormhole-foundation/sdk-base";
1416
import {
1517
AccountAddress,
16-
Chain,
1718
ChainAddress,
1819
ChainsConfig,
1920
Contracts,
2021
NativeAddress,
21-
Network,
2222
TokenAddress,
2323
UnsignedTransaction,
24-
} from "@wormhole-foundation/sdk-connect";
24+
} from "@wormhole-foundation/sdk-definitions";
2525
import {
2626
Ntt,
2727
WormholeNttTransceiver,

solana/tsconfig.anchor.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
"include": ["ts/sdk/**/*.ts", "ts/sdk/**/*.json"],
44
"exclude": ["jest.config.js"],
55
"compilerOptions": {
6-
"outDir": "dist/esm",
6+
"noEmit": true,
77
"rootDir": "ts/sdk",
88
"resolveJsonModule": true,
99
"noUnusedLocals": false,
1010
"allowUnreachableCode": true,
1111
"allowUnusedLabels": true,
12+
"noPropertyAccessFromIndexSignature": false,
1213
}
1314
}

0 commit comments

Comments
 (0)