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

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,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

@@ -9,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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9wdWJfa2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXBDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUFDLFVBQWtCO0lBQ3hELE1BQU0sUUFBUSxHQUFHLE1BQU0sUUFBUSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3RDLE9BQU8sS0FBSyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUUsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQzFFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHViX2tleS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9wdWJfa2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUzRCxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXBDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGlCQUFpQixDQUFDLFVBQWtCO0lBQ3hELE1BQU0sUUFBUSxHQUFHLE1BQU0sUUFBUSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQ3RDLE9BQU8sS0FBSyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUUsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBQzFFLENBQUMifQ==

package/package.json

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

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

package/src/aztec_rpc_client/aztec_rpc_client.ts

@@ -1,6 +1,14 @@
-import { AztecAddress, AztecRPC, EthAddress, Fr, Point, Tx } 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, TxHash } from '@aztec/types';
+import {
+  AztecRPC,
+  ContractData,
+  ContractDeploymentTx,
+  ContractPublicData,
+  TxExecutionRequest,
+  TxHash,
+  Tx,
+} from '@aztec/types';
 
 export const createAztecRpcClient = (url: string): AztecRPC =>
   createJsonRpcClient<AztecRPC>(

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';
 
 /**

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';

package/src/utils/account.ts

@@ -1,8 +1,10 @@
-import { AztecRPC, 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 { AztecRPC, TxStatus } from '@aztec/types';
 import { SchnorrAccountContractAbi } from '@aztec/noir-contracts/examples';
+import { Schnorr } from '@aztec/circuits.js/barretenberg';
+
 import { AccountWallet, Wallet } from '../aztec_rpc_client/wallet.js';
 import {
   AccountCollection,
@@ -11,7 +13,6 @@ import {
   SchnorrAuthProvider,
   generatePublicKey,
 } from '../index.js';
-import { Schnorr } from '@aztec/circuits.js/barretenberg';
 
 /**
  * Creates an Aztec Account.

package/src/utils/pub_key.ts

@@ -1,4 +1,5 @@
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
+
 import { Point } from '../index.js';
 
 /**

package/tsconfig.json

@@ -6,9 +6,6 @@
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
-    {
-      "path": "../aztec-rpc"
-    },
     {
       "path": "../circuits.js"
     },
@@ -16,10 +13,10 @@
       "path": "../foundation"
     },
     {
-      "path": "../key-store"
+      "path": "../noir-contracts"
     },
     {
-      "path": "../noir-contracts"
+      "path": "../types"
     }
   ],
   "include": ["src"]