Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions cartesi-rollups/contracts/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@ via_ir = true

allow_paths = ["../../prt/contracts", "../../machine/step"]
remappings = [
"@openzeppelin-contracts-5.2.0/=dependencies/cartesi-rollups-contracts-3.0.0-alpha.6/dependencies/@openzeppelin-contracts-5.2.0/",
"@openzeppelin-contracts-5.2.0/=dependencies/cartesi-rollups-contracts-3.0.0-alpha.9/dependencies/@openzeppelin-contracts-5.2.0/",
"@openzeppelin-contracts-5.5.0/=dependencies/@openzeppelin-contracts-5.5.0/",
"cartesi-machine-solidity-step-0.13.0/=dependencies/cartesi-rollups-contracts-3.0.0-alpha.6/dependencies/cartesi-machine-solidity-step-0.13.0/",
"cartesi-rollups-contracts-3.0.0/=dependencies/cartesi-rollups-contracts-3.0.0-alpha.6/",
"cartesi-machine-solidity-step-0.15.0/=dependencies/cartesi-rollups-contracts-3.0.0-alpha.9/dependencies/cartesi-machine-solidity-step-0.15.0/",
"cartesi-rollups-contracts-3.0.0/=dependencies/cartesi-rollups-contracts-3.0.0-alpha.9/",
"forge-std-1.9.6/=dependencies/forge-std-1.9.6/",
"prt-contracts/=../../prt/contracts/src/",
"prt-contracts-test/=../../prt/contracts/test/",
"prt-contracts/=../../prt/contracts/src/",
"step/=../../machine/step/",
]

solc_version = "0.8.30"
evm_version = "prague"
always_use_create_2_factory = true
fs_permissions = [
{ access = "read-write", path = "deployments" },
{ access = "read", path = "dependencies/cartesi-rollups-contracts-3.0.0-alpha.6/deployments" },
{ access = "read", path = "dependencies/cartesi-rollups-contracts-3.0.0-alpha.9/deployments" },
{ access = "read", path = "../../prt/contracts/deployments" },
]

Expand All @@ -32,11 +33,12 @@ recursive_deps = true

[fmt]
sort_imports = true
single_line_imports = true

[lint]
exclude_lints = ["incorrect-shift"]

