@arkecosystem/typescript-crypto 0.0.4 → 0.0.6

package/src/transactions/types/Transfer.ts

@@ -1,22 +1,7 @@
-import { AbiResult, TransactionData } from "@/types";
-
 import { AbstractTransaction } from "./AbstractTransaction";
-import { ContractAbiType } from "@/enums/ContractAbiType";
-import { Deserializer } from "@/transactions/Deserializer";
 
 export class Transfer extends AbstractTransaction {
 	getPayload(): string {
 		return "";
 	}
-
-	protected decodePayload(
-		data: TransactionData,
-		type: ContractAbiType = ContractAbiType.CONSENSUS,
-	): AbiResult | null {
-		if (!data["data"]) {
-			return null;
-		}
-
-		return Deserializer.decodePayload(data, type);
-	}
 }

package/src/transactions/types/Unvote.ts

@@ -1,24 +1,9 @@
-import { AbiResult, TransactionData } from "@/types";
-
 import { AbiEncoder } from "@/utils/AbiEncoder";
 import { AbiFunction } from "@/enums/AbiFunction";
 import { AbstractTransaction } from "./AbstractTransaction";
-import { ContractAbiType } from "@/enums/ContractAbiType";
-import { Deserializer } from "@/transactions/Deserializer";
 
 export class Unvote extends AbstractTransaction {
 	getPayload(): string {
 		return new AbiEncoder().encodeFunctionCall(AbiFunction.UNVOTE, []);
 	}
-
-	protected decodePayload(
-		data: TransactionData,
-		type: ContractAbiType = ContractAbiType.CONSENSUS,
-	): AbiResult | null {
-		if (!data["data"]) {
-			return null;
-		}
-
-		return Deserializer.decodePayload(data, type);
-	}
 }

package/src/transactions/types/UsernameRegistration.ts

@@ -1,11 +1,10 @@
-import { AbiResult, TransactionData } from "@/types";
+import { TransactionData } from "@/types";
 
 import { AbiDecoder } from "@/utils/AbiDecoder";
 import { AbiEncoder } from "@/utils/AbiEncoder";
 import { AbiFunction } from "@/enums/AbiFunction";
 import { AbstractTransaction } from "./AbstractTransaction";
 import { ContractAbiType } from "@/enums/ContractAbiType";
-import { Deserializer } from "@/transactions/Deserializer";
 
 export class UsernameRegistration extends AbstractTransaction {
 	public constructor(data: TransactionData) {
@@ -30,15 +29,4 @@ export class UsernameRegistration extends AbstractTransaction {
 			this.data["username"],
 		]);
 	}
-
-	protected decodePayload(
-		data: TransactionData,
-		type: ContractAbiType = ContractAbiType.CONSENSUS,
-	): AbiResult | null {
-		if (!data["data"]) {
-			return null;
-		}
-
-		return Deserializer.decodePayload(data, ContractAbiType.USERNAMES);
-	}
 }

package/src/transactions/types/UsernameResignation.ts

@@ -1,24 +1,10 @@
-import { AbiResult, TransactionData } from "@/types";
-
 import { AbiEncoder } from "@/utils/AbiEncoder";
 import { AbiFunction } from "@/enums/AbiFunction";
 import { AbstractTransaction } from "./AbstractTransaction";
 import { ContractAbiType } from "@/enums/ContractAbiType";
-import { Deserializer } from "@/transactions/Deserializer";
 
 export class UsernameResignation extends AbstractTransaction {
 	getPayload(): string {
 		return new AbiEncoder(ContractAbiType.USERNAMES).encodeFunctionCall(AbiFunction.USERNAME_RESIGNATION, []);
 	}
-
-	protected decodePayload(
-		data: TransactionData,
-		type: ContractAbiType = ContractAbiType.CONSENSUS,
-	): AbiResult | null {
-		if (!data["data"]) {
-			return null;
-		}
-
-		return Deserializer.decodePayload(data, ContractAbiType.USERNAMES);
-	}
 }

