Skip to content
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

test(contracts): modify Colosseum tests related to V2 #363

Merged
merged 5 commits into from
Jul 26, 2024
Merged

test(contracts): modify Colosseum tests related to V2 #363

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76021f7
fix(contracts): avoid divide by zero of kgh num
seolaoh Jul 25, 2024
b4527f0
test(contracts): modify `Colosseum` tests related to V2
seolaoh Jul 25, 2024
6baf418
feat(contracts): apply PR reviews
seolaoh Jul 26, 2024
24431e7
test(contracts): use delegator of common test in `AssetManager` tests
seolaoh Jul 26, 2024
9a60acd
test(contracts): apply PR reviews
seolaoh Jul 26, 2024
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
4 changes: 3 additions & 1 deletion packages/contracts/contracts/L1/AssetManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,9 @@ contract AssetManager is ISemver, IERC721Receiver, IAssetManager {
unchecked {
asset.totalKro += baseReward;
asset.validatorKro += validatorReward;
asset.rewardPerKghStored += boostedReward / asset.totalKgh;
if (asset.totalKgh != 0) {
asset.rewardPerKghStored += boostedReward / asset.totalKgh;
}
asset.validatorKroBonded -= BOND_AMOUNT;
}

Expand Down
1 change: 0 additions & 1 deletion packages/contracts/contracts/test/AssetManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ contract AssetManagerTest is ValidatorSystemUpgrade_Initializer {
MockValidatorManager public mockValMgr;
MockL2OutputOracle public mockOracle;
address public validator = trusted;
address public delegator = asserter;

function setUp() public override {
super.setUp();
Expand Down
181 changes: 142 additions & 39 deletions packages/contracts/contracts/test/Colosseum.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { ValidatorPool } from "../L1/ValidatorPool.sol";
import { Proxy } from "../universal/Proxy.sol";
import { ColosseumTestData } from "./testdata/ColosseumTestData.sol";
import { Colosseum_Initializer, ValidatorSystemUpgrade_Initializer } from "./CommonTest.t.sol";
import { MockL2OutputOracle } from "./ValidatorManager.t.sol";

// Test the implementations of the Colosseum
contract ColosseumTest is Colosseum_Initializer {
Expand Down Expand Up @@ -231,16 +232,28 @@ contract ColosseumTest is Colosseum_Initializer {
securityCouncil.confirmTransaction(txId);
}

function test_constructor() external {
function test_constructor_succeeds() external {
assertEq(address(colosseum.L2_ORACLE()), address(oracle), "oracle address not matched");
assertEq(
address(colosseum.ZK_VERIFIER()),
address(zkVerifier),
"zk verifier address not matched"
);
assertEq(colosseum.CREATION_PERIOD_SECONDS(), creationPeriodSeconds);
assertEq(colosseum.BISECTION_TIMEOUT(), bisectionTimeout);
assertEq(colosseum.PROVING_TIMEOUT(), provingTimeout);
assertEq(colosseum.L2_ORACLE_SUBMISSION_INTERVAL(), submissionInterval);
assertEq(colosseum.DUMMY_HASH(), DUMMY_HASH);
assertEq(colosseum.MAX_TXS(), MAX_TXS);
assertEq(colosseum.SECURITY_COUNCIL(), address(securityCouncil));
assertEq(colosseum.ZK_MERKLE_TRIE(), address(zkMerkleTrie));
}

function test_initialize_succeeds() external {
assertEq(colosseum.getSegmentsLength(1), segmentsLengths[0]);
assertEq(colosseum.getSegmentsLength(2), segmentsLengths[1]);
assertEq(colosseum.getSegmentsLength(3), segmentsLengths[2]);
assertEq(colosseum.getSegmentsLength(4), segmentsLengths[3]);
}

function test_createChallenge_succeeds() external {
Expand Down Expand Up @@ -931,11 +944,27 @@ contract ColosseumTest is Colosseum_Initializer {
}

contract Colosseum_ValidatorSystemUpgrade_Test is Colosseum_Initializer {
MockL2OutputOracle mockOracle;
uint256 internal targetOutputIndex;

function setUp() public override {
super.setUp();

address oracleAddress = address(oracle);
MockL2OutputOracle mockOracleImpl = new MockL2OutputOracle(
pool,
valMgr,
address(colosseum),
submissionInterval,
l2BlockTime,
startingBlockNumber,
startingTimestamp,
finalizationPeriodSeconds
);
vm.prank(multisig);
Proxy(payable(oracleAddress)).upgradeTo(address(mockOracleImpl));
mockOracle = MockL2OutputOracle(oracleAddress);

// Deploy ValidatorPool with new argument
terminateOutputIndex = 0;
poolImpl = new ValidatorPool({
Expand Down Expand Up @@ -1018,6 +1047,16 @@ contract Colosseum_ValidatorSystemUpgrade_Test is Colosseum_Initializer {
return arr;
}

function _firstSegments() private view returns (bytes32[] memory) {
0xHansLee marked this conversation as resolved.
Show resolved Hide resolved
Types.CheckpointOutput memory targetOutput = oracle.getL2Output(targetOutputIndex);
uint256 end = targetOutput.l2BlockNumber;
uint256 start = end - oracle.SUBMISSION_INTERVAL();

bytes32[] memory segments = _newSegments(challenger, 1, start, end - start);

return segments;
}

function _bisect(uint256 outputIndex, address _challenger, address sender) private {
Types.Challenge memory challenge = colosseum.getChallenge(outputIndex, _challenger);

Expand Down Expand Up @@ -1057,27 +1096,49 @@ contract Colosseum_ValidatorSystemUpgrade_Test is Colosseum_Initializer {
revert("failed to select faulty position");
}

function test_createChallenge_callValidatorManager_succeeds() public {
Types.CheckpointOutput memory targetOutput = oracle.getL2Output(targetOutputIndex);
uint256 end = targetOutput.l2BlockNumber;
uint256 start = end - oracle.SUBMISSION_INTERVAL();
function _getProof()
private
pure
returns (ColosseumTestData.ProofPair memory, Types.PublicInputProof memory)
{
(
Types.OutputRootProof memory srcOutputRootProof,
Types.OutputRootProof memory dstOutputRootProof
) = ColosseumTestData.outputRootProof();
Types.PublicInput memory publicInput = ColosseumTestData.publicInput();
Types.BlockHeaderRLP memory rlps = ColosseumTestData.blockHeaderRLP();
ColosseumTestData.ProofPair memory pp = ColosseumTestData.proofAndPair();
(ColosseumTestData.Account memory account, bytes[] memory merkleProof) = ColosseumTestData
.merkleProof();

bytes32[] memory segments = _newSegments(challenger, 1, start, end - start);
Types.PublicInputProof memory proof = Types.PublicInputProof({
srcOutputRootProof: srcOutputRootProof,
dstOutputRootProof: dstOutputRootProof,
publicInput: publicInput,
rlps: rlps,
l2ToL1MessagePasserBalance: bytes32(account.balance),
l2ToL1MessagePasserCodeHash: account.codeHash,
merkleProof: merkleProof
});

return (pp, proof);
}

function test_createChallenge_callValidatorManager_succeeds() public {
bytes32[] memory segments = _firstSegments();

vm.expectCall(
address(colosseum.L2_ORACLE().VALIDATOR_MANAGER()),
address(valMgr),
abi.encodeWithSelector(IValidatorManager.isActive.selector, challenger)
);
vm.prank(challenger);
colosseum.createChallenge(targetOutputIndex, bytes32(0), 0, segments);

assertEq(assetMgr.totalValidatorKroBonded(challenger), bondAmount);
}

function test_createChallenge_notSatisfyCondition_reverts() external {
Types.CheckpointOutput memory targetOutput = oracle.getL2Output(targetOutputIndex);
uint256 end = targetOutput.l2BlockNumber;
uint256 start = end - oracle.SUBMISSION_INTERVAL();

bytes32[] memory segments = _newSegments(challenger, 1, start, end - start);
bytes32[] memory segments = _firstSegments();

vm.expectRevert(IValidatorManager.ImproperValidatorStatus.selector);
vm.prank(makeAddr("other challenger"));
Expand All @@ -1088,36 +1149,19 @@ contract Colosseum_ValidatorSystemUpgrade_Test is Colosseum_Initializer {
test_createChallenge_callValidatorManager_succeeds();

Types.Challenge memory challenge = colosseum.getChallenge(targetOutputIndex, challenger);
uint128 beforeAsserterKro = assetMgr.totalValidatorKro(challenge.asserter);

while (colosseum.isAbleToBisect(targetOutputIndex, challenger)) {
_bisect(targetOutputIndex, challenger, _nextSender(challenge));
challenge = colosseum.getChallenge(targetOutputIndex, challenger);
}

(
Types.OutputRootProof memory srcOutputRootProof,
Types.OutputRootProof memory dstOutputRootProof
) = ColosseumTestData.outputRootProof();
Types.PublicInput memory publicInput = ColosseumTestData.publicInput();
Types.BlockHeaderRLP memory rlps = ColosseumTestData.blockHeaderRLP();
ColosseumTestData.ProofPair memory pp = ColosseumTestData.proofAndPair();
(ColosseumTestData.Account memory account, bytes[] memory merkleProof) = ColosseumTestData
.merkleProof();

Types.PublicInputProof memory proof = Types.PublicInputProof({
srcOutputRootProof: srcOutputRootProof,
dstOutputRootProof: dstOutputRootProof,
publicInput: publicInput,
rlps: rlps,
l2ToL1MessagePasserBalance: bytes32(account.balance),
l2ToL1MessagePasserCodeHash: account.codeHash,
merkleProof: merkleProof
});
(ColosseumTestData.ProofPair memory pp, Types.PublicInputProof memory proof) = _getProof();

uint256 position = _detectFault(challenge, challenge.challenger);

vm.expectCall(
address(colosseum.L2_ORACLE().VALIDATOR_MANAGER()),
address(valMgr),
abi.encodeWithSelector(
IValidatorManager.slash.selector,
targetOutputIndex,
Expand All @@ -1127,48 +1171,105 @@ contract Colosseum_ValidatorSystemUpgrade_Test is Colosseum_Initializer {
);
vm.prank(challenger);
colosseum.proveFault(targetOutputIndex, position, proof, pp.proof, pp.pair);

assertEq(assetMgr.totalValidatorKro(challenge.asserter), beforeAsserterKro - bondAmount);
assertEq(assetMgr.totalValidatorKro(challenger), minActivateAmount);
}

function test_dismissChallenge_callValidatorManager_succeeds() external {
Types.CheckpointOutput memory output = oracle.getL2Output(targetOutputIndex);
uint128 beforeAsserterKro = assetMgr.totalValidatorKro(output.submitter);

test_proveFault_callValidatorManager_succeeds();

vm.expectCall(
address(colosseum.L2_ORACLE().VALIDATOR_MANAGER()),
abi.encodeWithSelector(IValidatorManager.tryUnjail.selector, output.submitter, true)
address(valMgr),
abi.encodeWithSelector(
IValidatorManager.revertSlash.selector,
targetOutputIndex,
output.submitter
)
);
vm.prank(colosseum.SECURITY_COUNCIL());
vm.expectCall(
address(valMgr),
abi.encodeWithSelector(
IValidatorManager.slash.selector,
targetOutputIndex,
output.submitter,
challenger
)
);
vm.prank(address(securityCouncil));
colosseum.dismissChallenge(
targetOutputIndex,
challenger,
output.submitter,
output.outputRoot,
bytes32(0)
);

assertEq(assetMgr.totalValidatorKro(output.submitter), beforeAsserterKro);
assertEq(assetMgr.totalValidatorKro(challenger), minActivateAmount - bondAmount);

// check if original output submitter gets output reward + challenge reward
uint128 tax = (bondAmount * assetMgr.TAX_NUMERATOR()) / assetMgr.TAX_DENOMINATOR();
uint128 challengeReward = bondAmount - tax;

mockOracle.mockSetNextFinalizeOutputIndex(terminateOutputIndex + 1);
vm.warp(oracle.finalizedAt(targetOutputIndex));
_submitL2OutputV2(false);

assertEq(
assetMgr.reflectiveWeight(output.submitter),
minActivateAmount + baseReward + challengeReward
);
}

function test_forceDeleteOutput_callValidatorManager_succeeds() external {
test_createChallenge_callValidatorManager_succeeds();

Types.Challenge memory challenge = colosseum.getChallenge(targetOutputIndex, challenger);
uint128 beforeAsserterKro = assetMgr.totalValidatorKro(challenge.asserter);

while (colosseum.isAbleToBisect(targetOutputIndex, challenger)) {
_bisect(targetOutputIndex, challenger, _nextSender(challenge));
challenge = colosseum.getChallenge(targetOutputIndex, challenger);
}

vm.expectCall(
address(colosseum.L2_ORACLE().VALIDATOR_MANAGER()),
address(valMgr),
abi.encodeWithSelector(
IValidatorManager.slash.selector,
targetOutputIndex,
colosseum.SECURITY_COUNCIL(),
securityCouncil,
challenge.asserter
)
);
vm.prank(colosseum.SECURITY_COUNCIL());
vm.prank(address(securityCouncil));
colosseum.forceDeleteOutput(targetOutputIndex);

assertEq(assetMgr.totalValidatorKro(challenge.asserter), beforeAsserterKro - bondAmount);
assertEq(assetMgr.totalValidatorKro(challenger), minActivateAmount);
}

function test_cancelChallenge_callValidatorManager_succeeds() external {
address otherChallenger = asserter;
_registerValidator(asserter, minActivateAmount);

bytes32[] memory segments = _firstSegments();
vm.prank(otherChallenger);
colosseum.createChallenge(targetOutputIndex, bytes32(0), 0, segments);

test_proveFault_callValidatorManager_succeeds();

vm.expectCall(
address(valMgr),
abi.encodeWithSelector(IValidatorManager.unbondValidatorKro.selector, otherChallenger)
);
vm.prank(otherChallenger);
colosseum.cancelChallenge(targetOutputIndex);

assertEq(assetMgr.totalValidatorKroBonded(otherChallenger), 0);
}

function test_challengerTimeout_callValidatorManager_succeeds() external {
Expand All @@ -1188,7 +1289,7 @@ contract Colosseum_ValidatorSystemUpgrade_Test is Colosseum_Initializer {
);

vm.expectCall(
address(colosseum.L2_ORACLE().VALIDATOR_MANAGER()),
address(valMgr),
abi.encodeWithSelector(
IValidatorManager.slash.selector,
targetOutputIndex,
Expand All @@ -1198,5 +1299,7 @@ contract Colosseum_ValidatorSystemUpgrade_Test is Colosseum_Initializer {
);
vm.prank(challenge.asserter);
colosseum.challengerTimeout(targetOutputIndex, challenger);

assertEq(assetMgr.totalValidatorKro(challenger), minActivateAmount - bondAmount);
}
}
2 changes: 2 additions & 0 deletions packages/contracts/contracts/test/L2OutputOracle.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
assertEq(address(oracle.VALIDATOR_MANAGER()), address(valMgr));
assertEq(oracle.COLOSSEUM(), address(colosseum));
assertEq(oracle.SUBMISSION_INTERVAL(), submissionInterval);
assertEq(oracle.L2_BLOCK_TIME(), l2BlockTime);
assertEq(oracle.FINALIZATION_PERIOD_SECONDS(), finalizationPeriodSeconds);
assertEq(oracle.latestBlockNumber(), startingBlockNumber);
assertEq(oracle.startingBlockNumber(), startingBlockNumber);
assertEq(oracle.startingTimestamp(), startingTimestamp);
Expand Down
Loading