[dependencies]
"@openzeppelin-contracts" = "5.5.0"
forge-std = "1.9.6"
cartesi-rollups-contracts = "3.0.0-alpha.6"
cartesi-rollups-contracts = "3.0.0-alpha.9"
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/script/Deployment.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {DaveAppFactory} from "src/DaveAppFactory.sol";
contract DeploymentScript is BaseDeploymentScript {
function run() external {
_importDeployments("../../prt/contracts");
_importDeployments("dependencies/cartesi-rollups-contracts-3.0.0-alpha.6");
_importDeployments("dependencies/cartesi-rollups-contracts-3.0.0-alpha.9");

address inputBox = _loadDeployment(".", "InputBox");
address appFactory = _loadDeployment(".", "ApplicationFactory");
Expand Down
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/script/build-devnet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd "${BASH_SOURCE%/*}/.."

deployment_complete=0
build_fingerprint=$(../../script/devnet-fingerprint.sh inputs)
base_contracts=dependencies/cartesi-rollups-contracts-3.0.0-alpha.6
base_contracts=dependencies/cartesi-rollups-contracts-3.0.0-alpha.9

cleanup() {
exit_code=$?
Expand Down
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/script/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd "${BASH_SOURCE%/*}/.."

roots=(
'../../prt/contracts'
'dependencies/cartesi-rollups-contracts-3.0.0-alpha.6'
'dependencies/cartesi-rollups-contracts-3.0.0-alpha.9'
'.'
)

Expand Down
8 changes: 4 additions & 4 deletions cartesi-rollups/contracts/soldeer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ integrity = "da8336cf949f0e0667ae8360af849681e3a3e76d7e61e7a86b1a3414a158aeea"

[[dependencies]]
name = "cartesi-rollups-contracts"
version = "3.0.0-alpha.6"
url = "https://soldeer-revisions.s3.amazonaws.com/cartesi-rollups-contracts/3_0_0-alpha_6_21-05-2026_12:17:44_rollups-contracts.zip"
checksum = "cdfd86f90895ba37e188103e8fb62d6ca8e45a53846ebc63cb7b7af66f18d034"
integrity = "6fd07e7d895795aca4877d1c0f357f19f88adc56e1ff1ff88950900391328969"
version = "3.0.0-alpha.9"
url = "https://soldeer-revisions.s3.amazonaws.com/cartesi-rollups-contracts/3_0_0-alpha_9_19-08-2026_11:52:19_rollups-contracts.zip"
checksum = "c17618f6aa3313ce8e28f043877b8e16695b358ccf0f77ecca19b234718ebf16"
integrity = "f606c1db57d8b6ff0de8a73ec8b7d762e79d3b06959554e748663f03d0b1f588"

[[dependencies]]
name = "forge-std"
Expand Down
21 changes: 4 additions & 17 deletions cartesi-rollups/contracts/src/DaveAppFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ pragma solidity ^0.8.30;

import {Create2} from "@openzeppelin-contracts-5.5.0/utils/Create2.sol";

import {DataAvailability} from "cartesi-rollups-contracts-3.0.0/src/common/DataAvailability.sol";
import {WithdrawalConfig} from "cartesi-rollups-contracts-3.0.0/src/common/WithdrawalConfig.sol";
import {
IOutputsMerkleRootValidator
} from "cartesi-rollups-contracts-3.0.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IOutputsMerkleRootValidator} from "cartesi-rollups-contracts-3.0.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IApplication} from "cartesi-rollups-contracts-3.0.0/src/dapp/IApplication.sol";
import {IApplicationFactory} from "cartesi-rollups-contracts-3.0.0/src/dapp/IApplicationFactory.sol";
import {IInputBox} from "cartesi-rollups-contracts-3.0.0/src/inputs/IInputBox.sol";
Expand Down Expand Up @@ -64,23 +61,14 @@ contract DaveAppFactory is IDaveAppFactory {
);
}

/// @notice Encode the data availability blob for applications that only use the input box as DA.
function _encodeInputBoxDataAvailability() internal view returns (bytes memory) {
return abi.encodeCall(DataAvailability.InputBox, (INPUT_BOX));
}

/// @notice Instantiate a new application contract owned by the current contract,
/// with no outputs Merkle root validator (the zero address), and with the input box
/// as the only data availability source.
/// as the data-availability source.
function _newApplication(bytes32 templateHash, WithdrawalConfig calldata withdrawalConfig, bytes32 salt)
internal
returns (IApplication)
{
bytes memory dataAvailability = _encodeInputBoxDataAvailability();
return
APP_FACTORY.newApplication(
NO_VALIDATOR, address(this), templateHash, dataAvailability, withdrawalConfig, salt
);
return APP_FACTORY.newApplication(NO_VALIDATOR, address(this), templateHash, INPUT_BOX, withdrawalConfig, salt);
}

/// @notice Instantiate a new `DaveConsensus` contract.
Expand Down Expand Up @@ -110,9 +98,8 @@ contract DaveAppFactory is IDaveAppFactory {
WithdrawalConfig calldata withdrawalConfig,
bytes32 salt
) internal view returns (address) {
bytes memory dataAvailability = _encodeInputBoxDataAvailability();
return APP_FACTORY.calculateApplicationAddress(
NO_VALIDATOR, address(this), templateHash, dataAvailability, withdrawalConfig, salt
NO_VALIDATOR, address(this), templateHash, INPUT_BOX, withdrawalConfig, salt
);
}

Expand Down
14 changes: 11 additions & 3 deletions cartesi-rollups/contracts/src/DaveConsensus.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import {ERC165} from "@openzeppelin-contracts-5.2.0/utils/introspection/ERC165.s
import {IERC165} from "@openzeppelin-contracts-5.2.0/utils/introspection/IERC165.sol";
import {BitMaps} from "@openzeppelin-contracts-5.2.0/utils/structs/BitMaps.sol";

import {
IOutputsMerkleRootValidator
} from "cartesi-rollups-contracts-3.0.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IOutputsMerkleRootValidator} from "cartesi-rollups-contracts-3.0.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {ApplicationChecker} from "cartesi-rollups-contracts-3.0.0/src/dapp/ApplicationChecker.sol";
import {IInputBox} from "cartesi-rollups-contracts-3.0.0/src/inputs/IInputBox.sol";
import {LibBinaryMerkleTree} from "cartesi-rollups-contracts-3.0.0/src/library/LibBinaryMerkleTree.sol";
Expand Down Expand Up @@ -407,6 +405,16 @@ contract DaveConsensus is IDaveConsensus, ERC165, ApplicationChecker {
return Machine.Hash.unwrap(_lastFinalizedMachineStateHash);
}

function wasInputFinalized(address appContract, uint256 inputIndex, uint256)
external
view
override
onlyValidAppContract(appContract)
returns (bool)
{
return inputIndex < _inputIndexLowerBound;
}

function supportsInterface(bytes4 interfaceId) public view override(IERC165, ERC165) returns (bool) {
return interfaceId == type(IDaveConsensus).interfaceId || interfaceId == type(IDataProvider).interfaceId
|| interfaceId == type(IOutputsMerkleRootValidator).interfaceId || super.supportsInterface(interfaceId);
Expand Down
4 changes: 1 addition & 3 deletions cartesi-rollups/contracts/src/IDaveConsensus.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
pragma solidity ^0.8.30;

import {BinaryMerkleTreeErrors} from "cartesi-rollups-contracts-3.0.0/src/common/BinaryMerkleTreeErrors.sol";
import {
IOutputsMerkleRootValidator
} from "cartesi-rollups-contracts-3.0.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IOutputsMerkleRootValidator} from "cartesi-rollups-contracts-3.0.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IApplicationChecker} from "cartesi-rollups-contracts-3.0.0/src/dapp/IApplicationChecker.sol";
import {IInputBox} from "cartesi-rollups-contracts-3.0.0/src/inputs/IInputBox.sol";

Expand Down
Loading
Loading