chore: review changes

Author: r4mmer

__tests__/integration/nanocontracts/bet.test.ts

@@ -95,7 +95,6 @@ describe('full cycle of bet nano contract', () => {
 
     // Create NC
     const oracleData = getOracleBuffer(address1, network);
-    console.debug('Call to initialize');
     const tx1 = await wallet.createAndSendNanoContractTransaction(
       NANO_CONTRACTS_INITIALIZE_METHOD,
       address0,
@@ -178,7 +177,6 @@ describe('full cycle of bet nano contract', () => {
     ).rejects.toThrow(NanoContractTransactionError);
 
     // Bet 100 to address 2
-    console.debug('First call to bet');
     const txBet = await wallet.createAndSendNanoContractTransaction('bet', address2, {
       ncId: tx1.hash,
       args: [address2, '1x0'],
@@ -234,7 +232,6 @@ describe('full cycle of bet nano contract', () => {
 
     // Bet 200 to address 3
     const address3 = await wallet.getAddressAtIndex(3);
-    console.debug('Second call to bet');
     const txBet2 = await wallet.createAndSendNanoContractTransaction('bet', address3, {
       ncId: tx1.hash,
       args: [address3, '2x0'],
@@ -328,7 +325,6 @@ describe('full cycle of bet nano contract', () => {
     const result = '1x0';
     const resultSerialized = nanoSerializer.serializeFromType(result, 'str');
     const inputData = await getOracleInputData(oracleData, tx1.hash, resultSerialized, wallet);
-    console.debug('Call to set_result');
     const txSetResult = await wallet.createAndSendNanoContractTransaction('set_result', address1, {
       ncId: tx1.hash,
       args: [`${bufferToHex(inputData)},${result},str`],
@@ -369,7 +365,6 @@ describe('full cycle of bet nano contract', () => {
     expect((txSetResultParser.parsedArgs[0].value as NanoContractSignedData).value).toEqual(result);
 
     // Try to withdraw to address 2, success
-    console.debug('Call to withdraw');
     const txWithdrawal = await wallet.createAndSendNanoContractTransaction('withdraw', address2, {
       ncId: tx1.hash,
       actions: [

src/nano_contracts/methodArg.ts

@@ -14,6 +14,7 @@ import {
   BufferROExtract,
   NanoContractArgumentApiInputType,
   NanoContractArgumentApiInputSchema,
+  NanoContractArgumentByteTypes,
 } from './types';
 import Serializer from './serializer';
 import Deserializer from './deserializer';
@@ -52,9 +53,7 @@ function refineSingleValue(
     } else {
       return parse.data;
     }
-  } else if (
-    ['bytes', 'BlueprintId', 'ContractId', 'TokenUid', 'TxOutputScript', 'VertexId'].includes(type)
-  ) {
+  } else if (NanoContractArgumentByteTypes.safeParse(type).success) {
     const parse = z
       .string()
       .regex(/^[0-9A-Fa-f]+$/)
@@ -130,7 +129,7 @@ function refineSingleValue(
 
 /**
  * Type and value validation for non-container types.
- * Returns the internal TS type for the argument given.
+ * Returns the internal parsed value for the argument given.
  */
 const SingleValueApiInputScheme = z
   .tuple([
@@ -262,11 +261,7 @@ export class NanoContractMethodArgument {
       if (type === 'bool') {
         return (value as boolean) ? 'true' : 'false';
       }
-      if (
-        ['bytes', 'BlueprintId', 'ContractId', 'TokenUid', 'TxOutputScript', 'VertexId'].includes(
-          type
-        )
-      ) {
+      if (NanoContractArgumentByteTypes.safeParse(type).success) {
         return (value as Buffer).toString('hex');
       }
       if (type === 'VarInt') {

src/nano_contracts/types.ts

@@ -59,22 +59,26 @@ export const NanoContractArgumentSchema = z.union([
 ]);
 export type NanoContractArgumentType = z.output<typeof NanoContractArgumentSchema>;
 
+export const NanoContractArgumentByteTypes = z.enum([
+  'bytes',
+  'Address',
+  'BlueprintId',
+  'ContractId',
+  'TokenUid',
+  'TxOutputScript',
+  'VertexId',
+]);
+
 /**
  * Single type names
  */
 export const NanoContractArgumentSingleTypeNameSchema = z.enum([
   'bool',
-  'bytes',
   'int',
   'str',
-  'Address',
-  'BlueprintId',
-  'ContractId',
   'Timestamp',
-  'TokenUid',
-  'TxOutputScript',
   'VarInt',
-  'VertexId',
+  ...NanoContractArgumentByteTypes.options,
 ]);
 export type NanoContractArgumentSingleTypeName = z.output<
   typeof NanoContractArgumentSingleTypeNameSchema