sdk: adapt default blockNumber getter returning -1 instead of undefined

raiden-network · Oct 30, 2020 · f15c2cd · f15c2cd
1 parent 112a47a
commit f15c2cd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/raiden-ts/src/raiden.ts b/raiden-ts/src/raiden.ts
@@ -495,7 +495,13 @@ export class Raiden {
    * @returns Promise to current block number
    */
   public async getBlockNumber(): Promise<number> {
-    return this.deps.provider.blockNumber || (await this.deps.provider.getBlockNumber());
+    const lastBlockNumber = this.deps.provider.blockNumber;
+    if (
+      lastBlockNumber &&
+      lastBlockNumber >= this.deps.contractsInfo.TokenNetworkRegistry.block_number
+    )
+      return lastBlockNumber;
+    else return await this.deps.provider.getBlockNumber();
   }
 
   /**

diff --git a/raiden-ts/src/utils/ethers.ts b/raiden-ts/src/utils/ethers.ts
@@ -56,7 +56,13 @@ export function fromEthersEvent<T>(
     if (!fromBlock) {
       // 'resetEventsBlock' is private, set at [[Raiden]] constructor, so we need 'any'
       let resetBlock: number = (target as any)._lastBlockNumber;
-      resetBlock = resetBlock && resetBlock > 0 ? resetBlock : target.blockNumber ?? 1;
+      const innerBlockNumber = target.blockNumber;
+      resetBlock =
+        resetBlock && resetBlock > 0
+          ? resetBlock
+          : innerBlockNumber && innerBlockNumber > 0
+          ? innerBlockNumber
+          : 1;
       fromBlock = resetBlock - confirmations;
     }
     blockQueue.push(fromBlock); // starts 'blockQueue' with subscription-time's resetEventsBlock