remove connect-sdk dep, restore typescript version

barnjamin · barnjamin · commit e217403e0e15 · 2023-10-27T10:29:02.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,6 +19,6 @@
   },
   "devDependencies": {
     "prettier": "^2.8.1",
-    "typescript": "^5.2.2"
+    "typescript": "^4.9.4"
   }
 }
diff --git a/watcher/package.json b/watcher/package.json
@@ -27,7 +27,6 @@
     "@google-cloud/pubsub": "^3.4.1",
     "@mysten/sui.js": "^0.33.0",
     "@solana/web3.js": "^1.73.0",
-    "@wormhole-foundation/connect-sdk": "^0.1.6-beta.1",
     "@wormhole-foundation/wormhole-monitor-common": "^0.0.1",
     "algosdk": "^2.4.0",
     "aptos": "^1.4.0",
diff --git a/watcher/scripts/checkSolana.ts b/watcher/scripts/checkSolana.ts
@@ -2,12 +2,10 @@ import * as dotenv from 'dotenv';
 dotenv.config();
 
 import { SolanaWatcher } from '../src/watchers/SolanaWatcher';
-import { CONFIG } from '@wormhole-foundation/connect-sdk';
 
 // Temporary script to test SolanaWatcher for lookup addresses
 (async () => {
-  const conf = CONFIG.Testnet.chains.Solana!;
-  const sw = new SolanaWatcher(conf.rpc, conf.contracts.coreBridge);
+  const sw = new SolanaWatcher();
   const msgs = await sw.getMessagesForBlocks(245230133, 245230333);
   console.log(msgs);
 })();
diff --git a/watcher/src/watchers/SolanaWatcher.ts b/watcher/src/watchers/SolanaWatcher.ts
@@ -143,7 +143,8 @@ export class SolanaWatcher extends Watcher {
         }
         if (!res || !res.blockTime) {
           throw new Error(
-            `solana: failed to fetch tx for signature ${res?.transaction.signatures[0] || 'unknown'
+            `solana: failed to fetch tx for signature ${
+              res?.transaction.signatures[0] || 'unknown'
             }`
           );
         }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`},`
`20`	`20`	`"devDependencies": {`
`21`	`21`	`"prettier": "^2.8.1",`
`22`		`- "typescript": "^5.2.2"`
	`22`	`+ "typescript": "^4.9.4"`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,8 @@ export class SolanaWatcher extends Watcher {`
`143`	`143`	`}`
`144`	`144`	`if (!res \|\| !res.blockTime) {`
`145`	`145`	`throw new Error(`
`146`		- `solana: failed to fetch tx for signature ${res?.transaction.signatures[0] \|\| 'unknown'
	`146`	+ `solana: failed to fetch tx for signature ${
	`147`	`+ res?.transaction.signatures[0] \|\| 'unknown'`
`147`	`148`	}`
`148`	`149`	`);`
`149`	`150`	`}`