Skip to content

chore: bump rollups-contracts from 2.1.1 to 2.2.0 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guidanoli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: bump rollups-contracts from 2.1.1 to 2.2.0 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions cartesi-rollups/contracts/foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ via_ir = true

allow_paths = ["../../prt/contracts", "../../machine/step"]
remappings = [
"@openzeppelin-contracts-5.2.0/=dependencies/cartesi-rollups-contracts-2.1.1/dependencies/@openzeppelin-contracts-5.2.0/",
"@openzeppelin-contracts-5.2.0/=dependencies/cartesi-rollups-contracts-2.2.0/dependencies/@openzeppelin-contracts-5.2.0/",
"@openzeppelin-contracts-5.5.0/=dependencies/@openzeppelin-contracts-5.5.0/",
"cartesi-rollups-contracts-2.1.1/=dependencies/cartesi-rollups-contracts-2.1.1/",
"cartesi-rollups-contracts-2.2.0/=dependencies/cartesi-rollups-contracts-2.2.0/",
"forge-std-1.9.6/=dependencies/forge-std-1.9.6/",
"prt-contracts/=../../prt/contracts/src/",
"step/=../../machine/step/",
Expand All @@ -20,7 +20,7 @@ solc_version = "0.8.30"
evm_version = "prague"
fs_permissions = [
{ access = "read-write", path = "deployments" },
{ access = "read", path = "dependencies/cartesi-rollups-contracts-2.1.1/deployments" },
{ access = "read", path = "dependencies/cartesi-rollups-contracts-2.2.0/deployments" },
{ access = "read", path = "../../prt/contracts/deployments" },
]

Expand All @@ -37,4 +37,4 @@ exclude_lints = ["incorrect-shift"]
[dependencies]
"@openzeppelin-contracts" = "5.5.0"
forge-std = "1.9.6"
cartesi-rollups-contracts = "2.1.1"
cartesi-rollups-contracts = "2.2.0"
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/script/Deployment.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {TestNonFungibleToken} from "src/TestNonFungibleToken.sol";
contract DeploymentScript is BaseDeploymentScript {
function run() external {
_importDeployments("../../prt/contracts");
_importDeployments("dependencies/cartesi-rollups-contracts-2.1.1");
_importDeployments("dependencies/cartesi-rollups-contracts-2.2.0");

address inputBox = _loadDeployment(".", "InputBox");
address appFactory = _loadDeployment(".", "ApplicationFactory");
Expand Down
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/script/deploy.sh
View file
Open in desktop
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-2.1.1'
'dependencies/cartesi-rollups-contracts-2.2.0'
'.'
)

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

[[dependencies]]
name = "cartesi-rollups-contracts"
version = "2.1.1"
url = "https://soldeer-revisions.s3.amazonaws.com/cartesi-rollups-contracts/2_1_1_01-12-2025_17:36:49_rollups-contracts.zip"
checksum = "96dc4fe4b1a91005bdb8fadf5f63bed6fec12b3b0da067aa539943f7e10a74be"
integrity = "32cab9811c5f5380661fe9d2c043570c0b8656cd132043b76b9413c88c715164"
version = "2.2.0"
url = "https://soldeer-revisions.s3.amazonaws.com/cartesi-rollups-contracts/2_2_0_06-02-2026_19:12:57_rollups-contracts.zip"
checksum = "8ec1e639104f544cfb198629cb258c54cfe86382fbc8402ca3e831406887fa08"
integrity = "8af3eb0d2bdfe558ae0260562c617ff5aa79b687f584bc6687fdaedd93da3a02"

[[dependencies]]
name = "forge-std"
Expand Down
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/src/CannonDependencies.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ pragma solidity ^0.8.0;
// List of contracts used in Cannonfiles

/// forge-lint: disable-next-line(unused-import)
import {ApplicationFactory} from "cartesi-rollups-contracts-2.1.1/src/dapp/ApplicationFactory.sol";
import {ApplicationFactory} from "cartesi-rollups-contracts-2.2.0/src/dapp/ApplicationFactory.sol";
10 changes: 5 additions & 5 deletions cartesi-rollups/contracts/src/DaveAppFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ pragma solidity ^0.8.8;

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

import {DataAvailability} from "cartesi-rollups-contracts-2.1.1/src/common/DataAvailability.sol";
import {DataAvailability} from "cartesi-rollups-contracts-2.2.0/src/common/DataAvailability.sol";
import {
IOutputsMerkleRootValidator
} from "cartesi-rollups-contracts-2.1.1/src/consensus/IOutputsMerkleRootValidator.sol";
import {IApplication} from "cartesi-rollups-contracts-2.1.1/src/dapp/IApplication.sol";
import {IApplicationFactory} from "cartesi-rollups-contracts-2.1.1/src/dapp/IApplicationFactory.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.1.1/src/inputs/IInputBox.sol";
} from "cartesi-rollups-contracts-2.2.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IApplication} from "cartesi-rollups-contracts-2.2.0/src/dapp/IApplication.sol";
import {IApplicationFactory} from "cartesi-rollups-contracts-2.2.0/src/dapp/IApplicationFactory.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.2.0/src/inputs/IInputBox.sol";

import {ITournamentFactory} from "prt-contracts/ITournamentFactory.sol";
import {Machine} from "prt-contracts/types/Machine.sol";
Expand Down
6 changes: 3 additions & 3 deletions cartesi-rollups/contracts/src/DaveConsensus.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {IERC165} from "@openzeppelin-contracts-5.2.0/utils/introspection/IERC165

import {
IOutputsMerkleRootValidator
} from "cartesi-rollups-contracts-2.1.1/src/consensus/IOutputsMerkleRootValidator.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.1.1/src/inputs/IInputBox.sol";
import {LibMerkle32} from "cartesi-rollups-contracts-2.1.1/src/library/LibMerkle32.sol";
} from "cartesi-rollups-contracts-2.2.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.2.0/src/inputs/IInputBox.sol";
import {LibMerkle32} from "cartesi-rollups-contracts-2.2.0/src/library/LibMerkle32.sol";

