diff --git a/packages/platform-sdk-ark/__tests__/dto/transaction.test.ts b/packages/platform-sdk-ark/__tests__/dto/transaction.test.ts index bcd0ecd10c..75146b2e3a 100644 --- a/packages/platform-sdk-ark/__tests__/dto/transaction.test.ts +++ b/packages/platform-sdk-ark/__tests__/dto/transaction.test.ts @@ -1,5 +1,5 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { TransactionData } from "../../src/dto"; import Fixture from "../__fixtures__/client/transaction.json"; @@ -26,11 +26,11 @@ describe("TransactionData", function () { }); test("#confirmations", () => { - expect(subject.confirmations()).toEqual(BigNumber.make(4636121)); + expect(subject.confirmations()).toEqual(Utils.BigNumber.make(4636121)); }); test("#nonce", () => { - expect(subject.nonce()).toEqual(BigNumber.make(1)); + expect(subject.nonce()).toEqual(Utils.BigNumber.make(1)); }); test("#sender", () => { @@ -42,7 +42,7 @@ describe("TransactionData", function () { }); test("#amount", () => { - expect(subject.amount()).toEqual(BigNumber.make("12500000000000000")); + expect(subject.amount()).toEqual(Utils.BigNumber.make("12500000000000000")); }); test("#fee", () => { diff --git a/packages/platform-sdk-ark/__tests__/dto/wallet.test.ts b/packages/platform-sdk-ark/__tests__/dto/wallet.test.ts index 5fe25071d1..12ce99397a 100644 --- a/packages/platform-sdk-ark/__tests__/dto/wallet.test.ts +++ b/packages/platform-sdk-ark/__tests__/dto/wallet.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { WalletData } from "../../src/dto"; import Fixture from "../__fixtures__/client/wallet.json"; @@ -19,7 +19,7 @@ describe("WalletData", function () { }); test("#balance", () => { - expect(subject.balance()).toEqual(BigNumber.make("55827093444556")); + expect(subject.balance()).toEqual(Utils.BigNumber.make("55827093444556")); }); test("#toObject", () => { diff --git a/packages/platform-sdk-ark/src/dto/transaction.ts b/packages/platform-sdk-ark/src/dto/transaction.ts index 422ab895bc..3d9529ef97 100644 --- a/packages/platform-sdk-ark/src/dto/transaction.ts +++ b/packages/platform-sdk-ark/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.timestamp.epoch; } - public confirmations(): BigNumber { - return BigNumber.make(this.data.confirmations); + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.confirmations); } - public nonce(): BigNumber { - return BigNumber.make(this.data.nonce); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.nonce); } public sender(): string { @@ -34,19 +34,19 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.recipient; } - public amount(): BigNumber { + public amount(): Utils.BigNumber { if (this.data.typeGroup === 0 && this.data.type === 6) { return this.data.asset.payments.reduce( - (sum: BigNumber, { amount }: { amount: string }) => sum.plus(amount), - BigNumber.ZERO, + (sum: Utils.BigNumber, { amount }: { amount: string }) => sum.add(amount), + Utils.BigNumber.ZERO, ); } - return BigNumber.make(this.data.amount); + return Utils.BigNumber.make(this.data.amount); } - public fee(): BigNumber { - return BigNumber.make(this.data.fee); + public fee(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.fee); } public memo(): string | undefined { diff --git a/packages/platform-sdk-ark/src/dto/wallet.ts b/packages/platform-sdk-ark/src/dto/wallet.ts index 57a3f12e91..d07e27c6a8 100644 --- a/packages/platform-sdk-ark/src/dto/wallet.ts +++ b/packages/platform-sdk-ark/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return this.data.publicKey; } - public balance(): BigNumber { - return BigNumber.make(this.data.balance); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.balance); } - public nonce(): BigNumber { - return BigNumber.make(this.data.nonce); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.nonce); } } diff --git a/packages/platform-sdk-atom/__tests__/dto/transaction.test.ts b/packages/platform-sdk-atom/__tests__/dto/transaction.test.ts index 8978e1f38d..cc62a426b7 100644 --- a/packages/platform-sdk-atom/__tests__/dto/transaction.test.ts +++ b/packages/platform-sdk-atom/__tests__/dto/transaction.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { TransactionData } from "../../src/dto/transaction"; import Fixture from "../__fixtures__/client/transaction.json"; @@ -18,8 +18,8 @@ describe("TransactionData", function () { expect(result.nonce()).toEqual(BigNumber.ZERO); expect(result.sender()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0"); expect(result.recipient()).toBe("cosmos14ddvyl5t0hzmknceuv3zzu5szuum4rkygpq5ln"); - expect(result.amount()).toEqual(BigNumber.make(10680)); - expect(result.fee()).toEqual(BigNumber.make(36875)); + expect(result.amount()).toEqual(Utils.BigNumber.make(10680)); + expect(result.fee()).toEqual(Utils.BigNumber.make(36875)); expect(result.memo()).toBe("Hello World"); expect(result.blockId()).toBe("14990"); }); diff --git a/packages/platform-sdk-atom/__tests__/dto/wallet.test.ts b/packages/platform-sdk-atom/__tests__/dto/wallet.test.ts index a33d54fb39..d8412e0055 100644 --- a/packages/platform-sdk-atom/__tests__/dto/wallet.test.ts +++ b/packages/platform-sdk-atom/__tests__/dto/wallet.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { WalletData } from "../../src/dto/wallet"; import Fixture from "../__fixtures__/client/wallet.json"; @@ -12,7 +12,7 @@ describe("WalletData", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0"); expect(result.publicKey()).toBe("Ap65s+Jdgo8BtvTbkc7GyUti8yJ7RpZ7cE1zCuKgNeXY"); - expect(result.balance()).toEqual(BigNumber.make(69519574)); - expect(result.nonce()).toEqual(BigNumber.make(24242)); + expect(result.balance()).toEqual(Utils.BigNumber.make(69519574)); + expect(result.nonce()).toEqual(Utils.BigNumber.make(24242)); }); }); diff --git a/packages/platform-sdk-atom/__tests__/services/client.test.ts b/packages/platform-sdk-atom/__tests__/services/client.test.ts index 103fc49914..14b99ce5a5 100644 --- a/packages/platform-sdk-atom/__tests__/services/client.test.ts +++ b/packages/platform-sdk-atom/__tests__/services/client.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import nock from "nock"; import { ClientService } from "../../src/services/client"; @@ -32,8 +32,8 @@ describe("ClientService", function () { expect(result.nonce()).toEqual(BigNumber.ZERO); expect(result.sender()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0"); expect(result.recipient()).toBe("cosmos14ddvyl5t0hzmknceuv3zzu5szuum4rkygpq5ln"); - expect(result.amount()).toEqual(BigNumber.make(10680)); - expect(result.fee()).toEqual(BigNumber.make(36875)); + expect(result.amount()).toEqual(Utils.BigNumber.make(10680)); + expect(result.fee()).toEqual(Utils.BigNumber.make(36875)); expect(result.memo()).toBe("Hello World"); expect(result.blockId()).toBe("14990"); }); @@ -59,8 +59,8 @@ describe("ClientService", function () { expect(result.data[0].nonce()).toEqual(BigNumber.ZERO); expect(result.data[0].sender()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0"); expect(result.data[0].recipient()).toBe("cosmos14ddvyl5t0hzmknceuv3zzu5szuum4rkygpq5ln"); - expect(result.data[0].amount()).toEqual(BigNumber.make(10680)); - expect(result.data[0].fee()).toEqual(BigNumber.make(36875)); + expect(result.data[0].amount()).toEqual(Utils.BigNumber.make(10680)); + expect(result.data[0].fee()).toEqual(Utils.BigNumber.make(36875)); expect(result.data[0].memo()).toBe("Hello World"); expect(result.data[0].blockId()).toBe("14990"); }); @@ -77,8 +77,8 @@ describe("ClientService", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toBe("cosmos1de7pk372jkp9vrul0gv5j6r3l9mt3wa6m4h6h0"); expect(result.publicKey()).toBe("Ap65s+Jdgo8BtvTbkc7GyUti8yJ7RpZ7cE1zCuKgNeXY"); - expect(result.balance()).toEqual(BigNumber.make(69519574)); - expect(result.nonce()).toEqual(BigNumber.make(24242)); + expect(result.balance()).toEqual(Utils.BigNumber.make(69519574)); + expect(result.nonce()).toEqual(Utils.BigNumber.make(24242)); }); }); diff --git a/packages/platform-sdk-atom/src/dto/transaction.ts b/packages/platform-sdk-atom/src/dto/transaction.ts index 1fad6730cf..865cca4a98 100644 --- a/packages/platform-sdk-atom/src/dto/transaction.ts +++ b/packages/platform-sdk-atom/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return +new Date(this.data.timestamp); } - public confirmations(): BigNumber { - return BigNumber.ZERO; + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } public sender(): string { @@ -41,15 +41,15 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont } // @ts-ignore - public amount(): BigNumber { + public amount(): Utils.BigNumber { const event = this.data.events.find((event) => event.type === "transfer"); const attribute = event.attributes.find((attribute) => attribute.key === "amount"); - return BigNumber.make(attribute.value.replace(/\D/g, "")); + return Utils.BigNumber.make(attribute.value.replace(/\D/g, "")); } - public fee(): BigNumber { - return BigNumber.make(this.data.gas_used); + public fee(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.gas_used); } public memo(): string | undefined { diff --git a/packages/platform-sdk-atom/src/dto/wallet.ts b/packages/platform-sdk-atom/src/dto/wallet.ts index 0e8e3356fb..c90dc7de25 100644 --- a/packages/platform-sdk-atom/src/dto/wallet.ts +++ b/packages/platform-sdk-atom/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return this.data.public_key.value; } - public balance(): BigNumber { - return BigNumber.make(this.data.coins[0].amount.replace(/\D/g, "")); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.coins[0].amount.replace(/\D/g, "")); } - public nonce(): BigNumber { - return BigNumber.make(this.data.sequence); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.sequence); } } diff --git a/packages/platform-sdk-btc/__tests__/dto/transaction.test.ts b/packages/platform-sdk-btc/__tests__/dto/transaction.test.ts index f09617b3c7..23caf92355 100644 --- a/packages/platform-sdk-btc/__tests__/dto/transaction.test.ts +++ b/packages/platform-sdk-btc/__tests__/dto/transaction.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { TransactionData } from "../../src/dto/transaction"; import Fixture from "../__fixtures__/client/transaction.json"; @@ -14,12 +14,12 @@ describe("TransactionData", function () { expect(result.type()).toBeUndefined(); expect(result.typeGroup()).toBeUndefined(); expect(result.timestamp()).toBe(1561095453000); - expect(result.confirmations()).toEqual(BigNumber.make(159414)); + expect(result.confirmations()).toEqual(Utils.BigNumber.make(159414)); expect(result.nonce()).toEqual(BigNumber.ZERO); // expect(result.sender()).toBe("..."); // expect(result.recipient()).toBe("..."); - expect(result.amount()).toEqual(BigNumber.make(3050000)); - expect(result.fee()).toEqual(BigNumber.make(10000)); + expect(result.amount()).toEqual(Utils.BigNumber.make(3050000)); + expect(result.fee()).toEqual(Utils.BigNumber.make(10000)); expect(result.memo()).toBeUndefined(); expect(result.blockId()).toBe(1563778); }); diff --git a/packages/platform-sdk-btc/__tests__/dto/wallet.test.ts b/packages/platform-sdk-btc/__tests__/dto/wallet.test.ts index 8c4afc466c..b74e49b9ba 100644 --- a/packages/platform-sdk-btc/__tests__/dto/wallet.test.ts +++ b/packages/platform-sdk-btc/__tests__/dto/wallet.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { WalletData } from "../../src/dto/wallet"; import Fixture from "../__fixtures__/client/wallet.json"; @@ -12,6 +12,6 @@ describe("WalletData", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toBe("my48EN4kDnGEpRZMBfiDS65wdfwfgCGZRz"); expect(result.publicKey()).toBe("76a914c05f53de525d80151e209a729cf1c7909c88f88e88ac"); - expect(result.balance()).toEqual(BigNumber.make(3050000)); + expect(result.balance()).toEqual(Utils.BigNumber.make(3050000)); }); }); diff --git a/packages/platform-sdk-btc/__tests__/services/client.test.ts b/packages/platform-sdk-btc/__tests__/services/client.test.ts index bad8bcf309..371c59f320 100644 --- a/packages/platform-sdk-btc/__tests__/services/client.test.ts +++ b/packages/platform-sdk-btc/__tests__/services/client.test.ts @@ -1,5 +1,5 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import nock from "nock"; import { ClientService } from "../../src/services/client"; @@ -29,12 +29,12 @@ describe("ClientService", function () { expect(result.type()).toBeUndefined(); expect(result.typeGroup()).toBeUndefined(); expect(result.timestamp()).toBe(1561095453000); - expect(result.confirmations()).toEqual(BigNumber.make(159414)); + expect(result.confirmations()).toEqual(Utils.BigNumber.make(159414)); expect(result.nonce()).toEqual(BigNumber.ZERO); // expect(result.sender()).toBe("..."); // expect(result.recipient()).toBe("..."); - expect(result.amount()).toEqual(BigNumber.make(3050000)); - expect(result.fee()).toEqual(BigNumber.make(10000)); + expect(result.amount()).toEqual(Utils.BigNumber.make(3050000)); + expect(result.fee()).toEqual(Utils.BigNumber.make(10000)); expect(result.memo()).toBeUndefined(); expect(result.blockId()).toBe(1563778); }); @@ -51,7 +51,7 @@ describe("ClientService", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toBe("my48EN4kDnGEpRZMBfiDS65wdfwfgCGZRz"); expect(result.publicKey()).toBe("76a914c05f53de525d80151e209a729cf1c7909c88f88e88ac"); - expect(result.balance()).toEqual(BigNumber.make(3050000)); + expect(result.balance()).toEqual(Utils.BigNumber.make(3050000)); }); }); diff --git a/packages/platform-sdk-btc/src/dto/transaction.ts b/packages/platform-sdk-btc/src/dto/transaction.ts index cfbc43227b..aff276e4df 100644 --- a/packages/platform-sdk-btc/src/dto/transaction.ts +++ b/packages/platform-sdk-btc/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return +new Date(this.data.blockTime); } - public confirmations(): BigNumber { - return BigNumber.make(this.data.confirmations); + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.confirmations); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } public sender(): string { @@ -34,12 +34,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont throw new Exceptions.NotImplemented(this.constructor.name, "recipient"); } - public amount(): BigNumber { - return BigNumber.make(this.data.value); + public amount(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.value); } - public fee(): BigNumber { - return BigNumber.make(this.data.fee); + public fee(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.fee); } public memo(): string | undefined { diff --git a/packages/platform-sdk-btc/src/dto/wallet.ts b/packages/platform-sdk-btc/src/dto/wallet.ts index 4f5810f73c..b6c5dc7737 100644 --- a/packages/platform-sdk-btc/src/dto/wallet.ts +++ b/packages/platform-sdk-btc/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return this.data.publicKey; } - public balance(): BigNumber { - return BigNumber.make(this.data.balance); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.balance); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } } diff --git a/packages/platform-sdk-btc/src/utils/unspent-aggregator.ts b/packages/platform-sdk-btc/src/utils/unspent-aggregator.ts index 3163a09fd7..2f93359c1f 100644 --- a/packages/platform-sdk-btc/src/utils/unspent-aggregator.ts +++ b/packages/platform-sdk-btc/src/utils/unspent-aggregator.ts @@ -18,7 +18,7 @@ export class UnspentAggregator { // } - public async aggregate(address: string, amount: BigNumber): Promise { + public async aggregate(address: string, amount: Utils.BigNumber): Promise { const response = await Utils.Http.new(this.#peer).get(`wallets/${address}/transactions/unspent`); return response.map((transaction) => ({ diff --git a/packages/platform-sdk-eos/src/dto/transaction.ts b/packages/platform-sdk-eos/src/dto/transaction.ts index e814e7f71c..7f37f5b2c9 100644 --- a/packages/platform-sdk-eos/src/dto/transaction.ts +++ b/packages/platform-sdk-eos/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return undefined; } - public confirmations(): BigNumber { - return BigNumber.make(0); + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.make(0); } - public nonce(): BigNumber { - return BigNumber.make(this.data.nonce); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.nonce); } public sender(): string { @@ -34,12 +34,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.to; } - public amount(): BigNumber { - return BigNumber.make(this.data.value); + public amount(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.value); } - public fee(): BigNumber { - return BigNumber.make(this.data.gas); + public fee(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.gas); } public memo(): string | undefined { diff --git a/packages/platform-sdk-eos/src/dto/wallet.ts b/packages/platform-sdk-eos/src/dto/wallet.ts index 143d633580..ad6eed6654 100644 --- a/packages/platform-sdk-eos/src/dto/wallet.ts +++ b/packages/platform-sdk-eos/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return undefined; } - public balance(): BigNumber { - return BigNumber.make(this.data.net_weight); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.net_weight); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } } diff --git a/packages/platform-sdk-eth/__tests__/dto/transaction.test.ts b/packages/platform-sdk-eth/__tests__/dto/transaction.test.ts index 2403421f23..05fda76ef7 100644 --- a/packages/platform-sdk-eth/__tests__/dto/transaction.test.ts +++ b/packages/platform-sdk-eth/__tests__/dto/transaction.test.ts @@ -1,5 +1,5 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { TransactionData } from "../../src/dto"; import Fixture from "../__fixtures__/client/transaction.json"; @@ -42,11 +42,11 @@ describe("TransactionData", function () { }); test("#amount", () => { - expect(subject.amount()).toEqual(BigNumber.make("79000000000000")); + expect(subject.amount()).toEqual(Utils.BigNumber.make("79000000000000")); }); test("#fee", () => { - expect(subject.fee()).toEqual(BigNumber.make("21000")); + expect(subject.fee()).toEqual(Utils.BigNumber.make("21000")); }); test("#memo", () => { diff --git a/packages/platform-sdk-eth/__tests__/dto/wallet.test.ts b/packages/platform-sdk-eth/__tests__/dto/wallet.test.ts index 5f698eb586..932f96a3c6 100644 --- a/packages/platform-sdk-eth/__tests__/dto/wallet.test.ts +++ b/packages/platform-sdk-eth/__tests__/dto/wallet.test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { WalletData } from "../../src/dto"; @@ -16,6 +16,6 @@ describe("WalletData", function () { }); test("#balance", () => { - expect(subject.balance()).toEqual(BigNumber.make("10")); + expect(subject.balance()).toEqual(Utils.BigNumber.make("10")); }); }); diff --git a/packages/platform-sdk-eth/__tests__/services/client.test.ts b/packages/platform-sdk-eth/__tests__/services/client.test.ts index aaa14e8d60..3943aaf9ed 100644 --- a/packages/platform-sdk-eth/__tests__/services/client.test.ts +++ b/packages/platform-sdk-eth/__tests__/services/client.test.ts @@ -1,5 +1,5 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import nock from "nock"; import { ClientService } from "../../src/services/client"; @@ -33,8 +33,8 @@ describe("ClientService", function () { expect(result.nonce()).toEqual(BigNumber.ZERO); expect(result.sender()).toBe("0x4581A610f96878266008993475F1476cA9997081"); expect(result.recipient()).toBe("0x230b2A8C0CcE28fd6eFF491c47aeBa244b10A12c"); - expect(result.amount()).toEqual(BigNumber.make("79000000000000")); - expect(result.fee()).toEqual(BigNumber.make(21000)); + expect(result.amount()).toEqual(Utils.BigNumber.make("79000000000000")); + expect(result.fee()).toEqual(Utils.BigNumber.make(21000)); expect(result.memo()).toBeUndefined(); expect(result.blockId()).toBe(7623266); }); @@ -69,8 +69,8 @@ describe("ClientService", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toBe("0x33605918275099dfEF77A56e4e8C0103b881d584"); expect(result.publicKey()).toBeUndefined(); - expect(result.balance()).toEqual(BigNumber.make("3998865647999999997")); - expect(result.nonce()).toEqual(BigNumber.make(9)); + expect(result.balance()).toEqual(Utils.BigNumber.make("3998865647999999997")); + expect(result.nonce()).toEqual(Utils.BigNumber.make(9)); }); }); diff --git a/packages/platform-sdk-eth/src/dto/transaction.ts b/packages/platform-sdk-eth/src/dto/transaction.ts index c9f64093ca..25c7ce332e 100644 --- a/packages/platform-sdk-eth/src/dto/transaction.ts +++ b/packages/platform-sdk-eth/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return undefined; } - public confirmations(): BigNumber { - return BigNumber.make(0); + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.make(0); } - public nonce(): BigNumber { - return BigNumber.make(parseInt(this.data.nonce, 16)); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(parseInt(this.data.nonce, 16)); } public sender(): string { @@ -34,12 +34,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.to; } - public amount(): BigNumber { - return BigNumber.make(this.data.value); + public amount(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.value); } - public fee(): BigNumber { - return BigNumber.make(this.data.gas); + public fee(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.gas); } public memo(): string | undefined { diff --git a/packages/platform-sdk-eth/src/dto/wallet.ts b/packages/platform-sdk-eth/src/dto/wallet.ts index 3df886af65..1cb9dcbaf1 100644 --- a/packages/platform-sdk-eth/src/dto/wallet.ts +++ b/packages/platform-sdk-eth/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return undefined; } - public balance(): BigNumber { - return BigNumber.make(this.data.balance); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.balance); } - public nonce(): BigNumber { - return BigNumber.make(parseInt(this.data.nonce, 16)); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(parseInt(this.data.nonce, 16)); } } diff --git a/packages/platform-sdk-lsk/__tests__/dto/transaction.test.ts b/packages/platform-sdk-lsk/__tests__/dto/transaction.test.ts index 8ad1903138..38421ca4a7 100644 --- a/packages/platform-sdk-lsk/__tests__/dto/transaction.test.ts +++ b/packages/platform-sdk-lsk/__tests__/dto/transaction.test.ts @@ -1,5 +1,5 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { TransactionData } from "../../src/dto"; import Fixture from "../__fixtures__/client/transaction.json"; @@ -26,7 +26,7 @@ describe("TransactionData", function () { }); test("#confirmations", () => { - expect(subject.confirmations()).toEqual(BigNumber.make(35754)); + expect(subject.confirmations()).toEqual(Utils.BigNumber.make(35754)); }); test("#nonce", () => { @@ -42,11 +42,11 @@ describe("TransactionData", function () { }); test("#amount", () => { - expect(subject.amount()).toEqual(BigNumber.make("1")); + expect(subject.amount()).toEqual(Utils.BigNumber.make("1")); }); test("#fee", () => { - expect(subject.fee()).toEqual(BigNumber.make("10000000")); + expect(subject.fee()).toEqual(Utils.BigNumber.make("10000000")); }); test("#memo", () => { diff --git a/packages/platform-sdk-lsk/__tests__/dto/wallet.test.ts b/packages/platform-sdk-lsk/__tests__/dto/wallet.test.ts index 6719513c00..907414dac3 100644 --- a/packages/platform-sdk-lsk/__tests__/dto/wallet.test.ts +++ b/packages/platform-sdk-lsk/__tests__/dto/wallet.test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { WalletData } from "../../src/dto"; import Fixture from "../__fixtures__/client/wallet.json"; @@ -17,6 +17,6 @@ describe("WalletData", function () { }); test("#balance", () => { - expect(subject.balance()).toEqual(BigNumber.make("-9999333679754263")); + expect(subject.balance()).toEqual(Utils.BigNumber.make("-9999333679754263")); }); }); diff --git a/packages/platform-sdk-lsk/src/dto/transaction.ts b/packages/platform-sdk-lsk/src/dto/transaction.ts index 9dc09aeb9d..04d67d0f50 100644 --- a/packages/platform-sdk-lsk/src/dto/transaction.ts +++ b/packages/platform-sdk-lsk/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.timestamp; } - public confirmations(): BigNumber { - return BigNumber.make(this.data.confirmations); + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.confirmations); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } public sender(): string { @@ -34,12 +34,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.recipientId; } - public amount(): BigNumber { - return BigNumber.make(this.data.amount); + public amount(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.amount); } - public fee(): BigNumber { - return BigNumber.make(this.data.fee); + public fee(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.fee); } public memo(): string | undefined { diff --git a/packages/platform-sdk-lsk/src/dto/wallet.ts b/packages/platform-sdk-lsk/src/dto/wallet.ts index e0bb097028..1da5317a3e 100644 --- a/packages/platform-sdk-lsk/src/dto/wallet.ts +++ b/packages/platform-sdk-lsk/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return this.data.publicKey; } - public balance(): BigNumber { - return BigNumber.make(this.data.balance); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.balance); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } } diff --git a/packages/platform-sdk-neo/__tests__/dto/transaction.test.ts b/packages/platform-sdk-neo/__tests__/dto/transaction.test.ts index 0ea6993da3..6f50bae17f 100644 --- a/packages/platform-sdk-neo/__tests__/dto/transaction.test.ts +++ b/packages/platform-sdk-neo/__tests__/dto/transaction.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { TransactionData } from "../../src/dto/transaction"; @@ -25,7 +25,7 @@ describe("TransactionData", function () { expect(result.nonce()).toEqual(BigNumber.ZERO); expect(result.sender()).toBe("AStJyBXGGBK6bwrRfRUHSjp993PB5C9QgF"); expect(result.recipient()).toBe("Ab9QkPeMzx7ehptvjbjHviAXUfdhAmEAUF"); - expect(result.amount()).toEqual(BigNumber.make(1)); + expect(result.amount()).toEqual(Utils.BigNumber.make(1)); expect(result.fee()).toEqual(BigNumber.ZERO); // expect(result.memo()).toBeUndefined(); expect(result.blockId()).toBe(4259222); diff --git a/packages/platform-sdk-neo/__tests__/services/client.test.ts b/packages/platform-sdk-neo/__tests__/services/client.test.ts index c424fe98f7..bd42cbc2cc 100644 --- a/packages/platform-sdk-neo/__tests__/services/client.test.ts +++ b/packages/platform-sdk-neo/__tests__/services/client.test.ts @@ -1,5 +1,5 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import nock from "nock"; import { ClientService } from "../../src/services/client"; @@ -32,7 +32,7 @@ describe("ClientService", function () { expect(result.data[0].nonce()).toEqual(BigNumber.ZERO); expect(result.data[0].sender()).toBe("AStJyBXGGBK6bwrRfRUHSjp993PB5C9QgF"); expect(result.data[0].recipient()).toBe("Ab9QkPeMzx7ehptvjbjHviAXUfdhAmEAUF"); - expect(result.data[0].amount()).toEqual(BigNumber.make(1)); + expect(result.data[0].amount()).toEqual(Utils.BigNumber.make(1)); expect(result.data[0].fee()).toEqual(BigNumber.ZERO); // expect(result.data[0].memo()).toBeUndefined(); expect(result.data[0].blockId()).toBe(4259222); diff --git a/packages/platform-sdk-neo/src/dto/transaction.ts b/packages/platform-sdk-neo/src/dto/transaction.ts index f3e1b99f12..80a55fce54 100644 --- a/packages/platform-sdk-neo/src/dto/transaction.ts +++ b/packages/platform-sdk-neo/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,12 +18,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return +new Date(this.data.time); } - public confirmations(): BigNumber { - return BigNumber.ZERO; + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } public sender(): string { @@ -34,12 +34,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.address_to; } - public amount(): BigNumber { - return BigNumber.make(this.data.amount); + public amount(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.amount); } - public fee(): BigNumber { - return BigNumber.ZERO; + public fee(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } public memo(): string | undefined { diff --git a/packages/platform-sdk-neo/src/dto/wallet.ts b/packages/platform-sdk-neo/src/dto/wallet.ts index 6b07f0bd12..fce545738a 100644 --- a/packages/platform-sdk-neo/src/dto/wallet.ts +++ b/packages/platform-sdk-neo/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall throw new Exceptions.NotImplemented(this.constructor.name, "publicKey"); } - public balance(): BigNumber { + public balance(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "balance"); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } } diff --git a/packages/platform-sdk-trx/__tests__/dto/wallet.test.ts b/packages/platform-sdk-trx/__tests__/dto/wallet.test.ts index 3a1c764f89..fe52f76f6a 100644 --- a/packages/platform-sdk-trx/__tests__/dto/wallet.test.ts +++ b/packages/platform-sdk-trx/__tests__/dto/wallet.test.ts @@ -1,4 +1,4 @@ -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { WalletData } from "../../src/dto"; import Fixture from "../__fixtures__/client/wallet.json"; @@ -17,6 +17,6 @@ describe("WalletData", function () { }); test("#balance", () => { - expect(subject.balance()).toEqual(BigNumber.make("17491629")); + expect(subject.balance()).toEqual(Utils.BigNumber.make("17491629")); }); }); diff --git a/packages/platform-sdk-trx/src/dto/transaction.ts b/packages/platform-sdk-trx/src/dto/transaction.ts index 88ceeca81b..87213fa86d 100644 --- a/packages/platform-sdk-trx/src/dto/transaction.ts +++ b/packages/platform-sdk-trx/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,11 +18,11 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont throw new Exceptions.NotImplemented(this.constructor.name, "timestamp"); } - public confirmations(): BigNumber { + public confirmations(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "confirmations"); } - public nonce(): BigNumber { + public nonce(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "nonce"); } @@ -34,11 +34,11 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont throw new Exceptions.NotImplemented(this.constructor.name, "recipient"); } - public amount(): BigNumber { + public amount(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "amount"); } - public fee(): BigNumber { + public fee(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "fee"); } diff --git a/packages/platform-sdk-trx/src/dto/wallet.ts b/packages/platform-sdk-trx/src/dto/wallet.ts index 1e76f60022..ffd878cc5b 100644 --- a/packages/platform-sdk-trx/src/dto/wallet.ts +++ b/packages/platform-sdk-trx/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return undefined; } - public balance(): BigNumber { - return BigNumber.make(this.data.balance); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.balance); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } } diff --git a/packages/platform-sdk-xlm/__tests__/services/client.test.ts b/packages/platform-sdk-xlm/__tests__/services/client.test.ts index 6029e788dd..1b525da8ec 100644 --- a/packages/platform-sdk-xlm/__tests__/services/client.test.ts +++ b/packages/platform-sdk-xlm/__tests__/services/client.test.ts @@ -1,5 +1,5 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import nock from "nock"; import { ClientService } from "../../src/services/client"; @@ -35,12 +35,12 @@ describe("ClientService", function () { // expect(result.type()).toBeUndefined(); // expect(result.typeGroup()).toBeUndefined(); expect(result.timestamp()).toBe(1554840865000); - // expect(result.confirmations()).toEqual(BigNumber.make(159414)); - expect(result.nonce()).toEqual(BigNumber.make("4660039994869")); + // expect(result.confirmations()).toEqual(Utils.BigNumber.make(159414)); + expect(result.nonce()).toEqual(Utils.BigNumber.make("4660039994869")); expect(result.sender()).toBe("GAHXEI3BVFOBDHWLC4TJKCGTLY6VMTKMRRWWPKNPPULUC7E3PD63ENKO"); expect(result.recipient()).toBe("GB2V4J7WTTKLIN5O3QPUAQCOLLIIULJM3FHHAQ7GEQ5EH53BXXQ47HU3"); - expect(result.amount()).toEqual(BigNumber.make("100000000")); - expect(result.fee()).toEqual(BigNumber.make("10000000000")); + expect(result.amount()).toEqual(Utils.BigNumber.make("100000000")); + expect(result.fee()).toEqual(Utils.BigNumber.make("10000000000")); // expect(result.memo()).toBeUndefined(); // expect(result.blockId()).toBe(1563778); }); @@ -63,12 +63,12 @@ describe("ClientService", function () { // expect(data[0].type()).toBeUndefined(); // expect(data[0].typeGroup()).toBeUndefined(); expect(data[0].timestamp()).toBe(1554505662000); - // expect(data[0].confirmations()).toEqual(BigNumber.make(159414)); + // expect(data[0].confirmations()).toEqual(Utils.BigNumber.make(159414)); expect(data[0].nonce()).toEqual(BigNumber.ZERO); expect(data[0].sender()).toBe("GAGLYFZJMN5HEULSTH5CIGPOPAVUYPG5YSWIYDJMAPIECYEBPM2TA3QR"); expect(data[0].recipient()).toBe("GBYUUJHG6F4EPJGNLERINATVQLNDOFRUD7SGJZ26YZLG5PAYLG7XUSGF"); - expect(data[0].amount()).toEqual(BigNumber.make("100000000000000")); - // expect(data[0].fee()).toEqual(BigNumber.make("10000000000")); + expect(data[0].amount()).toEqual(Utils.BigNumber.make("100000000000000")); + // expect(data[0].fee()).toEqual(Utils.BigNumber.make("10000000000")); // expect(data[0].memo()).toBeUndefined(); // expect(data[0].blockId()).toBe(1563778); }); @@ -86,8 +86,8 @@ describe("ClientService", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toBe("GD42RQNXTRIW6YR3E2HXV5T2AI27LBRHOERV2JIYNFMXOBA234SWLQQB"); expect(result.publicKey()).toBe("GD42RQNXTRIW6YR3E2HXV5T2AI27LBRHOERV2JIYNFMXOBA234SWLQQB"); - expect(result.balance()).toEqual(BigNumber.make("100000000000000")); - expect(result.nonce()).toEqual(BigNumber.make("7275146318446606")); + expect(result.balance()).toEqual(Utils.BigNumber.make("100000000000000")); + expect(result.nonce()).toEqual(Utils.BigNumber.make("7275146318446606")); }); }); diff --git a/packages/platform-sdk-xlm/src/dto/transaction.ts b/packages/platform-sdk-xlm/src/dto/transaction.ts index d603d73da8..b43b756875 100644 --- a/packages/platform-sdk-xlm/src/dto/transaction.ts +++ b/packages/platform-sdk-xlm/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,17 +18,17 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return +new Date(this.data.created_at); } - public confirmations(): BigNumber { + public confirmations(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "confirmations"); } // todo: with the "transaction" method we get a nonce but with "transactions" it isn't available - public nonce(): BigNumber { + public nonce(): Utils.BigNumber { if (this.data.source_account_sequence) { - return BigNumber.make(this.data.source_account_sequence); + return Utils.BigNumber.make(this.data.source_account_sequence); } - return BigNumber.ZERO; + return Utils.BigNumber.ZERO; } public sender(): string { @@ -39,13 +39,13 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.to || this.data.operation.to; } - public amount(): BigNumber { - return BigNumber.make((this.data.amount || this.data.operation.amount) * 1e8); + public amount(): Utils.BigNumber { + return Utils.BigNumber.make((this.data.amount || this.data.operation.amount) * 1e8); } // todo: with the "transaction" method we get a nonce but with "transactions" it isn't available - public fee(): BigNumber { - return BigNumber.make((this.data.fee_charged || 0) * 1e8); + public fee(): Utils.BigNumber { + return Utils.BigNumber.make((this.data.fee_charged || 0) * 1e8); } public memo(): string | undefined { diff --git a/packages/platform-sdk-xlm/src/dto/wallet.ts b/packages/platform-sdk-xlm/src/dto/wallet.ts index 5a21ff1315..cfdd97df28 100644 --- a/packages/platform-sdk-xlm/src/dto/wallet.ts +++ b/packages/platform-sdk-xlm/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall return this.data.id; } - public balance(): BigNumber { - return BigNumber.make(this.data.balances[0].balance * 1e8); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.balances[0].balance * 1e8); } - public nonce(): BigNumber { - return BigNumber.make(this.data.sequence); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.sequence); } } diff --git a/packages/platform-sdk-xmr/src/dto/transaction.ts b/packages/platform-sdk-xmr/src/dto/transaction.ts index 88ceeca81b..87213fa86d 100644 --- a/packages/platform-sdk-xmr/src/dto/transaction.ts +++ b/packages/platform-sdk-xmr/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { public id(): string { @@ -18,11 +18,11 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont throw new Exceptions.NotImplemented(this.constructor.name, "timestamp"); } - public confirmations(): BigNumber { + public confirmations(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "confirmations"); } - public nonce(): BigNumber { + public nonce(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "nonce"); } @@ -34,11 +34,11 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont throw new Exceptions.NotImplemented(this.constructor.name, "recipient"); } - public amount(): BigNumber { + public amount(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "amount"); } - public fee(): BigNumber { + public fee(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "fee"); } diff --git a/packages/platform-sdk-xmr/src/dto/wallet.ts b/packages/platform-sdk-xmr/src/dto/wallet.ts index 6b07f0bd12..fce545738a 100644 --- a/packages/platform-sdk-xmr/src/dto/wallet.ts +++ b/packages/platform-sdk-xmr/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall throw new Exceptions.NotImplemented(this.constructor.name, "publicKey"); } - public balance(): BigNumber { + public balance(): Utils.BigNumber { throw new Exceptions.NotImplemented(this.constructor.name, "balance"); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } } diff --git a/packages/platform-sdk-xrp/__tests__/dto/transaction.test.ts b/packages/platform-sdk-xrp/__tests__/dto/transaction.test.ts index 595b62555f..6d3452a78e 100644 --- a/packages/platform-sdk-xrp/__tests__/dto/transaction.test.ts +++ b/packages/platform-sdk-xrp/__tests__/dto/transaction.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { TransactionData } from "../../src/dto/transaction"; import fixtures from "../services/fixtures/responses"; @@ -15,11 +15,11 @@ describe("TransactionData", function () { // expect(result.typeGroup()).toBeUndefined(); expect(result.timestamp()).toBe(1363132610000); expect(result.confirmations()).toEqual(BigNumber.ZERO); - expect(result.nonce()).toEqual(BigNumber.make(4)); + expect(result.nonce()).toEqual(Utils.BigNumber.make(4)); expect(result.sender()).toBe("r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59"); expect(result.recipient()).toBe("rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"); - expect(result.amount()).toEqual(BigNumber.make(100000)); - expect(result.fee()).toEqual(BigNumber.make(1000)); + expect(result.amount()).toEqual(Utils.BigNumber.make(100000)); + expect(result.fee()).toEqual(Utils.BigNumber.make(1000)); // expect(result.memo()).toBeUndefined(); // expect(result.blockId()).toBeUndefined(); }); diff --git a/packages/platform-sdk-xrp/__tests__/dto/wallet.test.ts b/packages/platform-sdk-xrp/__tests__/dto/wallet.test.ts index c5a5b82dcb..5078c9d87b 100644 --- a/packages/platform-sdk-xrp/__tests__/dto/wallet.test.ts +++ b/packages/platform-sdk-xrp/__tests__/dto/wallet.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import { WalletData } from "../../src/dto/wallet"; import fixtures from "../services/fixtures/responses"; @@ -15,6 +15,6 @@ describe("WalletData", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toEqual("rMWnHRpSWTYSsxbDjASvGvC31F4pRkyYHP"); // expect(result.publicKey()).toBeUndefined(); - expect(result.balance()).toEqual(BigNumber.make("92291324300")); + expect(result.balance()).toEqual(Utils.BigNumber.make("92291324300")); }); }); diff --git a/packages/platform-sdk-xrp/__tests__/services/client.test.ts b/packages/platform-sdk-xrp/__tests__/services/client.test.ts index 98c7d66cee..221c3be1f1 100644 --- a/packages/platform-sdk-xrp/__tests__/services/client.test.ts +++ b/packages/platform-sdk-xrp/__tests__/services/client.test.ts @@ -1,6 +1,6 @@ import "jest-extended"; import WebSocket from "ws"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import fixtures from "./fixtures/rippled"; @@ -98,11 +98,11 @@ describe("ClientService", function () { // expect(result.typeGroup()).toBeUndefined(); expect(result.timestamp()).toBe(1363132610000); expect(result.confirmations()).toEqual(BigNumber.ZERO); - expect(result.nonce()).toEqual(BigNumber.make(4)); + expect(result.nonce()).toEqual(Utils.BigNumber.make(4)); expect(result.sender()).toBe("r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59"); expect(result.recipient()).toBe("rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM"); - expect(result.amount()).toEqual(BigNumber.make(100000)); - expect(result.fee()).toEqual(BigNumber.make(1000)); + expect(result.amount()).toEqual(Utils.BigNumber.make(100000)); + expect(result.fee()).toEqual(Utils.BigNumber.make(1000)); // expect(result.memo()).toBeUndefined(); // expect(result.blockId()).toBeUndefined(); }); @@ -127,7 +127,7 @@ describe("ClientService", function () { expect(result).toBeInstanceOf(WalletData); expect(result.address()).toEqual("rMWnHRpSWTYSsxbDjASvGvC31F4pRkyYHP"); // expect(result.publicKey()).toBeUndefined(); - expect(result.balance()).toEqual(BigNumber.make("92291324300")); + expect(result.balance()).toEqual(Utils.BigNumber.make("92291324300")); }); }); diff --git a/packages/platform-sdk-xrp/src/dto/transaction.ts b/packages/platform-sdk-xrp/src/dto/transaction.ts index 7fc337e811..3af2b12fdb 100644 --- a/packages/platform-sdk-xrp/src/dto/transaction.ts +++ b/packages/platform-sdk-xrp/src/dto/transaction.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; import BN from "bignumber.js"; export class TransactionData extends DTO.AbstractTransactionData implements Contracts.TransactionData { @@ -19,12 +19,12 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return +new Date(this.data.outcome.timestamp); } - public confirmations(): BigNumber { - return BigNumber.ZERO; + public confirmations(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } - public nonce(): BigNumber { - return BigNumber.make(this.data.sequence); + public nonce(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.sequence); } public sender(): string { @@ -35,16 +35,16 @@ export class TransactionData extends DTO.AbstractTransactionData implements Cont return this.data.specification.destination.address; } - public amount(): BigNumber { + public amount(): Utils.BigNumber { const satoshi: string = new BN(this.data.outcome.deliveredAmount.value).times(1e8).toFixed(); - return BigNumber.make(satoshi); + return Utils.BigNumber.make(satoshi); } - public fee(): BigNumber { + public fee(): Utils.BigNumber { const satoshi: string = new BN(this.data.outcome.fee).times(1e8).toFixed(); - return BigNumber.make(satoshi); + return Utils.BigNumber.make(satoshi); } public memo(): string | undefined { diff --git a/packages/platform-sdk-xrp/src/dto/wallet.ts b/packages/platform-sdk-xrp/src/dto/wallet.ts index cefb51f21f..d4a4252c94 100644 --- a/packages/platform-sdk-xrp/src/dto/wallet.ts +++ b/packages/platform-sdk-xrp/src/dto/wallet.ts @@ -1,5 +1,5 @@ import { Contracts, DTO, Exceptions } from "@arkecosystem/platform-sdk"; -import { BigNumber } from "@arkecosystem/utils"; +import { Utils } from "@arkecosystem/platform-sdk"; export class WalletData extends DTO.AbstractWalletData implements Contracts.WalletData { public address(): string { @@ -10,11 +10,11 @@ export class WalletData extends DTO.AbstractWalletData implements Contracts.Wall throw new Exceptions.NotImplemented(this.constructor.name, "publicKey"); } - public balance(): BigNumber { - return BigNumber.make(this.data.balance * 1e8); + public balance(): Utils.BigNumber { + return Utils.BigNumber.make(this.data.balance * 1e8); } - public nonce(): BigNumber { - return BigNumber.ZERO; + public nonce(): Utils.BigNumber { + return Utils.BigNumber.ZERO; } } diff --git a/packages/platform-sdk/src/contracts/coins/data.ts b/packages/platform-sdk/src/contracts/coins/data.ts index c89e604183..572de040bb 100644 --- a/packages/platform-sdk/src/contracts/coins/data.ts +++ b/packages/platform-sdk/src/contracts/coins/data.ts @@ -1,5 +1,4 @@ -import { BigNumber } from "@arkecosystem/utils"; - +import { BigNumber } from "../../utils"; import { KeyValuePair } from "../types"; export interface TransactionData { diff --git a/packages/platform-sdk/src/dto/transaction.ts b/packages/platform-sdk/src/dto/transaction.ts index 50a1192bc2..3b42556a7d 100644 --- a/packages/platform-sdk/src/dto/transaction.ts +++ b/packages/platform-sdk/src/dto/transaction.ts @@ -1,6 +1,5 @@ -import { BigNumber } from "@arkecosystem/utils"; - import { KeyValuePair } from "../contracts/types"; +import { BigNumber } from "../utils"; export abstract class AbstractTransactionData { public constructor(protected readonly data: KeyValuePair) {} diff --git a/packages/platform-sdk/src/dto/wallet.ts b/packages/platform-sdk/src/dto/wallet.ts index 41275e51d9..a1786422bf 100644 --- a/packages/platform-sdk/src/dto/wallet.ts +++ b/packages/platform-sdk/src/dto/wallet.ts @@ -1,6 +1,5 @@ -import { BigNumber } from "@arkecosystem/utils"; - import { KeyValuePair } from "../contracts/types"; +import { BigNumber } from "../utils"; export abstract class AbstractWalletData { public constructor(protected readonly data: KeyValuePair) {} diff --git a/packages/platform-sdk/src/utils/bignumber.ts b/packages/platform-sdk/src/utils/bignumber.ts index 7e66795b1e..d9ea00a186 100644 --- a/packages/platform-sdk/src/utils/bignumber.ts +++ b/packages/platform-sdk/src/utils/bignumber.ts @@ -5,6 +5,10 @@ import { NumberLike } from "../contracts"; // This implementation is significantly slower than the native BigInt but for // applications that use the Platform SDK this performance loss is acceptable. export class BigNumber { + public static readonly ZERO: BigNumber = new BigNumber(0); + public static readonly ONE: BigNumber = new BigNumber(1); + public static readonly SATOSHI: BigNumber = new BigNumber(1e8); + #value: BigNumberJS; #decimals = 8;