[PLAT-308] Fix wormhole on identity (#3742)

* [PLAT-308] Fix wormhole on identity * Address comments
AudiusProject · Aug 24, 2022 · 879b906 · 879b906
1 parent 4d94f7c
commit 879b906
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/libs/src/AudiusLibs.ts b/libs/src/AudiusLibs.ts
@@ -565,11 +565,9 @@ export class AudiusLibs {
     }
     await Promise.all(contractsToInit)
     if (
-      this.hedgehog &&
       this.wormholeConfig &&
       this.ethWeb3Manager &&
       this.ethContracts &&
-      this.identityService &&
       this.solanaWeb3Manager
     ) {
       this.wormholeClient = new Wormhole(

diff --git a/libs/src/services/wormhole/Wormhole.ts b/libs/src/services/wormhole/Wormhole.ts
@@ -12,7 +12,7 @@ import { providers } from 'ethers/lib/index'
 import wormholeSDK, { ChainId } from '@certusone/wormhole-sdk'
 
 import { SolanaUtils, wAudioFromWeiAudio } from '../solana'
-import { Utils, sign, getTransferTokensDigest } from '../../utils'
+import { Utils, sign, getTransferTokensDigest, Nullable } from '../../utils'
 import type {
   RpcResponseAndContext,
   SignatureResult,
@@ -30,10 +30,10 @@ export type WormholeConfig = {
 
 /** Singleton state-manager for Audius Eth Contracts */
 export class Wormhole {
-  hedgehog: Hedgehog
+  hedgehog: Nullable<Hedgehog>
   ethWeb3Manager: EthWeb3Manager
   ethContracts: EthContracts
-  identityService: IdentityService
+  identityService: Nullable<IdentityService>
   solanaWeb3Manager: SolanaWeb3Manager
   rpcHosts: string[]
   solBridgeAddress: string
@@ -43,10 +43,10 @@ export class Wormhole {
   wormholeSDK: typeof wormholeSDK
 
   constructor(
-    hedgehog: Hedgehog,
+    hedgehog: Hedgehog | null,
     ethWeb3Manager: EthWeb3Manager,
     ethContracts: EthContracts,
-    identityService: IdentityService,
+    identityService: IdentityService | null,
     solanaWeb3Manager: SolanaWeb3Manager,
     rpcHosts: string[],
     solBridgeAddress: string,
@@ -146,6 +146,9 @@ export class Wormhole {
       if (customSignTransaction) {
         signTransaction = customSignTransaction
       } else {
+        if (!this.identityService) {
+          throw new Error('Identity service required to relay raw transaction')
+        }
         signTransaction = async (transaction: Transaction) => {
           const { blockhash } = await connection.getLatestBlockhash()
           // Must call serialize message to set the correct signatures on the transaction
@@ -205,6 +208,10 @@ export class Wormhole {
 
         await connection.confirmTransaction(txid)
       } else {
+        if (!this.identityService) {
+          throw new Error('Identity service required to relay raw transaction')
+        }
+
         transaction.serializeMessage()
 
         const { blockhash } = await connection.getLatestBlockhash()
@@ -247,6 +254,12 @@ export class Wormhole {
     ethTargetAddress: string,
     options = {}
   ) {
+    if (!this.hedgehog) {
+      throw new Error('Hedgehog required for sendTokensFromSolToEthViaWormhole')
+    }
+    if (!this.identityService) {
+      throw new Error('Identity service required to relay raw transaction')
+    }
     const phases = {
       GENERATE_SOL_ROOT_ACCT: 'GENERATE_SOL_ROOT_ACCT',
       TRANSFER_WAUDIO_TO_ROOT: 'TRANSFER_WAUDIO_TO_ROOT',
@@ -397,6 +410,11 @@ export class Wormhole {
     amount: BN,
     solanaAccount: string
   ) {
+    if (!this.hedgehog) {
+      throw new Error(
+        'Hedgehog required for _getTransferTokensToEthWormholeParams'
+      )
+    }
     const web3 = this.ethWeb3Manager.getWeb3()
     const wormholeClientAddress =
       this.ethContracts.WormholeClient.contractAddress