Staging batch 3

cartesi-rollups_versioned_docs/version-2.0/api-reference/backend/introduction.md

@@ -128,7 +128,7 @@ An **Advance** request involves sending input data to the base layer via JSON-RP
 
 In the dApp architecture, here is how an advance request plays out.
 
-- Step 1: Send an input to the [`addInput(address, bytes)`](../contracts/input-box.md#addinput) function of the InputBox smart contract.
+- Step 1: Send an input to the [`addInput(address, bytes)`](../json-rpc/input-box.md) function of the InputBox smart contract.
 
 - Step 2: The HTTP Rollups Server reads the data and gives it to the Cartesi machine for processing.
 

cartesi-rollups_versioned_docs/version-2.0/api-reference/backend/notices.md

@@ -56,16 +56,22 @@ async function handle_advance(data) {
 <pre><code>
 
 ```python
-# Notice creation Process from a message string
-def emit_notice(message):
-    notice_payload = {"payload": "0x" + message.encode("utf-8").hex()}
-    response = requests.post(rollup_server + "/notice", json=notice_payload)
-    if response.status_code == 200 or response.status_code == 201:
-        logger.info(f"Notice emitted successfully with data: {notice_payload}")
-    else:
-        logger.error(f"Failed to emit Notice with data: {notice_payload}. Status code: {response.status_code}")
-
-emit_notice("hello world")
+def handle_advance(data):
+   logger.info(f"Received advance request data {data}")
+
+   status = "accept"
+   try:
+       inputPayload = data["payload"]
+       # Send the input payload as a notice
+       response = requests.post(
+           rollup_server + "/notice", json={"payload": inputPayload}
+       )
+       logger.info(
+           f"Received notice status {response.status_code} body {response.content}"
+       )
+   except Exception as e:
+       # Emit report with error message here
+   return status
 ```
 
 </code></pre>

cartesi-rollups_versioned_docs/version-2.0/api-reference/backend/vouchers.md

@@ -12,7 +12,7 @@ The voucher explicitly specifies the action that the dApp intends to execute on
 
 For instance, in a DeFi application built on Cartesi, users may want to swap one token for another. The dApp generates a voucher that authorizes the on-chain smart contract to execute the swap on the user's behalf.
 
-The [`CartesiDApp`](../contracts/application.md) contract is crucial in validating and executing the received voucher on the blockchain. This execution process occurs through the [`executeVoucher()`](../contracts/application.md/#executevoucher) function, ensuring that the action specified in the voucher is legitimate and authorized.
+The [`CartesiDApp`](../json-rpc/application.md) contract is crucial in validating and executing the received voucher on the blockchain. This execution process occurs through the [`executeVoucher()`](../json-rpc/application.md/#executevoucher) function, ensuring that the action specified in the voucher is legitimate and authorized.
 
 The result of the voucher execution is recorded on the base layer. This recording typically involves submitting claims by a consensus contract, ensuring the integrity and transparency of the executed on-chain action.
 

cartesi-rollups_versioned_docs/version-2.0/api-reference/contracts/application-factory.md

@@ -2,7 +2,7 @@
 id: application-factory
 title: ApplicationFactory
 resources:
-  - url: https://github.com/cartesi/rollups-contracts/blob/prerelease/2.0.0/contracts/dapp/ApplicationFactory.sol
+  - url: https://github.com/cartesi/rollups-contracts/tree/v2.0.1/src/dapp/ApplicationFactory.sol
     title: Application Factory contract
 ---
 
@@ -12,62 +12,118 @@ Additionally, it provides a function to calculate the address of a potential new
 
 This contract ensures efficient and secure deployment of `Application` contracts within the Cartesi Rollups framework.
 
-## `newApplication()`
+## Functions
+
+### `newApplication()`
 
 ```solidity
-function newApplication( IConsensus consensus, address appOwner, bytes32 templateHash) external override returns (IApplication)
+function newApplication(
+    IOutputsMerkleRootValidator outputsMerkleRootValidator,
+    address appOwner,
+    bytes32 templateHash,
+    bytes calldata dataAvailability
+) external override returns (IApplication)
 ```
 
-Deploys a new Application contract without specifying a salt value for address derivation.
+Deploys a new Application contract without a salt value for address derivation.
+
+**Parameters**
 
-Emits an `ApplicationCreated` event upon successful deployment.
+| Name | Type | Description |
+|------|------|-------------|
+| `outputsMerkleRootValidator` | `IOutputsMerkleRootValidator` | The initial outputs Merkle root validator contract |
+| `appOwner` | `address` | Address of the owner of the application |
+| `templateHash` | `bytes32` | Hash of the template for the application |
+| `dataAvailability` | `bytes` | The data availability solution |
 
-#### Parameters
+**Return Values**
 
-| Name         | Type       | Description                              |
-| ------------ | ---------- | ---------------------------------------- |
-| consensus    | IConsensus | Instance of the consensus interface      |
-| appOwner     | address    | Address of the owner of the application  |
-| templateHash | bytes32    | Hash of the template for the application |
+| Name | Type | Description |
+|------|------|-------------|
+| `[0]` | `IApplication` | The deployed Application contract |
 
-## `newApplication()`(with salt)
+### `newApplication()` (with salt)
 
 ```solidity
-function newApplication( IConsensus consensus, address appOwner, bytes32 templateHash, bytes32 salt ) external override returns (IApplication)
+function newApplication(
+    IOutputsMerkleRootValidator outputsMerkleRootValidator,
+    address appOwner,
+    bytes32 templateHash,
+    bytes calldata dataAvailability,
+    bytes32 salt
+) external override returns (IApplication)
 ```
 
 Deploys a new `Application` contract with a specified salt value for address derivation.
 
-Emits an `ApplicationCreated` event upon successful deployment.
+**Parameters**
+
+| Name | Type | Description |
+|------|------|-------------|
+| `outputsMerkleRootValidator` | `IOutputsMerkleRootValidator` | The initial outputs Merkle root validator contract |
+| `appOwner` | `address` | Address of the owner of the application |
+| `templateHash` | `bytes32` | Hash of the template for the application |
+| `dataAvailability` | `bytes` | The data availability solution |
+| `salt` | `bytes32` | Salt value for address derivation |
 
-#### Parameters
+**Return Values**
 
-| Name         | Type       | Description                              |
-| ------------ | ---------- | ---------------------------------------- |
-| consensus    | IConsensus | Instance of the consensus interface      |
-| appOwner     | address    | Address of the owner of the application  |
-| templateHash | bytes32    | Hash of the template for the application |
-| salt         | bytes32    | Salt value for address derivation        |
+| Name | Type | Description |
+|------|------|-------------|
+| `[0]` | `IApplication` | The deployed Application contract |
 
 ### `calculateApplicationAddress()`
 
 ```solidity
-function calculateApplicationAddress( IConsensus consensus, address appOwner, bytes32 templateHash, bytes32 salt ) external view override returns (address)
+function calculateApplicationAddress(
+    IOutputsMerkleRootValidator outputsMerkleRootValidator,
+    address appOwner,
+    bytes32 templateHash,
+    bytes calldata dataAvailability,
+    bytes32 salt
+) external view override returns (address)
 ```
 
 Calculates the address of a potential new Application contract based on input parameters.
 
-#### Parameters
+**Parameters**
+
+| Name | Type | Description |
+|------|------|-------------|
+| `outputsMerkleRootValidator` | `IOutputsMerkleRootValidator` | The initial outputs Merkle root validator contract |
+| `appOwner` | `address` | Address of the owner of the application |
+| `templateHash` | `bytes32` | Hash of the template for the application |
+| `dataAvailability` | `bytes` | The data availability solution |
+| `salt` | `bytes32` | Salt value for address derivation |
+
+**Return Values**
+
+| Name | Type | Description |
+|------|------|-------------|
+| `[0]` | `address` | Address of the potential new Application contract |
+
+## Events
+
+### `ApplicationCreated()`
+
+```solidity
+event ApplicationCreated(
+    IOutputsMerkleRootValidator outputsMerkleRootValidator,
+    address appOwner,
+    bytes32 templateHash,
+    bytes dataAvailability,
+    IApplication appContract
+)
+```
 
-| Name         | Type       | Description                              |
-| ------------ | ---------- | ---------------------------------------- |
-| consensus    | IConsensus | Instance of the consensus interface      |
-| appOwner     | address    | Address of the owner of the application  |
-| templateHash | bytes32    | Hash of the template for the application |
-| salt         | bytes32    | Salt value for address derivation        |
+A new Application contract was deployed.
 
-#### Returns
+**Parameters**
 
-| Type    | Description                                       |
-| ------- | ------------------------------------------------- |
-| address | Address of the potential new Application contract |
+| Name | Type | Description |
+|------|------|-------------|
+| `outputsMerkleRootValidator` | `IOutputsMerkleRootValidator` | The outputs Merkle root validator contract |
+| `appOwner` | `address` | The owner of the application |
+| `templateHash` | `bytes32` | The template hash |
+| `dataAvailability` | `bytes` | The data availability solution |
+| `appContract` | `IApplication` | The deployed Application contract |