Bridge module

app/app.go

@@ -18,6 +18,10 @@ package app
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/x/group"
+	groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
+	groupmodule "github.com/cosmos/cosmos-sdk/x/group/module"
+	bridgemoduletypes "github.com/evmos/ethermint/x/bridge/types"
 	"io"
 	"net/http"
 	"os"
@@ -122,6 +126,8 @@ import (
 	"github.com/evmos/ethermint/ethereum/eip712"
 	srvflags "github.com/evmos/ethermint/server/flags"
 	ethermint "github.com/evmos/ethermint/types"
+	"github.com/evmos/ethermint/x/bridge"
+	bridgemodulekeeper "github.com/evmos/ethermint/x/bridge/keeper"
 	"github.com/evmos/ethermint/x/evm"
 	evmkeeper "github.com/evmos/ethermint/x/evm/keeper"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
@@ -171,13 +177,15 @@ var (
 		ibc.AppModuleBasic{},
 		authzmodule.AppModuleBasic{},
 		feegrantmodule.AppModuleBasic{},
+		groupmodule.AppModuleBasic{},
 		upgrade.AppModuleBasic{},
 		evidence.AppModuleBasic{},
 		transfer.AppModuleBasic{},
 		vesting.AppModuleBasic{},
 		// Ethermint modules
 		evm.AppModuleBasic{},
 		feemarket.AppModuleBasic{},
+		bridge.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -230,6 +238,7 @@ type EthermintApp struct {
 	UpgradeKeeper    upgradekeeper.Keeper
 	ParamsKeeper     paramskeeper.Keeper
 	FeeGrantKeeper   feegrantkeeper.Keeper
+	GroupKeeper      groupkeeper.Keeper
 	AuthzKeeper      authzkeeper.Keeper
 	IBCKeeper        *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
 	EvidenceKeeper   evidencekeeper.Keeper
@@ -242,6 +251,7 @@ type EthermintApp struct {
 	// Ethermint keepers
 	EvmKeeper       *evmkeeper.Keeper
 	FeeMarketKeeper feemarketkeeper.Keeper
+	BridgeKeeper    bridgemodulekeeper.Keeper
 
 	// the module manager
 	mm *module.Manager
@@ -289,9 +299,9 @@ func NewEthermintApp(
 		evidencetypes.StoreKey, capabilitytypes.StoreKey,
 		feegrant.StoreKey, authzkeeper.StoreKey,
 		// ibc keys
-		ibchost.StoreKey, ibctransfertypes.StoreKey,
+		ibchost.StoreKey, ibctransfertypes.StoreKey, group.StoreKey,
 		// ethermint keys
-		evmtypes.StoreKey, feemarkettypes.StoreKey,
+		evmtypes.StoreKey, feemarkettypes.StoreKey, bridgemoduletypes.StoreKey,
 	)
 
 	// Add the EVM transient store key
@@ -369,6 +379,18 @@ func NewEthermintApp(
 		&stakingKeeper,
 		authtypes.FeeCollectorName,
 	)
+	groupConfig := group.DefaultConfig()
+	/*
+		Example of setting group params:
+		groupConfig.MaxMetadataLen = 1000
+	*/
+	app.GroupKeeper = groupkeeper.NewKeeper(
+		keys[group.StoreKey],
+		appCodec,
+		app.MsgServiceRouter(),
+		app.AccountKeeper,
+		groupConfig,
+	)
 	app.SlashingKeeper = slashingkeeper.NewKeeper(
 		appCodec,
 		keys[slashingtypes.StoreKey],
@@ -453,6 +475,16 @@ func NewEthermintApp(
 		),
 	)
 
+	app.BridgeKeeper = *bridgemodulekeeper.NewKeeper(
+		appCodec,
+		keys[bridgemoduletypes.StoreKey],
+		keys[bridgemoduletypes.MemStoreKey],
+		app.GetSubspace(bridgemoduletypes.ModuleName),
+
+		app.GroupKeeper,
+	)
+	bridgeModule := bridge.NewAppModule(appCodec, app.BridgeKeeper, app.AccountKeeper, app.BankKeeper)
+
 	// Create Transfer Keepers
 	app.TransferKeeper = ibctransferkeeper.NewKeeper(
 		appCodec, keys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName),
@@ -493,6 +525,7 @@ func NewEthermintApp(
 		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper),
 		crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
+		groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
 		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil),
@@ -510,6 +543,7 @@ func NewEthermintApp(
 		// Ethermint app modules
 		feemarket.NewAppModule(app.FeeMarketKeeper, feeMarketSs),
 		evm.NewAppModule(app.EvmKeeper, app.AccountKeeper, evmSs),
+		bridgeModule,
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -538,8 +572,10 @@ func NewEthermintApp(
 		genutiltypes.ModuleName,
 		authz.ModuleName,
 		feegrant.ModuleName,
+		group.ModuleName,
 		paramstypes.ModuleName,
 		vestingtypes.ModuleName,
+		bridgemoduletypes.ModuleName,
 	)
 
 	// NOTE: fee market module must go last in order to retrieve the block gas used.
@@ -562,9 +598,11 @@ func NewEthermintApp(
 		evidencetypes.ModuleName,
 		authz.ModuleName,
 		feegrant.ModuleName,
+		group.ModuleName,
 		paramstypes.ModuleName,
 		upgradetypes.ModuleName,
 		vestingtypes.ModuleName,
+		bridgemoduletypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -594,11 +632,13 @@ func NewEthermintApp(
 		ibctransfertypes.ModuleName,
 		authz.ModuleName,
 		feegrant.ModuleName,
+		group.ModuleName,
 		paramstypes.ModuleName,
 		upgradetypes.ModuleName,
 		vestingtypes.ModuleName,
 		// NOTE: crisis module must go at the end to check for invariants on each module
 		crisistypes.ModuleName,
+		bridgemoduletypes.ModuleName,
 	)
 
 	// Uncomment if you want to set a custom migration order here.
@@ -868,5 +908,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	// ethermint subspaces
 	paramsKeeper.Subspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable()) //nolint: staticcheck
 	paramsKeeper.Subspace(feemarkettypes.ModuleName).WithKeyTable(feemarkettypes.ParamKeyTable())
+	paramsKeeper.Subspace(bridgemoduletypes.ModuleName)
 	return paramsKeeper
 }

init.bat

@@ -43,6 +43,8 @@ cat %GENESIS% | jq ".app_state[\"staking\"][\"params\"][\"bond_denom\"]=\"aphoto
 cat %GENESIS% | jq ".app_state[\"crisis\"][\"constant_fee\"][\"denom\"]=\"aphoton\"" > %TMPGENESIS% && move %TMPGENESIS% %GENESIS%
 cat %GENESIS% | jq ".app_state[\"gov\"][\"deposit_params\"][\"min_deposit\"][0][\"denom\"]=\"aphoton\"" > %TMPGENESIS% && move %TMPGENESIS% %GENESIS%
 cat %GENESIS% | jq ".app_state[\"mint\"][\"params\"][\"mint_denom\"]=\"aphoton\"" > %TMPGENESIS% && move %TMPGENESIS% %GENESIS%
+cat %GENESIS% | jq ".app_state[\"bridge\"][\"callerGroupList\"]=[{\"name\":\"caller group\",\"admin\":\"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c\",\"members\":[\"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c\"],\"creator\":\"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c\",}]" > %TMPGENESIS% && move %TMPGENESIS% %GENESIS%
+cat %GENESIS% | jq ".app_state[\"bridge\"][\"signerGroupList\"]=[{\"name\":\"signer group\",\"admin\":\"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c\",\"members\":[\"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c\"],\"creator\":\"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c\",}]" > %TMPGENESIS% && move %TMPGENESIS% %GENESIS%
 
 rem increase block time (?)
 cat %GENESIS% | jq ".consensus_params[\"block\"][\"time_iota_ms\"]=\"30000\"" > %TMPGENESIS% && move %TMPGENESIS% %GENESIS%

init.sh

@@ -32,6 +32,8 @@ cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["staking"]["params"][
 cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["crisis"]["constant_fee"]["denom"]="aphoton"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json
 cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="aphoton"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json
 cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]="aphoton"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json
+cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["bridge"]["callerGroupList"]=[{"name":"caller group","admin":"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c","members":["ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c"],"creator":"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c",}]' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json
+cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["bridge"]["signerGroupList"]=[{"name":"signer group","admin":"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c","members":["ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c"],"creator":"ethm1apz0lt5udhraewrnmcm6lms8s4xrh7awssta8c",}]' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json
 
 # Set gas limit in genesis
 cat $HOME/.ethermintd/config/genesis.json | jq '.consensus_params["block"]["max_gas"]="20000000"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json

proto/ethermint/bridge/v1/caller_group.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+package ethermint.bridge.v1;
+
+option go_package = "github.com/evmos/ethermint/x/bridge/types";
+
+message CallerGroup {
+  string name = 1; 
+  string admin = 2; 
+  repeated string members = 3; 
+  string creator = 4;
+}
+

proto/ethermint/bridge/v1/deposit.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+package ethermint.bridge.v1;
+
+option go_package = "github.com/evmos/ethermint/x/bridge/types";
+
+message Deposit {
+  string txHash = 1; 
+  string from = 2; 
+  string to = 3; 
+  string coinType = 4; 
+  uint64 value = 5; 
+  string data = 6; 
+  string status = 7; 
+  string creator = 8;
+}
+

proto/ethermint/bridge/v1/genesis.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package ethermint.bridge.v1;
+
+import "gogoproto/gogo.proto";
+import "ethermint/bridge/v1/params.proto";
+import "ethermint/bridge/v1/deposit.proto";
+import "ethermint/bridge/v1/withdraw.proto";
+import "ethermint/bridge/v1/caller_group.proto";
+import "ethermint/bridge/v1/signer_group.proto";
+
+option go_package = "github.com/evmos/ethermint/x/bridge/types";
+
+// GenesisState defines the test module's genesis state.
+message GenesisState {
+           Params      params          = 1 [(gogoproto.nullable) = false];
+  repeated Deposit     depositList     = 2 [(gogoproto.nullable) = false];
+  repeated Withdraw    withdrawList    = 3 [(gogoproto.nullable) = false];
+  repeated CallerGroup callerGroupList = 4 [(gogoproto.nullable) = false];
+  repeated SignerGroup signerGroupList = 5 [(gogoproto.nullable) = false];
+}
+

proto/ethermint/bridge/v1/params.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+package ethermint.bridge.v1;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/evmos/ethermint/x/bridge/types";
+
+// Params defines the parameters for the module.
+message Params {
+  option (gogoproto.goproto_stringer) = false;
+
+  string callerGroupName = 1 [(gogoproto.moretags) = "yaml:\"caller_group_name\""];
+  string signerGroupName = 2 [(gogoproto.moretags) = "yaml:\"signer_group_name\""];
+}

proto/ethermint/bridge/v1/query.proto

@@ -0,0 +1,142 @@
+syntax = "proto3";
+
+package ethermint.bridge.v1;
+
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "cosmos/base/query/v1beta1/pagination.proto";
+import "ethermint/bridge/v1/params.proto";
+import "ethermint/bridge/v1/deposit.proto";
+import "ethermint/bridge/v1/withdraw.proto";
+import "ethermint/bridge/v1/caller_group.proto";
+import "ethermint/bridge/v1/signer_group.proto";
+
+option go_package = "github.com/evmos/ethermint/x/bridge/types";
+
+// Query defines the gRPC querier service.
+service Query {
+
+  // Parameters queries the parameters of the module.
+  rpc Params (QueryParamsRequest) returns (QueryParamsResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/params";
+
+  }
+
+  // Queries a list of Deposit items.
+  rpc Deposit    (QueryGetDepositRequest) returns (QueryGetDepositResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/deposit/{txHash}";
+
+  }
+  rpc DepositAll (QueryAllDepositRequest) returns (QueryAllDepositResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/deposit";
+
+  }
+
+  // Queries a list of Withdraw items.
+  rpc Withdraw    (QueryGetWithdrawRequest) returns (QueryGetWithdrawResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/withdraw/{txHash}";
+
+  }
+  rpc WithdrawAll (QueryAllWithdrawRequest) returns (QueryAllWithdrawResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/withdraw";
+
+  }
+
+  // Queries a list of CallerGroup items.
+  rpc CallerGroup    (QueryGetCallerGroupRequest) returns (QueryGetCallerGroupResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/caller_group/{name}";
+
+  }
+  rpc CallerGroupAll (QueryAllCallerGroupRequest) returns (QueryAllCallerGroupResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/caller_group";
+
+  }
+
+  // Queries a list of SignerGroup items.
+  rpc SignerGroup    (QueryGetSignerGroupRequest) returns (QueryGetSignerGroupResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/signer_group/{name}";
+
+  }
+  rpc SignerGroupAll (QueryAllSignerGroupRequest) returns (QueryAllSignerGroupResponse) {
+    option (google.api.http).get = "/ethermint/bridge/v1/signer_group";
+
+  }
+}
+// QueryParamsRequest is request type for the Query/Params RPC method.
+message QueryParamsRequest {}
+
+// QueryParamsResponse is response type for the Query/Params RPC method.
+message QueryParamsResponse {
+
+  // params holds all the parameters of this module.
+  Params params = 1 [(gogoproto.nullable) = false];
+}
+
+message QueryGetDepositRequest {
+  string txHash = 1;
+}
+
+message QueryGetDepositResponse {
+  Deposit deposit = 1 [(gogoproto.nullable) = false];
+}
+
+message QueryAllDepositRequest {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+message QueryAllDepositResponse {
+  repeated Deposit                                deposit    = 1 [(gogoproto.nullable) = false];
+           cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
+message QueryGetWithdrawRequest {
+  string txHash = 1;
+}
+
+message QueryGetWithdrawResponse {
+  Withdraw withdraw = 1 [(gogoproto.nullable) = false];
+}
+
+message QueryAllWithdrawRequest {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+message QueryAllWithdrawResponse {
+  repeated Withdraw                               withdraw   = 1 [(gogoproto.nullable) = false];
+           cosmos.base.query.v1beta1.PageResponse pagination = 2;
+}
+
+message QueryGetCallerGroupRequest {
+  string name = 1;
+}
+
+message QueryGetCallerGroupResponse {
+  CallerGroup callerGroup = 1 [(gogoproto.nullable) = false];
+}
+
+message QueryAllCallerGroupRequest {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+message QueryAllCallerGroupResponse {
+  repeated CallerGroup                            callerGroup = 1 [(gogoproto.nullable) = false];
+           cosmos.base.query.v1beta1.PageResponse pagination  = 2;
+}
+
+message QueryGetSignerGroupRequest {
+  string name = 1;
+}
+
+message QueryGetSignerGroupResponse {
+  SignerGroup signerGroup = 1 [(gogoproto.nullable) = false];
+}
+
+message QueryAllSignerGroupRequest {
+  cosmos.base.query.v1beta1.PageRequest pagination = 1;
+}
+
+message QueryAllSignerGroupResponse {
+  repeated SignerGroup                            signerGroup = 1 [(gogoproto.nullable) = false];
+           cosmos.base.query.v1beta1.PageResponse pagination  = 2;
+}
+