@aztec/aztec.js 0.1.0-alpha23 → 0.1.0-alpha25

package/dest/utils/account.js

@@ -1,26 +1,23 @@
-import { CircuitsWasm, Fr, getContractDeploymentInfo } from '@aztec/circuits.js';
+import { Fr, getContractDeploymentInfo } from '@aztec/circuits.js';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { TxStatus } from '@aztec/types';
-import { SchnorrAccountContractAbi } from '@aztec/noir-contracts/examples';
-import { Schnorr } from '@aztec/circuits.js/barretenberg';
 import { AccountWallet } from '../aztec_rpc_client/wallet.js';
-import { AccountCollection, AccountContract, ContractDeployer, SchnorrAuthProvider, generatePublicKey, } from '../index.js';
+import { AccountCollection, ContractDeployer, SingleKeyAccountContract, generatePublicKey } from '../index.js';
 /**
  * Creates an Aztec Account.
  * @returns The account's address & public key.
  */
-export async function createAccounts(aztecRpcClient, privateKey, salt = Fr.random(), numberOfAccounts = 1, logger = createDebugLogger('aztec:aztec.js:accounts')) {
-    const accountAbi = SchnorrAccountContractAbi;
+export async function createAccounts(aztecRpcClient, accountContractAbi, privateKey, salt = Fr.random(), numberOfAccounts = 1, logger = createDebugLogger('aztec:aztec.js:accounts')) {
     const accountImpls = new AccountCollection();
-    const wasm = await CircuitsWasm.get();
     for (let i = 0; i < numberOfAccounts; ++i) {
         // TODO(#662): Let the aztec rpc server generate the keypair rather than hardcoding the private key
         const privKey = i == 0 && privateKey ? privateKey : randomBytes(32);
         const publicKey = await generatePublicKey(privKey);
-        const deploymentInfo = await getContractDeploymentInfo(accountAbi, [], salt, publicKey);
-        await aztecRpcClient.addAccount(privKey, deploymentInfo.address, deploymentInfo.partialAddress, accountAbi);
-        const contractDeployer = new ContractDeployer(accountAbi, aztecRpcClient, publicKey);
+        const deploymentInfo = await getContractDeploymentInfo(accountContractAbi, [], salt, publicKey);
+        await aztecRpcClient.addAccount(privKey, deploymentInfo.address, deploymentInfo.partialAddress);
+        const contractDeployer = new ContractDeployer(accountContractAbi, aztecRpcClient, publicKey);
         const tx = contractDeployer.deploy().send({ contractAddressSalt: salt });
         await tx.isMined(0, 0.5);
         const receipt = await tx.getReceipt();
@@ -32,7 +29,7 @@ export async function createAccounts(aztecRpcClient, privateKey, salt = Fr.rando
             throw new Error(`Deployment address does not match for account contract (expected ${deploymentInfo.address.toString()} got ${address.toString()})`);
         }
         logger(`Created account ${address.toString()} with public key ${publicKey.toString()}`);
-        accountImpls.registerAccount(address, new AccountContract(address, publicKey, new SchnorrAuthProvider(await Schnorr.new(), privKey), deploymentInfo.partialAddress, accountAbi, wasm));
+        accountImpls.registerAccount(address, new SingleKeyAccountContract(address, deploymentInfo.partialAddress, privKey, await Schnorr.new()));
     }
     return new AccountWallet(aztecRpcClient, accountImpls);
 }
@@ -42,13 +39,12 @@ export async function createAccounts(aztecRpcClient, privateKey, salt = Fr.rando
  * @param numberOfAccounts - The number of accounts to fetch.
  * @returns An AccountWallet implementation that includes all the accounts found.
  */
-export async function getAccountWallet(aztecRpcClient, privateKey, salt) {
-    const wasm = await CircuitsWasm.get();
+export async function getAccountWallet(aztecRpcClient, accountContractAbi, privateKey, salt) {
     const accountCollection = new AccountCollection();
     const publicKey = await generatePublicKey(privateKey);
-    const address = await aztecRpcClient.getAccountAddress(publicKey);
-    const deploymentInfo = await getContractDeploymentInfo(SchnorrAccountContractAbi, [], salt, publicKey);
-    accountCollection.registerAccount(address, new AccountContract(address, publicKey, new SchnorrAuthProvider(await Schnorr.new(), privateKey), deploymentInfo.partialAddress, SchnorrAccountContractAbi, wasm));
+    const deploymentInfo = await getContractDeploymentInfo(accountContractAbi, [], salt, publicKey);
+    const address = deploymentInfo.address;
+    accountCollection.registerAccount(address, new SingleKeyAccountContract(address, deploymentInfo.partialAddress, privateKey, await Schnorr.new()));
     return new AccountWallet(aztecRpcClient, accountCollection);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDakYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBWSxRQUFRLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDM0UsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTFELE9BQU8sRUFBRSxhQUFhLEVBQVUsTUFBTSwrQkFBK0IsQ0FBQztBQUN0RSxPQUFPLEVBQ0wsaUJBQWlCLEVBQ2pCLGVBQWUsRUFDZixnQkFBZ0IsRUFDaEIsbUJBQW1CLEVBQ25CLGlCQUFpQixHQUNsQixNQUFNLGFBQWEsQ0FBQztBQUVyQjs7O0dBR0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGNBQWMsQ0FDbEMsY0FBd0IsRUFDeEIsVUFBbUIsRUFDbkIsSUFBSSxHQUFHLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFDbEIsZ0JBQWdCLEdBQUcsQ0FBQyxFQUNwQixNQUFNLEdBQUcsaUJBQWlCLENBQUMseUJBQXlCLENBQUM7SUFFckQsTUFBTSxVQUFVLEdBQUcseUJBQXlCLENBQUM7SUFDN0MsTUFBTSxZQUFZLEdBQUcsSUFBSSxpQkFBaUIsRUFBRSxDQUFDO0lBQzdDLE1BQU0sSUFBSSxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3RDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxnQkFBZ0IsRUFBRSxFQUFFLENBQUMsRUFBRTtRQUN6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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBWSxRQUFRLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFbEQsT0FBTyxFQUFFLGFBQWEsRUFBVSxNQUFNLCtCQUErQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxnQkFBZ0IsRUFBRSx3QkFBd0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUUvRzs7O0dBR0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGNBQWMsQ0FDbEMsY0FBd0IsRUFDeEIsa0JBQStCLEVBQy9CLFVBQW1CLEVBQ25CLElBQUksR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQ2xCLGdCQUFnQixHQUFHLENBQUMsRUFDcEIsTUFBTSxHQUFHLGlCQUFpQixDQUFDLHlCQUF5QixDQUFDO0lBRXJELE1BQU0sWUFBWSxHQUFHLElBQUksaUJBQWlCLEVBQUUsQ0FBQztJQUU3QyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDLEVBQUU7UUFDekMsbUdBQW1HO1FBQ25HLE1BQU0sT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksVUFBVSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNwRSxNQUFNLFNBQVMsR0FBRyxNQUFN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

package/dest/utils/l1_contracts.d.ts

@@ -15,6 +15,14 @@ export type L1ContractAddresses = {
      * Address of the L1/L2 messaging inbox contract.
      */
     inbox: EthAddress;
+    /**
+     * Address of the L1/L2 messaging outbox contract.
+     */
+    outbox: EthAddress;
+    /**
+     * Address of the decoder helper contract
+     */
+    decoderHelper?: EthAddress;
     /**
      * Registry Address.
      */

package/dest/utils/l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,yBAAyB,EAAE,UAAU,CAAC;IACtC;;OAEG;IACH,KAAK,EAAE,UAAU,CAAC;IAElB;;OAEG;IACH,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AASF,eAAO,MAAM,sBAAsB,QAAe,MAAM,KAAG,QAAQ,mBAAmB,CAOrF,CAAC"}
+{"version":3,"file":"l1_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/l1_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,yBAAyB,EAAE,UAAU,CAAC;IACtC;;OAEG;IACH,KAAK,EAAE,UAAU,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,UAAU,CAAC;IAE3B;;OAEG;IACH,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AASF,eAAO,MAAM,sBAAsB,QAAe,MAAM,KAAG,QAAQ,mBAAmB,CAkBrF,CAAC"}

package/dest/utils/l1_contracts.js

@@ -1,8 +1,16 @@
 import { EthAddress } from '@aztec/circuits.js';
+import { retryUntil } from '@aztec/foundation/retry';
 export const getL1ContractAddresses = async (url) => {
     const reqUrl = new URL(`${url}/api/l1-contract-addresses`);
-    const response = (await (await fetch(reqUrl.toString())).json());
+    const response = await retryUntil(async () => {
+        try {
+            return (await (await fetch(reqUrl.toString())).json());
+        }
+        catch (err) {
+            // do nothing
+        }
+    }, 'isSandboxReady', 120, 1);
     const result = Object.fromEntries(Object.entries(response).map(([key, value]) => [key, EthAddress.fromString(value)]));
     return result;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2wxX2NvbnRyYWN0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFnQ2hELE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFHLEtBQUssRUFBRSxHQUFXLEVBQWdDLEVBQUU7SUFDeEYsTUFBTSxNQUFNLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxHQUFHLDRCQUE0QixDQUFDLENBQUM7SUFDM0QsTUFBTSxRQUFRLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBdUMsQ0FBQztJQUN2RyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsV0FBVyxDQUMvQixNQUFNLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDcEYsQ0FBQztJQUNGLE9BQU8sTUFBNkIsQ0FBQztBQUN2QyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2wxX2NvbnRyYWN0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBd0NyRCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxLQUFLLEVBQUUsR0FBVyxFQUFnQyxFQUFFO0lBQ3hGLE1BQU0sTUFBTSxHQUFHLElBQUksR0FBRyxDQUFDLEdBQUcsR0FBRyw0QkFBNEIsQ0FBQyxDQUFDO0lBQzNELE1BQU0sUUFBUSxHQUFHLE1BQU0sVUFBVSxDQUMvQixLQUFLLElBQUksRUFBRTtRQUNULElBQUk7WUFDRixPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQXVDLENBQUM7U0FDOUY7UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNaLGFBQWE7U0FDZDtJQUNILENBQUMsRUFDRCxnQkFBZ0IsRUFDaEIsR0FBRyxFQUNILENBQUMsQ0FDRixDQUFDO0lBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FDL0IsTUFBTSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ3BGLENBQUM7SUFDRixPQUFPLE1BQTZCLENBQUM7QUFDdkMsQ0FBQyxDQUFDIn0=

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@aztec/aztec.js",
-  "version": "0.1.0-alpha23",
+  "version": "0.1.0-alpha25",
   "exports": "./dest/index.js",
   "type": "module",
   "dependencies": {
-    "@aztec/circuits.js": "0.1.0-alpha23",
-    "@aztec/foundation": "0.1.0-alpha23",
-    "@aztec/noir-contracts": "0.1.0-alpha23",
-    "@aztec/types": "0.1.0-alpha23",
+    "@aztec/circuits.js": "0.1.0-alpha25",
+    "@aztec/foundation": "0.1.0-alpha25",
+    "@aztec/types": "0.1.0-alpha25",
     "tslib": "^2.4.0"
   }
 }

package/src/abis/ecdsa_account_contract.json

@@ -0,0 +1,150 @@
+{
+  "name": "EcdsaAccount",
+  "functions": [
+    {
+      "name": "constructor",
+      "functionType": "secret",
+      "parameters": [
+        {
+          "name": "signing_pub_key_x",
+          "type": {
+            "kind": "array",
+            "length": 32,
+            "type": {
+              "kind": "integer",
+              "sign": "unsigned",
+              "width": 8
+            }
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "signing_pub_key_y",
+          "type": {
+            "kind": "array",
+            "length": 32,
+            "type": {
+              "kind": "integer",
+              "sign": "unsigned",
+              "width": 8
+            }
+          },
+          "visibility": "public"
+        }
+      ],
+      "returnTypes": []
+    },
+    {
+      "name": "entrypoint",
+      "functionType": "secret",
+      "parameters": [
+        {
+          "name": "payload",
+          "type": {
+            "kind": "struct",
+            "fields": [
+              {
+                "name": "flattened_args_hashes",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "flattened_selectors",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "flattened_targets",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "nonce",
+                "type": {
+                  "kind": "field"
+                }
+              }
+            ]
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "signature",
+          "type": {
+            "kind": "array",
+            "length": 64,
+            "type": {
+              "kind": "integer",
+              "sign": "unsigned",
+              "width": 8
+            }
+          },
+          "visibility": "public"
+        }
+      ],
+      "returnTypes": []
+    },
+    {
+      "name": "stev",
+      "functionType": "unconstrained",
+      "parameters": [
+        {
+          "name": "contract_address",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "private"
+        },
+        {
+          "name": "nonce",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "private"
+        },
+        {
+          "name": "storage_slot",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "private"
+        },
+        {
+          "name": "preimage",
+          "type": {
+            "kind": "array",
+            "length": 5,
+            "type": {
+              "kind": "field"
+            }
+          },
+          "visibility": "private"
+        }
+      ],
+      "returnTypes": [
+        {
+          "kind": "array",
+          "length": 4,
+          "type": {
+            "kind": "field"
+          }
+        }
+      ]
+    }
+  ]
+}

package/src/abis/schnorr_account_contract.json

@@ -0,0 +1,96 @@
+{
+  "name": "SchnorrAccount",
+  "functions": [
+    {
+      "name": "constructor",
+      "functionType": "secret",
+      "parameters": [],
+      "returnTypes": []
+    },
+    {
+      "name": "entrypoint",
+      "functionType": "secret",
+      "parameters": [
+        {
+          "name": "payload",
+          "type": {
+            "kind": "struct",
+            "fields": [
+              {
+                "name": "flattened_args_hashes",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "flattened_selectors",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "flattened_targets",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "nonce",
+                "type": {
+                  "kind": "field"
+                }
+              }
+            ]
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "owner",
+          "type": {
+            "kind": "array",
+            "length": 64,
+            "type": {
+              "kind": "integer",
+              "sign": "unsigned",
+              "width": 8
+            }
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "signature",
+          "type": {
+            "kind": "array",
+            "length": 64,
+            "type": {
+              "kind": "integer",
+              "sign": "unsigned",
+              "width": 8
+            }
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "partial_address",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "public"
+        }
+      ],
+      "returnTypes": []
+    }
+  ]
+}

package/src/abis/schnorr_single_key_account_contract.json

@@ -0,0 +1,96 @@
+{
+  "name": "SchnorrSingleKeyAccount",
+  "functions": [
+    {
+      "name": "constructor",
+      "functionType": "secret",
+      "parameters": [],
+      "returnTypes": []
+    },
+    {
+      "name": "entrypoint",
+      "functionType": "secret",
+      "parameters": [
+        {
+          "name": "payload",
+          "type": {
+            "kind": "struct",
+            "fields": [
+              {
+                "name": "flattened_args_hashes",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "flattened_selectors",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "flattened_targets",
+                "type": {
+                  "kind": "array",
+                  "length": 2,
+                  "type": {
+                    "kind": "field"
+                  }
+                }
+              },
+              {
+                "name": "nonce",
+                "type": {
+                  "kind": "field"
+                }
+              }
+            ]
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "owner",
+          "type": {
+            "kind": "array",
+            "length": 64,
+            "type": {
+              "kind": "integer",
+              "sign": "unsigned",
+              "width": 8
+            }
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "signature",
+          "type": {
+            "kind": "array",
+            "length": 64,
+            "type": {
+              "kind": "integer",
+              "sign": "unsigned",
+              "width": 8
+            }
+          },
+          "visibility": "public"
+        },
+        {
+          "name": "partial_address",
+          "type": {
+            "kind": "field"
+          },
+          "visibility": "public"
+        }
+      ],
+      "returnTypes": []
+    }
+  ]
+}

package/src/account_impl/account_collection.ts

@@ -1,5 +1,6 @@
 import { AztecAddress, TxContext } from '@aztec/circuits.js';
 import { ExecutionRequest, TxExecutionRequest } from '@aztec/types';
+
 import { AccountImplementation } from './index.js';
 
 /**

package/src/account_impl/entrypoint_payload.ts

@@ -0,0 +1,76 @@
+import { CircuitsWasm, Fr } from '@aztec/circuits.js';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { sha256 } from '@aztec/foundation/crypto';
+import { ExecutionRequest, PackedArguments, emptyExecutionRequest } from '@aztec/types';
+
+const ACCOUNT_MAX_PRIVATE_CALLS = 1;
+const ACCOUNT_MAX_PUBLIC_CALLS = 1;
+
+/** Encoded payload for the account contract entrypoint */
+export type EntrypointPayload = {
+  // eslint-disable-next-line camelcase
+  /** Concatenated arguments for every call */
+  flattened_args_hashes: Fr[];
+  // eslint-disable-next-line camelcase
+  /** Concatenated selectors for every call */
+  flattened_selectors: Fr[];
+  // eslint-disable-next-line camelcase
+  /** Concatenated target addresses for every call */
+  flattened_targets: Fr[];
+  /** A nonce for replay protection */
+  nonce: Fr;
+};
+
+/** Assembles an entrypoint payload from a set of private and public function calls */
+export async function buildPayload(
+  privateCalls: ExecutionRequest[],
+  publicCalls: ExecutionRequest[],
+): Promise<{
+  /** The payload for the entrypoint function */
+  payload: EntrypointPayload;
+  /** The packed arguments of functions called */
+  packedArguments: PackedArguments[];
+}> {
+  const nonce = Fr.random();
+
+  const calls = [
+    ...padArrayEnd(privateCalls, emptyExecutionRequest(), ACCOUNT_MAX_PRIVATE_CALLS),
+    ...padArrayEnd(publicCalls, emptyExecutionRequest(), ACCOUNT_MAX_PUBLIC_CALLS),
+  ];
+
+  const packedArguments = [];
+  const wasm = await CircuitsWasm.get();
+
+  for (const call of calls) {
+    packedArguments.push(await PackedArguments.fromArgs(call.args, wasm));
+  }
+
+  return {
+    payload: {
+      // eslint-disable-next-line camelcase
+      flattened_args_hashes: packedArguments.map(args => args.hash),
+      // eslint-disable-next-line camelcase
+      flattened_selectors: calls.map(call => Fr.fromBuffer(call.functionData.functionSelectorBuffer)),
+      // eslint-disable-next-line camelcase
+      flattened_targets: calls.map(call => call.to.toField()),
+      nonce,
+    },
+    packedArguments,
+  };
+}
+
+/** Hashes an entrypoint payload (useful for signing) */
+export function hashPayload(payload: EntrypointPayload) {
+  // TODO: Switch to keccak when avaiable in Noir
+  return sha256(Buffer.concat(flattenPayload(payload).map(fr => fr.toBuffer())));
+}
+
+/** Flattens an entrypoint payload */
+export function flattenPayload(payload: EntrypointPayload) {
+  return [
+    ...payload.flattened_args_hashes,
+    ...payload.flattened_selectors,
+    ...payload.flattened_targets,
+    payload.nonce,
+  ];
+}

package/src/account_impl/index.ts

@@ -1,7 +1,8 @@
 import { AztecAddress, TxContext } from '@aztec/circuits.js';
 import { ExecutionRequest, TxExecutionRequest } from '@aztec/types';
 
-export * from './account_contract.js';
+export * from './single_key_account_contract.js';
+export * from './stored_key_account_contract.js';
 export * from './account_collection.js';
 
 /** Represents an implementation for a user account contract. Knows how to encode and sign a tx for that particular implementation. */

package/src/account_impl/single_key_account_contract.ts

@@ -0,0 +1,82 @@
+import { AztecAddress, CircuitsWasm, FunctionData, PartialContractAddress, TxContext } from '@aztec/circuits.js';
+import { Signer } from '@aztec/circuits.js/barretenberg';
+import { ContractAbi, encodeArguments, generateFunctionSelector } from '@aztec/foundation/abi';
+import { ExecutionRequest, PackedArguments, TxExecutionRequest } from '@aztec/types';
+
+import partition from 'lodash.partition';
+
+import SchnorrSingleKeyAccountContractAbi from '../abis/schnorr_account_contract.json' assert { type: 'json' };
+import { generatePublicKey } from '../index.js';
+import { buildPayload, hashPayload } from './entrypoint_payload.js';
+import { AccountImplementation } from './index.js';
+
+/**
+ * Account contract implementation that uses a single key for signing and encryption. This public key is not
+ * stored in the contract, but rather verified against the contract address. Note that this approach is not
+ * secure and should not be used in real use cases.
+ */
+export class SingleKeyAccountContract implements AccountImplementation {
+  constructor(
+    private address: AztecAddress,
+    private partialContractAddress: PartialContractAddress,
+    private privateKey: Buffer,
+    private signer: Signer,
+  ) {}
+
+  getAddress(): AztecAddress {
+    return this.address;
+  }
+
+  async createAuthenticatedTxRequest(
+    executions: ExecutionRequest[],
+    txContext: TxContext,
+  ): Promise<TxExecutionRequest> {
+    this.checkSender(executions);
+    this.checkIsNotDeployment(txContext);
+
+    const [privateCalls, publicCalls] = partition(executions, exec => exec.functionData.isPrivate);
+    const wasm = await CircuitsWasm.get();
+    const { payload, packedArguments: callsPackedArguments } = await buildPayload(privateCalls, publicCalls);
+    const hash = hashPayload(payload);
+
+    const signature = this.signer.constructSignature(hash, this.privateKey).toBuffer();
+    const publicKey = await generatePublicKey(this.privateKey);
+    const args = [payload, publicKey.toBuffer(), signature, this.partialContractAddress];
+    const abi = this.getEntrypointAbi();
+    const selector = generateFunctionSelector(abi.name, abi.parameters);
+    const packedArgs = await PackedArguments.fromArgs(encodeArguments(abi, args), wasm);
+    const txRequest = TxExecutionRequest.from({
+      argsHash: packedArgs.hash,
+      origin: this.address,
+      functionData: new FunctionData(selector, true, false),
+      txContext,
+      packedArguments: [...callsPackedArguments, packedArgs],
+    });
+
+    return txRequest;
+  }
+
+  private getEntrypointAbi() {
+    // We use the SchnorrSingleKeyAccountContract because it implements the interface we need, but ideally
+    // we should have an interface that defines the entrypoint for SingleKeyAccountContracts and
+    // load the abi from it.
+    const abi = (SchnorrSingleKeyAccountContractAbi as any as ContractAbi).functions.find(f => f.name === 'entrypoint');
+    if (!abi) throw new Error(`Entrypoint abi for account contract not found`);
+    return abi;
+  }
+
+  private checkIsNotDeployment(txContext: TxContext) {
+    if (txContext.isContractDeploymentTx) {
+      throw new Error(`Cannot yet deploy contracts from an account contract`);
+    }
+  }
+
+  private checkSender(executions: ExecutionRequest[]) {
+    const wrongSender = executions.find(e => !e.from.equals(this.address));
+    if (wrongSender) {
+      throw new Error(
+        `Sender ${wrongSender.from.toString()} does not match account address ${this.address.toString()}`,
+      );
+    }
+  }
+}