refactor: remove ipfs and second signature types

packages/mainsail/source/client.service.ts

@@ -181,11 +181,11 @@ export class ClientService extends Services.AbstractClientService {
 		};
 
 		const mappings: Record<string, string> = {
+			address: "address",
 			cursor: "page",
 			limit: "limit",
 			memo: "vendorField",
 			orderBy: "orderBy",
-			address: "address",
 			recipientId: "recipientId",
 			senderId: "senderId",
 			senderPublicKey: "senderPublicKey",
@@ -219,14 +219,6 @@ export class ClientService extends Services.AbstractClientService {
 					type: Enums.TransactionType.DelegateResignation,
 					typeGroup: Enums.TransactionTypeGroup.Core,
 				},
-				usernameRegistration: {
-					type: Enums.TransactionType.UsernameRegistration,
-					typeGroup: Enums.TransactionTypeGroup.Core,
-				},
-				usernameResignation: {
-					type: Enums.TransactionType.UsernameResignation,
-					typeGroup: Enums.TransactionTypeGroup.Core,
-				},
 				multiPayment: {
 					type: Enums.TransactionType.MultiPayment,
 					typeGroup: Enums.TransactionTypeGroup.Core,
@@ -235,14 +227,18 @@ export class ClientService extends Services.AbstractClientService {
 					type: Enums.TransactionType.MultiSignature,
 					typeGroup: Enums.TransactionTypeGroup.Core,
 				},
-				secondSignature: {
-					type: Enums.TransactionType.SecondSignature,
-					typeGroup: Enums.TransactionTypeGroup.Core,
-				},
 				transfer: {
 					type: Enums.TransactionType.Transfer,
 					typeGroup: Enums.TransactionTypeGroup.Core,
 				},
+				usernameRegistration: {
+					type: Enums.TransactionType.UsernameRegistration,
+					typeGroup: Enums.TransactionTypeGroup.Core,
+				},
+				usernameResignation: {
+					type: Enums.TransactionType.UsernameResignation,
+					typeGroup: Enums.TransactionTypeGroup.Core,
+				},
 				vote: {
 					type: Enums.TransactionType.Vote,
 					typeGroup: Enums.TransactionTypeGroup.Core,

packages/mainsail/source/confirmed-transaction.dto.ts

@@ -91,7 +91,7 @@ export class ConfirmedTransactionData extends DTO.AbstractConfirmedTransactionDa
 	}
 
 	public override isSecondSignature(): boolean {
-		return TransactionTypeService.isSecondSignature(this.data);
+		throw new Exceptions.NotImplemented(this.constructor.name, this.isSecondSignature.name);
 	}
 
 	public override isUsernameRegistration(): boolean {

packages/mainsail/source/crypto/enums.ts

@@ -1,6 +1,5 @@
 export enum TransactionType {
 	Transfer = 0,
-	SecondSignature = 1,
 	DelegateRegistration = 2,
 	Vote = 3,
 	MultiSignature = 4,

packages/mainsail/source/crypto/interfaces/transactions.ts

@@ -38,7 +38,6 @@ export interface ITransactionAsset {
 	votes?: string[];
 	multiSignatureLegacy?: IMultiSignatureLegacyAsset;
 	multiSignature?: IMultiSignatureAsset;
-	ipfs?: string;
 	payments?: IMultiPaymentItem[];
 }
 
@@ -63,7 +62,6 @@ export interface ITransactionData {
 
 	id?: string;
 	signature?: string;
-	secondSignature?: string;
 	signSignature?: string;
 	signatures?: string[];
 
@@ -94,14 +92,11 @@ export interface ITransactionJson {
 
 	id?: string;
 	signature?: string;
-	secondSignature?: string;
 	signSignature?: string;
 	signatures?: string[];
 
 	blockId?: string;
 	sequence?: number;
-
-	ipfsHash?: string;
 }
 
 export interface ISchemaValidationResult<T = any> {
@@ -139,6 +134,5 @@ export interface ISerializeOptions {
 	acceptLegacyVersion?: boolean;
 	disableVersionCheck?: boolean;
 	excludeSignature?: boolean;
-	excludeSecondSignature?: boolean;
 	excludeMultiSignature?: boolean;
 }

packages/mainsail/source/crypto/networks/mainnet/milestones.ts

@@ -13,8 +13,6 @@ export const milestones = [
 			staticFees: {
 				delegateRegistration: 2_500_000_000,
 				delegateResignation: 2_500_000_000,
-				usernameRegistration: 2_500_000_000,
-				usernameResignation: 2_500_000_000,
 				htlcClaim: 0,
 				htlcLock: 10_000_000,
 				htlcRefund: 0,
@@ -23,6 +21,8 @@ export const milestones = [
 				multiSignature: 500_000_000,
 				secondSignature: 500_000_000,
 				transfer: 10_000_000,
+				usernameRegistration: 2_500_000_000,
+				usernameResignation: 2_500_000_000,
 				vote: 100_000_000,
 			},
 		},

packages/mainsail/source/crypto/transactions/deserializer.ts

@@ -80,12 +80,6 @@ export class Deserializer {
 			return marker === 255;
 		};
 
-		// Second Signature
-		if (buf.getRemainderLength() && !beginningMultiSignature()) {
-			const secondSignatureLength: number = currentSignatureLength();
-			transaction.secondSignature = buf.readBuffer(secondSignatureLength).toString("hex");
-		}
-
 		// Multi Signatures
 		if (buf.getRemainderLength() && beginningMultiSignature()) {
 			buf.jump(1);
@@ -106,17 +100,13 @@ export class Deserializer {
 			transaction.signature = buf.readBuffer(64).toString("hex");
 		}
 
-		if (canReadNonMultiSignature()) {
-			transaction.secondSignature = buf.readBuffer(64).toString("hex");
-		}
-
 		if (buf.getRemainderLength()) {
 			if (buf.getRemainderLength() % 65 === 0) {
 				transaction.signatures = [];
 
 				const count: number = buf.getRemainderLength() / 65;
 				const publicKeyIndexes: { [index: number]: boolean } = {};
-				for (let i = 0; i < count; i++) {
+				for (let index = 0; index < count; index++) {
 					const multiSignaturePart: string = buf.readBuffer(65).toString("hex");
 					const publicKeyIndex: number = Number.parseInt(multiSignaturePart.slice(0, 2), 16);
 

packages/mainsail/source/crypto/transactions/serializer.ts

@@ -90,12 +90,6 @@ export class Serializer {
 			buf.writeBuffer(Buffer.from(transaction.signature, "hex"));
 		}
 
-		const secondSignature: string | undefined = transaction.secondSignature || transaction.signSignature;
-
-		if (secondSignature && !options.excludeSecondSignature) {
-			buf.writeBuffer(Buffer.from(secondSignature, "hex"));
-		}
-
 		if (transaction.signatures && !options.excludeMultiSignature) {
 			buf.writeBuffer(Buffer.from(transaction.signatures.join(""), "hex"));
 		}

packages/mainsail/source/crypto/transactions/signer.ts

@@ -6,8 +6,8 @@ import { Utils } from "./utils.js";
 
 export class Signer {
 	public static sign(transaction: ITransactionData, keys: IKeyPair, options?: ISerializeOptions): string {
-		if (!options || (options.excludeSignature === undefined && options.excludeSecondSignature === undefined)) {
-			options = { excludeSecondSignature: true, excludeSignature: true, ...options };
+		if (!options || options.excludeSignature === undefined) {
+			options = { excludeSignature: true, ...options };
 		}
 
 		const hash: Buffer = Utils.toHash(transaction, options);
@@ -20,17 +20,6 @@ export class Signer {
 		return signature;
 	}
 
-	public static secondSign(transaction: ITransactionData, keys: IKeyPair): string {
-		const hash: Buffer = Utils.toHash(transaction, { excludeSecondSignature: true });
-		const signature: string = Hash.signSchnorr(hash, keys);
-
-		if (!transaction.secondSignature) {
-			transaction.secondSignature = signature;
-		}
-
-		return signature;
-	}
-
 	public static async multiSign(
 		transaction: MainsailContracts.Crypto.TransactionData,
 		keys: IKeyPair,

packages/mainsail/source/crypto/transactions/types/schemas.ts

@@ -1,6 +1,7 @@
-import { TransactionType } from "../../enums.js";
 import deepmerge from "deepmerge";
 
+import { TransactionType } from "../../enums.js";
+
 const signedTransaction = {
 	anyOf: [
 		{ required: ["id", "signature"] },
@@ -23,11 +24,9 @@ export const transactionBaseSchema: Record<string, any> = {
 		id: { anyOf: [{ $ref: "transactionId" }, { type: "null" }] },
 		network: { $ref: "networkByte" },
 		nonce: { bignumber: { minimum: 0 } },
-		secondSignature: { $ref: "alphanumeric" },
 		senderPublicKey: { $ref: "publicKey" },
 		signSignature: { $ref: "alphanumeric" },
 		signature: { $ref: "alphanumeric" },
-		version: { enum: [1, 2] },
 		signatures: {
 			additionalItems: false,
 			items: { allOf: [{ maxLength: 130, minLength: 130 }, { $ref: "alphanumeric" }] },
@@ -36,8 +35,9 @@ export const transactionBaseSchema: Record<string, any> = {
 			type: "array",
 			uniqueItems: true,
 		},
-		timestamp: { type: "integer", minimum: 0 },
+		timestamp: { minimum: 0, type: "integer" },
 		typeGroup: { minimum: 0, type: "integer" },
+		version: { enum: [1, 2] },
 	},
 	then: { required: ["type", "senderPublicKey", "fee", "amount", "timestamp"] },
 	type: "object",
@@ -70,32 +70,6 @@ export const transfer = extend(transactionBaseSchema, {
 	required: ["recipientId"],
 });
 
-export const secondSignature = extend(transactionBaseSchema, {
-	$id: "secondSignature",
-	properties: {
-		amount: { bignumber: { maximum: 0, minimum: 0 } },
-		asset: {
-			properties: {
-				signature: {
-					properties: {
-						publicKey: {
-							$ref: "publicKey",
-						},
-					},
-					required: ["publicKey"],
-					type: "object",
-				},
-			},
-			required: ["signature"],
-			type: "object",
-		},
-		fee: { bignumber: { minimum: 1 } },
-		secondSignature: { type: "null" },
-		type: { transactionType: TransactionType.SecondSignature },
-	},
-	required: ["asset"],
-});
-
 export const delegateRegistration = extend(transactionBaseSchema, {
 	$id: "delegateRegistration",
 	properties: {
@@ -150,8 +124,8 @@ export const vote = extend(transactionBaseSchema, {
 				votes: {
 					additionalItems: false,
 					items: { $ref: "walletVote" },
-					minItems: 1,
 					maxItems: 2,
+					minItems: 1,
 					type: "array",
 				},
 			},
@@ -180,10 +154,10 @@ export const multiSignature = extend(transactionBaseSchema, {
 						},
 						publicKeys: {
 							additionalItems: false,
-							minItems: 1,
 							items: { $ref: "publicKey" },
-							type: "array",
 							maxItems: 16,
+							minItems: 1,
+							type: "array",
 							uniqueItems: true,
 						},
 					},
@@ -220,24 +194,24 @@ export const multiSignatureLegacy = extend(transactionBaseSchemaNoSignatures, {
 			properties: {
 				multiSignatureLegacy: {
 					properties: {
-						lifetime: {
-							minimum: 1,
-							type: "integer",
-							maximum: 72,
-						},
 						keysgroup: {
-							minItems: 1,
-							type: "array",
 							additionalItems: false,
-							maxItems: 16,
 							items: {
-								allOf: [{ minimum: 67, type: "string", maximum: 67, transform: ["toLowerCase"] }],
+								allOf: [{ maximum: 67, minimum: 67, transform: ["toLowerCase"], type: "string" }],
 							},
+							maxItems: 16,
+							minItems: 1,
+							type: "array",
 						},
-						min: {
-							type: "integer",
+						lifetime: {
+							maximum: 72,
 							minimum: 1,
+							type: "integer",
+						},
+						min: {
 							maximum: { $data: "1/keysgroup/length" },
+							minimum: 1,
+							type: "integer",
 						},
 					},
 					required: ["keysgroup", "min", "lifetime"],
@@ -270,11 +244,11 @@ export const multiPayment = extend(transactionBaseSchema, {
 				payments: {
 					additionalItems: false,
 					items: {
-						required: ["amount", "recipientId"],
 						properties: {
 							amount: { bignumber: { minimum: 1 } },
 							recipientId: { $ref: "address" },
 						},
+						required: ["amount", "recipientId"],
 						type: "object",
 					},
 					minItems: 2,

packages/mainsail/source/crypto/transactions/types/transaction.ts

@@ -49,10 +49,6 @@ export abstract class Transaction implements ITransaction {
 		return Verifier.verify(this.data, options);
 	}
 
-	public verifySecondSignature(publicKey: string): boolean {
-		return Verifier.verifySecondSignature(this.data, publicKey);
-	}
-
 	public verifySchema(): ISchemaValidationResult {
 		return Verifier.verifySchema(this.data);
 	}