CLI: Use SDK for manifest validations

.changeset/fresh-nails-act.md

@@ -0,0 +1,7 @@
+---
+"@mimicprotocol/cli": patch
+"@mimicprotocol/lib-ts": patch
+"@mimicprotocol/test-ts": patch
+---
+
+Use SDK for manifest validation

packages/cli/package.json

@@ -20,6 +20,7 @@
   ],
   "dependencies": {
     "@inquirer/prompts": "^7.2.4",
+    "@mimicprotocol/sdk": "^0.1.7",
     "@oclif/core": "^4.2.2",
     "@oclif/plugin-not-found": "^3.2.38",
     "axios": "^1.7.9",

packages/cli/src/commands/codegen.ts

@@ -1,11 +1,12 @@
 import { confirm } from '@inquirer/prompts'
+import { Manifest } from '@mimicprotocol/sdk'
 import { Command, Flags } from '@oclif/core'
 import * as fs from 'fs'
 import { join } from 'path'
 
 import { AbisInterfaceGenerator, InputsInterfaceGenerator, ManifestHandler } from '../lib'
 import log from '../log'
-import { FlagsType, Manifest } from '../types'
+import { FlagsType } from '../types'
 
 import Functions, { DefaultFunctionConfig } from './functions'
 

packages/cli/src/lib/InputsInterfaceGenerator.ts

@@ -1,4 +1,4 @@
-import { ManifestInputs } from '../types'
+import { ManifestInputs } from '@mimicprotocol/sdk'
 
 export default {
   generate(inputs: ManifestInputs): string {

packages/cli/src/lib/ManifestHandler.ts

@@ -1,12 +1,10 @@
 import { RUNNER_TARGET_VERSION } from '@mimicprotocol/lib-ts/constants'
+import { Manifest, ManifestValidator, ZodError } from '@mimicprotocol/sdk'
 import { Command } from '@oclif/core'
 import * as fs from 'fs'
 import { load } from 'js-yaml'
-import { ZodError } from 'zod'
 
 import { DuplicateEntryError, EmptyManifestError, GENERIC_SUGGESTION, MoreThanOneEntryError } from '../errors'
-import { Manifest } from '../types'
-import { ManifestValidator } from '../validators'
 
 export default {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/cli/src/types.ts

@@ -1,10 +1,4 @@
 import { Command, Interfaces } from '@oclif/core'
-import { z } from 'zod'
-
-import { ManifestValidator } from './validators'
-
-export type Manifest = z.infer<typeof ManifestValidator>
-export type ManifestInputs = z.infer<typeof ManifestValidator.shape.inputs>
 
 export type AbiParameter = {
   name?: string

packages/cli/tests/ManifestHandler.spec.ts

@@ -1,7 +1,7 @@
+import { SEMVER_REGEX } from '@mimicprotocol/sdk'
 import { expect } from 'chai'
 
 import ManifestHandler from '../src/lib/ManifestHandler'
-import { SEM_VER_REGEX } from '../src/validators'
 
 import invalidSemVers from './fixtures/sem-vers/invalid-sem-vers.json'
 import validSemVers from './fixtures/sem-vers/valid-sem-vers.json'
@@ -76,7 +76,7 @@ describe('ManifestHandler', () => {
           it('adds the runner target version to the manifest', () => {
             const parsedManifest = ManifestHandler.validate(manifest)
 
-            expect(parsedManifest.metadata.runnerTarget).to.match(SEM_VER_REGEX)
+            expect(parsedManifest.metadata.runnerTarget).to.match(SEMVER_REGEX)
           })
         })
 
@@ -138,7 +138,7 @@ describe('ManifestHandler', () => {
       context('when an input is invalid', () => {
         itReturnsAnError(
           { ...manifest, inputs: [...manifest.inputs, { wrong: 'u8' }] },
-          'Must be a valid solidity type'
+          'Must be a valid Solidity type or custom type (Token, TokenAmount)'
         )
       })
 

packages/cli/tsconfig.json

@@ -5,7 +5,8 @@
     "target": "ES2020",
     "strict": true,
     "types": ["node"],
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "skipLibCheck": true
   },
   "include": [ "src/**/*" ],
   "exclude": [ "src/templates/**/*" ]

yarn.lock

@@ -725,6 +725,18 @@
     "@mimicprotocol/runner-node-win32-arm64-msvc" "0.1.1"
     "@mimicprotocol/runner-node-win32-x64-msvc" "0.1.1"
 
+"@mimicprotocol/sdk@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@mimicprotocol/sdk/-/sdk-0.1.7.tgz#a40be86f2cbbfb20eb98c2af580660f40459e9d0"
+  integrity sha512-gza2noCNPC8RLlMNwWdxRktd4l2h5ZttqPjvAuKaIHmkagZZqfCaBu1XrjlYkqSevpZEYnBSfc6Fj8KqcJn5zQ==
+  dependencies:
+    "@coral-xyz/anchor" "0.32.1"
+    "@solana/web3.js" "^1.98.4"
+    borsh "^2.0.0"
+    cron-parser "^5.3.1"
+    ethers "^6.13.5"
+    zod "^3.23.8"
+
 "@mimicprotocol/sdk@~0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@mimicprotocol/sdk/-/sdk-0.1.5.tgz#2820867ac4acfa34bf3a0d7809b771cc0ba34173"