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

package/dest/contract_deployer/deploy_method.js

@@ -1,5 +1,4 @@
-import { getContractDeploymentInfo } from '@aztec/aztec-rpc';
-import { CircuitsWasm, ContractDeploymentData, TxContext } from '@aztec/circuits.js';
+import { CircuitsWasm, ContractDeploymentData, TxContext, getContractDeploymentInfo, } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -111,4 +110,4 @@ export class DeployMethod extends ContractFunctionInteraction {
         return new Contract(this.completeContractAddress, this.abi, withWallet);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdF9kZXBsb3llci9kZXBsb3lfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBWSx5QkFBeUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsc0JBQXNCLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUMsT0FBTyxFQUFvQixlQUFlLEVBQThCLGtCQUFrQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ2pILE9BQU8sRUFBRSxVQUFVLEVBQVUsTUFBTSwrQkFBK0IsQ0FBQztBQUNuRSxPQUFPLEVBQUUsUUFBUSxFQUFFLDJCQUEyQixFQUFxQixNQUFNLHNCQUFzQixDQUFDO0FBaUJoRzs7R0FFRztBQUNILE1BQU0sY0FBZSxTQUFRLFVBQVU7SUFDckMsVUFBVTtRQUNSLE9BQU8sWUFBWSxDQUFDLElBQUksQ0FBQztJQUMzQixDQUFDO0lBQ0QsS0FBSyxDQUFDLDRCQUE0QixDQUNoQyxVQUE4QixFQUM5QixTQUFvQjtRQUVwQixJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1lBQzNCLE1BQU0sSUFBSSxLQUFLLENBQUMsbUVBQW1FLFVBQVUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDO1NBQzFHO1FBQ0QsTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFHLFVBQVUsQ0FBQztRQUMvQixNQUFNLElBQUksR0FBRyxNQUFNLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUN0QyxNQUFNLGVBQWUsR0FBRyxNQUFNLGVBQWUsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdF9kZXBsb3llci9kZXBsb3lfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxZQUFZLEVBQ1osc0JBQXNCLEVBRXRCLFNBQVMsRUFDVCx5QkFBeUIsR0FDMUIsTUFBTSxvQkFBb0IsQ0FBQztBQUU1QixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDL0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQThCLGVBQWUsRUFBaUIsa0JBQWtCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFOUcsT0FBTyxFQUFFLFVBQVUsRUFBVSxNQUFNLCtCQUErQixDQUFDO0FBQ25FLE9BQU8sRUFBRSxRQUFRLEVBQUUsMkJBQTJCLEVBQXFCLE1BQU0sc0JBQXNCLENBQUM7QUFpQmhHOztHQUVHO0FBQ0gsTUFBTSxjQUFlLFNBQVEsVUFBVTtJQUNyQyxVQUFVO1FBQ1IsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDO0lBQzNCLENBQUM7SUFDRCxLQUFLLENBQUMsNEJBQTRCLENBQ2hDLFVBQThCLEVBQzlCLFNBQW9CO1FBRXBCLElBQUksVUFBVSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7WUFDM0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxtRUFBbUUsVUFBVSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7U0FDMUc7UUFDRCxNQUFNLENBQUMsU0FBUyxDQUFDLEdBQUcsVUFBVSxDQUFDO1FBQy9CLE1BQU0sSUFBSSxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ3RDLE1BQU0sZUFBZSxHQUFHLE1BQU0sZUFBZSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFF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

package/dest/index.d.ts

@@ -4,5 +4,6 @@ export * from './utils/index.js';
 export * from './aztec_rpc_client/index.js';
 export * from './auth/index.js';
 export * from './account_impl/index.js';
-export * from '@aztec/aztec-rpc';
+export { AztecAddress, EthAddress, Point, Fr } from '@aztec/circuits.js';
+export { AztecRPC } from '@aztec/types';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AAGxC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AAKxC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC"}

package/dest/index.js

@@ -5,5 +5,6 @@ export * from './aztec_rpc_client/index.js';
 export * from './auth/index.js';
 export * from './account_impl/index.js';
 // TODO - only export necessary stuffs
-export * from '@aztec/aztec-rpc';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMseUJBQXlCLENBQUM7QUFFeEMsc0NBQXNDO0FBQ3RDLGNBQWMsa0JBQWtCLENBQUMifQ==
+// export * from '@aztec/aztec-rpc';
+export { AztecAddress, EthAddress, Point, Fr } from '@aztec/circuits.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMseUJBQXlCLENBQUM7QUFFeEMsc0NBQXNDO0FBQ3RDLG9DQUFvQztBQUVwQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUMifQ==

package/dest/utils/account.d.ts

@@ -1,9 +1,17 @@
 /// <reference types="node" resolution-mode="require"/>
-import { AztecRPC } from '@aztec/aztec-rpc';
-import { Wallet } from '../aztec_rpc_client/wallet.js';
+import { Fr } from '@aztec/circuits.js';
+import { AztecRPC } from '@aztec/types';
+import { AccountWallet, Wallet } from '../aztec_rpc_client/wallet.js';
 /**
  * Creates an Aztec Account.
  * @returns The account's address & public key.
  */
-export declare function createAccounts(aztecRpcClient: AztecRPC, privateKey?: Buffer, numberOfAccounts?: number, logger?: import("@aztec/foundation/log").DebugLogger): Promise<Wallet>;
+export declare function createAccounts(aztecRpcClient: AztecRPC, privateKey?: Buffer, salt?: Fr, numberOfAccounts?: number, logger?: import("@aztec/foundation/log").DebugLogger): Promise<Wallet>;
+/**
+ * Gets the Aztec accounts that are stored in an Aztec RPC instance.
+ * @param aztecRpcClient - An instance of the Aztec RPC interface.
+ * @param numberOfAccounts - The number of accounts to fetch.
+ * @returns An AccountWallet implementation that includes all the accounts found.
+ */
+export declare function getAccountWallet(aztecRpcClient: AztecRPC, privateKey: Buffer, salt: Fr): Promise<AccountWallet>;
 //# sourceMappingURL=account.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/utils/account.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAuC,MAAM,kBAAkB,CAAC;AAKjF,OAAO,EAAiB,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAStE;;;GAGG;AACH,wBAAsB,cAAc,CAClC,cAAc,EAAE,QAAQ,EACxB,UAAU,CAAC,EAAE,MAAM,EACnB,gBAAgB,SAAI,EACpB,MAAM,8CAA+C,GACpD,OAAO,CAAC,MAAM,CAAC,CAmCjB"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/utils/account.ts"],"names":[],"mappings":";AAAA,OAAO,EAAgB,EAAE,EAA6B,MAAM,oBAAoB,CAAC;AAGjF,OAAO,EAAE,QAAQ,EAAY,MAAM,cAAc,CAAC;AAIlD,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAStE;;;GAGG;AACH,wBAAsB,cAAc,CAClC,cAAc,EAAE,QAAQ,EACxB,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,KAAc,EAClB,gBAAgB,SAAI,EACpB,MAAM,8CAA+C,GACpD,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,0BAmB5F"}

package/dest/utils/account.js

@@ -1,38 +1,54 @@
-import { TxStatus, getContractDeploymentInfo } from '@aztec/aztec-rpc';
-import { CircuitsWasm, Fr } from '@aztec/circuits.js';
+import { CircuitsWasm, Fr, getContractDeploymentInfo } from '@aztec/circuits.js';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { EcdsaAccountContractAbi } from '@aztec/noir-contracts/examples';
+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, EcdsaAuthProvider, generatePublicKey, } from '../index.js';
+import { AccountCollection, AccountContract, ContractDeployer, SchnorrAuthProvider, generatePublicKey, } from '../index.js';
 /**
  * Creates an Aztec Account.
  * @returns The account's address & public key.
  */
