From 9c850d152cd024c8852200c237790e8bee82b3a9 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 May 2018 16:52:41 -0700 Subject: Updated Order, SignedOrder schemas, removed ECSignature schema types and added Hex basic type --- packages/json-schemas/schemas/basic_type_schemas.ts | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packages/json-schemas/schemas/basic_type_schemas.ts') diff --git a/packages/json-schemas/schemas/basic_type_schemas.ts b/packages/json-schemas/schemas/basic_type_schemas.ts index 9d81ff333..8430b6f4a 100644 --- a/packages/json-schemas/schemas/basic_type_schemas.ts +++ b/packages/json-schemas/schemas/basic_type_schemas.ts @@ -4,6 +4,12 @@ export const addressSchema = { pattern: '^0x[0-9a-f]{40}$', }; +export const hexSchema = { + id: '/Hex', + type: 'string', + pattern: '^0x[0-9a-f]', +}; + export const numberSchema = { id: '/Number', type: 'string', -- cgit v1.2.3 From 59890f2c832a99372a3cdc423a23a4769f214fdc Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 May 2018 17:28:17 -0700 Subject: Fix Hex regex and tests --- packages/json-schemas/schemas/basic_type_schemas.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/json-schemas/schemas/basic_type_schemas.ts') diff --git a/packages/json-schemas/schemas/basic_type_schemas.ts b/packages/json-schemas/schemas/basic_type_schemas.ts index 8430b6f4a..2cf32b384 100644 --- a/packages/json-schemas/schemas/basic_type_schemas.ts +++ b/packages/json-schemas/schemas/basic_type_schemas.ts @@ -7,7 +7,7 @@ export const addressSchema = { export const hexSchema = { id: '/Hex', type: 'string', - pattern: '^0x[0-9a-f]', + pattern: '^0x([0-9a-f][0-9a-f])*$', }; export const numberSchema = { -- cgit v1.2.3 From 3ec05bb5d894d6c1f430e8fdeec2821f08328970 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 23 May 2018 17:36:34 -0700 Subject: Force hex to have at least two hex values after the prefix, but it could be two zeros --- packages/json-schemas/schemas/basic_type_schemas.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/json-schemas/schemas/basic_type_schemas.ts') diff --git a/packages/json-schemas/schemas/basic_type_schemas.ts b/packages/json-schemas/schemas/basic_type_schemas.ts index 2cf32b384..7565df9e0 100644 --- a/packages/json-schemas/schemas/basic_type_schemas.ts +++ b/packages/json-schemas/schemas/basic_type_schemas.ts @@ -7,7 +7,7 @@ export const addressSchema = { export const hexSchema = { id: '/Hex', type: 'string', - pattern: '^0x([0-9a-f][0-9a-f])*$', + pattern: '^0x([0-9a-f][0-9a-f])+$', }; export const numberSchema = { -- cgit v1.2.3