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

feat(contracts): separate validator kro from delegation pool #344

Merged
merged 7 commits into from
Jul 17, 2024
Merged

feat(contracts): separate validator kro from delegation pool #344

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a34550f
feat(contracts): separate validator kro from delegation pool
Jul 15, 2024
59f81ac
chore: comment tests out wrt new design temporarily
Jul 15, 2024
15477fb
feat: review applied
Jul 17, 2024
df1b542
chore: rollback comment of failed tests
Jul 17, 2024
21508fe
feat: review applied
Jul 17, 2024
13f7259
chore: update bindings
Jul 17, 2024
7ec9054
Update packages/contracts/contracts/L1/AssetManager.sol
seolaoh Jul 17, 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
Prev Previous commit
Next Next commit
chore: comment tests out wrt new design temporarily
  • Loading branch information
0xHansLee committed Jul 17, 2024
commit 59f81ac2939fc452730c7a98ec55df36aeb9d433
12 changes: 6 additions & 6 deletions op-e2e/actions/l2_challenger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ func TestValidatorSystemVersion(t *testing.T) {
test.f(t, nil, valhelper.ValidatorV1)
})
}
for _, test := range challengerTests {
test := test
t.Run(test.name+"_ValidatorManager", func(t *testing.T) {
test.f(t, nil, valhelper.ValidatorV2)
})
}
//for _, test := range challengerTests {
// test := test
// t.Run(test.name+"_ValidatorManager", func(t *testing.T) {
// test.f(t, nil, valhelper.ValidatorV2)
// })
//}
}

func ChallengeBasic(t *testing.T, deltaTimeOffset *hexutil.Uint64, version uint8) {
Expand Down
236 changes: 118 additions & 118 deletions op-e2e/system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,124 +1742,124 @@ func TestChallenge(t *testing.T) {
}
}

