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

Jump to bottom

chore(precompiles): disable stake, unstake and moveStake #3010

Merged
merged 7 commits into from
Oct 17, 2024
+1,055 −859
Merged

chore(precompiles): disable stake, unstake and moveStake #3010

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
01934cc
GH3005: disable stake, unstake and moveStake
fbac Oct 16, 2024
80dfd08
explicitly check for failed tx when staking
fbac Oct 17, 2024
59787cd
fix lint govet
fbac Oct 17, 2024
3621875
Merge branch 'develop' into GH3005/disable-stake-unstake-movestake
fbac Oct 17, 2024
55e89ff
rebase
fbac Oct 17, 2024
cadaa71
Merge branch 'develop' into GH3005/disable-stake-unstake-movestake
fbac Oct 17, 2024
9b67913
fix duplicated import
fbac Oct 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
4 changes: 2 additions & 2 deletions cmd/zetae2e/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
precompiledContractTests = []string{
e2etests.TestPrecompilesPrototypeName,
e2etests.TestPrecompilesPrototypeThroughContractName,
e2etests.TestPrecompilesStakingName,
e2etests.TestPrecompilesStakingThroughContractName,
// e2etests.TestPrecompilesStakingName,
// e2etests.TestPrecompilesStakingThroughContractName,
lumtis marked this conversation as resolved.
Show resolved Hide resolved
e2etests.TestPrecompilesBankName,
e2etests.TestPrecompilesBankFailName,
e2etests.TestPrecompilesBankThroughContractName,
Expand Down
98 changes: 49 additions & 49 deletions precompiles/staking/staking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ func (c *Contract) MoveStake(

// Run is the entrypoint of the precompiled contract, it switches over the input method,
// and execute them accordingly.
func (c *Contract) Run(evm *vm.EVM, contract *vm.Contract, readOnly bool) ([]byte, error) {
func (c *Contract) Run(evm *vm.EVM, contract *vm.Contract, _ bool) ([]byte, error) {
method, err := ABI.MethodById(contract.Input[:4])
if err != nil {
return nil, err
Expand Down Expand Up @@ -414,54 +414,54 @@ func (c *Contract) Run(evm *vm.EVM, contract *vm.Contract, readOnly bool) ([]byt
return nil, err
}
return res, nil
case StakeMethodName:
if readOnly {
return nil, ptypes.ErrWriteMethod{
Method: method.Name,
}
}

var res []byte
execErr := stateDB.ExecuteNativeAction(contract.Address(), nil, func(ctx sdk.Context) error {
res, err = c.Stake(ctx, evm, contract, method, args)
return err
})
if execErr != nil {
return nil, err
}
return res, nil
case UnstakeMethodName:
if readOnly {
return nil, ptypes.ErrWriteMethod{
Method: method.Name,
}
}

var res []byte
execErr := stateDB.ExecuteNativeAction(contract.Address(), nil, func(ctx sdk.Context) error {
res, err = c.Unstake(ctx, evm, contract, method, args)
return err
})
if execErr != nil {
return nil, err
}
return res, nil
case MoveStakeMethodName:
if readOnly {
return nil, ptypes.ErrWriteMethod{
Method: method.Name,
}
}

var res []byte
execErr := stateDB.ExecuteNativeAction(contract.Address(), nil, func(ctx sdk.Context) error {
res, err = c.MoveStake(ctx, evm, contract, method, args)
return err
})
if execErr != nil {
return nil, err
}
return res, nil
// case StakeMethodName:
lumtis marked this conversation as resolved.
Show resolved Hide resolved
// if readOnly {
// return nil, ptypes.ErrWriteMethod{
// Method: method.Name,
// }
// }

// var res []byte
// execErr := stateDB.ExecuteNativeAction(contract.Address(), nil, func(ctx sdk.Context) error {
// res, err = c.Stake(ctx, evm, contract, method, args)
// return err
// })
// if execErr != nil {
// return nil, err
// }
// return res, nil
// case UnstakeMethodName:
// if readOnly {
// return nil, ptypes.ErrWriteMethod{
// Method: method.Name,
// }
// }

// var res []byte
// execErr := stateDB.ExecuteNativeAction(contract.Address(), nil, func(ctx sdk.Context) error {
// res, err = c.Unstake(ctx, evm, contract, method, args)
// return err
// })
// if execErr != nil {
// return nil, err
// }
// return res, nil
// case MoveStakeMethodName:
// if readOnly {
// return nil, ptypes.ErrWriteMethod{
// Method: method.Name,
// }
// }

// var res []byte
// execErr := stateDB.ExecuteNativeAction(contract.Address(), nil, func(ctx sdk.Context) error {
// res, err = c.MoveStake(ctx, evm, contract, method, args)
// return err
// })
// if execErr != nil {
// return nil, err
// }
// return res, nil

default:
return nil, ptypes.ErrInvalidMethod{
Expand Down
Loading
Loading