lerna version bump and import fixes

streamflow-finance · Sep 4, 2024 · 43c4418 · 43c4418
1 parent 40c141f
commit 43c4418
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 27 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,6 +2,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.2",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/packages/stream/aptos/types.ts b/packages/stream/aptos/types.ts
@@ -3,9 +3,10 @@ import { WalletContextState } from "@manahippo/aptos-wallet-adapter";
 import BigNumber from "bignumber.js";
 import { Buffer } from "buffer";
 
-import { buildStreamType, calculateUnlockedAmount } from "../common/contractUtils";
-import { Stream, StreamType } from "../common/types";
-import { normalizeAptosAddress } from "./utils";
+import { buildStreamType, calculateUnlockedAmount } from "../common/contractUtils.js";
+import { Stream, StreamType } from "../common/types.js";
+import { normalizeAptosAddress } from "./utils.js";
+import { getNumberFromBigNumber } from "../common/utils.js";
 
 export interface ICreateStreamAptosExt {
   senderWallet: WalletContextState | AptosAccount;
@@ -211,9 +212,6 @@ export class Contract implements Stream {
   }
 
   remaining(decimals: number): number {
-    return this.depositedAmount
-      .minus(this.withdrawnAmount)
-      .div(10 ** decimals)
-      .toNumber();
+    return getNumberFromBigNumber(this.depositedAmount.minus(this.withdrawnAmount), decimals);
   }
 }
diff --git a/packages/stream/evm/types.ts b/packages/stream/evm/types.ts
@@ -1,8 +1,9 @@
 import BigNumber from "bignumber.js";
 import { BigNumber as BigNumberEvm } from "ethers";
 
-import { buildStreamType, calculateUnlockedAmount } from "../common/contractUtils";
-import { Stream, StreamType } from "../common/types";
+import { buildStreamType, calculateUnlockedAmount } from "../common/contractUtils.js";
+import { Stream, StreamType } from "../common/types.js";
+import { getNumberFromBigNumber } from "../common/utils.js";
 
 export interface StreamAbiResult {
   amount: BigNumberEvm;
@@ -194,9 +195,6 @@ export class EvmContract implements Stream {
   }
 
   remaining(decimals: number): number {
-    return this.depositedAmount
-      .minus(this.withdrawnAmount)
-      .div(10 ** decimals)
-      .toNumber();
+    return getNumberFromBigNumber(this.depositedAmount.minus(this.withdrawnAmount), decimals);
   }
 }
diff --git a/packages/stream/solana/instructions.ts b/packages/stream/solana/instructions.ts
@@ -3,9 +3,9 @@ import { PublicKey, TransactionInstruction } from "@solana/web3.js";
 import BigNumber from "bignumber.js";
 import { createHash } from "node:crypto";
 
-import * as Layout from "./layout";
-import { IUpdateData } from "../common/types";
-import { toBuffer } from "./utils";
+import * as Layout from "./layout.js";
+import { IUpdateData } from "../common/types.js";
+import { toBuffer } from "./utils.js";
 
 const hasher = () => createHash("sha256");
 const sha256 = {

diff --git a/packages/stream/solana/types.ts b/packages/stream/solana/types.ts
@@ -5,6 +5,7 @@ import BigNumber from "bignumber.js";
 
 import { buildStreamType, calculateUnlockedAmount } from "../common/contractUtils.js";
 import { IRecipient, Stream, StreamType } from "../common/types.js";
+import { getNumberFromBigNumber } from "../common/utils.js";
 
 export interface Account {
   pubkey: PublicKey;
@@ -173,10 +174,7 @@ export class Contract implements Stream {
   }
 
   remaining(decimals: number): number {
-    return this.depositedAmount
-      .minus(this.withdrawnAmount)
-      .div(10 ** decimals)
-      .toNumber();
+    return getNumberFromBigNumber(this.depositedAmount.minus(this.withdrawnAmount), decimals);
   }
 }
 

diff --git a/packages/stream/sui/types.ts b/packages/stream/sui/types.ts
@@ -4,8 +4,9 @@ import { TransactionBlock } from "@mysten/sui.js/transactions";
 import { ExecuteTransactionRequestType, SuiTransactionBlockResponseOptions } from "@mysten/sui.js/client";
 import BigNumber from "bignumber.js";
 
-import { buildStreamType, calculateUnlockedAmount } from "../common/contractUtils";
-import { Stream, StreamType } from "../common/types";
+import { buildStreamType, calculateUnlockedAmount } from "../common/contractUtils.js";
+import { Stream, StreamType } from "../common/types.js";
+import { getNumberFromBigNumber } from "../common/utils.js";
 
 export interface ICreateStreamSuiExt {
   senderWallet: WalletContextState | Keypair;
@@ -256,10 +257,7 @@ export class Contract implements Stream {
   }
 
   remaining(decimals: number): number {
-    return this.depositedAmount
-      .minus(this.withdrawnAmount)
-      .div(10 ** decimals)
-      .toNumber();
+    return getNumberFromBigNumber(this.depositedAmount.minus(this.withdrawnAmount), decimals);
   }
 }