-export async function createAccounts(aztecRpcClient, privateKey, numberOfAccounts = 1, logger = createDebugLogger('aztec:aztec.js:accounts')) {
+export async function createAccounts(aztecRpcClient, privateKey, salt = Fr.random(), numberOfAccounts = 1, logger = createDebugLogger('aztec:aztec.js:accounts')) {
+    const accountAbi = SchnorrAccountContractAbi;
     const accountImpls = new AccountCollection();
-    const results = [];
     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 accountAbi = EcdsaAccountContractAbi;
         const publicKey = await generatePublicKey(privKey);
-        const salt = Fr.random();
         const deploymentInfo = await getContractDeploymentInfo(accountAbi, [], salt, publicKey);
         await aztecRpcClient.addAccount(privKey, deploymentInfo.address, deploymentInfo.partialAddress, accountAbi);
         const contractDeployer = new ContractDeployer(accountAbi, aztecRpcClient, publicKey);
         const tx = contractDeployer.deploy().send({ contractAddressSalt: salt });
-        await tx.isMined(0, 0.1);
+        await tx.isMined(0, 0.5);
         const receipt = await tx.getReceipt();
         if (receipt.status !== TxStatus.MINED) {
             throw new Error(`Deployment tx not mined (status is ${receipt.status})`);
         }
         const address = receipt.contractAddress;
+        if (!address.equals(deploymentInfo.address)) {
+            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 EcdsaAuthProvider(privKey), deploymentInfo.partialAddress, accountAbi, wasm));
-        results.push([address, publicKey]);
+        accountImpls.registerAccount(address, new AccountContract(address, publicKey, new SchnorrAuthProvider(await Schnorr.new(), privKey), deploymentInfo.partialAddress, accountAbi, wasm));
     }
     return new AccountWallet(aztecRpcClient, accountImpls);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBWSxRQUFRLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNqRixPQUFPLEVBQWdCLFlBQVksRUFBRSxFQUFFLEVBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUMzRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekUsT0FBTyxFQUFFLGFBQWEsRUFBVSxNQUFNLCtCQUErQixDQUFDO0FBQ3RFLE9BQU8sRUFDTCxpQkFBaUIsRUFDakIsZUFBZSxFQUNmLGdCQUFnQixFQUNoQixpQkFBaUIsRUFDakIsaUJBQWlCLEdBQ2xCLE1BQU0sYUFBYSxDQUFDO0FBRXJCOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsY0FBYyxDQUNsQyxjQUF3QixFQUN4QixVQUFtQixFQUNuQixnQkFBZ0IsR0FBRyxDQUFDLEVBQ3BCLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQyx5QkFBeUIsQ0FBQztJQUVyRCxNQUFNLFlBQVksR0FBRyxJQUFJLGlCQUFpQixFQUFFLENBQUM7SUFDN0MsTUFBTSxPQUFPLEdBQTRCLEVBQUUsQ0FBQztJQUM1QyxNQUFNLElBQUksR0FBRyxNQUFNLFlBQVksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUN0QyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsZ0JBQWdCLEVBQUUsRUFBRSxDQUFDLEVBQUU7UUFDekMsbUdBQW1HO1FBQ25HLE1BQU0sT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksVUFBVSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNwRSxNQUFNLFVBQVUsR0FBRyx1QkFBdUIsQ0FBQztRQUMzQyxNQUFNLFNBQVMsR0FBRyxNQUFNLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ25ELE1BQU0sSUFBSSxHQUFHLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUN6QixNQUFNLGNBQWMsR0FBRyxNQUFNLHlCQUF5QixDQUFDLFVBQVUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3hGLE1BQU0sY0FBYyxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsY0FBYyxDQUFDLE9BQU8sRUFBRSxjQUFjLENBQUMsY0FBYyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQzVHLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsY0FBYyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3JGLE1BQU0sRUFBRSxHQUFHLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDekUsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUN6QixNQUFNLE9BQU8sR0FBRyxNQUFNLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUN0QyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLEtBQUssRUFBRTtZQUNyQyxNQUFNLElBQUksS0FBSyxDQUFDLHNDQUFzQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztTQUMxRTtRQUNELE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxlQUFnQixDQUFDO1FBQ3pDLE1BQU0sQ0FBQyxtQkFBbUIsT0FBTyxDQUFDLFFBQVEsRUFBRSxvQkFBb0IsU0FBUyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN4RixZQUFZLENBQUMsZUFBZSxDQUMxQixPQUFPLEVBQ1AsSUFBSSxlQUFlLENBQ2pCLE9BQU8sRUFDUCxTQUFTLEVBQ1QsSUFBSSxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsRUFDOUIsY0FBYyxDQUFDLGNBQWMsRUFDN0IsVUFBVSxFQUNWLElBQUksQ0FDTCxDQUNGLENBQUM7UUFDRixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7S0FDcEM7SUFDRCxPQUFPLElBQUksYUFBYSxDQUFDLGNBQWMsRUFBRSxZQUFZLENBQUMsQ0FBQztBQUN6RCxDQUFDIn0=
