Skip to content

rename DaveConsensus to OneOfN #436

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

Closed
wants to merge 1 commit into from
Closed

rename DaveConsensus to OneOfN #436

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
5 changes: 5 additions & 0 deletions .changeset/cold-cities-sit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cartesi/rollups": major
---

Renamed DaveConsensus to OneOfN
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ to Ethereum, Arbitrum, Optimism, Base, and their respective testnets.

Data Availability of user transactions and Consensus over their order is provided by the `InputBox` contract,
while Settlement is provided by the `Application` contract in conjunction with a settlement module.
Currently, we have implemented a quorum-based module (`Quorum`) and our very own fraud proof system (`DaveConsensus`).
Currently, we have implemented a quorum-based module (`Quorum`) and our very own fraud proof system (`Dave`).

The Cartesi Rollups Contracts are an integral part of the Cartesi Rollups SDK,
and are used by the [Cartesi Rollups Node], the [Cartesi Rollups Explorer],
Expand Down
2 changes: 1 addition & 1 deletion src/consensus/dave/DaveConsensus.sol → src/consensus/dave/OneOfN.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {LibKeccak256} from "../../library/LibKeccak256.sol";
/// After it, the next epoch is accumulating inputs. Once this epoch is settled,
/// the accumlating epoch is sealed, and a new accumulating epoch is created.
///
contract DaveConsensus is IDataProvider, IOutputsMerkleRootValidator, ERC165 {
contract OneOfN is IDataProvider, IOutputsMerkleRootValidator, ERC165 {
using LibBinaryMerkleTree for bytes32[];

/// @notice The input box contract
Expand Down
22 changes: 11 additions & 11 deletions src/consensus/dave/DaveConsensusFactory.sol → src/consensus/dave/OneOfNFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,37 @@ import {Create2} from "@openzeppelin-contracts-5.2.0/utils/Create2.sol";
import {ITournamentFactory} from "prt-contracts/ITournamentFactory.sol";
import {Machine} from "prt-contracts/types/Machine.sol";

import {DaveConsensus} from "./DaveConsensus.sol";
import {OneOfN} from "./OneOfN.sol";
import {IInputBox} from "../../inputs/IInputBox.sol";

/// @title Dave Consensus Factory
/// @notice Allows anyone to reliably deploy a new `DaveConsensus` contract.
contract DaveConsensusFactory {
/// @notice Allows anyone to reliably deploy a new `OneOfN` contract.
contract OneOfNFactory {
IInputBox inputBox;
ITournamentFactory tournamentFactory;

event DaveConsensusCreated(DaveConsensus daveConsensus);
event OneOfNCreated(OneOfN oneOfN);

constructor(IInputBox _inputBox, ITournamentFactory _tournament) {
inputBox = _inputBox;
tournamentFactory = _tournament;
}

function newDaveConsensus(
function newOneOfN(
address appContract,
Machine.Hash initialMachineStateHash,
bytes32 salt
) external returns (DaveConsensus) {
DaveConsensus daveConsensus = new DaveConsensus{salt: salt}(
) external returns (OneOfN) {
OneOfN oneOfN = new OneOfN{salt: salt}(
inputBox, appContract, tournamentFactory, initialMachineStateHash
);

emit DaveConsensusCreated(daveConsensus);
emit OneOfNCreated(oneOfN);

return daveConsensus;
return oneOfN;
}

function calculateDaveConsensusAddress(
function calculateOneOfNAddress(
address appContract,
Machine.Hash initialMachineStateHash,
bytes32 salt
Expand All @@ -47,7 +47,7 @@ contract DaveConsensusFactory {
salt,
keccak256(
abi.encodePacked(
type(DaveConsensus).creationCode,
type(OneOfN).creationCode,
abi.encode(
inputBox, appContract, tournamentFactory, initialMachineStateHash
)
Expand Down
91 changes: 41 additions & 50 deletions test/consensus/dave/DaveConsensus.t.sol → test/consensus/dave/OneOfN.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {Tree} from "prt-contracts/types/Tree.sol";
import {EmulatorConstants} from "step/src/EmulatorConstants.sol";
import {Memory} from "step/src/Memory.sol";

import {DaveConsensus} from "src/consensus/dave/DaveConsensus.sol";
import {OneOfN} from "src/consensus/dave/OneOfN.sol";

import {MockContract} from "../../util/MockContract.sol";

Expand Down Expand Up @@ -109,7 +109,7 @@ contract MockTournamentFactory is ITournamentFactory {
}
}

contract DaveConsensusTest is Test {
contract OneOfNTest is Test {
IInputBox _inputBox;
MockTournamentFactory _mockTournamentFactory;

Expand Down Expand Up @@ -142,38 +142,33 @@ contract DaveConsensusTest is Test {
_addInputs(appContract, inputCounts[0]);

(Machine.Hash state0,,) = _statesAndProofs(outputsMerkleRoots[0]);
address daveConsensusAddress =
_calculateNewDaveConsensus(appContract, state0, salts[0]);
address oneOfNAddress = _calculateNewOneOfN(appContract, state0, salts[0]);

_mockTournamentFactory.setSalt(salts[1]);
address mockTournamentAddress = _mockTournamentFactory.calculateTournamentAddress(
state0, IDataProvider(daveConsensusAddress)
state0, IDataProvider(oneOfNAddress)
);

vm.expectEmit(daveConsensusAddress);
emit DaveConsensus.ConsensusCreation(
_inputBox, appContract, _mockTournamentFactory
);
vm.expectEmit(oneOfNAddress);
emit OneOfN.ConsensusCreation(_inputBox, appContract, _mockTournamentFactory);

vm.expectEmit(daveConsensusAddress);
emit DaveConsensus.EpochSealed(
vm.expectEmit(oneOfNAddress);
emit OneOfN.EpochSealed(
0, 0, inputCounts[0], state0, bytes32(0), ITournament(mockTournamentAddress)
);

DaveConsensus daveConsensus = _newDaveConsensus(appContract, state0, salts[0]);
OneOfN oneOfN = _newOneOfN(appContract, state0, salts[0]);

assertEq(address(daveConsensus), daveConsensusAddress);
assertEq(address(daveConsensus.getInputBox()), address(_inputBox));
assertEq(daveConsensus.getApplicationContract(), appContract);
assertEq(
address(daveConsensus.getTournamentFactory()), address(_mockTournamentFactory)
);
assertEq(address(oneOfN), oneOfNAddress);
assertEq(address(oneOfN.getInputBox()), address(_inputBox));
assertEq(oneOfN.getApplicationContract(), appContract);
assertEq(address(oneOfN.getTournamentFactory()), address(_mockTournamentFactory));

{
bool isFinished;
uint256 epochNumber;

(isFinished, epochNumber,) = daveConsensus.canSettle();
(isFinished, epochNumber,) = oneOfN.canSettle();

assertFalse(isFinished);
assertEq(epochNumber, 0);
Expand All @@ -186,7 +181,7 @@ contract DaveConsensusTest is Test {
ITournament tournament;

(epochNumber, inputIndexLowerBound, inputIndexUpperBound, tournament) =
daveConsensus.getCurrentSealedEpoch();
oneOfN.getCurrentSealedEpoch();

assertEq(epochNumber, 0);
assertEq(inputIndexLowerBound, 0);
Expand All @@ -205,7 +200,7 @@ contract DaveConsensusTest is Test {
Machine.Hash.unwrap(mockTournament.getInitialState()),
Machine.Hash.unwrap(state0)
);
assertEq(address(mockTournament.getProvider()), address(daveConsensus));
assertEq(address(mockTournament.getProvider()), address(oneOfN));

{
(bool isFinished,,) = mockTournament.arbitrationResult();
Expand Down Expand Up @@ -237,7 +232,7 @@ contract DaveConsensusTest is Test {
bool isFinished;
uint256 epochNumber;

(isFinished, epochNumber,) = daveConsensus.canSettle();
(isFinished, epochNumber,) = oneOfN.canSettle();

assertTrue(isFinished);
assertEq(epochNumber, 0);
Expand All @@ -249,11 +244,11 @@ contract DaveConsensusTest is Test {

_mockTournamentFactory.setSalt(salts[2]);
mockTournamentAddress = _mockTournamentFactory.calculateTournamentAddress(
state1, IDataProvider(daveConsensusAddress)
state1, IDataProvider(oneOfNAddress)
);

vm.expectEmit(daveConsensusAddress);
emit DaveConsensus.EpochSealed(
vm.expectEmit(oneOfNAddress);
emit OneOfN.EpochSealed(
1,
inputCounts[0],
inputCounts[0] + inputCounts[1],
Expand All @@ -262,13 +257,13 @@ contract DaveConsensusTest is Test {
ITournament(mockTournamentAddress)
);

daveConsensus.settle(0, leaf1, proof1);
oneOfN.settle(0, leaf1, proof1);

{
bool isFinished;
uint256 epochNumber;

(isFinished, epochNumber,) = daveConsensus.canSettle();
(isFinished, epochNumber,) = oneOfN.canSettle();

assertFalse(isFinished);
assertEq(epochNumber, 1);
Expand All @@ -281,7 +276,7 @@ contract DaveConsensusTest is Test {
ITournament tournament;

(epochNumber, inputIndexLowerBound, inputIndexUpperBound, tournament) =
daveConsensus.getCurrentSealedEpoch();
oneOfN.getCurrentSealedEpoch();

assertEq(epochNumber, 1);
assertEq(inputIndexLowerBound, inputCounts[0]);
Expand All @@ -304,7 +299,7 @@ contract DaveConsensusTest is Test {
Machine.Hash.unwrap(mockTournament.getInitialState()),
Machine.Hash.unwrap(state1)
);
assertEq(address(mockTournament.getProvider()), address(daveConsensus));
assertEq(address(mockTournament.getProvider()), address(oneOfN));

{
(bool isFinished,,) = mockTournament.arbitrationResult();
Expand Down Expand Up @@ -350,19 +345,19 @@ contract DaveConsensusTest is Test {

_mockTournamentFactory.setSalt(salts[0]);

DaveConsensus daveConsensus = _newDaveConsensus(appContract, states[0], salts[1]);
OneOfN oneOfN = _newOneOfN(appContract, states[0], salts[1]);

_addInputs(appContract, inputCounts[1]);

vm.expectRevert(
abi.encodeWithSelector(
DaveConsensus.IncorrectEpochNumber.selector, wrongEpochNumber, 0
OneOfN.IncorrectEpochNumber.selector, wrongEpochNumber, 0
)
);
daveConsensus.settle(wrongEpochNumber, bytes32(0), new bytes32[](0));
oneOfN.settle(wrongEpochNumber, bytes32(0), new bytes32[](0));

vm.expectRevert(DaveConsensus.TournamentNotFinishedYet.selector);
daveConsensus.settle(0, bytes32(0), new bytes32[](0));
vm.expectRevert(OneOfN.TournamentNotFinishedYet.selector);
oneOfN.settle(0, bytes32(0), new bytes32[](0));
}

function testProvideMerkleRootOfInput(
Expand All @@ -378,14 +373,12 @@ contract DaveConsensusTest is Test {

_mockTournamentFactory.setSalt(salts[0]);

DaveConsensus daveConsensus =
_newDaveConsensus(appContract, initialState, salts[1]);
OneOfN oneOfN = _newOneOfN(appContract, initialState, salts[1]);

if (payloads.length > 0) {
inputIndexWithinBounds = bound(inputIndexWithinBounds, 0, payloads.length - 1);
bytes32 root = daveConsensus.provideMerkleRootOfInput(
inputIndexWithinBounds, new bytes(0)
);
bytes32 root =
oneOfN.provideMerkleRootOfInput(inputIndexWithinBounds, new bytes(0));
assertEq(
root, _inputBox.getInputMerkleRoot(appContract, inputIndexWithinBounds)
);
Expand All @@ -394,9 +387,8 @@ contract DaveConsensusTest is Test {
{
inputIndexOutsideBounds =
bound(inputIndexOutsideBounds, payloads.length, type(uint256).max);
bytes32 root = daveConsensus.provideMerkleRootOfInput(
inputIndexOutsideBounds, new bytes(0)
);
bytes32 root =
oneOfN.provideMerkleRootOfInput(inputIndexOutsideBounds, new bytes(0));
assertEq(root, bytes32(0));
}
}
Expand All @@ -413,7 +405,7 @@ contract DaveConsensusTest is Test {
}
}

function _calculateNewDaveConsensus(
function _calculateNewOneOfN(
address appContract,
Machine.Hash initialState,
bytes32 salt
Expand All @@ -422,7 +414,7 @@ contract DaveConsensusTest is Test {
salt,
keccak256(
abi.encodePacked(
type(DaveConsensus).creationCode,
type(OneOfN).creationCode,
abi.encode(
_inputBox, appContract, _mockTournamentFactory, initialState
)
Expand All @@ -431,12 +423,11 @@ contract DaveConsensusTest is Test {
);
}

function _newDaveConsensus(
address appContract,
Machine.Hash initialState,
bytes32 salt
) internal returns (DaveConsensus) {
return new DaveConsensus{salt: salt}(
function _newOneOfN(address appContract, Machine.Hash initialState, bytes32 salt)
internal
returns (OneOfN)
{
return new OneOfN{salt: salt}(
_inputBox, appContract, _mockTournamentFactory, initialState
);
}
Expand Down
Loading
Loading