Progress with validation on challenges package

packages/ethernaut-ai/src/tasks/config.js

@@ -1,4 +1,4 @@
-const { types } = require('hardhat/config')
+const types = require('ethernaut-common/src/types')
 const output = require('ethernaut-common/src/output')
 const storage = require('ethernaut-common/src/storage')
 

packages/ethernaut-ai/src/tasks/interpret.js

@@ -1,4 +1,4 @@
-const { types } = require('hardhat/config')
+const types = require('ethernaut-common/src/types')
 const Interpreter = require('../internal/assistants/Interpreter')
 const Explainer = require('../internal/assistants/Explainer')
 const Thread = require('../internal/threads/Thread')

packages/ethernaut-challenges/src/tasks/check.js

@@ -1,4 +1,4 @@
-const { types } = require('hardhat/config')
+const types = require('ethernaut-common/src/types')
 const helper = require('../internal/helper')
 const output = require('ethernaut-common/src/output')
 const findLevelCompletedEvents = require('../internal/level-completed-logs')
@@ -9,7 +9,7 @@ require('../scopes/challenges')
     'check',
     'Checks if the player has completed the specified level by submitting an instance modified as per the levels requirements',
   )
-  .addPositionalParam('level', 'The level number', undefined, types.string)
+  .addPositionalParam('level', 'The level number', undefined, types.int)
   .setAction(async ({ level }, hre) => {
     try {
       const completed = await checkLevel(level, hre)

packages/ethernaut-challenges/src/tasks/info.js

@@ -1,4 +1,4 @@
-const { types } = require('hardhat/config')
+const types = require('ethernaut-common/src/types')
 const helper = require('../internal/helper')
 const fs = require('fs')
 const path = require('path')
@@ -11,7 +11,7 @@ require('../scopes/challenges')
     'info',
     'Shows information about an open zeppelin challenges level. The info includes the level name, contract name, ABI path, address, and description. The ABI path can be used with the interact package call task to interact with the contract.',
   )
-  .addPositionalParam('level', 'The level number', undefined, types.string)
+  .addPositionalParam('level', 'The level number', undefined, types.int)
   .setAction(async ({ level }) => {
     try {
       const info = await getLevelInfo(level)

packages/ethernaut-challenges/src/tasks/instance.js

@@ -1,4 +1,4 @@
-const { types } = require('hardhat/config')
+const types = require('ethernaut-common/src/types')
 const helper = require('../internal/helper')
 const output = require('ethernaut-common/src/output')
 const { getNetworkName } = require('ethernaut-common/src/network')
@@ -11,7 +11,7 @@ require('../scopes/challenges')
     'instance',
     'Creates an instance of a level, so that it can be played. The address of the instance is printed to the console. Use this address to interact with the contract using the ethernaut-cli contract command. Make sure to use the info command to get instructions on how to complete the level.',
   )
-  .addPositionalParam('level', 'The level number', undefined, types.string)
+  .addPositionalParam('level', 'The level number', undefined, types.int)
   .setAction(async ({ level }, hre) => {
     try {
       const instanceAddress = await createInstance(level, hre)

packages/ethernaut-challenges/src/tasks/submit.js

@@ -1,4 +1,4 @@
-const { types } = require('hardhat/config')
+const types = require('ethernaut-common/src/types')
 const output = require('ethernaut-common/src/output')
 const debug = require('ethernaut-common/src/debug')
 const getEthernautContract = require('../internal/ethernaut-contract')
@@ -12,7 +12,7 @@ require('../scopes/challenges')
     'address',
     'The address of the instance to submit',
     undefined,
-    types.string,
+    types.address,
   )
   .setAction(async ({ address }, hre) => {
     try {

packages/ethernaut-common/src/type-address.js

@@ -16,6 +16,10 @@ module.exports = {
         `"${argValue}" is not an address`,
         `Invalid ${argName}`,
       )
+
+      if (typeof describe === 'function') {
+        throw err
+      }
     }
   },
 }

packages/ethernaut-common/src/type-ens.js

@@ -14,6 +14,10 @@ module.exports = {
       }
     } catch (err) {
       output.errorBoxStr(`"${argValue}" is not an ens`, `Invalid ${argName}`)
+
+      if (typeof describe === 'function') {
+        throw err
+      }
     }
   },
 }

packages/ethernaut-common/src/type-int.js

@@ -3,12 +3,18 @@ const output = require('./output')
 
 module.exports = {
   name: 'int',
-  parse: types.int.parse,
+  parse: function (argName, argValue) {
+    return argValue
+  },
   validate: (argName, argValue) => {
     try {
       types.int.validate(argName, argValue)
     } catch (err) {
-      output.errorBoxStr(`"${argValue}" is an int`, `Invalid ${argName}`)
+      output.errorBoxStr(`"${argValue}" is not an int`, `Invalid ${argName}`)
+
+      if (typeof describe === 'function') {
+        throw err
+      }
     }
   },
 }

packages/ethernaut-common/src/type-string.js

@@ -9,6 +9,10 @@ module.exports = {
       types.string.validate(argName, argValue)
     } catch (err) {
       output.errorBoxStr(`"${argValue}" is not string`, `Invalid ${argName}`)
+
+      if (typeof describe === 'function') {
+        throw err
+      }
     }
   },
 }