Simplify circuit code

app/axiom/average.circuit.ts

@@ -1,5 +1,5 @@
 import {
-  sum,
+  add,
   sub,
   mul,
   div,
@@ -38,24 +38,22 @@ export const circuit = async (inputs: CircuitInputs) => {
   // Perform the block number validation in the circuit as well
   checkLessThan(mul(samples, spacing), inputs.blockNumber);
 
-  // Creates a length-8 array of block numbers to sample from, starting from input blockNumber and 
-  // decreasing by the `spacing` size.
-  const blockNumbers = Array.from(
-    {length: samples}, 
-    (_: any, i: number) => sub(inputs.blockNumber, (spacing * i))
-  );
-
-  // Get all balances for the given address at the block numbers we are sampling from
-  let balances = [] as CircuitValue256[];
-  for (const blockNumber of blockNumbers) {
-    const balance = await getAccount(blockNumber, inputs.address).balance();
-    balances.push(balance); 
+  // Get account balance at the sample block numbers
+  let sampledAccounts = new Array(samples);
+  for (let i = 0; i < samples; i++) {
+    const sampleBlockNumber: CircuitValue = sub(inputs.blockNumber, mul(spacing, i));
+    const account = getAccount(sampleBlockNumber, inputs.address);
+    sampledAccounts[i] = account;
   }
 
-  // Calculate the total
-  const total = sum(balances.map((balance: CircuitValue256) => balance.value()));
+  // Accumulate all of the balances to `total`
+  let total = witness(0);
+  for (const account of sampledAccounts) {
+    const balance: CircuitValue256 = await account.balance();
+    total = add(total, balance.lo());
+  }
 
-  // Divide by the number of samples to get the average value
+  // Divide the total amount by the number of samples to get the average value
   const average = div(total, samples);
 
   // We call `addToCallback` on all values that we would like to be passed to our contract after the circuit has

app/axiom/data/compiled.json

@@ -1,5 +1,5 @@
 {
-  "vk": "Ag0AAAAABgAAAKdY0S2x49O88WffhIg6j+sI1Nhyl5stleJlyqOU4a4YI3l5FcT4uSbnhps89EEvH7Pl4PdxSKEhmsm6qRblcCSDhnlPeXfc7bd0HzP8RaTWakQ+Aahe9S4bg5MkZ1O/Eo4drg6OBVXSIu3jjAL4Uf0nSPVcW0DUUL4s4yE9ZAUwrazjLiv2KjvtIOxVhCeS0a2b+FfwK7ZM0vQTAhXwSiNwiFlLi5PiL5ujIN+MTEbG1CJA+a30FnGlU8Yl5t33LwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPktgLA7aIeVODphZ7L4iRLWEp+mQAeJuLMKgbl0t8IBfasO336AX3kP2APJKfbGUdS3FrxZejr1YNk/DcTcmyQszIAXsyvbUvQ2Yf+dv2915gQHaNqkF4eP62tJ2PXiJv7o8ZmHoaZ/4ELTlIRgFgRBio0vuTflU5ElUessIPwNNbkFZydC5AcudVP5ZXNpqh3VLZRV19ozwxNdZOd37y0LaVF9cdNxt8uBTro5G1nsbb3AAQSxhe5Ljm1KdHVRCMVaeC9tQ0w3NfPHRq1jJLc4gGmnkzh87EMghDb9tZohFxr4MAIY0dDW1Ud4bWbSs1Kf/wBRxHbvRBf8KXfImCeQ8abjs9k3ton3Trhk72vHrvJzzqyaX6Z2h9hMz+bpDZRnQtfr+JQ1bgNokpaNGYut/YrC6d4EAUolcHdxVmQmPw00zpXjE3dwhQh2dYuRplsWazp1c8j1gp5TTi8EaSAuzQzsg28mYGrOUFXlhRMSfGlaSHnDKCURmC65ZFtbApcf1/9uPF1GBySrWD9QIioAdGktKR6OGbbziOi/IfooYNIU+H3GYEpsYcSMbcBxQZ9QrwM9n9xmU8KOHXf/ACk=",
+  "vk": "Ag0AAAAABgAAAKdY0S2x49O88WffhIg6j+sI1Nhyl5stleJlyqOU4a4YI3l5FcT4uSbnhps89EEvH7Pl4PdxSKEhmsm6qRblcCRfLCv6FTmyOp0WXYzXOfrnQr9WnCoMfwAHh0yjtAG6I6RfADIMUg87mRA5A6jNVrS95tANWkBXxsE+J8dE95wGaUp0ENaONCtStUUWEp1Kk7FBC1Pf/qvcVosSwIdL8R1/8awZHhWhK1d/ewijadrpgYjwFPiXVX3Um1L4sEDrEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJqiO9wdXpKWan9YnWc9wJT9F6pv8lh1yQl46F9SOjYpNL7hF3F+hrCrGx95KebX2pb5qsOBKTLY93qFAFXGmRRF72wWqa9IukpqAwFY/ok5TKgEgV5cU7zFd+yQHhVeMI8vp5m+d5Mj7H4swzfmKAlGg2W/l8ccbQleshMUbVACNbkFZydC5AcudVP5ZXNpqh3VLZRV19ozwxNdZOd37y0LaVF9cdNxt8uBTro5G1nsbb3AAQSxhe5Ljm1KdHVRCMVaeC9tQ0w3NfPHRq1jJLc4gGmnkzh87EMghDb9tZohFxr4MAIY0dDW1Ud4bWbSs1Kf/wBRxHbvRBf8KXfImCeQ8abjs9k3ton3Trhk72vHrvJzzqyaX6Z2h9hMz+bpDZRnQtfr+JQ1bgNokpaNGYut/YrC6d4EAUolcHdxVmQmMfVylMdF/T90FtVLRnlG8XVEH1SDk7d1gCN7q0P3cSS+poOBX7ZkebDlhej7gN0XZryuHfTchTs6y1IMEqCLHKCh+7yZ9BcKjcdWwF6s1o+e3dXv1kgk4xjNZaNAlHknrLr4Of0VGfEW+giUz9/4p676XjNKlqurN18vt/v2QgY=",
   "config": {
     "k": 13,
     "numAdvice": 4,
@@ -8,7 +8,7 @@
     "numLookupBits": 12,
     "numVirtualInstance": 2
   },
-  "querySchema": "0x73aa20264324d23b8587d8d33a67b82104fa660a90abc02a6fd5cc72fa07fe51",
+  "querySchema": "0xddc4deb9373da5dd4e24401b02a8a1cba66203a2d4e36a8a191c3338469be5b9",
   "inputSchema": "eyJibG9ja051bWJlciI6IkNpcmN1aXRWYWx1ZSIsImFkZHJlc3MiOiJDaXJjdWl0VmFsdWUifQ==",
-  "circuit": "Y29uc3QgY2xpZW50XzEgPSBBWElPTV9DTElFTlRfSU1QT1JUCmFzeW5jIChpbnB1dHMpID0+IHsKICAgIC8vIE51bWJlciBvZiBzYW1wbGVzIHRvIHRha2UuIE5vdGUgdGhhdCB0aGlzIG11c3QgYmUgYSBjb25zdGFudCB2YWx1ZSBhbmQgTk9UIGFuIGlucHV0IGJlY2F1c2UgdGhlIHNpemUgb2YgCiAgICAvLyB0aGUgY2lyY3VpdCBtdXN0IGJlIGtub3duIGF0IGNvbXBpbGUgdGltZS4KICAgIGNvbnN0IHNhbXBsZXMgPSA4OwogICAgLy8gTnVtYmVyIG9mIGJsb2NrcyBiZXR3ZWVuIGVhY2ggc2FtcGxlLgogICAgY29uc3Qgc3BhY2luZyA9IDkwMDsKICAgIC8vIFZhbGlkYXRlIHRoYXQgdGhlIGJsb2NrIG51bWJlciBpcyBncmVhdGVyIHRoYW4gdGhlIG51bWJlciBvZiBzYW1wbGVzIHRpbWVzIHRoZSBzcGFjaW5nCiAgICBpZiAoaW5wdXRzLmJsb2NrTnVtYmVyLnZhbHVlKCkgPD0gKHNhbXBsZXMgKiBzcGFjaW5nKSkgewogICAgICAgIHRocm93IG5ldyBFcnJvcigiQmxvY2sgbnVtYmVyIG11c3QgYmUgZ3JlYXRlciB0aGFuIHRoZSBudW1iZXIgb2Ygc2FtcGxlcyB0aW1lcyB0aGUgc3BhY2luZyIpOwogICAgfQogICAgLy8gUGVyZm9ybSB0aGUgYmxvY2sgbnVtYmVyIHZhbGlkYXRpb24gaW4gdGhlIGNpcmN1aXQgYXMgd2VsbAogICAgKDAsIGNsaWVudF8xLmNoZWNrTGVzc1RoYW4pKCgwLCBjbGllbnRfMS5tdWwpKHNhbXBsZXMsIHNwYWNpbmcpLCBpbnB1dHMuYmxvY2tOdW1iZXIpOwogICAgLy8gQ3JlYXRlcyBhIGxlbmd0aC04IGFycmF5IG9mIGJsb2NrIG51bWJlcnMgdG8gc2FtcGxlIGZyb20sIHN0YXJ0aW5nIGZyb20gaW5wdXQgYmxvY2tOdW1iZXIgYW5kIAogICAgLy8gZGVjcmVhc2luZyBieSB0aGUgYHNwYWNpbmdgIHNpemUuCiAgICBjb25zdCBibG9ja051bWJlcnMgPSBBcnJheS5mcm9tKHsgbGVuZ3RoOiBzYW1wbGVzIH0sIChfLCBpKSA9PiAoMCwgY2xpZW50XzEuc3ViKShpbnB1dHMuYmxvY2tOdW1iZXIsIChzcGFjaW5nICogaSkpKTsKICAgIC8vIEdldCBhbGwgYmFsYW5jZXMgZm9yIHRoZSBnaXZlbiBhZGRyZXNzIGF0IHRoZSBibG9jayBudW1iZXJzIHdlIGFyZSBzYW1wbGluZyBmcm9tCiAgICBsZXQgYmFsYW5jZXMgPSBbXTsKICAgIGZvciAoY29uc3QgYmxvY2tOdW1iZXIgb2YgYmxvY2tOdW1iZXJzKSB7CiAgICAgICAgY29uc3QgYmFsYW5jZSA9IGF3YWl0ICgwLCBjbGllbnRfMS5nZXRBY2NvdW50KShibG9ja051bWJlciwgaW5wdXRzLmFkZHJlc3MpLmJhbGFuY2UoKTsKICAgICAgICBiYWxhbmNlcy5wdXNoKGJhbGFuY2UpOwogICAgfQogICAgLy8gQ2FsY3VsYXRlIHRoZSB0b3RhbAogICAgY29uc3QgdG90YWwgPSAoMCwgY2xpZW50XzEuc3VtKShiYWxhbmNlcy5tYXAoKGJhbGFuY2UpID0+IGJhbGFuY2UudmFsdWUoKSkpOwogICAgLy8gRGl2aWRlIGJ5IHRoZSBudW1iZXIgb2Ygc2FtcGxlcyB0byBnZXQgdGhlIGF2ZXJhZ2UgdmFsdWUKICAgIGNvbnN0IGF2ZXJhZ2UgPSAoMCwgY2xpZW50XzEuZGl2KSh0b3RhbCwgc2FtcGxlcyk7CiAgICAvLyBXZSBjYWxsIGBhZGRUb0NhbGxiYWNrYCBvbiBhbGwgdmFsdWVzIHRoYXQgd2Ugd291bGQgbGlrZSB0byBiZSBwYXNzZWQgdG8gb3VyIGNvbnRyYWN0IGFmdGVyIHRoZSBjaXJjdWl0IGhhcwogICAgLy8gYmVlbiBwcm92ZW4gaW4gWksuIFRoZSB2YWx1ZXMgY2FuIHRoZW4gYmUgaGFuZGxlZCBieSBvdXIgY29udHJhY3Qgb25jZSB0aGUgcHJvdmVyIGNhbGxzIHRoZSBjYWxsYmFjayBmdW5jdGlvbi4KICAgICgwLCBjbGllbnRfMS5hZGRUb0NhbGxiYWNrKShpbnB1dHMuYmxvY2tOdW1iZXIpOwogICAgKDAsIGNsaWVudF8xLmFkZFRvQ2FsbGJhY2spKGlucHV0cy5hZGRyZXNzKTsKICAgICgwLCBjbGllbnRfMS5hZGRUb0NhbGxiYWNrKShhdmVyYWdlKTsKfQ=="
+  "circuit": "Y29uc3QgY2xpZW50XzEgPSBBWElPTV9DTElFTlRfSU1QT1JUCmFzeW5jIChpbnB1dHMpID0+IHsKICAgIC8vIE51bWJlciBvZiBzYW1wbGVzIHRvIHRha2UuIE5vdGUgdGhhdCB0aGlzIG11c3QgYmUgYSBjb25zdGFudCB2YWx1ZSBhbmQgTk9UIGFuIGlucHV0IGJlY2F1c2UgdGhlIHNpemUgb2YgCiAgICAvLyB0aGUgY2lyY3VpdCBtdXN0IGJlIGtub3duIGF0IGNvbXBpbGUgdGltZS4KICAgIGNvbnN0IHNhbXBsZXMgPSA4OwogICAgLy8gTnVtYmVyIG9mIGJsb2NrcyBiZXR3ZWVuIGVhY2ggc2FtcGxlLgogICAgY29uc3Qgc3BhY2luZyA9IDkwMDsKICAgIC8vIFZhbGlkYXRlIHRoYXQgdGhlIGJsb2NrIG51bWJlciBpcyBncmVhdGVyIHRoYW4gdGhlIG51bWJlciBvZiBzYW1wbGVzIHRpbWVzIHRoZSBzcGFjaW5nCiAgICBpZiAoaW5wdXRzLmJsb2NrTnVtYmVyLnZhbHVlKCkgPD0gKHNhbXBsZXMgKiBzcGFjaW5nKSkgewogICAgICAgIHRocm93IG5ldyBFcnJvcigiQmxvY2sgbnVtYmVyIG11c3QgYmUgZ3JlYXRlciB0aGFuIHRoZSBudW1iZXIgb2Ygc2FtcGxlcyB0aW1lcyB0aGUgc3BhY2luZyIpOwogICAgfQogICAgLy8gUGVyZm9ybSB0aGUgYmxvY2sgbnVtYmVyIHZhbGlkYXRpb24gaW4gdGhlIGNpcmN1aXQgYXMgd2VsbAogICAgKDAsIGNsaWVudF8xLmNoZWNrTGVzc1RoYW4pKCgwLCBjbGllbnRfMS5tdWwpKHNhbXBsZXMsIHNwYWNpbmcpLCBpbnB1dHMuYmxvY2tOdW1iZXIpOwogICAgLy8gR2V0IGFjY291bnQgYmFsYW5jZSBhdCB0aGUgc2FtcGxlIGJsb2NrIG51bWJlcnMKICAgIGxldCBzYW1wbGVkQWNjb3VudHMgPSBuZXcgQXJyYXkoc2FtcGxlcyk7CiAgICBmb3IgKGxldCBpID0gMDsgaSA8IHNhbXBsZXM7IGkrKykgewogICAgICAgIGNvbnN0IHNhbXBsZUJsb2NrTnVtYmVyID0gKDAsIGNsaWVudF8xLnN1YikoaW5wdXRzLmJsb2NrTnVtYmVyLCAoMCwgY2xpZW50XzEubXVsKShzcGFjaW5nLCBpKSk7CiAgICAgICAgY29uc3QgYWNjb3VudCA9ICgwLCBjbGllbnRfMS5nZXRBY2NvdW50KShzYW1wbGVCbG9ja051bWJlciwgaW5wdXRzLmFkZHJlc3MpOwogICAgICAgIHNhbXBsZWRBY2NvdW50c1tpXSA9IGFjY291bnQ7CiAgICB9CiAgICAvLyBBY2N1bXVsYXRlIGFsbCBvZiB0aGUgYmFsYW5jZXMgdG8gYHRvdGFsYAogICAgbGV0IHRvdGFsID0gKDAsIGNsaWVudF8xLndpdG5lc3MpKDApOwogICAgZm9yIChjb25zdCBhY2NvdW50IG9mIHNhbXBsZWRBY2NvdW50cykgewogICAgICAgIGNvbnN0IGJhbGFuY2UgPSBhd2FpdCBhY2NvdW50LmJhbGFuY2UoKTsKICAgICAgICB0b3RhbCA9ICgwLCBjbGllbnRfMS5hZGQpKHRvdGFsLCBiYWxhbmNlLmxvKCkpOwogICAgfQogICAgLy8gRGl2aWRlIHRoZSB0b3RhbCBhbW91bnQgYnkgdGhlIG51bWJlciBvZiBzYW1wbGVzIHRvIGdldCB0aGUgYXZlcmFnZSB2YWx1ZQogICAgY29uc3QgYXZlcmFnZSA9ICgwLCBjbGllbnRfMS5kaXYpKHRvdGFsLCBzYW1wbGVzKTsKICAgIC8vIFdlIGNhbGwgYGFkZFRvQ2FsbGJhY2tgIG9uIGFsbCB2YWx1ZXMgdGhhdCB3ZSB3b3VsZCBsaWtlIHRvIGJlIHBhc3NlZCB0byBvdXIgY29udHJhY3QgYWZ0ZXIgdGhlIGNpcmN1aXQgaGFzCiAgICAvLyBiZWVuIHByb3ZlbiBpbiBaSy4gVGhlIHZhbHVlcyBjYW4gdGhlbiBiZSBoYW5kbGVkIGJ5IG91ciBjb250cmFjdCBvbmNlIHRoZSBwcm92ZXIgY2FsbHMgdGhlIGNhbGxiYWNrIGZ1bmN0aW9uLgogICAgKDAsIGNsaWVudF8xLmFkZFRvQ2FsbGJhY2spKGlucHV0cy5ibG9ja051bWJlcik7CiAgICAoMCwgY2xpZW50XzEuYWRkVG9DYWxsYmFjaykoaW5wdXRzLmFkZHJlc3MpOwogICAgKDAsIGNsaWVudF8xLmFkZFRvQ2FsbGJhY2spKGF2ZXJhZ2UpOwp9"
 }

app/index.ts

@@ -24,6 +24,12 @@ const axiomMain = async (input: UserInput<CircuitInputs>) => {
     privateKey: process.env.PRIVATE_KEY_SEPOLIA as string,
     mock: false,
   });
+  axiom.setParams({
+    callback: {
+      target: "0x4A4e2D8f3fBb3525aD61db7Fc843c9bf097c362e",
+      extraData: "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+  })
   await axiom.init();
   const args = await axiom.prove(input);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "axiom-quickstart",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Axiom Quickstart",
   "main": "index.js",
   "scripts": {
@@ -10,8 +10,7 @@
   "author": "Intrinsic Technologies",
   "license": "ISC",
   "dependencies": {
-    "@axiom-crypto/client": "0.2.2-rc2.2-alpha.1",
-    "@axiom-crypto/core": "2.3.0-rc2.2",
+    "@axiom-crypto/client": "0.2.2-rc2.2",
     "dotenv": "^16.3.1",
     "ethers": "^6.10.0"
   },