transaction filter improvements

ArkEcosystem · Nov 28, 2024 · 6a3355e · 6a3355e
1 parent 805425a
commit 6a3355e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packages/api-http/source/resources/transaction.ts b/packages/api-http/source/resources/transaction.ts
@@ -29,7 +29,7 @@ export class TransactionResource implements Contracts.Api.Resource {
 			blockId: resource.blockId,
 
 			confirmations,
-			data: resource.data,
+			data: resource.data === "0x" ? "" : resource.data,
 			gasLimit: resource.gasLimit,
 
 			gasPrice: resource.gasPrice,

diff --git a/packages/api-http/source/schemas/schemas.ts b/packages/api-http/source/schemas/schemas.ts
@@ -1,4 +1,5 @@
 import Joi from "joi";
+import { walletAddressSchema } from "./wallets.js";
 
 // Old
 
@@ -12,7 +13,7 @@ export const orderBy = Joi.alternatives().try(
 	Joi.array().items(Joi.string().regex(/^[._a-z]{1,40}:(asc|desc)$/i)),
 );
 
-export const address = Joi.string().alphanum().max(96);
+export const address = walletAddressSchema;
 
 export const delegateIdentifier = Joi.string()
 	.regex(/^[\w!$&.@]+$/)
@@ -82,14 +83,14 @@ export const transactionCriteriaSchemas = {
 	asset: orContainsCriteria(Joi.object()),
 	blockId: orEqualCriteria(blockId),
 	data: orEqualCriteria(
-		Joi.alternatives().try(Joi.string().valid("0x"), Joi.string().hex({ prefix: "optional" }).max(10)),
+		Joi.alternatives().try(Joi.string().valid("", "0x"), Joi.string().hex({ prefix: "optional" }).max(10)),
 	),
 	gasFee: orNumericCriteria(Joi.number().integer().min(0)),
 	gasPrice: orNumericCriteria(Joi.number().integer().min(0)),
 	id: orEqualCriteria(Joi.string().hex().length(64)),
 	nonce: orNumericCriteria(Joi.number().integer().positive()),
 	recipientId: orEqualCriteria(address),
-	senderAddress: orEqualCriteria(Joi.string().hex().length(42)),
+	senderAddress: orEqualCriteria(address),
 	senderId: orEqualCriteria(address),
 	senderPublicKey: orEqualCriteria(Joi.string().hex().length(66)),
 	sequence: orNumericCriteria(Joi.number().integer().positive()),

diff --git a/packages/api-http/source/schemas/wallets.ts b/packages/api-http/source/schemas/wallets.ts
@@ -1,8 +1,8 @@
 import { Schemas } from "@mainsail/api-common";
 import Joi from "joi";
 
-export const walletAddressSchema = Joi.string().alphanum(); /* TODO: .length(34); */
-export const walletPublicKeySchema = Joi.string().hex(); /* TODO: .length(66); */
+export const walletAddressSchema = Joi.string().hex({ prefix: true }).length(42);
+export const walletPublicKeySchema = Joi.string().hex({ prefix: false }).length(66);
 export const walletUsernameSchema = Joi.string().max(256);
 
 export const walletId = Joi.alternatives().try(