package/src/transactions/types/ValidatorRegistration.ts

@@ -1,11 +1,9 @@
-import { AbiResult, TransactionData } from "@/types";
+import { TransactionData } from "@/types";
 
 import { AbiDecoder } from "@/utils/AbiDecoder";
 import { AbiEncoder } from "@/utils/AbiEncoder";
 import { AbiFunction } from "@/enums/AbiFunction";
 import { AbstractTransaction } from "./AbstractTransaction";
-import { ContractAbiType } from "@/enums/ContractAbiType";
-import { Deserializer } from "@/transactions/Deserializer";
 
 export class ValidatorRegistration extends AbstractTransaction {
 	public constructor(data: TransactionData) {
@@ -30,15 +28,4 @@ export class ValidatorRegistration extends AbstractTransaction {
 			this.data["validatorPublicKey"],
 		]);
 	}
-
-	protected decodePayload(
-		data: TransactionData,
-		type: ContractAbiType = ContractAbiType.CONSENSUS,
-	): AbiResult | null {
-		if (!data["data"]) {
-			return null;
-		}
-
-		return Deserializer.decodePayload(data, type);
-	}
 }

package/src/transactions/types/ValidatorResignation.ts

@@ -1,24 +1,9 @@
-import { AbiResult, TransactionData } from "@/types";
-
 import { AbiEncoder } from "@/utils/AbiEncoder";
 import { AbiFunction } from "@/enums/AbiFunction";
 import { AbstractTransaction } from "./AbstractTransaction";
-import { ContractAbiType } from "@/enums/ContractAbiType";
-import { Deserializer } from "@/transactions/Deserializer";
 
 export class ValidatorResignation extends AbstractTransaction {
 	getPayload(): string {
 		return new AbiEncoder().encodeFunctionCall(AbiFunction.VALIDATOR_RESIGNATION, []);
 	}
-
-	protected decodePayload(
-		data: TransactionData,
-		type: ContractAbiType = ContractAbiType.CONSENSUS,
-	): AbiResult | null {
-		if (!data["data"]) {
-			return null;
-		}
-
-		return Deserializer.decodePayload(data, type);
-	}
 }

package/src/transactions/types/Vote.ts

@@ -1,11 +1,9 @@
-import { AbiResult, TransactionData } from "@/types";
+import { TransactionData } from "@/types";
 
 import { AbiDecoder } from "@/utils/AbiDecoder";
 import { AbiEncoder } from "@/utils/AbiEncoder";
 import { AbiFunction } from "@/enums/AbiFunction";
 import { AbstractTransaction } from "./AbstractTransaction";
