Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[feat] Integrate sdk-rs and mock query args js cli #26

Merged
merged 6 commits into from
Jun 3, 2024
Merged

[feat] Integrate sdk-rs and mock query args js cli #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20d3c28
Integrate sdk-rs and mock query args js cli
ytham Jun 2, 2024
3fa8d5e
Update CI
ytham Jun 2, 2024
42671e3
gsComments
ytham Jun 2, 2024
1e049de
feat: specify rust-toolchain in CLI
yi-sun Jun 2, 2024
9560f98
chore: switch CI to nightly
yi-sun Jun 2, 2024
1b70818
chore: remove redundant CI runs
yi-sun Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Foundry

on:
workflow_dispatch:
pull_request:
push:
branches:
- "**"
Expand All @@ -20,6 +19,12 @@ jobs:
with:
node-version: 18

- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2024-01-01
override: true

- name: Build CLI
run: |
npm install
Expand All @@ -46,7 +51,8 @@ jobs:
run: |
export PROVIDER_URI_SEPOLIA=${{ secrets.PROVIDER_URI_SEPOLIA }}
export PROVIDER_URI_BASE=${{ secrets.PROVIDER_URI_BASE }}
RUST_BACKTRACE=1 forge test -vvv
export PROVIDER_URI_MAINNET=${{ secrets.PROVIDER_URI_MAINNET }}
RUST_BACKTRACE=1 forge test -vvvv

test-mac:
name: Foundry Tests Mac
Expand All @@ -60,6 +66,12 @@ jobs:
with:
node-version: 18

- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2024-01-01
override: true