+/**
+ * Gets the Aztec accounts that are stored in an Aztec RPC instance.
+ * @param aztecRpcClient - An instance of the Aztec RPC interface.
+ * @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();
+    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));
+    return new AccountWallet(aztecRpcClient, accountCollection);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9hY2NvdW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsRUFBRSxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDakYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBWSxRQUFRLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDbEQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDM0UsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTFELE9BQU8sRUFBRSxhQUFhLEVBQVUsTUFBTSwrQkFBK0IsQ0FBQztBQUN0RSxPQUFPLEVBQ0wsaUJBQWlCLEVBQ2pCLGVBQWUsRUFDZixnQkFBZ0IsRUFDaEIsbUJBQW1CLEVBQ25CLGlCQUFpQixHQUNsQixNQUFNLGFBQWEsQ0FBQztBQUVyQjs7O0dBR0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGNBQWMsQ0FDbEMsY0FBd0IsRUFDeEIsVUFBbUIsRUFDbkIsSUFBSSxHQUFHLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFDbEIsZ0JBQWdCLEdBQUcsQ0FBQyxFQUNwQixNQUFNLEdBQUcsaUJBQWlCLENBQUMseUJBQXlCLENBQUM7SUFFckQsTUFBTSxVQUFVLEdBQUcseUJBQXlCLENBQUM7SUFDN0MsTUFBTSxZQUFZLEdBQUcsSUFBSSxpQkFBaUIsRUFBRSxDQUFDO0lBQzdDLE1BQU0sSUFBSSxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3RDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxnQkFBZ0IsRUFBRSxFQUFFLENBQUMsRUFBRTtRQUN6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

package/dest/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './secrets.js';
 export * from './account.js';
 export * from './pub_key.js';
+export * from './l1_contracts.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}

package/dest/utils/index.js

@@ -1,4 +1,5 @@
 export * from './secrets.js';
 export * from './account.js';
 export * from './pub_key.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUMifQ==
+export * from './l1_contracts.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxtQkFBbUIsQ0FBQyJ9

package/dest/utils/l1_contracts.d.ts

@@ -0,0 +1,24 @@
+import { EthAddress } from '@aztec/circuits.js';
+/**
+ * A dictionary of the Aztec-deployed L1 contracts.
+ */
+export type L1ContractAddresses = {
+    /**
+     * Address fo the main Aztec rollup contract.
+     */
+    rollup: EthAddress;
+    /**
+     * Address of the contract that emits events on public contract deployment.
+     */
+    contractDeploymentEmitter: EthAddress;
+    /**
+     * Address of the L1/L2 messaging inbox contract.
+     */
+    inbox: EthAddress;
+    /**
+     * Registry Address.
+     */
+    registry: EthAddress;
+};
+export declare const getL1ContractAddresses: (url: string) => Promise<L1ContractAddresses>;
+//# sourceMappingURL=l1_contracts.d.ts.map

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

