chore: fix conflicts

axiom-crypto · May 28, 2024 · 318493b · 318493b
2 parents 1a31d94 + 1e9c82c
commit 318493b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/build/axiom-std-cli-build.js b/build/axiom-std-cli-build.js
@@ -281,7 +281,7 @@ var require_prove = __commonJS({
         }
         let target;
         if (blockhashOracle || broadcaster) {
-          let targetRpcUrlOrCache = (0, utils_1.getRpcUrl)(targetRpcUrl);
+          const targetRpcUrlOrCache = (0, utils_1.getRpcUrl)(targetRpcUrl);
           target = {
             chainId: targetChainId,
             rpcUrl: targetRpcUrlOrCache
@@ -338,6 +338,6 @@ var compile_1 = require_compile();
 var prove_1 = require_prove();
 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("<rpcUrl>", "JSON-RPC provider to use").option("-q, --override-query-schema <suffix>", "query schema").action(compile_1.compile);
-program.command("prove").description("Prove a circuit and generate query results").argument("<compiledJson>", "compiled json string").argument("<inputs>", "inputs to the circuit").argument("<rpcUrl>", "JSON-RPC provider to use for the source chain").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").option("-t, --targetChainId [targetChainId]", "target chain id").option("-b, --bridgeId [bridgeId]", "bridge id", parseInt).option("-br, --broadcaster", "Use crosschain broadcaster").option("-bo, --blockhashOracle", "Use crosschain blockhash oracle").option("-tr, --targetRpcUrl [targetRpcUrl]", "JSON-RPC provider to use for the target chain").action(prove_1.prove);
+program.command("read-circuit").description("Read and compile a circuit").argument("<circuit-path>", "path to the typescript circuit file").argument("<rpc-url>", "JSON-RPC provider to use").option("-q, --override-query-schema <suffix>", "query schema").action(compile_1.compile);
+program.command("prove").description("Prove a circuit and generate query results").argument("<compiled-json>", "compiled json string").argument("<inputs>", "inputs to the circuit").argument("<rpc-url>", "JSON-RPC provider to use for the source chain").argument("<source-chain-id>", "source chain id").argument("<callback-target>", "callback target").argument("<callback-extra-data>", "callback extra data").argument("<refund-address>", "refund address").argument("<max-fee-per-gas>", "max fee per gas").argument("<callback-gas-limit>", "callback gas limit").argument("<caller>", "caller").option("-t, --target-chain-id <target-chain-id>", "target chain id").option("-b, --bridge-id <bridge-id>", "bridge id", parseInt).option("-br, --broadcaster", "Use crosschain broadcaster").option("-bo, --blockhash-oracle", "Use crosschain blockhash oracle").option("-tr, --target-rpc-url <target-rpc-url>", "JSON-RPC provider to use for the target chain").action(prove_1.prove);
 program.parseAsync(process.argv);
diff --git a/cli/axiom-std-cli.ts b/cli/axiom-std-cli.ts
@@ -6,30 +6,30 @@ const program = new Command("axiom-std");
 
 program.name("axiom-std").usage("axiom-std CLI");
 
-program.command("readCircuit")
+program.command("read-circuit")
     .description("Read and compile a circuit")
-    .argument("<circuitPath>", "path to the typescript circuit file")
-    .argument("<rpcUrl>", "JSON-RPC provider to use")
+    .argument("<circuit-path>", "path to the typescript circuit file")
+    .argument("<rpc-url>", "JSON-RPC provider to use")
     .option("-q, --override-query-schema <suffix>", "query schema")
     .action(compile);
 
 program.command("prove")
     .description("Prove a circuit and generate query results")
-    .argument("<compiledJson>", "compiled json string")
+    .argument("<compiled-json>", "compiled json string")
     .argument("<inputs>", "inputs to the circuit")
-    .argument("<rpcUrl>", "JSON-RPC provider to use for the source chain")
-    .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("<rpc-url>", "JSON-RPC provider to use for the source chain")
+    .argument("<source-chain-id>", "source chain id")
+    .argument("<callback-target>", "callback target")
+    .argument("<callback-extra-data>", "callback extra data")
+    .argument("<refund-address>", "refund address")
+    .argument("<max-fee-per-gas>", "max fee per gas")
+    .argument("<callback-gas-limit>", "callback gas limit")
     .argument("<caller>", "caller")
-    .option("-t, --targetChainId [targetChainId]", "target chain id")
-    .option("-b, --bridgeId [bridgeId]", "bridge id", parseInt)
+    .option("-t, --target-chain-id <target-chain-id>", "target chain id")
+    .option("-b, --bridge-id <bridge-id>", "bridge id", parseInt)
     .option("-br, --broadcaster", "Use crosschain broadcaster")
-    .option("-bo, --blockhashOracle", "Use crosschain blockhash oracle")
-    .option("-tr, --targetRpcUrl [targetRpcUrl]", "JSON-RPC provider to use for the target chain")    
+    .option("-bo, --blockhash-oracle", "Use crosschain blockhash oracle")
+    .option("-tr, --target-rpc-url <target-rpc-url>", "JSON-RPC provider to use for the target chain")    
     .action(prove);
 
 program.parseAsync(process.argv);
diff --git a/cli/prove.ts b/cli/prove.ts
@@ -98,7 +98,7 @@ export const prove = async (
 
         let target;
         if (blockhashOracle || broadcaster) {
-            let targetRpcUrlOrCache = getRpcUrl(targetRpcUrl!);
+            const targetRpcUrlOrCache = getRpcUrl(targetRpcUrl);
             target = {
                 chainId: targetChainId!,
                 rpcUrl: targetRpcUrlOrCache,

diff --git a/src/AxiomCli.sol b/src/AxiomCli.sol
@@ -3,5 +3,5 @@ pragma solidity ^0.8.0;
 
 library AxiomCli {
     /// @dev The SHA256 hash of the Axiom CLI binary
-    bytes public constant CLI_SHASUM = hex"072532d7c5ac1da9a37b225db5eddf302d34d9fe5a903a6ec1f26e4a466e1ec3";
+    bytes public constant CLI_SHASUM = hex"5f01fa3b07fab1ee38fd7755f158a2d59a8d2bffec88bde3fad474b006a53981";
 }
diff --git a/src/AxiomVm.sol b/src/AxiomVm.sol
@@ -264,7 +264,7 @@ contract AxiomVm is Test {
         string[] memory cli = new string[](5);
         cli[0] = NODE_PATH;
         cli[1] = CLI_PATH;
-        cli[2] = "readCircuit";
+        cli[2] = "read-circuit";
         cli[3] = _circuitPath;
         cli[4] = vm.rpcUrl(urlOrAlias);
         bytes memory axiomOutput = vm.ffi(cli);
@@ -285,7 +285,7 @@ contract AxiomVm is Test {
         string[] memory cli = new string[](7);
         cli[0] = NODE_PATH;
         cli[1] = CLI_PATH;
-        cli[2] = "readCircuit";
+        cli[2] = "read-circuit";
         cli[3] = _circuitPath;
         cli[4] = vm.rpcUrl(urlOrAlias);
         cli[5] = "--override-query-schema";

diff --git a/test/BaseCrosschain.t.sol b/test/BaseCrosschain.t.sol
@@ -65,7 +65,7 @@ contract MockClient is AxiomV2Client {
     }
 }
 
-contract BaseArrayTest is AxiomTest {
+contract BaseCrosschainArrayTest is AxiomTest {
     using Axiom for Query;
 
     struct AxiomInput {