merge with master

.circleci/config.yml

@@ -521,6 +521,17 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_2_pxes.test.ts
 
+  e2e-note-getter:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_note_getter.test.ts
+
   e2e-multiple-accounts-1-enc-key:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -1221,6 +1232,7 @@ workflows:
             - cli
           <<: *defaults
       - e2e-2-pxes: *e2e_test
+      - e2e-note-getter: *e2e_test
       - e2e-deploy-contract: *e2e_test
       - e2e-lending-contract: *e2e_test
       - e2e-token-contract: *e2e_test
@@ -1260,6 +1272,7 @@ workflows:
           requires:
             - mainnet-fork
             - e2e-2-pxes
+            - e2e-note-getter
             - e2e-deploy-contract
             - e2e-lending-contract
             - e2e-token-contract

barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 519fb4b40794eddecd686643b5ab62dacbb71d9e
-	parent = 88e7923ed2ecd747b65f72c5955016c6a1b80b9f
+	commit = 74d4bbd1c283af2f2c3b034c002fea3740c32705
+	parent = 9e6250aacbe2d47aa71dee9fa5e43c66eec73e75
 	method = merge
 	cmdver = 0.4.6

boxes/token/src/contracts/src/types/transparent_note.nr

@@ -3,7 +3,7 @@ use dep::aztec::{
     note::{
         note_header::NoteHeader,
         note_interface::NoteInterface,
-        utils::compute_siloed_note_hash,
+        utils::compute_note_hash_for_read_or_nullify,
     },
     hash::{compute_secret_hash, pedersen_hash},
     context::PrivateContext,
@@ -75,8 +75,7 @@ impl TransparentNote {
     }
 
     pub fn compute_nullifier_without_context(self) -> Field {
-        // TODO(#1386): should use `compute_note_hash_for_read_or_nullify` once public functions inject nonce!
-        let siloed_note_hash = compute_siloed_note_hash(TransparentNoteMethods, self);
+        let siloed_note_hash = compute_note_hash_for_read_or_nullify(TransparentNoteMethods, self);
         // TODO(#1205) Should use a non-zero generator index.
         pedersen_hash([self.secret, siloed_note_hash],0)
     }

docs/docs/developers/apis/accounts/_category_.yml

@@ -0,0 +1 @@
+label: "API"

docs/docs/developers/apis/accounts/classes/_category_.yml

@@ -0,0 +1,2 @@
+label: "Classes"
+position: 3

docs/docs/developers/apis/accounts/classes/defaults.DefaultAccountContract.md

@@ -0,0 +1,112 @@
+---
+id: "defaults.DefaultAccountContract"
+title: "Class: DefaultAccountContract"
+sidebar_label: "DefaultAccountContract"
+custom_edit_url: null
+---
+
+[defaults](../modules/defaults.md).DefaultAccountContract
+
+Base class for implementing an account contract. Requires that the account uses the
+default entrypoint method signature.
+
+## Hierarchy
+
+- **`DefaultAccountContract`**
+
+  ↳ [`EcdsaAccountContract`](ecdsa.EcdsaAccountContract.md)
+
+  ↳ [`SchnorrAccountContract`](schnorr.SchnorrAccountContract.md)
+
+  ↳ [`SingleKeyAccountContract`](single_key.SingleKeyAccountContract.md)
+
+## Implements
+
+- `AccountContract`
+
+## Constructors
+
+### constructor
+
+• **new DefaultAccountContract**(`artifact`): [`DefaultAccountContract`](defaults.DefaultAccountContract.md)
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `artifact` | `ContractArtifact` |
+
+#### Returns
+
+[`DefaultAccountContract`](defaults.DefaultAccountContract.md)
+
+## Properties
+
+### artifact
+
+• `Private` **artifact**: `ContractArtifact`
+
+## Methods
+
+### getAuthWitnessProvider
+
+▸ **getAuthWitnessProvider**(`address`): `AuthWitnessProvider`
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `address` | `CompleteAddress` |
+
+#### Returns
+
+`AuthWitnessProvider`
+
+___
+
+### getContractArtifact
+
+▸ **getContractArtifact**(): `ContractArtifact`
+
+#### Returns
+
+`ContractArtifact`
+
+#### Implementation of
+
+AccountContract.getContractArtifact
+
+___
+
+### getDeploymentArgs
+
+▸ **getDeploymentArgs**(): `any`[]
+
+#### Returns
+
+`any`[]
+
+#### Implementation of
+
+AccountContract.getDeploymentArgs
+
+___
+
+### getInterface
+
+▸ **getInterface**(`address`, `nodeInfo`): `AccountInterface`
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `address` | `CompleteAddress` |
+| `nodeInfo` | `NodeInfo` |
+
+#### Returns
+
+`AccountInterface`
+
+#### Implementation of
+
+AccountContract.getInterface

docs/docs/developers/apis/accounts/classes/defaults.DefaultAccountEntrypoint.md

@@ -0,0 +1,88 @@
+---
+id: "defaults.DefaultAccountEntrypoint"
+title: "Class: DefaultAccountEntrypoint"
+sidebar_label: "DefaultAccountEntrypoint"
+custom_edit_url: null
+---
+
+[defaults](../modules/defaults.md).DefaultAccountEntrypoint
+
+Implementation for an entrypoint interface that follows the default entrypoint signature
+for an account, which accepts an EntrypointPayload as defined in noir-libs/aztec-noir/src/entrypoint.nr.
+
+## Implements
+
+- `EntrypointInterface`
+
+## Constructors
+
+### constructor
+
+• **new DefaultAccountEntrypoint**(`address`, `auth`, `chainId?`, `version?`): [`DefaultAccountEntrypoint`](defaults.DefaultAccountEntrypoint.md)
+
+#### Parameters
+
+| Name | Type | Default value |
+| :------ | :------ | :------ |
+| `address` | `AztecAddress` | `undefined` |
+| `auth` | `AuthWitnessProvider` | `undefined` |
+| `chainId` | `number` | `DEFAULT_CHAIN_ID` |
+| `version` | `number` | `DEFAULT_VERSION` |
+
+#### Returns
+
+[`DefaultAccountEntrypoint`](defaults.DefaultAccountEntrypoint.md)
+
+## Properties
+
+### address
+
+• `Private` **address**: `AztecAddress`
+
+___
+
+### auth
+
+• `Private` **auth**: `AuthWitnessProvider`
+
+___
+
+### chainId
+
+• `Private` **chainId**: `number` = `DEFAULT_CHAIN_ID`
+
+___
+
+### version
+
+• `Private` **version**: `number` = `DEFAULT_VERSION`
+
+## Methods
+
+### createTxExecutionRequest
+
+▸ **createTxExecutionRequest**(`executions`): `Promise`\<`TxExecutionRequest`\>
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `executions` | `FunctionCall`[] |
+
+#### Returns
+
+`Promise`\<`TxExecutionRequest`\>
+
+#### Implementation of
+
+EntrypointInterface.createTxExecutionRequest
+
+___
+
+### getEntrypointAbi
+
+▸ **getEntrypointAbi**(): `FunctionAbi`
+
+#### Returns
+
+`FunctionAbi`