@@ -0,0 +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"}

package/dest/utils/l1_contracts.js

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

package/dest/utils/pub_key.d.ts

@@ -1,14 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
 import { Point } from '../index.js';
-/**
- * Converts a Point type to a public key represented by BigInt coordinates
- * @param point - The Point to convert.
- * @returns An object with x & y coordinates represented as bigints.
- */
-export declare function pointToPublicKey(point: Point): {
-    x: bigint;
-    y: bigint;
-};
 /**
  * Method for generating a public grumpkin key from a private key.
  * @param privateKey - The private key.

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

@@ -1 +1 @@
-{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK;;;EAO5C;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAG1E"}
+{"version":3,"file":"pub_key.d.ts","sourceRoot":"","sources":["../../src/utils/pub_key.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAG1E"}

package/dest/utils/pub_key.js

@@ -1,18 +1,5 @@
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
 import { Point } from '../index.js';
-/**
- * Converts a Point type to a public key represented by BigInt coordinates
- * @param point - The Point to convert.
- * @returns An object with x & y coordinates represented as bigints.
- */
-export function pointToPublicKey(point) {
-    const x = point.x.toBigInt();
-    const y = point.y.toBigInt();
-    return {
-        x,
-        y,
-    };
-}
 /**
  * Method for generating a public grumpkin key from a private key.
  * @param privateKey - The private key.
@@ -22,4 +9,4 @@ export async function generatePublicKey(privateKey) {
     const grumpkin = await Grumpkin.new();
     return Point.fromBuffer(grumpkin.mul(grumpkin.generator(), privateKey));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9wdWJfa2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXBDOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsS0FBWTtJQUMzQyxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzdCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDN0IsT0FBTztRQUNMLENBQUM7UUFDRCxDQUFDO0tBQ0YsQ0FBQztBQUNKLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxpQkFBaUIsQ0FBQyxVQUFrQjtJQUN4RCxNQUFNLFFBQVEsR0FBRyxNQUFNLFFBQVEsQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUN0QyxPQUFPLEtBQUssQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQztBQUMxRSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9wdWJfa2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUzRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXBDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUFDLFVBQWtCO0lBQ3hELE1BQU0sUUFBUSxHQUFHLE1BQU0sUUFBUSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3RDLE9BQU8sS0FBSyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUUsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQzFFLENBQUMifQ==

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@aztec/aztec.js",
-  "version": "0.1.0-alpha21",
+  "version": "0.1.0-alpha23",
   "exports": "./dest/index.js",
   "type": "module",
   "dependencies": {
-    "@aztec/aztec-rpc": "0.1.0-alpha21",
-    "@aztec/circuits.js": "0.1.0-alpha21",
-    "@aztec/foundation": "0.1.0-alpha21",
-    "@aztec/key-store": "0.1.0-alpha21",
-    "@aztec/noir-contracts": "0.1.0-alpha21",
+    "@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",
     "tslib": "^2.4.0"
   }
 }

package/src/account_impl/account_collection.ts

@@ -6,7 +6,7 @@ import { AccountImplementation } from './index.js';
  * A concrete account implementation that manages multiple accounts.
  */
 export class AccountCollection implements AccountImplementation {
-  private accounts: Map<AztecAddress, AccountImplementation> = new Map();
+  private accounts: Map<string, AccountImplementation> = new Map();
 
   /**
    * Registers an account implementation against an aztec address
@@ -14,12 +14,12 @@ export class AccountCollection implements AccountImplementation {
    * @param impl - The account implementation to be registered.
    */
   public registerAccount(addr: AztecAddress, impl: AccountImplementation) {
-    this.accounts.set(addr, impl);
+    this.accounts.set(addr.toString(), impl);
   }
 
   getAddress(): AztecAddress {
     if (!this.accounts) throw new Error(`No accounts registered`);
-    return this.accounts.keys().next().value as AztecAddress;
+    return AztecAddress.fromString(this.accounts.keys().next().value as string);
   }
 
   /**
@@ -34,7 +34,7 @@ export class AccountCollection implements AccountImplementation {
   ): Promise<TxExecutionRequest> {
     // TODO: Check all executions have the same origin
     const sender = executions[0].from;
-    const impl = this.accounts.get(sender);
+    const impl = this.accounts.get(sender.toString());
     if (!impl) throw new Error(`No account implementation registered for ${sender}`);
     return impl.createAuthenticatedTxRequest(executions, txContext);
   }

package/src/account_impl/account_contract.ts

@@ -1,13 +1,11 @@
-import { encodeArguments } from '@aztec/acir-simulator';
-import { AztecAddress, CircuitsWasm, Fr, FunctionData, TxContext } from '@aztec/circuits.js';
+import partition from 'lodash.partition';
+import { AztecAddress, CircuitsWasm, Fr, FunctionData, PartialContractAddress, TxContext } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { sha256 } from '@aztec/foundation/crypto';
-import { PublicKey } from '@aztec/key-store';
-import { ExecutionRequest, PackedArguments, PartialContractAddress, TxExecutionRequest } from '@aztec/types';
-import partition from 'lodash.partition';
-import { generateFunctionSelector } from '../index.js';
+import { ExecutionRequest, PackedArguments, PublicKey, TxExecutionRequest } from '@aztec/types';
+import { ContractAbi, encodeArguments, generateFunctionSelector } from '@aztec/foundation/abi';
+
 import { AccountImplementation } from './index.js';
-import { ContractAbi } from '@aztec/foundation/abi';
 import { EcdsaAuthProvider, SchnorrAuthProvider } from '../auth/index.js';
 
 /**

package/src/auth/ecdsa.ts

@@ -1,9 +1,9 @@
 import { secp256k1 } from '@noble/curves/secp256k1';
+import { EcdsaSignature } from '@aztec/circuits.js/barretenberg';
+
 import { AztecAddress } from '../index.js';
 import { AuthPayload } from './index.js';
-
 import { EntrypointPayload } from '../account_impl/account_contract.js';
-import { EcdsaSignature } from '@aztec/circuits.js/barretenberg';
 
 /**
  * An ecdsa implementation of auth provider.

package/src/auth/schnorr.ts

@@ -1,6 +1,7 @@
-import { AuthPayload, AztecAddress, EntrypointPayload } from '@aztec/aztec.js';
 import { Schnorr } from '@aztec/circuits.js/barretenberg';
 
+import { AuthPayload, AztecAddress, EntrypointPayload } from '../index.js';
+
 /**
  * Implementation of a schnorr signature provider
  */

package/src/aztec_rpc_client/aztec_rpc_client.ts

@@ -1,36 +1,14 @@
-import { AztecAddress, AztecRPC, EthAddress, Fr, Point, Tx, TxHash } from '@aztec/aztec-rpc';
+import { AztecAddress, EthAddress, Fr, Point } from '@aztec/circuits.js';
 import { createJsonRpcClient } from '@aztec/foundation/json-rpc';
-import { ContractData, ContractDeploymentTx, ContractPublicData, TxExecutionRequest } from '@aztec/types';
-
-/**
- * A dictionary of the Aztec-deployed L1 contracts.
- */
-export type L1ContractAddresses = {
-  /**
-   * Address fo the main Aztec rollup contract.
-   */
-  rollup: EthAddress;
-  /**
-   * Address of the contract that emits events on public contract deployment.
-   */
-  contractDeploymentEmitter: EthAddress;
-  /**
-   * Address of the L1/L2 messaging inbox contract.
-   */
-  inbox: EthAddress;
-
-  /**
-   * Registry Address.
-   */
-  registry: EthAddress;
-};
-
-/**
- * string dictionary of aztec contract addresses that we receive over http.
- */
-type L1ContractAddressesResp = {
-  [K in keyof L1ContractAddresses]: string;
-};
+import {
+  AztecRPC,
+  ContractData,
+  ContractDeploymentTx,
+  ContractPublicData,
+  TxExecutionRequest,
+  TxHash,
+  Tx,
+} from '@aztec/types';
 
 export const createAztecRpcClient = (url: string): AztecRPC =>
   createJsonRpcClient<AztecRPC>(
@@ -48,12 +26,3 @@ export const createAztecRpcClient = (url: string): AztecRPC =>
     { Tx, ContractDeploymentTx },
     false,
   );
-
-export const getL1ContractAddresses = async (url: string): Promise<L1ContractAddresses> => {
-  const reqUrl = new URL(`${url}/api/l1-contract-addresses`);
-  const response = (await (await fetch(reqUrl.toString())).json()) as unknown as L1ContractAddressesResp;
-  const result = Object.fromEntries(
-    Object.entries(response).map(([key, value]) => [key, EthAddress.fromString(value)]),
-  );
-  return result as L1ContractAddresses;
-};

package/src/aztec_rpc_client/wallet.ts

@@ -1,7 +1,19 @@
-import { AztecAddress, AztecRPC, DeployedContract, Fr, NodeInfo, Point, Tx, TxHash, TxReceipt } from '@aztec/aztec-rpc';
-import { TxContext } from '@aztec/circuits.js';
+import { AztecAddress, Fr, Point, TxContext } from '@aztec/circuits.js';
 import { ContractAbi } from '@aztec/foundation/abi';
-import { ContractData, ContractPublicData, ExecutionRequest, L2BlockL2Logs, TxExecutionRequest } from '@aztec/types';
+import {
+  AztecRPC,
+  ContractData,
+  ContractPublicData,
+  DeployedContract,
+  ExecutionRequest,
+  L2BlockL2Logs,
+  NodeInfo,
+  Tx,
+  TxExecutionRequest,
+  TxHash,
+  TxReceipt,
+} from '@aztec/types';
+
 import { AccountImplementation } from '../account_impl/index.js';
 
 /**
@@ -33,6 +45,9 @@ export abstract class BaseWallet implements Wallet {
   getAccountPublicKey(address: AztecAddress): Promise<Point> {
     return this.rpc.getAccountPublicKey(address);
   }
+  getAccountAddress(publicKey: Point): Promise<AztecAddress> {
+    return this.rpc.getAccountAddress(publicKey);
+  }
   addContracts(contracts: DeployedContract[]): Promise<void> {
     return this.rpc.addContracts(contracts);
   }

package/src/contract/contract.test.ts

@@ -1,11 +1,11 @@
-import { AztecAddress, DeployedContract, EthAddress, NodeInfo, Tx, TxHash, TxReceipt } from '@aztec/aztec-rpc';
 import { MockProxy, mock } from 'jest-mock-extended';
-
+import { DeployedContract, NodeInfo, Tx, TxHash, TxReceipt } from '@aztec/types';
 import { ABIParameterVisibility, ContractAbi, FunctionType } from '@aztec/foundation/abi';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { TxExecutionRequest } from '@aztec/types';
 import { Wallet } from '../aztec_rpc_client/wallet.js';
 import { Contract } from './contract.js';
+import { AztecAddress, EthAddress } from '@aztec/circuits.js';
 
 describe('Contract Class', () => {
   let wallet: MockProxy<Wallet>;
@@ -102,7 +102,7 @@ describe('Contract Class', () => {
     const param0 = 12;
     const param1 = 345n;
     const sentTx = fooContract.methods.bar(param0, param1).send({
-      from: account,
+      origin: account,
     });
     const txHash = await sentTx.getTxHash();
     const receipt = await sentTx.getReceipt();
@@ -128,7 +128,7 @@ describe('Contract Class', () => {
     const fooContract = new Contract(contractAddress, defaultAbi, wallet);
     expect(() =>
       fooContract.methods.qux().send({
-        from: account,
+        origin: account,
       }),
     ).toThrow();
   });

package/src/contract/contract.ts

@@ -1,9 +1,9 @@
-import { DeployedContract, generateFunctionSelector } from '@aztec/aztec-rpc';
-import { ContractAbi, FunctionAbi } from '@aztec/foundation/abi';
+import { ContractAbi, FunctionAbi, generateFunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Wallet } from '../aztec_rpc_client/wallet.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
+import { DeployedContract } from '@aztec/types';
 
 /**
  * Type representing a contract method that returns a ContractFunctionInteraction instance

package/src/contract/contract_function_interaction.ts

@@ -1,8 +1,7 @@
-import { encodeArguments } from '@aztec/acir-simulator';
-import { generateFunctionSelector, Tx } from '@aztec/aztec-rpc';
 import { AztecAddress, Fr, FunctionData, TxContext } from '@aztec/circuits.js';
-import { FunctionAbi, FunctionType } from '@aztec/foundation/abi';
-import { ExecutionRequest, TxExecutionRequest } from '@aztec/types';
+import { FunctionAbi, FunctionType, encodeArguments, generateFunctionSelector } from '@aztec/foundation/abi';
+import { ExecutionRequest, Tx, TxExecutionRequest } from '@aztec/types';
+
 import { Wallet } from '../aztec_rpc_client/wallet.js';
 import { SentTx } from './sent_tx.js';
 
@@ -14,7 +13,7 @@ export interface SendMethodOptions {
   /**
    * Sender's address initiating the transaction.
    */
-  from?: AztecAddress;
+  origin?: AztecAddress;
   /**
    * The nonce representing the order of transactions sent by the address.
    */
@@ -61,7 +60,7 @@ export class ContractFunctionInteraction {
       throw new Error("Can't call `create` on an unconstrained function.");
     }
     if (!this.txRequest) {
-      const executionRequest = this.getExecutionRequest(this.contractAddress, options.from);
+      const executionRequest = this.getExecutionRequest(this.contractAddress, options.origin);
       const nodeInfo = await this.wallet.getNodeInfo();
       const txContext = TxContext.empty(new Fr(nodeInfo.chainId), new Fr(nodeInfo.version));
       const txRequest = await this.wallet.createAuthenticatedTxRequest([executionRequest], txContext);

package/src/contract/sent_tx.ts

@@ -1,5 +1,5 @@
-import { AztecRPC, TxReceipt, TxHash, TxStatus } from '@aztec/aztec-rpc';
 import { retryUntil } from '@aztec/foundation/retry';
+import { AztecRPC, TxHash, TxReceipt, TxStatus } from '@aztec/types';
 
 /**
  * The SentTx class represents a sent transaction through the AztecRPCClient, providing methods to fetch

package/src/contract_deployer/contract_deployer.test.ts

@@ -1,9 +1,9 @@
-import { AztecRPC, Tx, TxHash, TxReceipt } from '@aztec/aztec-rpc';
-import { AztecAddress, EthAddress, Fr, Point } from '@aztec/circuits.js';
-import { ContractAbi, FunctionType } from '@aztec/foundation/abi';
-import { PublicKey } from '@aztec/key-store';
 import { randomBytes } from 'crypto';
 import { MockProxy, mock } from 'jest-mock-extended';
+import { AztecAddress, EthAddress, Fr, Point } from '@aztec/circuits.js';
+import { ContractAbi, FunctionType } from '@aztec/foundation/abi';
+import { AztecRPC, Tx, TxHash, TxReceipt, PublicKey } from '@aztec/types';
+
 import { ContractDeployer } from './contract_deployer.js';
 
 describe.skip('Contract Deployer', () => {
@@ -43,7 +43,7 @@ describe.skip('Contract Deployer', () => {
     const sentTx = deployer.deploy(args[0], args[1]).send({
       portalContract,
       contractAddressSalt,
-      from: account,
+      origin: account,
     });
     const txHash = await sentTx.getTxHash();
     const receipt = await sentTx.getReceipt();

package/src/contract_deployer/contract_deployer.ts

@@ -1,7 +1,8 @@
-import { AztecRPC, Point } from '@aztec/aztec-rpc';
+import { Point } from '@aztec/circuits.js';
 import { ContractAbi } from '@aztec/foundation/abi';
+import { AztecRPC, PublicKey } from '@aztec/types';
+
 import { DeployMethod } from './deploy_method.js';
-import { PublicKey } from '@aztec/key-store';
 
 /**
  * A class for deploying contract.

package/src/contract_deployer/deploy_method.ts

@@ -1,11 +1,16 @@
-import { AztecRPC, getContractDeploymentInfo } from '@aztec/aztec-rpc';
-import { CircuitsWasm, ContractDeploymentData, TxContext } from '@aztec/circuits.js';
+import {
+  CircuitsWasm,
+  ContractDeploymentData,
+  PartialContractAddress,
+  TxContext,
+  getContractDeploymentInfo,
+} from '@aztec/circuits.js';
 import { ContractAbi } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { PublicKey } from '@aztec/key-store';
-import { ExecutionRequest, PackedArguments, PartialContractAddress, Tx, TxExecutionRequest } from '@aztec/types';
+import { AztecRPC, ExecutionRequest, PackedArguments, PublicKey, Tx, TxExecutionRequest } from '@aztec/types';
+
 import { BaseWallet, Wallet } from '../aztec_rpc_client/wallet.js';
 import { Contract, ContractFunctionInteraction, SendMethodOptions } from '../contract/index.js';
 

package/src/index.ts

@@ -6,4 +6,7 @@ export * from './auth/index.js';
 export * from './account_impl/index.js';
 
 // TODO - only export necessary stuffs
-export * from '@aztec/aztec-rpc';
+// export * from '@aztec/aztec-rpc';
+
+export { AztecAddress, EthAddress, Point, Fr } from '@aztec/circuits.js';
+export { AztecRPC } from '@aztec/types';