-import { ContractAbiType } from "@/enums/ContractAbiType";
-import { Deserializer } from "@/transactions/Deserializer";
 
 export class Vote extends AbstractTransaction {
 	public constructor(data: TransactionData) {
@@ -28,15 +26,4 @@ export class Vote extends AbstractTransaction {
 
 		return new AbiEncoder().encodeFunctionCall(AbiFunction.VOTE, [this.data["vote"]]);
 	}
-
-	protected decodePayload(
-		data: TransactionData,
-		type: ContractAbiType = ContractAbiType.CONSENSUS,
-	): AbiResult | null {
-		if (!data["data"]) {
-			return null;
-		}
-
-		return Deserializer.decodePayload(data, type);
-	}
 }

package/src/types.ts

@@ -1,32 +1,33 @@
+import BigNumber from "bignumber.js";
 import { Result } from "ethers";
 
-export type TransactionData = {
+export interface TransactionData {
 	gasPrice?: string | null;
 	network?: number | string | null;
-	id?: string | null;
-	gasLimit?: string | null;
+	hash?: string | null;
+	gas?: string | null;
 	nonce?: number | string | null;
 	senderPublicKey?: string | null;
-	recipientAddress?: string | null;
+	to?: string | null;
 	value?: string | null;
 	data?: string | null;
 	r?: string;
 	s?: string;
 	v?: number;
 
-	[key: string]: number | string | undefined | null | Array<any> | string;
-};
+	[key: string]: number | string | undefined | null | unknown[] | string;
+}
 
-export type AbiResult = {
+export interface AbiResult {
 	functionName: string;
 	args: Result;
-};
+}
 
-export type SignedMessage = {
+export interface SignedMessage {
 	publicKey: string;
 	signature: string;
 	message: string;
-};
+}
 
 export interface ITransaction {
 	data: TransactionData;
@@ -34,12 +35,11 @@ export interface ITransaction {
 
 	getPayload(): string;
 	refreshPayloadData(): ITransaction;
-	getId(): string;
-	sign(privateKey: any): Promise<ITransaction>;
+	sign(privateKey: unknown): Promise<ITransaction>;
 	recoverSender(): void;
 
 	verify(): boolean;
-	toArray(): TransactionData;
+	toObject(): TransactionData;
 	toJson(): string;
 	hash(skipSignature?: boolean): string;
 	serialize(skipSignature?: boolean): Buffer;
@@ -48,19 +48,19 @@ export interface ITransaction {
 export interface ITransactionBuilder<T extends ITransactionBuilder<T>> {
 	transaction: ITransaction;
 
-	gasLimit(gasLimit: string): T;
-	gasPrice(gasPrice: string): T;
-	recipientAddress(recipientAddress: string): T;
+	gas(gas: string | BigNumber): T;
+	gasPrice(gasPrice: string | BigNumber): T;
+	to(to: string): T;
 	nonce(nonce: string): T;
 	network(network: number): T;
 	sign(passphrase: string): Promise<T>;
 	verify(): boolean;
-	toArray(): TransactionData;
+	toObject(): TransactionData;
 	toJson(): string;
 }
 
 export interface ITransferBuilder extends ITransactionBuilder<ITransferBuilder> {
-	value(value: string): ITransferBuilder;
+	value(value: string | BigNumber): ITransferBuilder;
 }
 
 export interface IVoteBuilder extends ITransactionBuilder<IVoteBuilder> {
@@ -80,7 +80,7 @@ export interface IEvmCallBuilder extends ITransactionBuilder<IEvmCallBuilder> {
 }
 
 export interface IMultipaymentBuilder extends ITransactionBuilder<IMultipaymentBuilder> {
-	pay(address: string, amount: string): IMultipaymentBuilder;
+	pay(address: string, amount: string | BigNumber): IMultipaymentBuilder;
 }
 
 export interface IBasicTransactionBuilder extends ITransactionBuilder<IBasicTransactionBuilder> {}

package/src/utils/Abi/ArgumentDecoder.ts

@@ -4,26 +4,26 @@ export class ArgumentDecoder {
 	private bytes: Buffer;
 
 	constructor(bytes: string) {
-		this.bytes = Buffer.from(bytes, 'hex');
+		this.bytes = Buffer.from(bytes, "hex");
 	}
 
 	decodeString(): string {
-		return new AbiCoder().decode(['string'], this.bytes)[0].toString();
+		return new AbiCoder().decode(["string"], this.bytes)[0].toString();
 	}
 
 	decodeAddress(): string {
-		return new AbiCoder().decode(['address'], this.bytes).toString();
+		return new AbiCoder().decode(["address"], this.bytes).toString();
 	}
 
 	decodeUnsignedInt(): string {
-		return new AbiCoder().decode(['uint'], this.bytes)[0].toString();
+		return new AbiCoder().decode(["uint"], this.bytes)[0].toString();
 	}
 
 	decodeSignedInt(): string {
-		return new AbiCoder().decode(['int'], this.bytes)[0].toString();
+		return new AbiCoder().decode(["int"], this.bytes)[0].toString();
 	}
 
 	decodeBool(): boolean {
-		return new AbiCoder().decode(['bool'], this.bytes)[0] === true;
+		return new AbiCoder().decode(["bool"], this.bytes)[0] === true;
 	}
 }