func TestChallengeV2(t *testing.T) {
InitParallel(t)

cfg := DefaultSystemConfig(t)
cfg.EnableChallenge = true
cfg.NonFinalizedOutputs = true // speed up the time till we see checkpoint outputs
cfg.DeployConfig.L1BlockTime = 3
cfg.DeployConfig.L2BlockTime = 2 // same config with L2OutputOracle
cfg.ValidatorVersion = valhelper.ValidatorV2
newTerminationIndex := hexutil.Big(*common.Big1)
cfg.DeployConfig.ValidatorPoolTerminateOutputIndex = &newTerminationIndex

sys, err := cfg.Start(t)
require.NoError(t, err, "Error starting up system")
defer sys.Close()

l1Client := sys.Clients["l1"]
validatorHelper := sys.ValidatorHelper()

// Register to ValidatorManager to be a challenger
beforeAmount := cfg.DeployConfig.ValidatorManagerMinActivateAmount.ToInt()
validatorHelper.RegisterToValMgr(cfg.Secrets.Challenger1, beforeAmount, cfg.Secrets.Addresses().Challenger1)

l2OutputOracle, err := bindings.NewL2OutputOracleCaller(cfg.L1Deployments.L2OutputOracleProxy, l1Client)
require.NoError(t, err)

colosseum, err := bindings.NewColosseumCaller(cfg.L1Deployments.ColosseumProxy, l1Client)
require.NoError(t, err)

securityCouncil, err := bindings.NewSecurityCouncil(cfg.L1Deployments.SecurityCouncilProxy, l1Client)
require.NoError(t, err)

targetOutputOracleIndex := uint64(math.Ceil(float64(testdata.TargetBlockNumber) / float64(cfg.DeployConfig.L2OutputOracleSubmissionInterval)))
challengerAddr := cfg.Secrets.Addresses().Challenger1
validatorAddr := cfg.Secrets.Addresses().TrustedValidator

// Subscribe slash event in ValidatorManager
slashedCh := make(chan *bindings.ValidatorManagerSlashed, 1)
slashedSub, err := validatorHelper.ValMgrContract.WatchSlashed(&bind.WatchOpts{}, slashedCh, []*big.Int{}, []common.Address{})
require.NoError(t, err)
defer slashedSub.Unsubscribe()

// Set a timeout for challenge success and output validation by security council
ctx, cancel := context.WithTimeout(context.Background(), 200*time.Second)
defer cancel()

ticker := time.NewTicker(time.Second)
defer ticker.Stop()

for challengeCreated, numCheck, slashed := false, 0, false; ; <-ticker.C {
select {
case <-ctx.Done():
t.Fatalf("Timed out waiting for challenge conclusion")
case evt := <-slashedCh:
require.Equal(t, validatorAddr, evt.Loser)
require.Equal(t, targetOutputOracleIndex, evt.OutputIndex.Uint64())

slashedAmount := evt.Amount
afterAmount, err := validatorHelper.AssetMgrContract.TotalKroAssets(&bind.CallOpts{}, validatorAddr)
require.NoError(t, err)
require.Equal(t, new(big.Int).Sub(beforeAmount, slashedAmount).Uint64(), afterAmount.Uint64())

taxNum, err := validatorHelper.AssetMgrContract.TAXNUMERATOR(&bind.CallOpts{})
require.NoError(t, err)
taxDenom, err := validatorHelper.AssetMgrContract.TAXDENOMINATOR(&bind.CallOpts{})
require.NoError(t, err)
taxAmount := new(big.Int).Div(new(big.Int).Mul(slashedAmount, taxNum), taxDenom)

scBalance, err := validatorHelper.AssetTokenContract.BalanceOf(&bind.CallOpts{}, cfg.L1Deployments.SecurityCouncilProxy)
require.NoError(t, err)
require.Equal(t, taxAmount.Uint64(), scBalance.Uint64())

slashed = true
default:
challengeStatus, err := colosseum.GetStatus(&bind.CallOpts{}, new(big.Int).SetUint64(targetOutputOracleIndex), challengerAddr)
require.NoError(t, err)

if challengeStatus == chal.StatusReadyToProve {
challengeCreated = true
}
if !challengeCreated {
continue
}
// after challenge is proven, status is NONE
if challengeStatus != chal.StatusNone {
continue
}

// check validation request tx exists and not executed
toBlock := latestBlock(t, l1Client)
iter, err := securityCouncil.FilterValidationRequested(&bind.FilterOpts{End: &toBlock}, nil)
require.NoError(t, err)
eventExists := iter.Next()
require.True(t, eventExists)
tx, err := securityCouncil.Transactions(&bind.CallOpts{}, iter.Event.TransactionId)
require.NoError(t, err)
eventExists = iter.Next()
require.False(t, eventExists)
err = iter.Close()
require.NoError(t, err)
require.NotEqual(t, tx.Target, common.Address{})
require.False(t, tx.Executed)

// check output is deleted by challenger
output, err := l2OutputOracle.GetL2Output(&bind.CallOpts{}, new(big.Int).SetUint64(targetOutputOracleIndex))
require.NoError(t, err)
require.Equal(t, output.Submitter, challengerAddr)
require.True(t, val.IsOutputDeleted(output.OutputRoot))

numCheck++
}

// after enough time for security council elapsed, the challenge is regarded to be correct
if slashed && numCheck >= 5 {
return
}
}
}
//func TestChallengeV2(t *testing.T) {
// InitParallel(t)
//
// cfg := DefaultSystemConfig(t)
// cfg.EnableChallenge = true
// cfg.NonFinalizedOutputs = true // speed up the time till we see checkpoint outputs
// cfg.DeployConfig.L1BlockTime = 3
// cfg.DeployConfig.L2BlockTime = 2 // same config with L2OutputOracle
// cfg.ValidatorVersion = valhelper.ValidatorV2
// newTerminationIndex := hexutil.Big(*common.Big1)
// cfg.DeployConfig.ValidatorPoolTerminateOutputIndex = &newTerminationIndex
//
// sys, err := cfg.Start(t)
// require.NoError(t, err, "Error starting up system")
// defer sys.Close()
//
// l1Client := sys.Clients["l1"]
// validatorHelper := sys.ValidatorHelper()
//
// // Register to ValidatorManager to be a challenger
// beforeAmount := cfg.DeployConfig.ValidatorManagerMinActivateAmount.ToInt()
// validatorHelper.RegisterToValMgr(cfg.Secrets.Challenger1, beforeAmount, cfg.Secrets.Addresses().Challenger1)
//
// l2OutputOracle, err := bindings.NewL2OutputOracleCaller(cfg.L1Deployments.L2OutputOracleProxy, l1Client)
// require.NoError(t, err)
//
// colosseum, err := bindings.NewColosseumCaller(cfg.L1Deployments.ColosseumProxy, l1Client)
// require.NoError(t, err)
//
// securityCouncil, err := bindings.NewSecurityCouncil(cfg.L1Deployments.SecurityCouncilProxy, l1Client)
// require.NoError(t, err)
//
// targetOutputOracleIndex := uint64(math.Ceil(float64(testdata.TargetBlockNumber) / float64(cfg.DeployConfig.L2OutputOracleSubmissionInterval)))
// challengerAddr := cfg.Secrets.Addresses().Challenger1
// validatorAddr := cfg.Secrets.Addresses().TrustedValidator
//
// // Subscribe slash event in ValidatorManager
// slashedCh := make(chan *bindings.ValidatorManagerSlashed, 1)
// slashedSub, err := validatorHelper.ValMgrContract.WatchSlashed(&bind.WatchOpts{}, slashedCh, []*big.Int{}, []common.Address{})
// require.NoError(t, err)
// defer slashedSub.Unsubscribe()
//
// // Set a timeout for challenge success and output validation by security council
// ctx, cancel := context.WithTimeout(context.Background(), 200*time.Second)
// defer cancel()
//
// ticker := time.NewTicker(time.Second)
// defer ticker.Stop()
//
// for challengeCreated, numCheck, slashed := false, 0, false; ; <-ticker.C {
// select {
// case <-ctx.Done():
// t.Fatalf("Timed out waiting for challenge conclusion")
// case evt := <-slashedCh:
// require.Equal(t, validatorAddr, evt.Loser)
// require.Equal(t, targetOutputOracleIndex, evt.OutputIndex.Uint64())
//
// slashedAmount := evt.Amount
// afterAmount, err := validatorHelper.AssetMgrContract.TotalKroAssets(&bind.CallOpts{}, validatorAddr)
// require.NoError(t, err)
// require.Equal(t, new(big.Int).Sub(beforeAmount, slashedAmount).Uint64(), afterAmount.Uint64())
//
// taxNum, err := validatorHelper.AssetMgrContract.TAXNUMERATOR(&bind.CallOpts{})
// require.NoError(t, err)
// taxDenom, err := validatorHelper.AssetMgrContract.TAXDENOMINATOR(&bind.CallOpts{})
// require.NoError(t, err)
// taxAmount := new(big.Int).Div(new(big.Int).Mul(slashedAmount, taxNum), taxDenom)
//
// scBalance, err := validatorHelper.AssetTokenContract.BalanceOf(&bind.CallOpts{}, cfg.L1Deployments.SecurityCouncilProxy)
// require.NoError(t, err)
// require.Equal(t, taxAmount.Uint64(), scBalance.Uint64())
//
// slashed = true
// default:
// challengeStatus, err := colosseum.GetStatus(&bind.CallOpts{}, new(big.Int).SetUint64(targetOutputOracleIndex), challengerAddr)
// require.NoError(t, err)
//
// if challengeStatus == chal.StatusReadyToProve {
// challengeCreated = true
// }
// if !challengeCreated {
// continue
// }
// // after challenge is proven, status is NONE
// if challengeStatus != chal.StatusNone {
// continue
// }
//
// // check validation request tx exists and not executed
// toBlock := latestBlock(t, l1Client)
// iter, err := securityCouncil.FilterValidationRequested(&bind.FilterOpts{End: &toBlock}, nil)
// require.NoError(t, err)
// eventExists := iter.Next()
// require.True(t, eventExists)
// tx, err := securityCouncil.Transactions(&bind.CallOpts{}, iter.Event.TransactionId)
// require.NoError(t, err)
// eventExists = iter.Next()
// require.False(t, eventExists)
// err = iter.Close()
// require.NoError(t, err)
// require.NotEqual(t, tx.Target, common.Address{})
// require.False(t, tx.Executed)
//
// // check output is deleted by challenger
// output, err := l2OutputOracle.GetL2Output(&bind.CallOpts{}, new(big.Int).SetUint64(targetOutputOracleIndex))
// require.NoError(t, err)
// require.Equal(t, output.Submitter, challengerAddr)
// require.True(t, val.IsOutputDeleted(output.OutputRoot))
//
// numCheck++
// }
//
// // after enough time for security council elapsed, the challenge is regarded to be correct
// if slashed && numCheck >= 5 {
// return
// }
// }
//}

func TestChallengerTimeoutByGuardian(t *testing.T) {
InitParallel(t)
Expand Down
5 changes: 3 additions & 2 deletions packages/contracts/contracts/test/AssetManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ contract AssetManagerTest is ValidatorSystemUpgrade_Initializer {
kro.transfer(address(delegator), kroAmount);
vm.startPrank(validator);
kro.approve(address(assetManager), kroAmount);
// Self delegation
// deposit
valMgr.registerValidator(kroAmount, 0, withdrawAcc);
vm.stopPrank();

Expand Down Expand Up @@ -257,8 +257,9 @@ contract AssetManagerTest is ValidatorSystemUpgrade_Initializer {
function test_delegate_succeeds() external {
_setUpKroDelegation(100e18);

assertEq(assetManager.totalKroAssets(validator), 200e18);
assertEq(assetManager.totalKroAssets(validator), 100e18);
assertEq(valMgr.getWeight(validator), 200e18);
assertEq(assetManager.totalValidatorKro(validator), 100e18);
}

function test_delegate_withoutValidatorDelegation_reverts() external {
Expand Down
Loading