Skip to content

Commit

Permalink
Fixed some spelling issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@trestinlsd
trestinlsd committed Feb 19, 2025
1 parent 2cdab58 commit 945b54b
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 44 deletions.
8 changes: 4 additions & 4 deletions precompiles/avs/avs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func (p Precompile) Run(evm *vm.EVM, contract *vm.Contract, readOnly bool) (bz [
writeFunc()
}
// queries
case MethodGetOptinOperators:
case MethodGetOptInOperators:
bz, err = p.GetOptedInOperatorAccAddresses(ctx, contract, method, args)
if err != nil {
ctx.Logger().Error("internal error when calling avs precompile", "module", "avs precompile", "method", method.Name, "err", err)
Expand Down Expand Up @@ -196,8 +196,8 @@ func (p Precompile) Run(evm *vm.EVM, contract *vm.Contract, readOnly bool) (bz [
bz, err = method.Outputs.Pack(common.Big0)
}

case MethodGetRegisteredPubkey:
bz, err = p.GetRegisteredPubkey(ctx, contract, method, args)
case MethodGetRegisteredPubKey:
bz, err = p.GetRegisteredPubKey(ctx, contract, method, args)
if err != nil {
ctx.Logger().Error("internal error when calling avs precompile", "module", "avs precompile", "method", method.Name, "err", err)
bz, err = method.Outputs.Pack([]byte{})
Expand Down Expand Up @@ -256,7 +256,7 @@ func (Precompile) IsTransaction(methodID string) bool {
case MethodRegisterAVS, MethodDeregisterAVS, MethodUpdateAVS, MethodRegisterOperatorToAVS,
MethodDeregisterOperatorFromAVS, MethodCreateAVSTask, MethodRegisterBLSPublicKey, MethodChallenge, MethodOperatorSubmitTask:
return true
case MethodGetRegisteredPubkey, MethodGetOptinOperators, MethodGetAVSUSDValue, MethodGetOperatorOptedUSDValue,
case MethodGetRegisteredPubKey, MethodGetOptInOperators, MethodGetAVSUSDValue, MethodGetOperatorOptedUSDValue,
MethodGetAVSEpochIdentifier, MethodGetTaskInfo, MethodIsOperator, MethodGetCurrentEpoch:
return false
default:
Expand Down
8 changes: 4 additions & 4 deletions precompiles/avs/avs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ func (suite *AVSManagerPrecompileSuite) TestDeregisterOperatorFromAVS() {
}

setUp := func() {
avs := &types.AVSInfo{
avsInfo := &types.AVSInfo{
Name: avsName,
AvsAddress: suite.Address.String(),
SlashAddress: slashAddress,
Expand All @@ -601,10 +601,10 @@ func (suite *AVSManagerPrecompileSuite) TestDeregisterOperatorFromAVS() {
AvsSlash: sdk.MustNewDecFromStr(strconv.Itoa(int(params[2]))),
}

err := suite.App.AVSManagerKeeper.SetAVSInfo(suite.Ctx, avs)
err := suite.App.AVSManagerKeeper.SetAVSInfo(suite.Ctx, avsInfo)
suite.NoError(err)
}
optin := func() {
optIn := func() {
operatorParams := &types.OperatorOptParams{}
operatorParams.OperatorAddress = operatorAddress
operatorParams.AvsAddress = suite.Address
Expand Down Expand Up @@ -637,7 +637,7 @@ func (suite *AVSManagerPrecompileSuite) TestDeregisterOperatorFromAVS() {
malleate: func() (common.Address, []byte) {
registerOperator()
setUp()
optin()
optIn()
return commonMalleate()
},
readOnly: false,
Expand Down
26 changes: 13 additions & 13 deletions precompiles/avs/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
)

const (
MethodGetRegisteredPubkey = "getRegisteredPubkey"
MethodGetOptinOperators = "getOptInOperators"
MethodGetRegisteredPubKey = "getRegisteredPubkey"
MethodGetOptInOperators = "getOptInOperators"
MethodGetAVSUSDValue = "getAVSUSDValue"
MethodGetOperatorOptedUSDValue = "getOperatorOptedUSDValue"

Expand All @@ -32,24 +32,24 @@ const (
MethodGetChallengeInfo = "getChallengeInfo"
)

func (p Precompile) GetRegisteredPubkey(
func (p Precompile) GetRegisteredPubKey(
ctx sdk.Context,
_ *vm.Contract,
method *abi.Method,
args []interface{},
) ([]byte, error) {
if len(args) != len(p.ABI.Methods[MethodGetRegisteredPubkey].Inputs) {
return nil, fmt.Errorf(cmn.ErrInvalidNumberOfArgs, len(p.ABI.Methods[MethodGetRegisteredPubkey].Inputs), len(args))
if len(args) != len(p.ABI.Methods[MethodGetRegisteredPubKey].Inputs) {
return nil, fmt.Errorf(cmn.ErrInvalidNumberOfArgs, len(p.ABI.Methods[MethodGetRegisteredPubKey].Inputs), len(args))
}
opratorAddress, ok := args[0].(common.Address)
if !ok || opratorAddress == (common.Address{}) {
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 0, "common.Address", opratorAddress)
operatorAddress, ok := args[0].(common.Address)
if !ok || operatorAddress == (common.Address{}) {
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 0, "common.Address", operatorAddress)
}
avsAddress, ok := args[1].(common.Address)
if !ok {
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 1, "common.Address", avsAddress)
}
var accAddress sdk.AccAddress = opratorAddress[:]
var accAddress sdk.AccAddress = operatorAddress[:]
blsPubKeyInfo, err := p.avsKeeper.GetOperatorPubKey(ctx, accAddress.String(), avsAddress.String())
if err != nil {
if errors.Is(err, avstype.ErrNoKeyInTheStore) {
Expand All @@ -66,8 +66,8 @@ func (p Precompile) GetOptedInOperatorAccAddresses(
method *abi.Method,
args []interface{},
) ([]byte, error) {
if len(args) != len(p.ABI.Methods[MethodGetOptinOperators].Inputs) {
return nil, fmt.Errorf(cmn.ErrInvalidNumberOfArgs, len(p.ABI.Methods[MethodGetOptinOperators].Inputs), len(args))
if len(args) != len(p.ABI.Methods[MethodGetOptInOperators].Inputs) {
return nil, fmt.Errorf(cmn.ErrInvalidNumberOfArgs, len(p.ABI.Methods[MethodGetOptInOperators].Inputs), len(args))
}

avsAddress, ok := args[0].(common.Address)
Expand Down Expand Up @@ -315,7 +315,7 @@ func (p Precompile) GetOperatorTaskResponseList(
resList := make([]OperatorResInfo, 0)

for _, accAddress := range task.SignedOperators {
bech32, err := sdk.AccAddressFromBech32(accAddress)
tempAddress, err := sdk.AccAddressFromBech32(accAddress)
if err != nil {
return nil, err
}
Expand All @@ -334,7 +334,7 @@ func (p Precompile) GetOperatorTaskResponseList(
result := OperatorResInfo{
TaskContractAddress: taskAddress,
TaskID: taskID,
OperatorAddress: common.BytesToAddress(bech32),
OperatorAddress: common.BytesToAddress(tempAddress),
TaskResponseHash: res.TaskResponseHash,
TaskResponse: res.TaskResponse,
BlsSignature: res.BlsSignature,
Expand Down
12 changes: 6 additions & 6 deletions precompiles/avs/query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var baseTestCases = []avsTestCases{
}

func (suite *AVSManagerPrecompileSuite) TestGetOptedInOperatorAccAddress() {
method := suite.precompile.Methods[avsManagerPrecompile.MethodGetOptinOperators]
method := suite.precompile.Methods[avsManagerPrecompile.MethodGetOptInOperators]
operatorAddress, avsAddress, slashContract := "exo18cggcpvwspnd5c6ny8wrqxpffj5zmhklprtnph", suite.Address, "0xDF907c29719154eb9872f021d21CAE6E5025d7aB"

operatorOptIn := func() {
Expand Down Expand Up @@ -95,7 +95,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetOptedInOperatorAccAddress() {
},
func(bz []byte) {
var out []string
err := suite.precompile.UnpackIntoInterface(&out, avsManagerPrecompile.MethodGetOptinOperators, bz)
err := suite.precompile.UnpackIntoInterface(&out, avsManagerPrecompile.MethodGetOptInOperators, bz)
suite.Require().NoError(err, "failed to unpack output", err)
suite.Require().Equal(0, len(out))
},
Expand All @@ -113,7 +113,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetOptedInOperatorAccAddress() {
},
func(bz []byte) {
var out []common.Address
err := suite.precompile.UnpackIntoInterface(&out, avsManagerPrecompile.MethodGetOptinOperators, bz)
err := suite.precompile.UnpackIntoInterface(&out, avsManagerPrecompile.MethodGetOptInOperators, bz)
suite.Require().NoError(err, "failed to unpack output", err)
suite.Require().Equal(1, len(out))
acc, err := sdk.AccAddressFromBech32(operatorAddress)
Expand Down Expand Up @@ -322,7 +322,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetOperatorOptedUSDValue() {
}

func (suite *AVSManagerPrecompileSuite) TestGetRegisteredPubkey() {
method := suite.precompile.Methods[avsManagerPrecompile.MethodGetRegisteredPubkey]
method := suite.precompile.Methods[avsManagerPrecompile.MethodGetRegisteredPubKey]
privateKey, err := blst.RandKey()
suite.NoError(err)
address := utiltx.GenerateAddress()
Expand Down Expand Up @@ -352,7 +352,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetRegisteredPubkey() {
},
func(bz []byte) {
var out []byte
err := suite.precompile.UnpackIntoInterface(&out, avsManagerPrecompile.MethodGetRegisteredPubkey, bz)
err := suite.precompile.UnpackIntoInterface(&out, avsManagerPrecompile.MethodGetRegisteredPubKey, bz)
suite.Require().NoError(err, "failed to unpack output", err)
suite.Require().Equal(48, len(out))
suite.Require().Equal(publicKey.Marshal(), out)
Expand All @@ -368,7 +368,7 @@ func (suite *AVSManagerPrecompileSuite) TestGetRegisteredPubkey() {
suite.Run(tc.name, func() {
contract := vm.NewContract(vm.AccountRef(suite.Address), suite.precompile, big.NewInt(0), tc.gas)

bz, err := suite.precompile.GetRegisteredPubkey(suite.Ctx, contract, &method, tc.malleate())
bz, err := suite.precompile.GetRegisteredPubKey(suite.Ctx, contract, &method, tc.malleate())

if tc.expErr {
suite.Require().Error(err)
Expand Down
26 changes: 11 additions & 15 deletions precompiles/avs/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,8 @@ func (p Precompile) DeregisterAVS(
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 1, "string", avsName)
}
avsParams.AvsName = avsName

avsParams.AvsAddress = contract.CallerAddress
avsParams.Action = avstypes.DeRegisterAction
// validates that this is owner

err := p.avsKeeper.UpdateAVSInfo(ctx, avsParams)
if err != nil {
return nil, err
Expand Down Expand Up @@ -193,7 +190,7 @@ func (p Precompile) UnbindOperatorToAVS(
return method.Outputs.Pack(true)
}

// CreateAVSTask Middleware uses exocore's default avstask template to create tasks in avstask module.
// CreateAVSTask Middleware uses exocore's default avs task template to create tasks in avs task module.
func (p Precompile) CreateAVSTask(
ctx sdk.Context,
_ common.Address,
Expand All @@ -217,7 +214,7 @@ func (p Precompile) CreateAVSTask(
return method.Outputs.Pack(taskID)
}

// Challenge Middleware uses exocore's default avstask template to create tasks in avstask module.
// Challenge Middleware uses exocore's default avs task template to create tasks in avs task module.
func (p Precompile) Challenge(
ctx sdk.Context,
_ common.Address,
Expand Down Expand Up @@ -284,7 +281,6 @@ func (p Precompile) Challenge(
return method.Outputs.Pack(true)
}

// RegisterBLSPublicKey
func (p Precompile) RegisterBLSPublicKey(
ctx sdk.Context,
_ common.Address,
Expand All @@ -308,23 +304,23 @@ func (p Precompile) RegisterBLSPublicKey(
}
blsParams.AvsAddress = avsAddress

pubkeyBz, ok := args[2].([]byte)
pubKeyBz, ok := args[2].([]byte)
if !ok {
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 2, "[]byte", pubkeyBz)
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 2, "[]byte", pubKeyBz)
}
blsParams.PubKey = pubkeyBz
blsParams.PubKey = pubKeyBz

pubkeyRegistrationSignature, ok := args[3].([]byte)
pubKeyRegistrationSignature, ok := args[3].([]byte)
if !ok {
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 3, "[]byte", pubkeyRegistrationSignature)
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 3, "[]byte", pubKeyRegistrationSignature)
}
blsParams.PubkeyRegistrationSignature = pubkeyRegistrationSignature
blsParams.PubkeyRegistrationSignature = pubKeyRegistrationSignature

pubkeyRegistrationMessageHash, ok := args[4].([]byte)
pubKeyRegistrationMessageHash, ok := args[4].([]byte)
if !ok {
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 4, "[]byte", pubkeyRegistrationMessageHash)
return nil, fmt.Errorf(exocmn.ErrContractInputParamOrType, 4, "[]byte", pubKeyRegistrationMessageHash)
}
blsParams.PubkeyRegistrationMessageHash = pubkeyRegistrationMessageHash
blsParams.PubkeyRegistrationMessageHash = pubKeyRegistrationMessageHash

err := p.avsKeeper.RegisterBLSPublicKey(ctx, blsParams)
if err != nil {
Expand Down
2 changes: 0 additions & 2 deletions precompiles/avs/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func (p Precompile) GetAVSParamsFromInputs(contract *vm.Contract, origin common.
}
avsParams.RewardContractAddress = avsPayload.AVSParams.RewardAddress

// bech32
if avsPayload.AVSParams.AvsOwnerAddresses == nil {
return nil, fmt.Errorf("the contract input parameter AvsOwnerAddresses error,value:%v", avsPayload.AVSParams.AvsOwnerAddresses)
}
Expand All @@ -72,7 +71,6 @@ func (p Precompile) GetAVSParamsFromInputs(contract *vm.Contract, origin common.
exoAddresses[i] = accAddress.String()
}
avsParams.AvsOwnerAddresses = exoAddresses
// bech32

if avsPayload.AVSParams.WhitelistAddresses == nil {
return nil, fmt.Errorf("the contract input parameter WhitelistAddresses error,value:%v", avsPayload.AVSParams.WhitelistAddresses)
Expand Down

0 comments on commit 945b54b

Please sign in to comment.