@arkecosystem/typescript-crypto 0.0.10 → 0.0.11

package/tests/unit/transactions/builders/ValidatorRegistrationBuilder.test.ts

@@ -1,8 +1,7 @@
+import { ValidatorRegistrationBuilder } from "@/transactions/builders/ValidatorRegistrationBuilder";
 import fixture from "@tests/fixtures/transactions/validator-registration.json";
 import identityFixture from "@tests/fixtures/identity.json";
 
-import { ValidatorRegistrationBuilder } from "@/transactions/builders/ValidatorRegistrationBuilder";
-
 it("should build a transaction", async () => {
 	const transaction = (
 		await ValidatorRegistrationBuilder.new()
@@ -11,16 +10,14 @@ it("should build a transaction", async () => {
 			)
 			.nonce(fixture.data.nonce)
 			.gasPrice(fixture.data.gasPrice)
-			.gas(fixture.data.gas)
+			.gasLimit(fixture.data.gasLimit)
 			.value(fixture.data.value)
-			.network(fixture.data.network)
 			.sign(identityFixture.passphrase)
 	).transaction;
 
 	expect(transaction.data.gasPrice).toBe(fixture.data.gasPrice);
 	expect(transaction.data.nonce).toBe(fixture.data.nonce);
-	expect(transaction.data.network).toBe(fixture.data.network);
-	expect(transaction.data.gas).toBe(fixture.data.gas);
+	expect(transaction.data.gasLimit).toBe(fixture.data.gasLimit);
 	expect(transaction.data.to).toBe(fixture.data.to);
 	expect(transaction.data.value).toBe(fixture.data.value);
 	expect(transaction.data.v).toBe(fixture.data.v);
@@ -40,16 +37,14 @@ it("should handle validator public key with leading 0x", async () => {
 			)
 			.nonce(fixture.data.nonce)
 			.gasPrice(fixture.data.gasPrice)
-			.gas(fixture.data.gas)
+			.gasLimit(fixture.data.gasLimit)
 			.value(fixture.data.value)
-			.network(fixture.data.network)
 			.sign(identityFixture.passphrase)
 	).transaction;
 
 	expect(transaction.data.gasPrice).toBe(fixture.data.gasPrice);
 	expect(transaction.data.nonce).toBe(fixture.data.nonce);
-	expect(transaction.data.network).toBe(fixture.data.network);
-	expect(transaction.data.gas).toBe(fixture.data.gas);
+	expect(transaction.data.gasLimit).toBe(fixture.data.gasLimit);
 	expect(transaction.data.to).toBe(fixture.data.to);
 	expect(transaction.data.value).toBe(fixture.data.value);
 	expect(transaction.data.v).toBe(fixture.data.v);
@@ -67,8 +62,7 @@ it("should sign a transaction", async () => {
 
 	expect(transaction.data.gasPrice).toBe(fixture.data.gasPrice);
 	expect(transaction.data.nonce).toBe(fixture.data.nonce);
-	expect(transaction.data.network).toBe(fixture.data.network);
-	expect(transaction.data.gas).toBe(fixture.data.gas);
+	expect(transaction.data.gasLimit).toBe(fixture.data.gasLimit);
 	expect(transaction.data.to).toBe(fixture.data.to);
 	expect(transaction.data.value).toBe(fixture.data.value);
 	expect(transaction.data.v).toBe(fixture.data.v);
@@ -94,8 +88,7 @@ it("should convert to an array", async () => {
 		to: fixture.data.to,
 		value: fixture.data.value,
 		gasPrice: fixture.data.gasPrice,
-		gas: fixture.data.gas,
-		network: fixture.data.network,
+		gasLimit: fixture.data.gasLimit,
 		nonce: fixture.data.nonce,
 		v: fixture.data.v,
 		r: fixture.data.r,
@@ -111,9 +104,8 @@ it("should convert to json", async () => {
 	expect(transaction.toJson()).toEqual(
 		JSON.stringify({
 			gasPrice: fixture.data.gasPrice,
-			network: fixture.data.network,
 			hash: fixture.data.hash,
-			gas: fixture.data.gas,
+			gasLimit: fixture.data.gasLimit,
 			nonce: fixture.data.nonce,
 			senderPublicKey: fixture.data.senderPublicKey,
 			to: fixture.data.to,
@@ -132,9 +124,8 @@ it("should convert to string", async () => {
 	expect(transaction.toString()).toEqual(
 		JSON.stringify({
 			gasPrice: fixture.data.gasPrice,
-			network: fixture.data.network,
 			hash: fixture.data.hash,
-			gas: fixture.data.gas,
+			gasLimit: fixture.data.gasLimit,
 			nonce: fixture.data.nonce,
 			senderPublicKey: fixture.data.senderPublicKey,
 			to: fixture.data.to,

package/tests/unit/transactions/builders/ValidatorResignationBuilder.test.ts

@@ -1,22 +1,19 @@
+import { ValidatorResignationBuilder } from "@/transactions/builders/ValidatorResignationBuilder";
 import fixture from "@tests/fixtures/transactions/validator-resignation.json";
 import identityFixture from "@tests/fixtures/identity.json";
 
-import { ValidatorResignationBuilder } from "@/transactions/builders/ValidatorResignationBuilder";
-
 it("should build a transaction", async () => {
 	const transaction = (
 		await ValidatorResignationBuilder.new()
 			.nonce(fixture.data.nonce)
 			.gasPrice(fixture.data.gasPrice)
-			.gas(fixture.data.gas)
-			.network(fixture.data.network)
+			.gasLimit(fixture.data.gasLimit)
 			.sign(identityFixture.passphrase)
 	).transaction;
 
 	expect(transaction.data.gasPrice).toBe(fixture.data.gasPrice);
 	expect(transaction.data.nonce).toBe(fixture.data.nonce);
-	expect(transaction.data.network).toBe(fixture.data.network);
-	expect(transaction.data.gas).toBe(fixture.data.gas);
+	expect(transaction.data.gasLimit).toBe(fixture.data.gasLimit);
 	expect(transaction.data.to).toBe(fixture.data.to);
 	expect(transaction.data.value).toBe(fixture.data.value);
 	expect(transaction.data.v).toBe(fixture.data.v);
@@ -34,8 +31,7 @@ it("should sign a transaction", async () => {
 
 	expect(transaction.data.gasPrice).toBe(fixture.data.gasPrice);
 	expect(transaction.data.nonce).toBe(fixture.data.nonce);
-	expect(transaction.data.network).toBe(fixture.data.network);
-	expect(transaction.data.gas).toBe(fixture.data.gas);
+	expect(transaction.data.gasLimit).toBe(fixture.data.gasLimit);
 	expect(transaction.data.to).toBe(fixture.data.to);
 	expect(transaction.data.value).toBe(fixture.data.value);
 	expect(transaction.data.v).toBe(fixture.data.v);
@@ -61,8 +57,7 @@ it("should convert to an array", async () => {
 		to: fixture.data.to,
 		value: fixture.data.value,
 		gasPrice: fixture.data.gasPrice,
-		gas: fixture.data.gas,
-		network: fixture.data.network,
+		gasLimit: fixture.data.gasLimit,
 		nonce: fixture.data.nonce,
 		v: fixture.data.v,
 		r: fixture.data.r,
@@ -78,9 +73,8 @@ it("should convert to json", async () => {
 	expect(transaction.toJson()).toEqual(
 		JSON.stringify({
 			gasPrice: fixture.data.gasPrice,
-			network: fixture.data.network,
 			hash: fixture.data.hash,
-			gas: fixture.data.gas,
+			gasLimit: fixture.data.gasLimit,
 			nonce: fixture.data.nonce,
 			senderPublicKey: fixture.data.senderPublicKey,
 			to: fixture.data.to,
@@ -99,9 +93,8 @@ it("should convert to string", async () => {
 	expect(transaction.toString()).toEqual(
 		JSON.stringify({
 			gasPrice: fixture.data.gasPrice,
-			network: fixture.data.network,
 			hash: fixture.data.hash,
-			gas: fixture.data.gas,
+			gasLimit: fixture.data.gasLimit,
 			nonce: fixture.data.nonce,
 			senderPublicKey: fixture.data.senderPublicKey,
 			to: fixture.data.to,

package/tests/unit/transactions/builders/VoteBuilder.test.ts

@@ -1,23 +1,20 @@
+import { VoteBuilder } from "@/transactions/builders/VoteBuilder";
 import fixture from "@tests/fixtures/transactions/vote.json";
 import identityFixture from "@tests/fixtures/identity.json";
 
-import { VoteBuilder } from "@/transactions/builders/VoteBuilder";
-
 it("should build a transaction", async () => {
 	const transaction = (
 		await VoteBuilder.new()
 			.vote("0xc3bbe9b1cee1ff85ad72b87414b0e9b7f2366763")
 			.nonce(fixture.data.nonce)
 			.gasPrice(fixture.data.gasPrice)
-			.gas(fixture.data.gas)
-			.network(fixture.data.network)
+			.gasLimit(fixture.data.gasLimit)
 			.sign(identityFixture.passphrase)
 	).transaction;
 
 	expect(transaction.data.gasPrice).toBe(fixture.data.gasPrice);
 	expect(transaction.data.nonce).toBe(fixture.data.nonce);
-	expect(transaction.data.network).toBe(fixture.data.network);
-	expect(transaction.data.gas).toBe(fixture.data.gas);
+	expect(transaction.data.gasLimit).toBe(fixture.data.gasLimit);
 	expect(transaction.data.to).toBe(fixture.data.to);
 	expect(transaction.data.value).toBe(fixture.data.value);
 	expect(transaction.data.v).toBe(fixture.data.v);
@@ -34,8 +31,7 @@ it("should sign a transaction", async () => {
 
 	expect(transaction.data.gasPrice).toBe(fixture.data.gasPrice);
 	expect(transaction.data.nonce).toBe(fixture.data.nonce);
-	expect(transaction.data.network).toBe(fixture.data.network);
-	expect(transaction.data.gas).toBe(fixture.data.gas);
+	expect(transaction.data.gasLimit).toBe(fixture.data.gasLimit);
 	expect(transaction.data.to).toBe(fixture.data.to);
 	expect(transaction.data.value).toBe(fixture.data.value);
 	expect(transaction.data.v).toBe(fixture.data.v);
@@ -61,8 +57,7 @@ it("should convert to an array", async () => {
 		to: fixture.data.to,
 		value: fixture.data.value,
 		gasPrice: fixture.data.gasPrice,
-		gas: fixture.data.gas,
-		network: fixture.data.network,
+		gasLimit: fixture.data.gasLimit,
 		nonce: fixture.data.nonce,
 		v: fixture.data.v,
 		r: fixture.data.r,
@@ -78,9 +73,8 @@ it("should convert to json", async () => {
 	expect(transaction.toJson()).toEqual(
 		JSON.stringify({
 			gasPrice: fixture.data.gasPrice,
-			network: fixture.data.network,
 			hash: fixture.data.hash,
-			gas: fixture.data.gas,
+			gasLimit: fixture.data.gasLimit,
 			nonce: fixture.data.nonce,
 			senderPublicKey: fixture.data.senderPublicKey,
 			to: fixture.data.to,
@@ -99,9 +93,8 @@ it("should convert to string", async () => {
 	expect(transaction.toString()).toEqual(
 		JSON.stringify({
 			gasPrice: fixture.data.gasPrice,
-			network: fixture.data.network,
 			hash: fixture.data.hash,
-			gas: fixture.data.gas,
+			gasLimit: fixture.data.gasLimit,
 			nonce: fixture.data.nonce,
 			senderPublicKey: fixture.data.senderPublicKey,
 			to: fixture.data.to,

package/tests/unit/transactions/types/AbstractTransaction.test.ts

@@ -1,10 +1,8 @@
-import fixture from "@tests/fixtures/transactions/transfer.json";
-import fixtureGlobal from "@tests/fixtures/global.json";
-
 import { AbstractTransaction } from "@/transactions/types/AbstractTransaction";
 import { PrivateKey } from "@/identities/PrivateKey";
-import { TransactionData } from "@/types";
 import { Transfer } from "@/transactions/types/Transfer";
+import fixture from "@tests/fixtures/transactions/transfer.json";
+import fixtureGlobal from "@tests/fixtures/global.json";
 
 class Transaction extends AbstractTransaction {
 	getPayload(): string {
@@ -94,9 +92,8 @@ it("should convert the transaction to json", () => {
 	expect(transaction.toJson()).toEqual(
 		JSON.stringify({
 			gasPrice: fixture.data["gasPrice"],
-			network: fixture.data["network"],
 			hash: fixture.data["hash"],
-			gas: fixture.data["gas"],
+			gasLimit: fixture.data["gasLimit"],
 			nonce: fixture.data["nonce"],
 			senderPublicKey: fixture.data["senderPublicKey"],
 			to: fixture.data["to"],
@@ -135,8 +132,9 @@ it("should serialize the transaction without signature", () => {
 
 	const serialized = transaction.serialize(true).toString("hex");
 
-	expect(serialized).toHaveLength(88);
+	expect(serialized).toHaveLength(86);
 
 	// We don't store serialized without the signature in the fixtures so we do a partial check
-	expect(fixture.serialized).toContain(serialized.substring(4));
+	const trimmedSerialized = serialized.substring(1, serialized.length - 9); // Remove leading char and last 9 chars (dummy signature)
+	expect(fixture.serialized).toContain(trimmedSerialized);
 });

package/tests/unit/utils/TransactionUtils.test.ts

@@ -1,5 +1,5 @@
-import fixture from "@tests/fixtures/transactions/transfer.json";
 import { TransactionUtils } from "@/utils/TransactionUtils";
+import fixture from "@tests/fixtures/transactions/transfer.json";
 
 it("should convert a transaction to a buffer with a signature", () => {
 	const buffer = TransactionUtils.toBuffer(fixture.data);
@@ -16,30 +16,28 @@ it("should convert a transaction to a buffer without a signature", () => {
 
 it("should convert a transaction to a buffer using fallback values if missing", () => {
 	const result = TransactionUtils.toBuffer({
-		network: undefined,
 		nonce: undefined,
 		gasPrice: undefined,
 		gasLimit: undefined,
-		recipientAddress: undefined,
+		to: undefined,
 		value: undefined,
 		data: undefined,
 	}).toString("hex");
 
-	expect(result).toEqual("02c98080808080808080c0");
+	expect(result).toEqual("cb808080808080822e248080");
 });
 
 it("should convert a transaction to a buffer handling data starting with 0x", () => {
 	const result = TransactionUtils.toBuffer({
-		network: undefined,
 		nonce: undefined,
 		gasPrice: undefined,
 		gasLimit: undefined,
-		recipientAddress: undefined,
+		to: undefined,
 		value: undefined,
 		data: "0x1234567890",
 	}).toString("hex");
 
-	expect(result).toEqual("02ce80808080808080851234567890c0");
+	expect(result).toEqual("d08080808080851234567890822e248080");
 });
 
 it("should convert a transaction to a hash with a signature", () => {

package/dist/enums/Constants.d.ts

@@ -1,5 +0,0 @@
-export declare enum Constants {
-    EIP_1559_PREFIX = "02",
-    ETHEREUM_RECOVERY_ID_OFFSET = 27
-}
-//# sourceMappingURL=Constants.d.ts.map

package/dist/enums/Constants.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Constants.d.ts","sourceRoot":"","sources":["../../src/enums/Constants.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACpB,eAAe,OAAO;IACtB,2BAA2B,KAAK;CAChC"}

package/dist/enums/Constants.js

@@ -1,5 +0,0 @@
-export var Constants;
-(function (Constants) {
-    Constants["EIP_1559_PREFIX"] = "02";
-    Constants[Constants["ETHEREUM_RECOVERY_ID_OFFSET"] = 27] = "ETHEREUM_RECOVERY_ID_OFFSET";
-})(Constants || (Constants = {}));

package/src/enums/Constants.ts

@@ -1,4 +0,0 @@
-export enum Constants {
-	EIP_1559_PREFIX = "02",
-	ETHEREUM_RECOVERY_ID_OFFSET = 27,
-}