🛠 fix node build

Curu24 · Aug 19, 2020 · ea801a6 · ea801a6
1 parent 1e09edb
commit ea801a6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/modules/node/src/cfCore/cfCore.service.ts b/modules/node/src/cfCore/cfCore.service.ts
@@ -173,7 +173,7 @@ export class CFCoreService {
     assertNoChallenges(channel);
     const amount = toBN(params.amount);
     const { assetId, nonce, recipient } = params;
-    const json = ChannelSerializer.toJSON(channel);
+    const json = ChannelSerializer.toJSON(channel)!;
     const contractAddresses = this.configService.getContractAddresses(channel.chainId);
     const multisigOwners = [
       getSignerAddressFromPublicIdentifier(json.userIdentifiers[0]),

diff --git a/modules/node/src/challenge/challenge.service.ts b/modules/node/src/challenge/challenge.service.ts
@@ -37,8 +37,8 @@ export class ChallengeService implements OnModuleInit {
   ): Promise<ChallengeInitiatedResponse> {
     this.assertWatcher();
     await this.channelRepository.findByMultisigAddressOrThrow(multisigAddress);
-    const appInstance = await this.appInstanceRepository.findByIdentityHashOrThrow(appIdentityHash);
-    return this.watcher.initiate(appInstance.identityHash);
+    const app = await this.appInstanceRepository.findByIdentityHashOrThrow(appIdentityHash)!;
+    return this.watcher!.initiate(app.identityHash);
   }
 
   async cancelChallenge(
@@ -49,11 +49,11 @@ export class ChallengeService implements OnModuleInit {
     this.assertWatcher();
     // Verify the signature is on the proper nonce
     const channel = await this.channelRepository.findByMultisigAddressOrThrow(multisigAddress);
-    const appInstance = await this.appInstanceRepository.findByIdentityHashOrThrow(appIdentityHash);
+    const app = await this.appInstanceRepository.findByIdentityHashOrThrow(appIdentityHash)!;
 
     const hash = computeCancelDisputeHash(
-      appInstance.identityHash,
-      BigNumber.from(appInstance.latestVersionNumber),
+      app.identityHash,
+      BigNumber.from(app.latestVersionNumber),
     );
     const recovered = await recoverAddressFromChannelMessage(hash, userSignature);
     const userSignerAddress = getSignerAddressFromPublicIdentifier(channel.userIdentifier);
@@ -67,12 +67,12 @@ export class ChallengeService implements OnModuleInit {
     const nodeSignature = await signer.signMessage(hash);
     const req = {
       signatures: [nodeSignature, userSignature],
-      versionNumber: BigNumber.from(appInstance.latestVersionNumber),
+      versionNumber: BigNumber.from(app.latestVersionNumber),
     };
 
     // Call cancel challenge
     // TODO: remove challenge from channel entry iff cancelled
-    return this.watcher.cancel(appInstance.identityHash, req);
+    return this.watcher!.cancel(app.identityHash, req);
   }
 
   private assertWatcher() {

diff --git a/modules/node/src/channel/channel.entity.ts b/modules/node/src/channel/channel.entity.ts
@@ -73,7 +73,7 @@ export class Channel {
   transactions!: OnchainTransaction[];
 
   @OneToMany((type: any) => Challenge, (challenge: Challenge) => challenge.channel)
-  challenges: Challenge[];
+  challenges!: Challenge[];
 
   @CreateDateColumn()
   createdAt!: Date;

diff --git a/modules/node/src/config/config.service.ts b/modules/node/src/config/config.service.ts
@@ -58,7 +58,7 @@ export class ConfigService implements OnModuleInit {
     return Wallet.fromMnemonic(this.get(`INDRA_MNEMONIC`)).privateKey;
   }
 
-  getSigner(chainId: number): IChannelSigner {
+  getSigner(chainId?: number): IChannelSigner {
     if (chainId) {
       const providers = this.getIndraChainProviders();
       const provider = getEthProvider(providers[chainId], chainId);

diff --git a/modules/node/src/onchainTransactions/onchainTransaction.service.ts b/modules/node/src/onchainTransactions/onchainTransaction.service.ts
@@ -144,8 +144,12 @@ export class OnchainTransactionService implements OnModuleInit {
     multisigAddress: string,
   ): Promise<providers.TransactionResponse> {
     const channel = await this.channelRepository.findByMultisigAddressOrThrow(multisigAddress);
+    const queue = this.queues.get(chainId);
+    if (!queue) {
+      throw new Error(`Unsupported chainId ${chainId}. Expected one of: ${Array.from(this.queues.keys())}`);
+    }
     const tx: OnchainTransactionResponse = await new Promise((resolve, reject) => {
-      this.queues.get(chainId).add(() => {
+      queue.add(() => {
         this.sendTransaction(transaction, TransactionReason.DISPUTE, channel)
           .then((result) => resolve(result))
           .catch((error) => reject(error.message));

diff --git a/modules/node/src/test/e2e/happy.spec.ts b/modules/node/src/test/e2e/happy.spec.ts
@@ -23,7 +23,7 @@ import { env, ethProviderUrl, expect, MockConfigService } from "../utils";
 const { AddressZero } = constants;
 const { parseEther } = utils;
 
-describe.only("Mostly happy paths", () => {
+describe("Mostly happy paths", () => {
   const log = new ColorfulLogger("MostlyHappy", env.logLevel, true, "Test");
 
   let app: INestApplication;

diff --git a/ops/start-chain.sh b/ops/start-chain.sh
@@ -44,7 +44,7 @@ else
   opts="--entrypoint bash --mount type=bind,source=$root,target=/root"
 fi
 
-echo "Running ${INDRA_ENV}-mode image for testnet ${chain_id}: ${image}"
+echo "Running ${INDRA_ENV:-dev}-mode image for testnet ${chain_id}: ${image}"
 
 docker run $opts \
   --detach \