From 417f4f1f1c7a3ad769f9baf718b105a031959e60 Mon Sep 17 00:00:00 2001 From: trestinlsd Date: Thu, 11 Apr 2024 14:38:16 +0800 Subject: [PATCH] fix: fix lint bugs --- app/app.go | 11 +++--- go.mod | 2 +- precompiles/avsTask/avsTask.sol | 8 ++--- precompiles/avsTask/events.go | 2 +- precompiles/avsTask/methods.go | 19 ++++++----- precompiles/avsTask/parser.go | 5 +-- precompiles/avsTask/setup_test.go | 3 +- precompiles/avsTask/task.go | 15 ++++---- precompiles/avsTask/task_test.go | 11 +++--- .../exocore/{task => avstask}/v1/query.proto | 8 ++--- proto/exocore/{task => avstask}/v1/tx.proto | 4 +-- x/{avs_task => avstask}/client/cli/query.go | 23 +++++-------- x/{avs_task => avstask}/client/cli/tx.go | 17 +++++----- x/{avs_task => avstask}/keeper/keeper.go | 3 +- x/{avs_task => avstask}/keeper/msg_server.go | 7 ++-- x/{avs_task => avstask}/keeper/query.go | 3 +- x/{avs_task => avstask}/keeper/setup_test.go | 0 x/{avs_task => avstask}/keeper/task.go | 12 +++---- x/{avs_task => avstask}/keeper/task_test.go | 7 ++-- x/{avs_task => avstask}/module.go | 12 +++---- x/{avs_task => avstask}/types/codec.go | 0 x/{avs_task => avstask}/types/errors.go | 5 +-- .../types/expected_keepers.go | 0 x/{avs_task => avstask}/types/keys.go | 2 +- x/{avs_task => avstask}/types/msg.go | 4 +-- x/{avs_task => avstask}/types/query.pb.go | 22 ++++++------ x/{avs_task => avstask}/types/query.pb.gw.go | 34 +++++++------------ x/{avs_task => avstask}/types/tx.pb.go | 30 ++++++++-------- x/{avs_task => avstask}/types/types.go | 0 x/delegation/keeper/abci.go | 2 +- x/evm/keeper/precompiles.go | 3 +- 31 files changed, 131 insertions(+), 143 deletions(-) rename proto/exocore/{task => avstask}/v1/query.proto (71%) rename proto/exocore/{task => avstask}/v1/tx.proto (91%) rename x/{avs_task => avstask}/client/cli/query.go (67%) rename x/{avs_task => avstask}/client/cli/tx.go (79%) rename x/{avs_task => avstask}/keeper/keeper.go (94%) rename x/{avs_task => avstask}/keeper/msg_server.go (91%) rename x/{avs_task => avstask}/keeper/query.go (83%) rename x/{avs_task => avstask}/keeper/setup_test.go (100%) rename x/{avs_task => avstask}/keeper/task.go (93%) rename x/{avs_task => avstask}/keeper/task_test.go (86%) rename x/{avs_task => avstask}/module.go (88%) rename x/{avs_task => avstask}/types/codec.go (100%) rename x/{avs_task => avstask}/types/errors.go (70%) rename x/{avs_task => avstask}/types/expected_keepers.go (100%) rename x/{avs_task => avstask}/types/keys.go (96%) rename x/{avs_task => avstask}/types/msg.go (94%) rename x/{avs_task => avstask}/types/query.pb.go (94%) rename x/{avs_task => avstask}/types/query.pb.gw.go (90%) rename x/{avs_task => avstask}/types/tx.pb.go (96%) rename x/{avs_task => avstask}/types/types.go (100%) diff --git a/app/app.go b/app/app.go index cc8d28f00..85b4ca57e 100644 --- a/app/app.go +++ b/app/app.go @@ -4,15 +4,16 @@ import ( "context" "encoding/json" "fmt" - "github.com/ExocoreNetwork/exocore/x/avs_task" - avsTaskKeeper "github.com/ExocoreNetwork/exocore/x/avs_task/keeper" - avsTaskTypes "github.com/ExocoreNetwork/exocore/x/avs_task/types" "io" "net/http" "os" "path/filepath" "sort" + "github.com/ExocoreNetwork/exocore/x/avstask" + avsTaskKeeper "github.com/ExocoreNetwork/exocore/x/avstask/keeper" + avsTaskTypes "github.com/ExocoreNetwork/exocore/x/avstask/types" + "github.com/ExocoreNetwork/exocore/x/avs" "github.com/ExocoreNetwork/exocore/x/operator" operatorKeeper "github.com/ExocoreNetwork/exocore/x/operator/keeper" @@ -277,7 +278,7 @@ var ( reward.AppModuleBasic{}, exoslash.AppModuleBasic{}, avs.AppModuleBasic{}, - avs_task.AppModuleBasic{}, + avstask.AppModuleBasic{}, ) // module account permissions @@ -853,7 +854,7 @@ func NewExocoreApp( reward.NewAppModule(appCodec, app.RewardKeeper), exoslash.NewAppModule(appCodec, app.ExoSlashKeeper), avs.NewAppModule(appCodec, app.AVSManagerKeeper), - avs_task.NewAppModule(appCodec, app.TaskKeeper), + avstask.NewAppModule(appCodec, app.TaskKeeper), ) // During begin block slashing happens after reward.BeginBlocker so that diff --git a/go.mod b/go.mod index 695e92f2e..46db1ad90 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/armon/go-metrics v0.4.1 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/btcutil v1.0.5 github.com/cosmos/cosmos-proto v1.0.0-beta.3 github.com/cosmos/cosmos-sdk v0.47.5 github.com/cosmos/go-bip39 v1.0.0 @@ -83,7 +84,6 @@ require ( github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect - github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect diff --git a/precompiles/avsTask/avsTask.sol b/precompiles/avsTask/avsTask.sol index c8de44dfc..52207031d 100644 --- a/precompiles/avsTask/avsTask.sol +++ b/precompiles/avsTask/avsTask.sol @@ -16,9 +16,9 @@ IAVSTask constant AVSTASK_CONTRACT = IAVSTask( interface IAVSTask { /// TRANSACTIONS /// @dev IAVSTask the oprator, that will change the state in AVSTask module -/// @param TaskContractAddress task Contract Address -/// @param Name task name -/// @param MetaInfo task desc +/// @param TaskContractAddress avstask Contract Address +/// @param Name avstask name +/// @param MetaInfo avstask desc function registerAVSTask( string memory TaskContractAddress, string memory Name, @@ -40,7 +40,7 @@ interface IAVSTask { function getRegisteredPubkey(address operator) external returns (bytes32); /// TRANSACTIONS -/// @dev Get the count of the current task +/// @dev Get the count of the current avstask function checkSignatures( bytes32 msgHash, bytes calldata signature, diff --git a/precompiles/avsTask/events.go b/precompiles/avsTask/events.go index df51313d8..55882b3cb 100644 --- a/precompiles/avsTask/events.go +++ b/precompiles/avsTask/events.go @@ -10,7 +10,7 @@ import ( ) const ( - // EventTypeNewTaskCreated defines the event type for the task create transaction. + // EventTypeNewTaskCreated defines the event type for the avstask create transaction. EventTypeNewPubkeyRegistration = "NewPubkeyRegistration" ) diff --git a/precompiles/avsTask/methods.go b/precompiles/avsTask/methods.go index f4ccc35dc..1c0bb5169 100644 --- a/precompiles/avsTask/methods.go +++ b/precompiles/avsTask/methods.go @@ -2,6 +2,7 @@ package task import ( "fmt" + exocmn "github.com/ExocoreNetwork/exocore/precompiles/common" "github.com/cosmos/btcutil/bech32" sdk "github.com/cosmos/cosmos-sdk/types" @@ -13,7 +14,7 @@ import ( ) const ( - // MethodRegisterAVSTask defines the ABI method name for the task + // MethodRegisterAVSTask defines the ABI method name for the avstask // transaction. MethodRegisterAVSTask = "registerAVSTask" MethodRegisterBLSPublicKey = "registerBLSPublicKey" @@ -21,7 +22,7 @@ const ( MethodICheckSignatures = "checkSignatures" ) -// RegisterAVSTask Middleware uses exocore's default task template to create tasks in task module. +// RegisterAVSTask Middleware uses exocore's default avstask template to create tasks in avstask module. func (p Precompile) RegisterAVSTask( ctx sdk.Context, _ common.Address, @@ -62,13 +63,13 @@ func (p Precompile) RegisterBLSPublicKey( } addr, ok := args[0].(string) - if !ok { - return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 0, "string") + if !ok || addr == "" { + return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 0, "string", addr) } pubkeyBz, ok := args[1].([]byte) if !ok { - return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 0, "string") + return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 0, "[]byte", pubkeyBz) } err := p.taskKeeper.SetOperatorPubKey(ctx, addr, pubkeyBz) @@ -87,8 +88,8 @@ func (p Precompile) RegisterBLSPublicKey( } func (p Precompile) CheckSignatures( - ctx sdk.Context, - contract *vm.Contract, + _ sdk.Context, + _ *vm.Contract, method *abi.Method, args []interface{}, ) ([]byte, error) { @@ -101,7 +102,7 @@ func (p Precompile) CheckSignatures( // GetRegisteredPubkey func (p Precompile) GetRegisteredPubkey( ctx sdk.Context, - contract *vm.Contract, + _ *vm.Contract, method *abi.Method, args []interface{}, ) ([]byte, error) { @@ -111,7 +112,7 @@ func (p Precompile) GetRegisteredPubkey( addr, ok := args[0].(string) if !ok { - return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 0, "string") + return nil, xerrors.Errorf(exocmn.ErrContractInputParaOrType, 0, "string", addr) } pubkey, err := p.taskKeeper.GetOperatorPubKey(ctx, addr) diff --git a/precompiles/avsTask/parser.go b/precompiles/avsTask/parser.go index bacc93007..557cfeea1 100644 --- a/precompiles/avsTask/parser.go +++ b/precompiles/avsTask/parser.go @@ -2,14 +2,15 @@ package task import ( "fmt" + exocmn "github.com/ExocoreNetwork/exocore/precompiles/common" - types "github.com/ExocoreNetwork/exocore/x/avs_task/types" + types "github.com/ExocoreNetwork/exocore/x/avstask/types" sdk "github.com/cosmos/cosmos-sdk/types" cmn "github.com/evmos/evmos/v14/precompiles/common" "golang.org/x/xerrors" ) -func (p Precompile) GetTaskParamsFromInputs(ctx sdk.Context, args []interface{}) (*types.RegisterAVSTaskReq, error) { +func (p Precompile) GetTaskParamsFromInputs(_ sdk.Context, args []interface{}) (*types.RegisterAVSTaskReq, error) { if len(args) != 3 { return nil, fmt.Errorf(cmn.ErrInvalidNumberOfArgs, 3, len(args)) } diff --git a/precompiles/avsTask/setup_test.go b/precompiles/avsTask/setup_test.go index a9af615e5..8255b2304 100644 --- a/precompiles/avsTask/setup_test.go +++ b/precompiles/avsTask/setup_test.go @@ -1,9 +1,10 @@ package task_test import ( + "testing" + "github.com/ExocoreNetwork/exocore/precompiles/avsTask" "github.com/ExocoreNetwork/exocore/testutil" - "testing" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/precompiles/avsTask/task.go b/precompiles/avsTask/task.go index 17367abd7..3cc8f8895 100644 --- a/precompiles/avsTask/task.go +++ b/precompiles/avsTask/task.go @@ -4,8 +4,9 @@ import ( "bytes" "embed" "fmt" + "github.com/ExocoreNetwork/exocore/x/avs/keeper" - taskKeeper "github.com/ExocoreNetwork/exocore/x/avs_task/keeper" + taskKeeper "github.com/ExocoreNetwork/exocore/x/avstask/keeper" "github.com/cometbft/cometbft/libs/log" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -23,14 +24,14 @@ var _ vm.PrecompiledContract = &Precompile{} //go:embed abi.json var f embed.FS -// Precompile defines the precompiled contract for task. +// Precompile defines the precompiled contract for avstask. type Precompile struct { cmn.Precompile taskKeeper taskKeeper.Keeper avsKeeper keeper.Keeper } -// NewPrecompile creates a new task Precompile instance as a +// NewPrecompile creates a new avstask Precompile instance as a // PrecompiledContract interface. func NewPrecompile( authzKeeper authzkeeper.Keeper, @@ -39,7 +40,7 @@ func NewPrecompile( ) (*Precompile, error) { abiBz, err := f.ReadFile("abi.json") if err != nil { - return nil, fmt.Errorf("error loading the task ABI %s", err) + return nil, fmt.Errorf("error loading the avstask ABI %s", err) } newAbi, err := abi.JSON(bytes.NewReader(abiBz)) @@ -60,7 +61,7 @@ func NewPrecompile( }, nil } -// Address defines the address of the task compile contract. +// Address defines the address of the avstask compile contract. // address: 0x0000000000000000000000000000000000000901 func (p Precompile) Address() common.Address { return common.HexToAddress("0x0000000000000000000000000000000000000901") @@ -116,7 +117,7 @@ func (p Precompile) Run(evm *vm.EVM, contract *vm.Contract, readOnly bool) (bz [ // IsTransaction checks if the given methodID corresponds to a transaction or query. // -// Available task transactions are: +// Available avstask transactions are: func (Precompile) IsTransaction(methodID string) bool { switch methodID { case MethodRegisterAVSTask: @@ -128,5 +129,5 @@ func (Precompile) IsTransaction(methodID string) bool { // Logger returns a precompile-specific logger. func (p Precompile) Logger(ctx sdk.Context) log.Logger { - return ctx.Logger().With("ExoCore module", "task") + return ctx.Logger().With("ExoCore module", "avstask") } diff --git a/precompiles/avsTask/task_test.go b/precompiles/avsTask/task_test.go index ff6d256ee..2985df691 100644 --- a/precompiles/avsTask/task_test.go +++ b/precompiles/avsTask/task_test.go @@ -2,6 +2,8 @@ package task_test import ( "encoding/hex" + "math/big" + "github.com/ExocoreNetwork/exocore/app" "github.com/ExocoreNetwork/exocore/precompiles/avsTask" "github.com/cosmos/btcutil/bech32" @@ -10,7 +12,6 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/evmos/evmos/v14/x/evm/statedb" evmtypes "github.com/evmos/evmos/v14/x/evm/types" - "math/big" ) func (s *TaskPrecompileTestSuite) TestIsTransaction() { @@ -38,7 +39,7 @@ func (s *TaskPrecompileTestSuite) TestIsTransaction() { } } -// TestRun tests the precompiles Run method reg task. +// TestRun tests the precompiles Run method reg avstask. func (s *TaskPrecompileTestSuite) TestRunRegTaskinfo() { avsName, avsAddres, operatorAddress, assetID := "avsTest", "exo13h6xg79g82e2g2vhjwg7j4r2z2hlncelwutkjr", "exo18h6xg79g82e2g2vhjwg7j4r2z2hlncelwutkjr", "" _, byteData, _ := bech32.DecodeToBase256(avsAddres) @@ -51,8 +52,8 @@ func (s *TaskPrecompileTestSuite) TestRunRegTaskinfo() { input, err := s.precompile.Pack( task.MethodRegisterAVSTask, "exo1j9ly7f0jynscjgvct0enevaa659te58k3xztc8", - "test-task", - "test-task-url", + "test-avstask", + "test-avstask-url", ) s.Require().NoError(err, "failed to pack input") return common.HexToAddress(caller), input @@ -68,7 +69,7 @@ func (s *TaskPrecompileTestSuite) TestRunRegTaskinfo() { returnBytes []byte }{ { - name: "pass - task via pre-compiles", + name: "pass - avstask via pre-compiles", malleate: func() (common.Address, []byte) { s.Require().NoError(err) registerAvs() diff --git a/proto/exocore/task/v1/query.proto b/proto/exocore/avstask/v1/query.proto similarity index 71% rename from proto/exocore/task/v1/query.proto rename to proto/exocore/avstask/v1/query.proto index a09476dc9..8bbf14c6e 100644 --- a/proto/exocore/task/v1/query.proto +++ b/proto/exocore/avstask/v1/query.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package exocore.task.v1; +package exocore.avstask.v1; import "cosmos_proto/cosmos.proto"; -import "exocore/task/v1/tx.proto"; +import "exocore/avstask/v1/tx.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/ExocoreNetwork/exocore/x/avs_task/types"; +option go_package = "github.com/ExocoreNetwork/exocore/x/avstask/types"; // QueryAVSTaskInfoReq is the request to obtain the task information. message GetAVSTaskInfoReq { @@ -19,6 +19,6 @@ message GetAVSTaskInfoReq { service Query { // TaskInfo queries the task information. rpc GetAVSTaskInfo(GetAVSTaskInfoReq) returns(TaskContractInfo){ - option (google.api.http).get = "/exocore/task/v1/GetAVSTaskInfoReq"; + option (google.api.http).get = "/exocore/avstask/v1/GetAVSTaskInfoReq"; } } diff --git a/proto/exocore/task/v1/tx.proto b/proto/exocore/avstask/v1/tx.proto similarity index 91% rename from proto/exocore/task/v1/tx.proto rename to proto/exocore/avstask/v1/tx.proto index aebbc6b2f..7b8614d66 100644 --- a/proto/exocore/task/v1/tx.proto +++ b/proto/exocore/avstask/v1/tx.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -package exocore.task.v1; +package exocore.avstask.v1; import "amino/amino.proto"; import "cosmos/msg/v1/msg.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/ExocoreNetwork/exocore/x/avs_task/types"; +option go_package = "github.com/ExocoreNetwork/exocore/x/avstask/types"; // TaskContractInfo is the task info. message TaskContractInfo { string task_contract_address = 1; diff --git a/x/avs_task/client/cli/query.go b/x/avstask/client/cli/query.go similarity index 67% rename from x/avs_task/client/cli/query.go rename to x/avstask/client/cli/query.go index fb24367ed..763da272a 100644 --- a/x/avs_task/client/cli/query.go +++ b/x/avstask/client/cli/query.go @@ -3,26 +3,21 @@ package cli import ( "context" "fmt" - tasktypes "github.com/ExocoreNetwork/exocore/x/avs_task/types" - "github.com/cosmos/cosmos-sdk/client/flags" - // "strings" + avstasktypes "github.com/ExocoreNetwork/exocore/x/avstask/types" + "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - // "github.com/cosmos/cosmos-sdk/client/flags" - // sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/ExocoreNetwork/exocore/x/avs_task/types" ) // GetQueryCmd returns the cli query commands for this module func GetQueryCmd() *cobra.Command { cmd := &cobra.Command{ - Use: types.ModuleName, - Short: fmt.Sprintf("Querying commands for the %s module", types.ModuleName), + Use: avstasktypes.ModuleName, + Short: fmt.Sprintf("Querying commands for the %s module", avstasktypes.ModuleName), DisableFlagParsing: true, SuggestionsMinimumDistance: 2, RunE: client.ValidateCmd, @@ -35,9 +30,9 @@ func GetQueryCmd() *cobra.Command { // GetTaskInfo queries operator info func GetTaskInfo() *cobra.Command { cmd := &cobra.Command{ - Use: "GetTaskInfo task info", - Short: "Get task info", - Long: "Get task info", + Use: "GetTaskInfo avstask info", + Short: "Get avstask info", + Long: "Get avstask info", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd) @@ -45,8 +40,8 @@ func GetTaskInfo() *cobra.Command { return err } - queryClient := tasktypes.NewQueryClient(clientCtx) - req := &tasktypes.GetAVSTaskInfoReq{ + queryClient := avstasktypes.NewQueryClient(clientCtx) + req := &avstasktypes.GetAVSTaskInfoReq{ TaskAddr: args[0], } res, err := queryClient.GetAVSTaskInfo(context.Background(), req) diff --git a/x/avs_task/client/cli/tx.go b/x/avstask/client/cli/tx.go similarity index 79% rename from x/avs_task/client/cli/tx.go rename to x/avstask/client/cli/tx.go index 8905f08e1..7de4156d4 100644 --- a/x/avs_task/client/cli/tx.go +++ b/x/avstask/client/cli/tx.go @@ -2,22 +2,20 @@ package cli import ( "fmt" + "github.com/spf13/cobra" + avstasktypes "github.com/ExocoreNetwork/exocore/x/avstask/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - - // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/ExocoreNetwork/exocore/x/avs_task/types" - taskTypes "github.com/ExocoreNetwork/exocore/x/avs_task/types" "github.com/cosmos/cosmos-sdk/client/tx" ) // GetTxCmd returns the transaction commands for this module func GetTxCmd() *cobra.Command { cmd := &cobra.Command{ - Use: types.ModuleName, - Short: fmt.Sprintf("%s transactions subcommands", types.ModuleName), + Use: avstasktypes.ModuleName, + Short: fmt.Sprintf("%s transactions subcommands", avstasktypes.ModuleName), DisableFlagParsing: true, SuggestionsMinimumDistance: 2, RunE: client.ValidateCmd, @@ -49,12 +47,13 @@ func RegisterAVSTask() *cobra.Command { } sender := cliCtx.GetFromAddress().String() - msg := &taskTypes.RegisterAVSTaskReq{ + msg := &avstasktypes.RegisterAVSTaskReq{ FromAddress: sender, - Task: &taskTypes.TaskContractInfo{ + Task: &avstasktypes.TaskContractInfo{ TaskContractAddress: args[0], Name: args[1], - MetaInfo: args[2]}, + MetaInfo: args[2], + }, } if err := msg.ValidateBasic(); err != nil { return err diff --git a/x/avs_task/keeper/keeper.go b/x/avstask/keeper/keeper.go similarity index 94% rename from x/avs_task/keeper/keeper.go rename to x/avstask/keeper/keeper.go index 4e3754ea6..97f8fde7a 100644 --- a/x/avs_task/keeper/keeper.go +++ b/x/avstask/keeper/keeper.go @@ -3,8 +3,9 @@ package keeper import ( "context" "fmt" + "github.com/ExocoreNetwork/exocore/x/avs/keeper" - "github.com/ExocoreNetwork/exocore/x/avs_task/types" + "github.com/ExocoreNetwork/exocore/x/avstask/types" "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/x/avs_task/keeper/msg_server.go b/x/avstask/keeper/msg_server.go similarity index 91% rename from x/avs_task/keeper/msg_server.go rename to x/avstask/keeper/msg_server.go index 8cc7be81c..7d9620094 100644 --- a/x/avs_task/keeper/msg_server.go +++ b/x/avstask/keeper/msg_server.go @@ -2,9 +2,11 @@ package keeper import ( "context" - errorsmod "cosmossdk.io/errors" "fmt" - "github.com/ExocoreNetwork/exocore/x/avs_task/types" + + errorsmod "cosmossdk.io/errors" + + "github.com/ExocoreNetwork/exocore/x/avstask/types" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -15,7 +17,6 @@ func (k *Keeper) RegisterAVSTask(ctx context.Context, req *types.RegisterAVSTask avs, _ := k.avsKeeper.GetAVSInfo(c, req.FromAddress) if avs.GetInfo() == nil { return nil, errorsmod.Wrap(types.ErrNotYetRegistered, fmt.Sprintf("RegisterAVSTask: avs address is %s", req.FromAddress)) - } err := k.SetAvsTaskInfo(c, req) if err != nil { diff --git a/x/avs_task/keeper/query.go b/x/avstask/keeper/query.go similarity index 83% rename from x/avs_task/keeper/query.go rename to x/avstask/keeper/query.go index d4c2d6586..974facb4d 100644 --- a/x/avs_task/keeper/query.go +++ b/x/avstask/keeper/query.go @@ -2,7 +2,8 @@ package keeper import ( "context" - tasktypes "github.com/ExocoreNetwork/exocore/x/avs_task/types" + + tasktypes "github.com/ExocoreNetwork/exocore/x/avstask/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/avs_task/keeper/setup_test.go b/x/avstask/keeper/setup_test.go similarity index 100% rename from x/avs_task/keeper/setup_test.go rename to x/avstask/keeper/setup_test.go diff --git a/x/avs_task/keeper/task.go b/x/avstask/keeper/task.go similarity index 93% rename from x/avs_task/keeper/task.go rename to x/avstask/keeper/task.go index 09f202456..3e89e4687 100644 --- a/x/avs_task/keeper/task.go +++ b/x/avstask/keeper/task.go @@ -1,15 +1,16 @@ package keeper import ( - errorsmod "cosmossdk.io/errors" "fmt" - "github.com/ExocoreNetwork/exocore/x/avs_task/types" + + errorsmod "cosmossdk.io/errors" + + "github.com/ExocoreNetwork/exocore/x/avstask/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" ) func (k *Keeper) SetAvsTaskInfo(ctx sdk.Context, info *types.RegisterAVSTaskReq) (err error) { - taskAccAddr, err := sdk.AccAddressFromBech32(info.Task.TaskContractAddress) if err != nil { return errorsmod.Wrap(err, "SetTaskInfo: error occurred when parse acc address from Bech32") @@ -28,7 +29,7 @@ func (k *Keeper) GetAvsTaskInfo(ctx sdk.Context, addr string) (info *types.TaskC return nil, errorsmod.Wrap(err, "GetTaskInfo: error occurred when parse acc address from Bech32") } store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixAVSTaskInfo) - //key := common.HexToAddress(incentive.Contract) + // key := common.HexToAddress(incentive.Contract) isExist := store.Has(taskAccAddr) if !isExist { return nil, errorsmod.Wrap(types.ErrNoKeyInTheStore, fmt.Sprintf("GetOperatorInfo: key is %suite", addr)) @@ -47,7 +48,6 @@ func (k *Keeper) IsExistTask(ctx sdk.Context, addr sdk.AccAddress) bool { } func (k *Keeper) SetOperatorPubKey(ctx sdk.Context, addr string, pub []byte) (err error) { - opAccAddr, err := sdk.AccAddressFromBech32(addr) if err != nil { return errorsmod.Wrap(err, "SetTaskInfo: error occurred when parse acc address from Bech32") @@ -64,7 +64,7 @@ func (k *Keeper) GetOperatorPubKey(ctx sdk.Context, addr string) (pub []byte, er return nil, errorsmod.Wrap(err, "GetTaskInfo: error occurred when parse acc address from Bech32") } store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixOperatePub) - //key := common.HexToAddress(incentive.Contract) + // key := common.HexToAddress(incentive.Contract) isExist := store.Has(opAccAddr) if !isExist { return nil, errorsmod.Wrap(types.ErrNoKeyInTheStore, fmt.Sprintf("GetOperatorInfo: key is %suite", addr)) diff --git a/x/avs_task/keeper/task_test.go b/x/avstask/keeper/task_test.go similarity index 86% rename from x/avs_task/keeper/task_test.go rename to x/avstask/keeper/task_test.go index 4b62f3e2c..1767f067a 100644 --- a/x/avs_task/keeper/task_test.go +++ b/x/avstask/keeper/task_test.go @@ -1,13 +1,13 @@ package keeper_test -import tasktype "github.com/ExocoreNetwork/exocore/x/avs_task/types" +import tasktype "github.com/ExocoreNetwork/exocore/x/avstask/types" func (suite *OperatorTestSuite) TestTaskInfo() { info := &tasktype.RegisterAVSTaskReq{ FromAddress: suite.AccAddress.String(), Task: &tasktype.TaskContractInfo{ - Name: "test-task-01", - MetaInfo: "task up", + Name: "test-avstask-01", + MetaInfo: "avstask up", TaskContractAddress: "exo1j9ly7f0jynscjgvct0enevaa659te58k3xztc8", Status: "active", }, @@ -21,7 +21,6 @@ func (suite *OperatorTestSuite) TestTaskInfo() { } func (suite *OperatorTestSuite) TestOperator_pubkey() { - err := suite.App.TaskKeeper.SetOperatorPubKey(suite.Ctx, "exo1j9ly7f0jynscjgvct0enevaa659te58k3xztc8", []byte("pubkey")) suite.NoError(err) diff --git a/x/avs_task/module.go b/x/avstask/module.go similarity index 88% rename from x/avs_task/module.go rename to x/avstask/module.go index 77ab6f483..29e62fcad 100644 --- a/x/avs_task/module.go +++ b/x/avstask/module.go @@ -1,10 +1,11 @@ -package avs_task +package avstask import ( "context" - "github.com/ExocoreNetwork/exocore/x/avs_task/client/cli" - "github.com/ExocoreNetwork/exocore/x/avs_task/keeper" - "github.com/ExocoreNetwork/exocore/x/avs_task/types" + + "github.com/ExocoreNetwork/exocore/x/avstask/client/cli" + "github.com/ExocoreNetwork/exocore/x/avstask/keeper" + "github.com/ExocoreNetwork/exocore/x/avstask/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -93,7 +94,6 @@ func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.Weig // EndBlock executes all ABCI EndBlock logic respective to the claim module. It // returns no validator updates. -func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate { - //am.keeper.EndBlock(ctx, req) +func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { return []abci.ValidatorUpdate{} } diff --git a/x/avs_task/types/codec.go b/x/avstask/types/codec.go similarity index 100% rename from x/avs_task/types/codec.go rename to x/avstask/types/codec.go diff --git a/x/avs_task/types/errors.go b/x/avstask/types/errors.go similarity index 70% rename from x/avs_task/types/errors.go rename to x/avstask/types/errors.go index dfe650096..c4733cda4 100644 --- a/x/avs_task/types/errors.go +++ b/x/avstask/types/errors.go @@ -1,15 +1,12 @@ package types -// DONTCOVER - import ( errorsmod "cosmossdk.io/errors" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) // x/avs_task module sentinel errors var ( - ErrSample = sdkerrors.Register(ModuleName, 1100, "sample error") + ErrSample = errorsmod.Register(ModuleName, 1100, "sample error") ErrNoKeyInTheStore = errorsmod.Register(ModuleName, 0, "there is not the key for in the store") ErrNotYetRegistered = errorsmod.Register(ModuleName, 1101, "this AVS has not been registered yet") ) diff --git a/x/avs_task/types/expected_keepers.go b/x/avstask/types/expected_keepers.go similarity index 100% rename from x/avs_task/types/expected_keepers.go rename to x/avstask/types/expected_keepers.go diff --git a/x/avs_task/types/keys.go b/x/avstask/types/keys.go similarity index 96% rename from x/avs_task/types/keys.go rename to x/avstask/types/keys.go index f2a3b93ad..80eee0197 100644 --- a/x/avs_task/types/keys.go +++ b/x/avstask/types/keys.go @@ -7,7 +7,7 @@ import ( const ( // ModuleName defines the module name - ModuleName = "task" + ModuleName = "avstask" // StoreKey defines the primary module store key StoreKey = ModuleName diff --git a/x/avs_task/types/msg.go b/x/avstask/types/msg.go similarity index 94% rename from x/avs_task/types/msg.go rename to x/avstask/types/msg.go index c9203fe8b..031d3b269 100644 --- a/x/avs_task/types/msg.go +++ b/x/avstask/types/msg.go @@ -5,9 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -var ( - _ sdk.Msg = &RegisterAVSTaskReq{} -) +var _ sdk.Msg = &RegisterAVSTaskReq{} // GetSigners returns the expected signers for a MsgUpdateParams message. func (m *RegisterAVSTaskReq) GetSigners() []sdk.AccAddress { diff --git a/x/avs_task/types/query.pb.go b/x/avstask/types/query.pb.go similarity index 94% rename from x/avs_task/types/query.pb.go rename to x/avstask/types/query.pb.go index f0f9b616a..3f597c619 100644 --- a/x/avs_task/types/query.pb.go +++ b/x/avstask/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: exocore/task/v1/query.proto +// source: exocore/avstask/v1/query.proto package types @@ -29,9 +29,9 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// QueryAVSTaskInfoReq is the request to obtain the task information. +// QueryAVSTaskInfoReq is the request to obtain the avstask information. type GetAVSTaskInfoReq struct { - // task_addr is the task contract address,its type should be a sdk.AccAddress + // task_addr is the avstask contract address,its type should be a sdk.AccAddress TaskAddr string `protobuf:"bytes,1,opt,name=task_addr,json=taskAddr,proto3" json:"task_addr,omitempty"` } @@ -76,10 +76,10 @@ func (m *GetAVSTaskInfoReq) GetTaskAddr() string { } func init() { - proto.RegisterType((*GetAVSTaskInfoReq)(nil), "exocore.task.v1.GetAVSTaskInfoReq") + proto.RegisterType((*GetAVSTaskInfoReq)(nil), "exocore.avstask.v1.GetAVSTaskInfoReq") } -func init() { proto.RegisterFile("exocore/task/v1/query.proto", fileDescriptor_76ba8969919da189) } +func init() { proto.RegisterFile("exocore/avstask/v1/query.proto", fileDescriptor_76ba8969919da189) } var fileDescriptor_76ba8969919da189 = []byte{ // 303 bytes of a gzipped FileDescriptorProto @@ -116,7 +116,7 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { - // TaskInfo queries the task information. + // TaskInfo queries the avstask information. GetAVSTaskInfo(ctx context.Context, in *GetAVSTaskInfoReq, opts ...grpc.CallOption) (*TaskContractInfo, error) } @@ -130,7 +130,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) GetAVSTaskInfo(ctx context.Context, in *GetAVSTaskInfoReq, opts ...grpc.CallOption) (*TaskContractInfo, error) { out := new(TaskContractInfo) - err := c.cc.Invoke(ctx, "/exocore.task.v1.Query/GetAVSTaskInfo", in, out, opts...) + err := c.cc.Invoke(ctx, "/exocore.avstask.v1.Query/GetAVSTaskInfo", in, out, opts...) if err != nil { return nil, err } @@ -139,7 +139,7 @@ func (c *queryClient) GetAVSTaskInfo(ctx context.Context, in *GetAVSTaskInfoReq, // QueryServer is the server API for Query service. type QueryServer interface { - // TaskInfo queries the task information. + // TaskInfo queries the avstask information. GetAVSTaskInfo(context.Context, *GetAVSTaskInfoReq) (*TaskContractInfo, error) } @@ -165,7 +165,7 @@ func _Query_GetAVSTaskInfo_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/exocore.task.v1.Query/GetAVSTaskInfo", + FullMethod: "/exocore.avstask.v1.Query/GetAVSTaskInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetAVSTaskInfo(ctx, req.(*GetAVSTaskInfoReq)) @@ -174,7 +174,7 @@ func _Query_GetAVSTaskInfo_Handler(srv interface{}, ctx context.Context, dec fun } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "exocore.task.v1.Query", + ServiceName: "exocore.avstask.v1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -183,7 +183,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "exocore/task/v1/query.proto", + Metadata: "exocore/avstask/v1/query.proto", } func (m *GetAVSTaskInfoReq) Marshal() (dAtA []byte, err error) { diff --git a/x/avs_task/types/query.pb.gw.go b/x/avstask/types/query.pb.gw.go similarity index 90% rename from x/avs_task/types/query.pb.gw.go rename to x/avstask/types/query.pb.gw.go index baf86d5e0..d8ed9cce4 100644 --- a/x/avs_task/types/query.pb.gw.go +++ b/x/avstask/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: exocore/task/v1/query.proto +// source: exocore/avstask/v1/query.proto /* Package types is a reverse proxy. @@ -25,18 +25,18 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = descriptor.ForMessage -var _ = metadata.Join - var ( - filter_Query_GetAVSTaskInfo_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + _ codes.Code + _ io.Reader + _ status.Status + _ = runtime.String + _ = utilities.NewDoubleArray + _ = descriptor.ForMessage + _ = metadata.Join ) +var filter_Query_GetAVSTaskInfo_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + func request_Query_GetAVSTaskInfo_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq GetAVSTaskInfoReq var metadata runtime.ServerMetadata @@ -50,7 +50,6 @@ func request_Query_GetAVSTaskInfo_0(ctx context.Context, marshaler runtime.Marsh msg, err := client.GetAVSTaskInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_GetAVSTaskInfo_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -66,7 +65,6 @@ func local_request_Query_GetAVSTaskInfo_0(ctx context.Context, marshaler runtime msg, err := server.GetAVSTaskInfo(ctx, &protoReq) return msg, metadata, err - } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -74,7 +72,6 @@ func local_request_Query_GetAVSTaskInfo_0(ctx context.Context, marshaler runtime // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { - mux.Handle("GET", pattern_Query_GetAVSTaskInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -95,7 +92,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_GetAVSTaskInfo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -138,7 +134,6 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { - mux.Handle("GET", pattern_Query_GetAVSTaskInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -156,16 +151,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_GetAVSTaskInfo_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil } -var ( - pattern_Query_GetAVSTaskInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"exocore", "task", "v1", "GetAVSTaskInfoReq"}, "", runtime.AssumeColonVerbOpt(false))) -) +var pattern_Query_GetAVSTaskInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"exocore", "avstask", "v1", "GetAVSTaskInfoReq"}, "", runtime.AssumeColonVerbOpt(false))) -var ( - forward_Query_GetAVSTaskInfo_0 = runtime.ForwardResponseMessage -) +var forward_Query_GetAVSTaskInfo_0 = runtime.ForwardResponseMessage diff --git a/x/avs_task/types/tx.pb.go b/x/avstask/types/tx.pb.go similarity index 96% rename from x/avs_task/types/tx.pb.go rename to x/avstask/types/tx.pb.go index 6eddba7b2..059a9dc8c 100644 --- a/x/avs_task/types/tx.pb.go +++ b/x/avstask/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: exocore/task/v1/tx.proto +// source: exocore/avstask/v1/tx.proto package types @@ -31,7 +31,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// TaskContractInfo is the task info. +// TaskContractInfo is the avstask info. type TaskContractInfo struct { TaskContractAddress string `protobuf:"bytes,1,opt,name=task_contract_address,json=taskContractAddress,proto3" json:"task_contract_address,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` @@ -108,12 +108,12 @@ func (m *TaskContractInfo) GetSourceCode() string { return "" } -// RegisterAVSTaskReq is the request to register a new task for avs. +// RegisterAVSTaskReq is the request to register a new avstask for avs. type RegisterAVSTaskReq struct { // from_address is the address of the avs (sdk.AccAddress). FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` - // info is the task info. - Task *TaskContractInfo `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"` + // info is the avstask info. + Task *TaskContractInfo `protobuf:"bytes,2,opt,name=avstask,proto3" json:"avstask,omitempty"` } func (m *RegisterAVSTaskReq) Reset() { *m = RegisterAVSTaskReq{} } @@ -186,12 +186,12 @@ func (m *RegisterAVSTaskResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RegisterAVSTaskResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*TaskContractInfo)(nil), "exocore.task.v1.TaskContractInfo") - proto.RegisterType((*RegisterAVSTaskReq)(nil), "exocore.task.v1.RegisterAVSTaskReq") - proto.RegisterType((*RegisterAVSTaskResponse)(nil), "exocore.task.v1.RegisterAVSTaskResponse") + proto.RegisterType((*TaskContractInfo)(nil), "exocore.avstask.v1.TaskContractInfo") + proto.RegisterType((*RegisterAVSTaskReq)(nil), "exocore.avstask.v1.RegisterAVSTaskReq") + proto.RegisterType((*RegisterAVSTaskResponse)(nil), "exocore.avstask.v1.RegisterAVSTaskResponse") } -func init() { proto.RegisterFile("exocore/task/v1/tx.proto", fileDescriptor_bb9b36cc7c0f3a98) } +func init() { proto.RegisterFile("exocore/avstask/v1/tx.proto", fileDescriptor_bb9b36cc7c0f3a98) } var fileDescriptor_bb9b36cc7c0f3a98 = []byte{ // 460 bytes of a gzipped FileDescriptorProto @@ -238,7 +238,7 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MsgClient interface { - // RegisterAVSTask registers a new task. + // RegisterAVSTask registers a new avstask. RegisterAVSTask(ctx context.Context, in *RegisterAVSTaskReq, opts ...grpc.CallOption) (*RegisterAVSTaskResponse, error) } @@ -252,7 +252,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) RegisterAVSTask(ctx context.Context, in *RegisterAVSTaskReq, opts ...grpc.CallOption) (*RegisterAVSTaskResponse, error) { out := new(RegisterAVSTaskResponse) - err := c.cc.Invoke(ctx, "/exocore.task.v1.Msg/RegisterAVSTask", in, out, opts...) + err := c.cc.Invoke(ctx, "/exocore.avstask.v1.Msg/RegisterAVSTask", in, out, opts...) if err != nil { return nil, err } @@ -261,7 +261,7 @@ func (c *msgClient) RegisterAVSTask(ctx context.Context, in *RegisterAVSTaskReq, // MsgServer is the server API for Msg service. type MsgServer interface { - // RegisterAVSTask registers a new task. + // RegisterAVSTask registers a new avstask. RegisterAVSTask(context.Context, *RegisterAVSTaskReq) (*RegisterAVSTaskResponse, error) } @@ -287,7 +287,7 @@ func _Msg_RegisterAVSTask_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/exocore.task.v1.Msg/RegisterAVSTask", + FullMethod: "/exocore.avstask.v1.Msg/RegisterAVSTask", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).RegisterAVSTask(ctx, req.(*RegisterAVSTaskReq)) @@ -296,7 +296,7 @@ func _Msg_RegisterAVSTask_Handler(srv interface{}, ctx context.Context, dec func } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "exocore.task.v1.Msg", + ServiceName: "exocore.avstask.v1.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -305,7 +305,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "exocore/task/v1/tx.proto", + Metadata: "exocore/avstask/v1/tx.proto", } func (m *TaskContractInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/avs_task/types/types.go b/x/avstask/types/types.go similarity index 100% rename from x/avs_task/types/types.go rename to x/avstask/types/types.go diff --git a/x/delegation/keeper/abci.go b/x/delegation/keeper/abci.go index eaf8cbfdf..6e27227c3 100644 --- a/x/delegation/keeper/abci.go +++ b/x/delegation/keeper/abci.go @@ -8,7 +8,7 @@ import ( ) // EndBlock : completed Undelegation events according to the canCompleted blockHeight -// This function will be triggered at the end of every block, it will query the undelegation state to get the records that need to be handled and try to complete the undelegation task. +// This function will be triggered at the end of every block, it will query the undelegation state to get the records that need to be handled and try to complete the undelegation avstask. func (k *Keeper) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { records, err := k.GetWaitCompleteUndelegationRecords(ctx, uint64(ctx.BlockHeight())) if err != nil { diff --git a/x/evm/keeper/precompiles.go b/x/evm/keeper/precompiles.go index fa0390f80..3f5f0bfd5 100644 --- a/x/evm/keeper/precompiles.go +++ b/x/evm/keeper/precompiles.go @@ -2,9 +2,10 @@ package keeper import ( "fmt" + taskPrecompile "github.com/ExocoreNetwork/exocore/precompiles/avsTask" stakingStateKeeper "github.com/ExocoreNetwork/exocore/x/assets/keeper" - taskKeeper "github.com/ExocoreNetwork/exocore/x/avs_task/keeper" + taskKeeper "github.com/ExocoreNetwork/exocore/x/avstask/keeper" rewardKeeper "github.com/ExocoreNetwork/exocore/x/reward/keeper" withdrawKeeper "github.com/ExocoreNetwork/exocore/x/withdraw/keeper"