From 172ddad2e77a03d67e2ab564bb9e567529c2a8b4 Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:01:54 +0900 Subject: [PATCH 1/5] deserialize value as bigint --- packages/crypto-transaction/source/deserializer.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/crypto-transaction/source/deserializer.ts b/packages/crypto-transaction/source/deserializer.ts index fd95053d8..6e37ccb53 100644 --- a/packages/crypto-transaction/source/deserializer.ts +++ b/packages/crypto-transaction/source/deserializer.ts @@ -1,7 +1,7 @@ import { inject, injectable } from "@mainsail/container"; import { Contracts, Identifiers } from "@mainsail/contracts"; import { BigNumber } from "@mainsail/utils"; -import { decodeRlp } from "ethers"; +import { decodeRlp, ethers } from "ethers"; @injectable() export class Deserializer implements Contracts.Crypto.TransactionDeserializer { @@ -21,7 +21,7 @@ export class Deserializer implements Contracts.Crypto.TransactionDeserializer { data.gasPrice = this.#parseNumber(decoded[3].toString()); data.gasLimit = this.#parseNumber(decoded[4].toString()); data.recipientAddress = this.#parseAddress(decoded[5].toString()); - data.value = BigNumber.make(this.#parseNumber(decoded[6].toString())); + data.value = this.#parseBigNumber(decoded[6].toString()); data.data = this.#parseData(decoded[7].toString()); if (decoded.length === 12) { @@ -42,6 +42,10 @@ export class Deserializer implements Contracts.Crypto.TransactionDeserializer { return value === "0x" ? 0 : Number(value); } + #parseBigNumber(value: string): BigNumber { + return value === "0x" ? BigNumber.ZERO : BigNumber.make(ethers.getBigInt(value)); + } + #parseAddress(value: string): string | undefined { return value === "0x" ? undefined : value; } From 6d8bfd5fef67359069092bae1702b2ff06f601c5 Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:02:19 +0900 Subject: [PATCH 2/5] Empty commit From 0b3bfae6c29ea350d26a9e3111445018dff5e330 Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:22:40 +0900 Subject: [PATCH 3/5] fix premine distribution --- .../configuration-generator/bin/create-genesis-block.js | 7 ++++++- .../source/configuration-generator.ts | 4 ++-- .../source/generators/genesis-block.ts | 6 ++++++ packages/configuration-generator/source/identifiers.ts | 1 - 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/configuration-generator/bin/create-genesis-block.js b/packages/configuration-generator/bin/create-genesis-block.js index 0f6ed933c..24b08647a 100644 --- a/packages/configuration-generator/bin/create-genesis-block.js +++ b/packages/configuration-generator/bin/create-genesis-block.js @@ -1,5 +1,6 @@ import envPaths from "env-paths"; import path from "path"; +import { Identifiers as AppIdentifiers } from "@mainsail/contracts"; import { makeApplication } from "../distribution/application-factory.js"; import { Identifiers } from "../distribution/identifiers.js"; @@ -16,11 +17,15 @@ async function run() { symbol: "TѦ", token: "ARK", distribute: true, - premine: "12499999999999969", + premine: "125000000000000000000000000", // snapshot: { // path: "../../snapshot-19a87c96dbe8ad1be06d33e97cd17f5662eb952c29efd3d8bb00c9c75e7582bc.json", // }, }); + + for (const tag of ["evm", "ephemeral"]) { + await app.getTagged(AppIdentifiers.Evm.Instance, "instance", tag).dispose(); + } } run(); diff --git a/packages/configuration-generator/source/configuration-generator.ts b/packages/configuration-generator/source/configuration-generator.ts index 91748a8b2..1ec1f4268 100644 --- a/packages/configuration-generator/source/configuration-generator.ts +++ b/packages/configuration-generator/source/configuration-generator.ts @@ -228,8 +228,8 @@ export class ConfigurationGenerator { } let logger: Contracts.Kernel.Logger | undefined; - if (this.app.isBound(InternalIdentifiers.LogService)) { - logger = this.app.get(InternalIdentifiers.LogService); + if (this.app.isBound(Identifiers.Services.Log.Service)) { + logger = this.app.get(Identifiers.Services.Log.Service); } for (const task of tasks) { diff --git a/packages/configuration-generator/source/generators/genesis-block.ts b/packages/configuration-generator/source/generators/genesis-block.ts index bc892e9a7..e9343ba8c 100644 --- a/packages/configuration-generator/source/generators/genesis-block.ts +++ b/packages/configuration-generator/source/generators/genesis-block.ts @@ -62,6 +62,12 @@ export class GenesisBlockGenerator extends Generator { options.pubKeyHash, )), ); + + options.premine = transactions + .reduce((acc, curr) => { + return acc.plus(curr.data.value); + }, BigNumber.ZERO) + .toFixed(); } else { transactions = transactions.concat( await this.#createTransferTransaction( diff --git a/packages/configuration-generator/source/identifiers.ts b/packages/configuration-generator/source/identifiers.ts index b5ae6fe4b..66093927d 100644 --- a/packages/configuration-generator/source/identifiers.ts +++ b/packages/configuration-generator/source/identifiers.ts @@ -13,5 +13,4 @@ export const Identifiers = { Peers: Symbol.for("Generator"), Wallet: Symbol.for("Generator"), }, - LogService: Symbol.for("Configuration"), }; From e894d07d45347f9b159a73ba3ef15f6711700d48 Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:24:29 +0900 Subject: [PATCH 4/5] Empty commit From 308f86435270bd81432730d523ee11a8ca5c7661 Mon Sep 17 00:00:00 2001 From: oXtxNt9U <120286271+oXtxNt9U@users.noreply.github.com> Date: Tue, 14 Jan 2025 03:27:35 +0000 Subject: [PATCH 5/5] style: resolve style guide violations --- .../source/generators/genesis-block.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/configuration-generator/source/generators/genesis-block.ts b/packages/configuration-generator/source/generators/genesis-block.ts index e9343ba8c..10ec99418 100644 --- a/packages/configuration-generator/source/generators/genesis-block.ts +++ b/packages/configuration-generator/source/generators/genesis-block.ts @@ -64,9 +64,7 @@ export class GenesisBlockGenerator extends Generator { ); options.premine = transactions - .reduce((acc, curr) => { - return acc.plus(curr.data.value); - }, BigNumber.ZERO) + .reduce((accumulator, current) => accumulator.plus(current.data.value), BigNumber.ZERO) .toFixed(); } else { transactions = transactions.concat(