remove hex check & add null check to htx

firstbatchxyz · Aug 14, 2023 · 78d6441 · 78d6441
1 parent 50725a8
commit 78d6441
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/contracts/errors/index.ts b/src/contracts/errors/index.ts
@@ -1,6 +1,5 @@
 export const KeyExistsError = new ContractError('Key already exists.');
 export const KeyNotExistsError = new ContractError('Key does not exist.');
-export const KeyNotHexadecimalError = new ContractError('Key expected to be hexadecimal.');
 export const CantEvolveError = new ContractError('Evolving is disabled.');
 export const NoVerificationKeyError = new ContractError('No verification key.');
 export const UnknownProtocolError = new ContractError('Unknown protocol.');

diff --git a/src/contracts/functions/htx.ts b/src/contracts/functions/htx.ts
@@ -1,5 +1,5 @@
 import type {ContractState} from '../types';
-import {KeyExistsError, KeyNotHexadecimalError} from '../errors';
+import {KeyExistsError, NullValueError} from '../errors';
 import {assertWhitelist, safeGet, verifyAuthProofImmediate} from '../utils';
 import {HTXValueType, PutHTXInput, RemoveHTXInput, UpdateHTXInput} from '../types/htx';
 
@@ -10,11 +10,9 @@ export async function putHTX<State extends ContractState<{whitelists: ['put']; c
 ) {
   assertWhitelist(state, caller, 'put');
 
-  // check hexadecimal
-  if (!/^0x[\da-f]+$/i.test(key)) {
-    throw KeyNotHexadecimalError;
+  if (value === null) {
+    throw NullValueError;
   }
-
   if ((await SmartWeave.kv.get(key)) !== null) {
     throw KeyExistsError;
   }
@@ -47,6 +45,9 @@ export async function updateHTX<State extends ContractState<{whitelists: ['updat
 ) {
   assertWhitelist(state, caller, 'update');
 
+  if (value === null) {
+    throw NullValueError;
+  }
   const dbValue = await safeGet<string>(key);
   const [oldHash] = dbValue.split('.');
   const [newHash] = value.split('.');