inputs defaults and export UserInputs type

circuit/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiom-crypto/circuit",
-  "version": "0.2.2-rc2.0",
+  "version": "0.2.2-rc2.1",
   "author": "Intrinsic Technologies",
   "license": "MIT",
   "description": "Client SDK to write custom queries for Axiom, the ZK Coprocessor for Ethereum.",

circuit/js/src/cliHandler/compile.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import { AxiomBaseCircuit } from "../js";
-import { getFunctionFromTs, getProvider, readJsonFromFile, saveJsonToFile } from "./utils";
+import { fileExists, getFunctionFromTs, getProvider, readJsonFromFile, saveJsonToFile } from "./utils";
 
 export const compile = async (
     circuitPath: string,
@@ -27,11 +27,14 @@ export const compile = async (
         shouldTime: options.stats,
         inputSchema: f.inputSchema,
     })
-    let circuitInputs = f.inputs;
-    if (options.inputs) {
-        circuitInputs = readJsonFromFile(options.inputs);
+    let inputFile = path.join(path.dirname(circuitPath), "data", "inputs.json");
+    if (options.inputs !== undefined) {
+        inputFile = options.inputs;
     }
-    else {
+    let circuitInputs = f.inputs;
+    if (fileExists(inputFile)) {
+        circuitInputs = readJsonFromFile(inputFile);
+    } else {
         if (circuitInputs === undefined) {
             throw new Error("No inputs provided. Either export `inputs` from your circuit file or provide a path to a json file with inputs.");
         }

circuit/js/src/cliHandler/prove.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import { AxiomBaseCircuit } from "../js";
-import { getFunctionFromTs, getProvider, readJsonFromFile, saveJsonToFile } from "./utils";
+import { fileExists, getFunctionFromTs, getProvider, readJsonFromFile, saveJsonToFile } from "./utils";
 
 export const prove = async (
     circuitPath: string,
@@ -34,11 +34,14 @@ export const prove = async (
         shouldTime: options.stats,
         inputSchema: compiledJson.inputSchema,
     })
-    let circuitInputs = f.inputs;
-    if (options.inputs) {
-        circuitInputs = readJsonFromFile(options.inputs);
+    let inputFile = path.join(path.dirname(circuitPath), "data", "inputs.json");
+    if (options.inputs !== undefined) {
+        inputFile = options.inputs;
     }
-    else {
+    let circuitInputs = f.inputs;
+    if (fileExists(inputFile)) {
+        circuitInputs = readJsonFromFile(inputFile);
+    } else {
         if (circuitInputs === undefined) {
             throw new Error("No inputs provided. Either export `inputs` from your circuit file or provide a path to a json file with inputs.");
         }

circuit/js/src/cliHandler/utils.ts

@@ -88,4 +88,8 @@ export function saveJsonToFile(json: any, filePath: string) {
 
 export function readJsonFromFile(relativePath: string) {
     return JSON.parse(fs.readFileSync(path.resolve(relativePath), 'utf8'))
+}
+
+export function fileExists(relativePath: string) {
+    return fs.existsSync(path.resolve(relativePath));
 }

circuit/js/src/index.ts

@@ -1,5 +1,6 @@
 export * from "./subquery";
 export * from "./circuitRunner";
 export * from "./encoder";
+export { RawInput as UserInput } from './types';
 export { CircuitValue, CircuitValue256 } from "@axiom-crypto/halo2-lib-js";
 export * from "@axiom-crypto/halo2-lib-js/halo2lib/functions";

client/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@axiom-crypto/client",
-  "version": "0.2.2-rc2.0",
+  "version": "0.2.2-rc2.1",
   "author": "Intrinsic Technologies",
   "license": "MIT",
   "description": "Client SDK to write custom queries for Axiom, the ZK Coprocessor for Ethereum.",
   "main": "index.js",
+  "types": "index.d.ts",
   "browser": "web/index.js",
-  "types": "web/index.d.ts",
   "scripts": {
     "build": "rm -rf ./dist/* && node scripts/preTsc.js && tsc && node scripts/postTsc.js",
     "build:docs": "./scripts/buildDocs.sh",
@@ -24,7 +24,7 @@
     "crypto"
   ],
   "dependencies": {
-    "@axiom-crypto/circuit": "0.2.2-rc2.0",
+    "@axiom-crypto/circuit": "0.2.2-rc2.1",
     "@axiom-crypto/core": "2.3.0-rc2.2",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",

client/src/cli/index.ts

@@ -28,8 +28,8 @@ circuit
   .argument("<circuitPath>", "path to the typescript circuit file")
   .option("-st, --stats", "print stats")
   .option("-p, --provider [provider]", "JSON-RPC provider (https)")
-  .option("-i, --inputs [inputs]", "inputs")
-  .option("-o, --outputs [outputs]", "outputs")
+  .option("-i, --inputs [inputs]", "inputs json file")
+  .option("-o, --outputs [outputs]", "outputs json file")
   .option("-f, --function [function]", "function name in typescript circuit")
   .action(compile);
 
@@ -42,8 +42,8 @@ circuit
   .option("-m, --mock", "generate a mock compute proof")
   .option("-st, --stats", "print stats")
   .option("-p, --provider [provider]", "JSON-RPC provider (https)")
-  .option("-i, --inputs [inputs]", "inputs")
-  .option("-o, --outputs [outputs]", "outputs")
+  .option("-i, --inputs [inputs]", "inputs json file")
+  .option("-o, --outputs [outputs]", "outputs json file")
   .option("-f, --function [function]", "function name in typescript circuit")
   .action(prove);
 

client/src/version.ts

@@ -1,4 +1,4 @@
 // This is an autogenerated file. It should match the version number in package.json.
 // Do not modify this file directly.
 
-export const CLIENT_VERSION = "0.2.2-rc2.0";
+export const CLIENT_VERSION = "0.2.2-rc2.1";

harness/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiom-crypto/harness",
-  "version": "0.2.2-rc2.0",
+  "version": "0.2.2-rc2.1",
   "author": "Intrinsic Technologies",
   "license": "MIT",
   "description": "Circuit harness for axiom-client",
@@ -41,6 +41,6 @@
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "@axiom-crypto/client": "0.2.2-rc2.0"
+    "@axiom-crypto/client": "0.2.2-rc2.1"
   }
 }

harness/src/version.ts

@@ -1,4 +1,4 @@
 // This is an autogenerated file. It should match the version number in package.json.
 // Do not modify this file directly.
 
-export const HARNESS_VERSION = "0.2.2-rc2.0";
+export const HARNESS_VERSION = "0.2.2-rc2.1";