solving conflicts

AztecProtocol · May 20, 2024 · 5092fe1 · 5092fe1
1 parent 6e50bfa
commit 5092fe1
Show file tree

Hide file tree

Showing 35 changed files with 20 additions and 3,497 deletions.
diff --git a/docs/docs/.gitignore b/docs/docs/.gitignore
diff --git a/docs/docs/aztec/concepts/index.md b/docs/docs/aztec/concepts/index.md
@@ -29,7 +29,7 @@ Private state works with UTXOs, or what we call notes. To keep things private, e
 
 Public state works similarly to other chains like Ethereum, behaving like a public ledger. Public data is stored in a [public data tree](/aztec/concepts/storage/trees/index.md#public-state-tree).
 
-Aztec [smart contract](/aztec/aztec/concepts/smart_contracts/index.md) developers should keep in mind that different types are used when manipulating private or public state. Working with private state is creating commitments and nullifiers to state, whereas working with public state is directly updating state.
+Aztec [smart contract](/aztec/concepts/smart_contracts/index.md) developers should keep in mind that different types are used when manipulating private or public state. Working with private state is creating commitments and nullifiers to state, whereas working with public state is directly updating state.
 
 ## Accounts
 
@@ -70,14 +70,4 @@ Explore the Concepts for a deeper understanding into the components that make up
 
 ### Start coding
 
-<<<<<<< HEAD
-<<<<<<< HEAD:docs/docs/aztec/aztec/concepts/index.md
-Follow the [developer getting started guide](/getting_started/getting_started).
-=======
 Follow the [developer getting started guide](/getting_started).
-
->>>>>>> fd81464071 (removing nested folders):docs/docs/aztec/concepts/index.md
-=======
-Follow the [developer getting started guide](/getting_started).
-
->>>>>>> 02be02cbcb (fixing conflicts)
diff --git a/docs/docs/aztec/concepts/smart_contracts/communication/cross_chain_calls.md b/docs/docs/aztec/concepts/smart_contracts/communication/cross_chain_calls.md
diff --git a/docs/docs/aztec/concepts/smart_contracts/functions/context.md b/docs/docs/aztec/concepts/smart_contracts/functions/context.md
@@ -126,11 +126,7 @@ The public call stack contains all of the external function calls that are creat
 
 ### New L2 to L1 msgs
 
-<<<<<<< HEAD:docs/docs/aztec/aztec/concepts/smart_contracts/functions/context.md
 New L2 to L1 messages contains messages that are delivered to the [l1 outbox](/protocol-specs/l1-smart-contracts/index.md) on the execution of each rollup.
-=======
-New L2 to L1 messages contains messages that are delivered to the [l1 outbox](/aztec/concepts/smart_contracts/communication/cross_chain_calls) on the execution of each rollup.
->>>>>>> fd81464071 (removing nested folders):docs/docs/aztec/concepts/smart_contracts/functions/context.md
 
 ## Public Context
 

diff --git a/docs/docs/aztec/core_components.md b/docs/docs/aztec/core_components.md
@@ -39,11 +39,7 @@ A user of the Aztec network will interact with the network through Aztec.js. Azt
 
 ### Private Execution Environment
 
-<<<<<<< HEAD:docs/docs/aztec/aztec/core_components.md
-The PXE provides a secure environment for the execution of sensitive operations, ensuring private information and decrypted data are not accessible to unauthorized applications. It hides the details of the [state model](/aztec/aztec/concepts/state_model/index.md) from end users, but the state model is important for Aztec developers to understand as it has implications for [private/public execution](/aztec/aztec/concepts/smart_contracts/communication/public_private_calls.md) and [L1/L2 communication](../../protocol-specs/l1-smart-contracts/index.md). The PXE also includes the [ACIR Simulator](/aztec/aztec/concepts/pxe/acir_simulator.md) for private executions and the KeyStore for secure key management.
-=======
-The PXE provides a secure environment for the execution of sensitive operations, ensuring private information and decrypted data are not accessible to unauthorized applications. It hides the details of the [state model](/aztec/concepts/state_model/index.md) from end users, but the state model is important for Aztec developers to understand as it has implications for [private/public execution](/aztec/concepts/smart_contracts/communication/public_private_calls.md) and [L1/L2 communication](/aztec/concepts/smart_contracts/communication/cross_chain_calls). The PXE also includes the [ACIR Simulator](/aztec/concepts/pxe/acir_simulator.md) for private executions and the KeyStore for secure key management.
->>>>>>> fd81464071 (removing nested folders):docs/docs/aztec/core_components.md
+The PXE provides a secure environment for the execution of sensitive operations, ensuring private information and decrypted data are not accessible to unauthorized applications. It hides the details of the [state model](/aztec/concepts/state_model/index.md) from end users, but the state model is important for Aztec developers to understand as it has implications for [private/public execution](/aztec/concepts/smart_contracts/communication/public_private_calls.md) and [L1/L2 communication](/protocol-specs/l1-smart-contracts/index.md). The PXE also includes the [ACIR Simulator](/aztec/concepts/pxe/acir_simulator.md) for private executions and the KeyStore for secure key management.
 
 Procedurally, the PXE sends results of private function execution and requests for public function executions to the [sequencer](/aztec/concepts/nodes_clients/sequencer), which will update the state of the rollup.
 

diff --git a/...ocs/guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md b/...ocs/guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md
@@ -2,11 +2,7 @@
 title: Communicating with L1
 ---
 
-<<<<<<< HEAD:docs/docs/guides/guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md
-Is this your first time hearing the word `Portal`? Check out the [concepts section](../../../../../protocol-specs/l1-smart-contracts/index.md).
-=======
-Is this your first time hearing the word `Portal`? Check out the [concepts section](/aztec/concepts/smart_contracts/communication/cross_chain_calls).
->>>>>>> fd81464071 (removing nested folders):docs/docs/guides/smart_contracts/writing_contracts/portals/communicate_with_portal.md
+Is this your first time hearing the word `Portal`? Check out the [concepts section](../../../../protocol-specs/l1-smart-contracts/index.md).
 
 Follow the [token bridge tutorial](/tutorials/contract_tutorials/advanced/token_bridge) for hands-on experience writing and deploying a Portal contract.
 

diff --git a/docs/docs/guides/smart_contracts/writing_contracts/portals/deploy_with_portal.md b/docs/docs/guides/smart_contracts/writing_contracts/portals/deploy_with_portal.md
diff --git a/docs/docs/guides/smart_contracts/writing_contracts/portals/index.md b/docs/docs/guides/smart_contracts/writing_contracts/portals/index.md
@@ -2,6 +2,4 @@
 title: Portals
 ---
 
-A portal is a point of contact between L1 and a contract on Aztec. For applications such as token bridges, this is the point where the tokens are held on L1 while used in L2.
-
-As outlined in [Communication](/aztec/concepts/smart_contracts/communication/cross_chain_calls), an Aztec L2 contract is linked to _ONE_ L1 address at time of deployment (specified by the developer). This L1 address is the only address that can send messages to that specific L2 contract, and the only address that can receive messages sent from the L2 contract to L1. Note, that a portal doesn't actually need to be a contract, it could be any address on L1.
+A portal is a point of contact between L1 and a contract on Aztec. For applications such as token bridges, this is the point where the tokens are held on L1 while used in L2. Note, that a portal doesn't actually need to be a contract, it could be any address on L1.
diff --git a/docs/docs/reference/aztecjs/accounts/_category_.yml b/docs/docs/reference/aztecjs/accounts/_category_.yml
diff --git a/docs/docs/reference/aztecjs/accounts/classes/_category_.yml b/docs/docs/reference/aztecjs/accounts/classes/_category_.yml
diff --git a/docs/docs/reference/aztecjs/accounts/classes/defaults.DefaultAccountContract.md b/docs/docs/reference/aztecjs/accounts/classes/defaults.DefaultAccountContract.md
diff --git a/docs/docs/reference/aztecjs/accounts/classes/defaults.DefaultAccountInterface.md b/docs/docs/reference/aztecjs/accounts/classes/defaults.DefaultAccountInterface.md