@mimicprotocol/cli 0.0.1-rc.20 → 0.0.1-rc.22

package/dist/commands/test.js

@@ -37,21 +37,24 @@ const core_1 = require("@oclif/core");
 const child_process_1 = require("child_process");
 const path = __importStar(require("path"));
 class Test extends core_1.Command {
+    runOrExit(cmd, args, cwd) {
+        const result = (0, child_process_1.spawnSync)(cmd, args, { cwd, stdio: 'inherit' });
+        if (result.status !== 0)
+            this.exit(result.status ?? 1);
+    }
     async run() {
         const { flags } = await this.parse(Test);
         const baseDir = path.resolve(flags.directory);
         const testPath = path.join(baseDir, 'tests');
         if (!flags.skipCompile) {
-            const codegen = (0, child_process_1.spawnSync)('yarn', ['mimic', 'codegen'], { cwd: baseDir, stdio: 'inherit' });
-            if (codegen.status !== 0)
-                return;
-            const compile = (0, child_process_1.spawnSync)('yarn', ['mimic', 'compile'], { cwd: baseDir, stdio: 'inherit' });
-            if (compile.status !== 0)
-                return;
+            this.runOrExit('yarn', ['mimic', 'codegen'], baseDir);
+            this.runOrExit('yarn', ['mimic', 'compile'], baseDir);
         }
-        (0, child_process_1.spawnSync)('yarn', ['tsx', './node_modules/mocha/bin/mocha.js', `${testPath}/**/*.spec.ts`], {
+        const result = (0, child_process_1.spawnSync)('yarn', ['tsx', './node_modules/mocha/bin/mocha.js', `${testPath}/**/*.spec.ts`], {
+            cwd: baseDir,
             stdio: 'inherit',
         });
+        this.exit(result.status ?? 1);
     }
 }
 Test.description = 'Runs task tests';

package/dist/lib/AbisInterfaceGenerator/FunctionHandler.js

@@ -57,7 +57,7 @@ class FunctionHandler {
     }
     static getReturnType(fn, tupleDefinitions, abiTypeConverter) {
         if (this.isWriteFunction(fn))
-            return 'CallBuilder';
+            return 'EvmCallBuilder';
         if (!fn.outputs || fn.outputs.length === 0)
             return 'void';
         if (fn.outputs.length === 1)
@@ -93,8 +93,8 @@ class FunctionHandler {
         lines.push(`  ${methodName}(${methodParams}): ${returnType} {`);
         lines.push(`    const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName).join(', ')})`);
         importManager.addType(types_1.LibTypes.Bytes);
-        importManager.addType('CallBuilder');
-        lines.push(`    return CallBuilder.forChain(this._chainId).addCall(this._address, encodedData)`);
+        importManager.addType('EvmCallBuilder');
+        lines.push(`    return EvmCallBuilder.forChain(this._chainId).addCall(this._address, encodedData)`);
         lines.push(`  }`);
         lines.push('');
     }
@@ -107,7 +107,7 @@ class FunctionHandler {
         lines.push(`  ${methodName}(${methodParams}): ${returnType} {`);
         lines.push(`    const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName).join(', ')})`);
         importManager.addType('environment');
-        const contractCallLine = `environment.contractCall(this._address, this._chainId, this._timestamp, encodedData.toHexString())`;
+        const contractCallLine = `environment.contractCall(this._address, this._chainId, encodedData.toHexString(), this._timestamp)`;
         if (returnType === 'void') {
             lines.push(`    ${contractCallLine}`);
         }

package/dist/lib/InputsInterfaceGenerator.js

@@ -33,15 +33,21 @@ function convertInputs(inputs) {
     }));
 }
 function generateImports(inputs) {
-    const typesToImport = new Set(Object.values(inputs).filter((e) => e === 'Address' || e === 'Bytes' || e === 'BigInt'));
-    if (typesToImport.size === 0)
+    const IMPORTABLE_TYPES = new Set(['Address', 'Bytes', 'BigInt', 'TokenAmount', 'BlockchainToken']);
+    const imports = new Set(Object.values(inputs).filter((type) => IMPORTABLE_TYPES.has(type)));
+    if (imports.size === 0)
         return '';
-    return `import { ${[...typesToImport].sort().join(', ')} } from '@mimicprotocol/lib-ts'`;
+    return `import { ${[...imports].sort().join(', ')} } from '@mimicprotocol/lib-ts'`;
 }
 function generateInputsMapping(inputs, originalInputs) {
     return Object.entries(inputs)
         .map(([name, type]) => {
-        const declaration = type === 'string' || type === 'Address' || type === 'Bytes' || type === 'BigInt'
+        const declaration = type === 'string' ||
+            type === 'Address' ||
+            type === 'Bytes' ||
+            type === 'BigInt' ||
+            type === 'BlockchainToken' ||
+            type === 'TokenAmount'
             ? `var ${name}: string | null`
             : `const ${name}: ${type}`;
         const originalInput = originalInputs[name];
@@ -75,6 +81,10 @@ function convertType(type) {
         return 'Address';
     if (type.includes('bytes'))
         return 'Bytes';
+    if (type === 'Token')
+        return 'BlockchainToken';
+    if (type === 'TokenAmount')
+        return 'TokenAmount';
     return type;
 }
 function generateGetter(name, type) {
@@ -88,6 +98,10 @@ function generateGetter(name, type) {
         returnStr = `Bytes.fromHexString(${str}!)`;
     else if (type === 'BigInt')
         returnStr = `BigInt.fromString(${str}!)`;
+    else if (type === 'BlockchainToken')
+        returnStr = `BlockchainToken.fromSerializable(${str}!)`;
+    else if (type === 'TokenAmount')
+        returnStr = `TokenAmount.fromSerializable(${str}!)`;
     else
         returnStr = str;
     return `static get ${name}(): ${type} {

package/dist/validators.js

@@ -3,17 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManifestValidator = exports.SEM_VER_REGEX = void 0;
 const zod_1 = require("zod");
 const SOLIDITY_TYPE_REGEX = /^(u?int(8|16|32|64|128|256)?|bool|address|bytes([1-9]|[1-2][0-9]|3[0-2])?|string)$/;
+const TOKEN_TYPE_REGEX = /^(Token|TokenAmount)$/;
 // https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
 exports.SEM_VER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
 const String = zod_1.z.string().min(1);
 const SolidityType = String.regex(SOLIDITY_TYPE_REGEX, 'Must be a valid solidity type');
-const InputValue = zod_1.z.union([
-    SolidityType,
-    zod_1.z.object({
-        type: SolidityType,
-        description: String.optional(),
-    }),
-]);
+const TokenType = String.regex(TOKEN_TYPE_REGEX, 'Must be a valid token type');
+const InputType = zod_1.z.union([SolidityType, TokenType]);
+const InputValue = zod_1.z.union([InputType, zod_1.z.object({ type: InputType, description: String.optional() })]);
 exports.ManifestValidator = zod_1.z.object({
     version: String.regex(exports.SEM_VER_REGEX, 'Must be a valid semver'),
     name: String,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimicprotocol/cli",
-  "version": "0.0.1-rc.20",
+  "version": "0.0.1-rc.22",
   "license": "GPL-3.0",
   "private": false,
   "type": "commonjs",