Merge remote-tracking branch 'origin/refactor/tx-fetching-logic' into…

… refactor/tx-fetching-logic
ArdentHQ · Jan 14, 2025 · 971b78c · 971b78c
2 parents c42d383 + 095ce83
commit 971b78c
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 24 deletions.
diff --git a/packages/ark/package.json b/packages/ark/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-ark",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/cryptography/package.json b/packages/cryptography/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-cryptography",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/fetch/package.json b/packages/fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-fetch",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "HTTP Client for @ardenthq/sdk",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/helpers/package.json b/packages/helpers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-helpers",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/intl/package.json b/packages/intl/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-intl",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-ledger",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Ledger for @ardenthq/sdk",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/mainsail/package.json b/packages/mainsail/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-mainsail",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/mainsail/source/confirmed-transaction.dto.test.ts b/packages/mainsail/source/confirmed-transaction.dto.test.ts
@@ -11,6 +11,7 @@ import { createService } from "../test/mocking";
 import { ConfirmedTransactionData } from "./confirmed-transaction.dto.js";
 import { BindingType } from "./coin.contract";
 import { AddressService } from "./address.service";
+import { formatUnits } from "./helpers/format-units";
 
 const createSubject = async () => {
 	return await createService(ConfirmedTransactionData, "mainsail.devnet", function (container: IoC.Container) {
@@ -69,8 +70,8 @@ describe("ConfirmedTransactionData", async ({ assert, beforeEach, it, stub }) =>
 	// });
 	//
 	it("should have a fee", (context) => {
-		// fees are in gwei unit
-		assert.equal(context.subject.fee(), BigNumber.make(105_000_000_000_000));
+		// fees are in arks
+		assert.equal(context.subject.fee(), formatUnits(BigNumber.make(105_000).toString(), "gwei"));
 	});
 
 	it("should determine if the transaction is confirmed", (context) => {

diff --git a/packages/mainsail/source/confirmed-transaction.dto.ts b/packages/mainsail/source/confirmed-transaction.dto.ts
@@ -6,6 +6,7 @@ import { BindingType } from "./coin.contract.js";
 import { decodeFunctionData } from "./helpers/decode-function-data.js";
 import { parseUnits } from "./helpers/parse-units.js";
 import { TransactionTypeService } from "./transaction-type.service.js";
+import { formatUnits } from "./helpers/format-units";
 
 export class ConfirmedTransactionData extends DTO.AbstractConfirmedTransactionData {
 	readonly #addressService: Services.AddressService;
@@ -64,7 +65,7 @@ export class ConfirmedTransactionData extends DTO.AbstractConfirmedTransactionDa
 
 	public override fee(): BigNumber {
 		const gasPrice = this.bigNumberService.make(this.data.gasPrice);
-		return parseUnits(gasPrice.times(this.data.gasLimit).toNumber(), "gwei");
+		return formatUnits(gasPrice.times(this.data.gasLimit).toString(), "gwei");
 	}
 
 	public override asset(): Record<string, unknown> {

diff --git a/packages/mainsail/source/signed-transaction.dto.test.ts b/packages/mainsail/source/signed-transaction.dto.test.ts
@@ -4,6 +4,7 @@ import { describe } from "@ardenthq/sdk-test";
 
 import { createService } from "../test/mocking";
 import { SignedTransactionData } from "./signed-transaction.dto.js";
+import { formatUnits } from "./helpers/format-units";
 
 describe("SignedTransactionData", async ({ assert, beforeAll, it, nock, loader }) => {
 	beforeAll(async (context) => {
@@ -96,7 +97,7 @@ describe("SignedTransactionData", async ({ assert, beforeAll, it, nock, loader }
 	});
 
 	it("should have a fee", (context) => {
-		assert.equal(context.subject.fee(), BigNumber.make("1000000000000000"));
+		assert.equal(context.subject.fee(), formatUnits(BigNumber.make(1_000_000).toString(), "gwei"));
 	});
 
 	it("should have a timestamp", (context) => {

diff --git a/packages/mainsail/source/signed-transaction.dto.ts b/packages/mainsail/source/signed-transaction.dto.ts
@@ -8,8 +8,8 @@ import { Hex } from "viem";
 import { BindingType } from "./coin.contract.js";
 import { Hash } from "./crypto/hash.js";
 import { decodeFunctionData } from "./helpers/decode-function-data.js";
-import { parseUnits } from "./helpers/parse-units.js";
 import { TransactionTypeService } from "./transaction-type.service.js";
+import { formatUnits } from "./helpers/format-units";
 
 export class SignedTransactionData
 	extends DTO.AbstractSignedTransactionData
@@ -44,7 +44,7 @@ export class SignedTransactionData
 
 	public override fee(): BigNumber {
 		const gasPrice = this.bigNumberService.make(this.signedData.gasPrice);
-		return parseUnits(gasPrice.times(this.signedData.gasLimit).toNumber(), "gwei");
+		return formatUnits(gasPrice.times(this.signedData.gasLimit).toString(), "gwei");
 	}
 
 	public override memo(): string | undefined {

diff --git a/packages/mainsail/source/transaction.service.test.ts b/packages/mainsail/source/transaction.service.test.ts
@@ -15,6 +15,7 @@ import { PublicKeyService } from "./public-key.service.js";
 import { SignedTransactionData } from "./signed-transaction.dto.js";
 import { TransactionService } from "./transaction.service.js";
 import { WalletData } from "./wallet.dto.js";
+import { formatUnits } from "./helpers/format-units";
 
 describe("TransactionService", async ({ assert, beforeAll, nock, it, loader }) => {
 	beforeAll(async (context) => {
@@ -97,7 +98,10 @@ describe("TransactionService", async ({ assert, beforeAll, nock, it, loader }) =
 		);
 		assert.is(
 			signedTransaction.fee().toString(),
-			parseUnits(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice, "gwei").valueOf(),
+			formatUnits(
+				(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice).toString(),
+				"gwei",
+			).valueOf(),
 		);
 		assert.is(signedTransaction.nonce().toString(), context.defaultTransferInput.nonce);
 		assert.is(signedTransaction.recipient(), context.defaultTransferInput.data.to);
@@ -149,7 +153,10 @@ describe("TransactionService", async ({ assert, beforeAll, nock, it, loader }) =
 
 		assert.is(
 			signedTransaction.fee().toString(),
-			parseUnits(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice, "gwei").valueOf(),
+			formatUnits(
+				(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice).toString(),
+				"gwei",
+			).valueOf(),
 		);
 		assert.is(signedTransaction.nonce().toString(), context.defaultValidatorRegistrationInput.nonce);
 
@@ -201,7 +208,10 @@ describe("TransactionService", async ({ assert, beforeAll, nock, it, loader }) =
 
 		assert.is(
 			signedTransaction.fee().toString(),
-			parseUnits(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice, "gwei").valueOf(),
+			formatUnits(
+				(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice).toString(),
+				"gwei",
+			).valueOf(),
 		);
 		assert.is(signedTransaction.nonce().toString(), context.defaultValidatorRegistrationInput.nonce);
 	});

diff --git a/packages/mainsail/source/transaction.service.votes.test.ts b/packages/mainsail/source/transaction.service.votes.test.ts
@@ -6,7 +6,6 @@ import { identity } from "../test/wallets";
 import { AddressService } from "./address.service.js";
 import { ClientService } from "./client.service.js";
 import { ConfirmedTransactionData } from "./confirmed-transaction.dto.js";
-import { parseUnits } from "./helpers/parse-units.js";
 import { KeyPairService } from "./key-pair.service.js";
 import { LedgerService } from "./ledger.service.js";
 import { MultiSignatureService } from "./multi-signature.service.js";
@@ -15,6 +14,7 @@ import { PublicKeyService } from "./public-key.service.js";
 import { SignedTransactionData } from "./signed-transaction.dto.js";
 import { TransactionService } from "./transaction.service.js";
 import { WalletData } from "./wallet.dto.js";
+import { formatUnits } from "./helpers/format-units";
 
 describe("TransactionService Votes", async ({ assert, beforeAll, nock, it }) => {
 	beforeAll(async (context) => {
@@ -61,7 +61,10 @@ describe("TransactionService Votes", async ({ assert, beforeAll, nock, it }) =>
 		assert.is(signedTransaction.isUnvote(), false);
 		assert.is(
 			signedTransaction.fee().toString(),
-			parseUnits(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice, "gwei").valueOf(),
+			formatUnits(
+				(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice).toString(),
+				"gwei",
+			).valueOf(),
 		);
 		assert.is(signedTransaction.nonce().toString(), context.defaultInput.nonce);
 	});
@@ -76,7 +79,10 @@ describe("TransactionService Votes", async ({ assert, beforeAll, nock, it }) =>
 		assert.is(signedTransaction.isVote(), false);
 		assert.is(
 			signedTransaction.fee().toString(),
-			parseUnits(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice, "gwei").valueOf(),
+			formatUnits(
+				(signedTransaction.signedData.gasLimit * signedTransaction.signedData.gasPrice).toString(),
+				"gwei",
+			).valueOf(),
 		);
 		assert.is(signedTransaction.nonce().toString(), context.defaultInput.nonce);
 	});

diff --git a/packages/markets/package.json b/packages/markets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-markets",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/news/package.json b/packages/news/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-news",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/profiles/package.json b/packages/profiles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-profiles",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Profiles for @ardenthq/sdk",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@ardenthq/sdk-test",
-	"version": "2.0.0-alpha.36",
+	"version": "2.0.0-alpha.37",
 	"description": "Cross-Platform Utilities for Ardent Applications",
 	"license": "MIT",
 	"contributors": [],