- name: Build CLI
run: |
npm install
Expand All @@ -86,4 +98,5 @@ jobs:
run: |
export PROVIDER_URI_SEPOLIA=${{ secrets.PROVIDER_URI_SEPOLIA }}
export PROVIDER_URI_BASE=${{ secrets.PROVIDER_URI_BASE }}
RUST_BACKTRACE=1 forge test -vvv
export PROVIDER_URI_MAINNET=${{ secrets.PROVIDER_URI_MAINNET }}
RUST_BACKTRACE=1 forge test -vvvv
101 changes: 94 additions & 7 deletions build/axiom-std-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ var require_compile = __commonJS({
var utils_12 = require("@axiom-crypto/circuit/cliHandler/utils");
var utils_22 = require_utils();
var viem_12 = require("viem");
var compile = async (circuitPath, providerUri2, options) => {
var compile = async (circuitPath, rpcUrlInput, options) => {
const { restoreConsole: restoreConsole2, getCaptures: getCaptures2 } = (0, utils_22.redirectConsole)();
let circuitFunction = "circuit";
const f = await (0, utils_12.getFunctionFromTs)(circuitPath, circuitFunction);
const provider2 = (0, utils_12.getProvider)(providerUri2);
const rpcUrl2 = (0, utils_12.getRpcUrl)(rpcUrlInput);
const circuit2 = new js_12.AxiomBaseCircuit({
f: f.circuit,
mock: true,
provider: provider2,
rpcUrl: rpcUrl2,
shouldTime: false,
inputSchema: f.inputSchema
});
Expand Down Expand Up @@ -217,18 +217,19 @@ var require_prove = __commonJS({
var viem_1 = require("viem");
var client_1 = require("@axiom-crypto/client");
var utils_3 = require("@axiom-crypto/client/axiom/utils");
var prove = async (compiledJson, inputs, providerUri, sourceChainId, callbackTarget, callbackExtraData, refundAddress, maxFeePerGas, callbackGasLimit, caller) => {
var prove = async (compiledJson, inputs, rpcUrl, sourceChainId, callbackTarget, callbackExtraData, refundAddress, maxFeePerGas, callbackGasLimit, caller) => {
const { restoreConsole, getCaptures } = (0, utils_2.redirectConsole)();
const decoder = new TextDecoder();
const provider = (0, utils_1.getProvider)(providerUri);
const rpcUrlOrCached = (0, utils_1.getRpcUrl)(rpcUrl);
const axiomV2QueryAddress = (0, client_1.getAxiomV2QueryAddress)(sourceChainId);
let compiled = JSON.parse(compiledJson);
const decodedArray = Buffer.from(compiled.circuit, "base64");
const raw = decoder.decode(decodedArray);
const AXIOM_CLIENT_IMPORT = require("@axiom-crypto/client");
const circuit = new js_1.AxiomBaseCircuit({
f: eval(raw),
mock: true,
provider,
rpcUrl: rpcUrlOrCached,
shouldTime: false,
inputSchema: compiled.inputSchema
});
Expand All @@ -248,7 +249,8 @@ var require_prove = __commonJS({
};
let build = await (0, client_1.buildSendQuery)({
chainId: sourceChainId,
providerUri: provider,
rpcUrl: rpcUrlOrCached,
axiomV2QueryAddress,
dataQuery: res.dataQuery,
computeQuery: res.computeQuery,
callback: {
Expand Down Expand Up @@ -288,13 +290,98 @@ var require_prove = __commonJS({
}
});

// dist/sdkRs/mockQueryArgs.js
var require_mockQueryArgs = __commonJS({
"dist/sdkRs/mockQueryArgs.js"(exports2) {
"use strict";
Object.defineProperty(exports2, "__esModule", { value: true });
exports2.mockQueryArgs = void 0;
var viem_12 = require("viem");
var utils_12 = require_utils();
var mockQueryArgs = async (sourceChainId2, computeResults, querySchema, callbackTarget2, callbackExtraData2, maxFeePerGas2, callbackGasLimit2, overrideAxiomQueryFee, refundee) => {
const { restoreConsole: restoreConsole2, getCaptures: getCaptures2 } = (0, utils_12.redirectConsole)();
try {
let computeQuery = {
k: 13,
vkey: [
"0x0001000009000100000004010000010080000000000000000000000000000000",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
],
computeProof: "",
resultLen: 0
};
const parsedComputeResults = JSON.parse(computeResults.replace(/\\n/g, "").trim());
computeQuery.resultLen = parsedComputeResults.length;
const computeAccumulator = (0, viem_12.concat)([viem_12.zeroHash, viem_12.zeroHash]);
const computeProofBytes = "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
const computeProof = (0, viem_12.concat)([computeAccumulator, ...parsedComputeResults, computeProofBytes]);
computeQuery.computeProof = computeProof.toString();
const callback = {
target: callbackTarget2,
extraData: callbackExtraData2
};
const feeData = {
maxFeePerGas: maxFeePerGas2,
callbackGasLimit: callbackGasLimit2,
overrideAxiomQueryFee
};
const queryArgs = {
args: {
sourceChainId: sourceChainId2,
dataQueryHash: viem_12.zeroHash,
computeQuery,
callback,
feeData,
userSalt: viem_12.zeroHash,
refundee,
dataQuery: "0x00"
},
querySchema,
queryId: viem_12.zeroHash,
computeResults: parsedComputeResults,
value: "50000000000000000"
};
console.log(queryArgs);
const logs = getCaptures2();
const output = (0, viem_12.encodeAbiParameters)((0, viem_12.parseAbiParameters)("string x, string y, string z"), [logs.logs, logs.errors, JSON.stringify(queryArgs)]);
restoreConsole2();
console.log(output);
} catch (e) {
console.error(e);
const logs = getCaptures2();
const output = (0, viem_12.encodeAbiParameters)((0, viem_12.parseAbiParameters)("string x, string y, string z"), [logs.logs, logs.errors, ""]);
restoreConsole2();
console.log(output);
}
};
exports2.mockQueryArgs = mockQueryArgs;
}
});

// dist/axiom-std-cli.js
Object.defineProperty(exports, "__esModule", { value: true });
var commander_1 = require("commander");
var compile_1 = require_compile();
var prove_1 = require_prove();
var mockQueryArgs_1 = require_mockQueryArgs();
var program = new commander_1.Command("axiom-std");
program.name("axiom-std").usage("axiom-std CLI");
program.command("readCircuit").description("Read and compile a circuit").argument("<circuitPath>", "path to the typescript circuit file").argument("<providerUri>", "provider to use").option("-q, --override-query-schema <suffix>", "query schema").action(compile_1.compile);
program.command("prove").description("Prove a circuit").argument("<compiledJson>", "compiled json string").argument("<inputs>", "inputs to the circuit").argument("<providerUri>", "provider to use").argument("<sourceChainId>", "source chain id").argument("<callbackTarget>", "callback target").argument("<callbackExtraData>", "callback extra data").argument("<refundAddress>", "refund address").argument("<maxFeePerGas>", "max fee per gas").argument("<callbackGasLimit>", "callback gas limit").argument("<caller>", "caller").action(prove_1.prove);
var sdkRs = program.command("sdk-rs").description("Axiom Rust SDK helper commands");
sdkRs.command("mock-query-args").description("Generate a mock compute proof").argument("<compute results string>", "compute results as a string").argument("<query schema>", "query schema").argument("<source chain id>", "source chain id").argument("<callback target>", "callback target").argument("<callback extra data>", "callback extra data").argument("<max fee per gas>", "max fee per gas").argument("<callback gas limit>", "callback gas limit").argument("<override axiom query fee>", "override axiom query fee").argument("<refundee>", "refundee").action(mockQueryArgs_1.mockQueryArgs);
program.parseAsync(process.argv);
18 changes: 18 additions & 0 deletions cli/axiom-std-cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Command } from "commander";
import { compile } from "./compile";
import { prove } from "./prove";
import { mockQueryArgs } from "./sdkRs/mockQueryArgs";

const program = new Command("axiom-std");

Expand All @@ -27,4 +28,21 @@ program.command("prove")
.argument("<caller>", "caller")
.action(prove);


const sdkRs = program.command("sdk-rs")
.description("Axiom Rust SDK helper commands");

sdkRs.command("mock-query-args")
.description("Generate a mock compute proof")
.argument("<compute results string>", "compute results as a string")
.argument("<query schema>", "query schema")
.argument("<source chain id>", "source chain id")
.argument("<callback target>", "callback target")
.argument("<callback extra data>", "callback extra data")
.argument("<max fee per gas>", "max fee per gas")
.argument("<callback gas limit>", "callback gas limit")
.argument("<override axiom query fee>", "override axiom query fee")
.argument("<refundee>", "refundee")
.action(mockQueryArgs);

program.parseAsync(process.argv);
8 changes: 4 additions & 4 deletions cli/compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { AxiomBaseCircuit } from "@axiom-crypto/circuit/js";
import { getFunctionFromTs, getProvider } from "@axiom-crypto/circuit/cliHandler/utils";
import { getFunctionFromTs, getRpcUrl } from "@axiom-crypto/circuit/cliHandler/utils";
import { redirectConsole } from "./utils";
import { encodeAbiParameters, parseAbiParameters } from "viem";

export const compile = async (
circuitPath: string,
providerUri: string,
rpcUrlInput: string,
options: { overrideQuerySchema?: string }
) => {
const { restoreConsole, getCaptures } = redirectConsole();
let circuitFunction = "circuit";
const f = await getFunctionFromTs(circuitPath, circuitFunction);
const provider = getProvider(providerUri);
const rpcUrl = getRpcUrl(rpcUrlInput);
const circuit = new AxiomBaseCircuit({
f: f.circuit,
mock: true,
provider,
rpcUrl,
shouldTime: false,
inputSchema: f.inputSchema,
})
Expand Down
14 changes: 8 additions & 6 deletions cli/prove.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { AxiomBaseCircuit } from "@axiom-crypto/circuit/js";
import { getProvider } from "@axiom-crypto/circuit/cliHandler/utils";
import { getRpcUrl } from "@axiom-crypto/circuit/cliHandler/utils";
import { getInputs, redirectConsole } from './utils';
import { encodeAbiParameters, parseAbiParameters } from 'viem';
import { buildSendQuery } from "@axiom-crypto/client";
import { buildSendQuery, getAxiomV2QueryAddress } from "@axiom-crypto/client";
import { argsArrToObj } from '@axiom-crypto/client/axiom/utils';

export const prove = async (
compiledJson: string,
inputs: string,
providerUri: string,
rpcUrl: string,
sourceChainId: string,
callbackTarget: string,
callbackExtraData: string,
Expand All @@ -20,7 +20,8 @@ export const prove = async (
const { restoreConsole, getCaptures } = redirectConsole();
const decoder = new TextDecoder();

const provider = getProvider(providerUri);
const rpcUrlOrCached = getRpcUrl(rpcUrl);
const axiomV2QueryAddress = getAxiomV2QueryAddress(sourceChainId);
let compiled = JSON.parse(compiledJson);

const decodedArray = Buffer.from(compiled.circuit, 'base64');
Expand All @@ -30,7 +31,7 @@ export const prove = async (
const circuit = new AxiomBaseCircuit({
f: eval(raw),
mock: true,
provider,
rpcUrl: rpcUrlOrCached,
shouldTime: false,
inputSchema: compiled.inputSchema,
})
Expand All @@ -55,7 +56,8 @@ export const prove = async (

let build = await buildSendQuery({
chainId: sourceChainId,
providerUri: provider,
rpcUrl: rpcUrlOrCached,
axiomV2QueryAddress,
dataQuery: res.dataQuery,
computeQuery: res.computeQuery,
callback: {
Expand Down
Loading
Loading