import {IDataProvider} from "prt-contracts/IDataProvider.sol";
import {ITournament} from "prt-contracts/ITournament.sol";
Expand Down
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/src/IDaveAppFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

pragma solidity ^0.8.8;

import {IApplication} from "cartesi-rollups-contracts-2.1.1/src/dapp/IApplication.sol";
import {IApplication} from "cartesi-rollups-contracts-2.2.0/src/dapp/IApplication.sol";

import {IDaveConsensus} from "./IDaveConsensus.sol";

Expand Down
4 changes: 2 additions & 2 deletions cartesi-rollups/contracts/src/IDaveConsensus.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ pragma solidity ^0.8.8;

import {
IOutputsMerkleRootValidator
} from "cartesi-rollups-contracts-2.1.1/src/consensus/IOutputsMerkleRootValidator.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.1.1/src/inputs/IInputBox.sol";
} from "cartesi-rollups-contracts-2.2.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.2.0/src/inputs/IInputBox.sol";
import {IDataProvider} from "prt-contracts/IDataProvider.sol";

import {ITournament} from "prt-contracts/ITournament.sol";
Expand Down
12 changes: 6 additions & 6 deletions cartesi-rollups/contracts/test/DaveAppFactory.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ pragma solidity ^0.8.22;
import {Test} from "forge-std-1.9.6/src/Test.sol";
import {Vm} from "forge-std-1.9.6/src/Vm.sol";

import {DataAvailability} from "cartesi-rollups-contracts-2.1.1/src/common/DataAvailability.sol";
import {ApplicationFactory} from "cartesi-rollups-contracts-2.1.1/src/dapp/ApplicationFactory.sol";
import {IApplication} from "cartesi-rollups-contracts-2.1.1/src/dapp/IApplication.sol";
import {IApplicationFactory} from "cartesi-rollups-contracts-2.1.1/src/dapp/IApplicationFactory.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.1.1/src/inputs/IInputBox.sol";
import {InputBox} from "cartesi-rollups-contracts-2.1.1/src/inputs/InputBox.sol";
import {DataAvailability} from "cartesi-rollups-contracts-2.2.0/src/common/DataAvailability.sol";
import {ApplicationFactory} from "cartesi-rollups-contracts-2.2.0/src/dapp/ApplicationFactory.sol";
import {IApplication} from "cartesi-rollups-contracts-2.2.0/src/dapp/IApplication.sol";
import {IApplicationFactory} from "cartesi-rollups-contracts-2.2.0/src/dapp/IApplicationFactory.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.2.0/src/inputs/IInputBox.sol";
import {InputBox} from "cartesi-rollups-contracts-2.2.0/src/inputs/InputBox.sol";

import {IDataProvider} from "prt-contracts/IDataProvider.sol";
import {ITournamentFactory} from "prt-contracts/ITournamentFactory.sol";
Expand Down
8 changes: 4 additions & 4 deletions cartesi-rollups/contracts/test/DaveConsensus.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import {IERC165} from "@openzeppelin-contracts-5.5.0/utils/introspection/IERC165

import {
IOutputsMerkleRootValidator
} from "cartesi-rollups-contracts-2.1.1/src/consensus/IOutputsMerkleRootValidator.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.1.1/src/inputs/IInputBox.sol";
import {InputBox} from "cartesi-rollups-contracts-2.1.1/src/inputs/InputBox.sol";
import {LibMerkle32} from "cartesi-rollups-contracts-2.1.1/src/library/LibMerkle32.sol";
} from "cartesi-rollups-contracts-2.2.0/src/consensus/IOutputsMerkleRootValidator.sol";
import {IInputBox} from "cartesi-rollups-contracts-2.2.0/src/inputs/IInputBox.sol";
import {InputBox} from "cartesi-rollups-contracts-2.2.0/src/inputs/InputBox.sol";
import {LibMerkle32} from "cartesi-rollups-contracts-2.2.0/src/library/LibMerkle32.sol";

import {IDataProvider} from "prt-contracts/IDataProvider.sol";
import {ITournament} from "prt-contracts/ITournament.sol";
Expand Down