Merge main

docs/proto/proto-docs.md

@@ -5,6 +5,7 @@
 ## Table of Contents
 
 - [osmosis/meshsecurity/v1beta1/meshsecurity.proto](#osmosis/meshsecurity/v1beta1/meshsecurity.proto)
+    - [Delegation](#osmosis.meshsecurity.v1beta1.Delegation)
     - [Params](#osmosis.meshsecurity.v1beta1.Params)
     - [VirtualStakingMaxCapInfo](#osmosis.meshsecurity.v1beta1.VirtualStakingMaxCapInfo)
 
@@ -41,6 +42,23 @@
 
 
 
+<a name="osmosis.meshsecurity.v1beta1.Delegation"></a>
+
+### Delegation
+Delegation represents the bond with tokens held by an account.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `delegator_address` | [string](#string) |  | delegator_address is the bech32-encoded address of the delegator. |
+| `validator_address` | [string](#string) |  | validator_address is the bech32-encoded address of the validator. |
+| `amount` | [string](#string) |  | amount define the delegation amount. |
+
+
+
+
+
+
 <a name="osmosis.meshsecurity.v1beta1.Params"></a>
 
 ### Params

proto/osmosis/meshsecurity/v1beta1/meshsecurity.proto

@@ -22,6 +22,21 @@ message VirtualStakingMaxCapInfo {
   cosmos.base.v1beta1.Coin cap = 3 [ (gogoproto.nullable) = false ];
 }
 
+// Delegation represents the bond with tokens held by an account.
+message Delegation {
+  option (gogoproto.equal) = false;
+
+  // delegator_address is the bech32-encoded address of the delegator.
+  string delegator_address = 1;
+  // validator_address is the bech32-encoded address of the validator.
+  string validator_address = 2;
+  // amount define the delegation amount.
+  string amount = 3 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable)   = false
+  ];
+}
+
 // Params defines the parameters for the x/meshsecurity module.
 message Params {
   option (amino.name) = "meshsecurity/Params";

proto/osmosis/meshsecurity/v1beta1/scheduler.proto

@@ -1,21 +1,13 @@
 syntax = "proto3";
 package osmosis.meshsecurity.v1beta1;
 
-// import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
-// import "amino/amino.proto";
 import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/osmosis-labs/mesh-security-sdk/x/meshsecurity/types";
 option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.equal_all) = false;
 
-//
-message ScheduledWork {
-  bool repeat = 1;
-}
-
-
 // ValidatorAddress payload data to be used with the scheduler
 message ValidatorAddress {
   // Address is the ValAddress bech32 string

proto/osmosis/meshsecurityprovider/genesis.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+package osmosis.meshsecurityprovider;
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/any.proto";
+import "cosmos_proto/cosmos.proto";
+
+option go_package = "github.com/osmosis-labs/mesh-security-sdk/x/meshsecurityprovider/types";
+
+message Params {
+    string vault_address = 1  [ (gogoproto.moretags) = "yaml:\"vault_address\"" ];
+    string native_staking_address = 2 [ (gogoproto.moretags) = "yaml:\"native_staking_address\"" ];
+}
+
+// GenesisState defines the meshsecurityprovider module's genesis state.
+message GenesisState {
+  // params is the container of meshsecurityprovider parameters.
+  Params params = 1 [ (gogoproto.nullable) = false ];
+}

proto/osmosis/meshsecurityprovider/query.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+package osmosis.meshsecurityprovider;
+
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "osmosis/meshsecurityprovider/genesis.proto";
+import "osmosis/meshsecurityprovider/tx.proto";
+
+option go_package = "github.com/osmosis-labs/mesh-security-sdk/x/meshsecurityprovider/types";
+
+service Query {
+  rpc Params(ParamsRequest) returns (ParamsResponse) {
+    option (google.api.http).get = "/osmosis/meshsecurityprovider/Params";
+  }
+}
+
+//=============================== Params
+message ParamsRequest {}
+message ParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; }

proto/osmosis/meshsecurityprovider/tx.proto

@@ -0,0 +1,31 @@
+syntax = "proto3";
+package osmosis.meshsecurityprovider;
+
+import "amino/amino.proto";
+import "gogoproto/gogo.proto";
+import "cosmos/base/v1beta1/coin.proto";
+import "cosmos/msg/v1/msg.proto";
+import "osmosis/meshsecurityprovider/genesis.proto";
+
+option go_package = "github.com/osmosis-labs/mesh-security-sdk/x/meshsecurityprovider/types";
+option (gogoproto.goproto_getters_all) = false;
+
+service Msg {
+    rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
+}
+
+// MsgUpdateParams updates meshsecurityprovider module 's params
+message MsgUpdateParams {
+  option (amino.name) = "meshsecurityprovider/MsgUpdateParams";
+  option (cosmos.msg.v1.signer) = "authority";
+
+  // Authority is the address that controls the module (defaults to x/gov unless
+  // overwritten).
+  string authority = 1;
+
+  // params defines the x/meshsecurityprovider parameters to update.
+  Params params = 2 [ (gogoproto.nullable) = false ];
+
+}
+
+message MsgUpdateParamsResponse {}

tests/e2e/README.md

@@ -1,10 +1,9 @@
 # End-To-End Tests
+
 Multi-chain system tests that run against the demo app.
 
+Run them with:
 
-Run them with: 
 ```shell
 make test
-``` 
-
-
+```

tests/e2e/e2e.go

@@ -104,6 +104,7 @@ type example struct {
 	ProviderDenom    string
 	ConsumerDenom    string
 	MyProvChainActor string
+	MaxRetrieve      uint16
 }
 
 func setupExampleChains(t *testing.T) example {
@@ -120,6 +121,7 @@ func setupExampleChains(t *testing.T) example {
 		ProviderDenom:    sdk.DefaultBondDenom,
 		ConsumerDenom:    sdk.DefaultBondDenom,
 		MyProvChainActor: provChain.SenderAccount.GetAddress().String(),
+		MaxRetrieve:      50,
 	}
 }
 
@@ -128,7 +130,7 @@ func setupMeshSecurity(t *testing.T, x example) (*TestConsumerClient, ConsumerCo
 
 	// setup contracts on both chains
 	consumerCli := NewConsumerClient(t, x.ConsumerChain)
-	consumerContracts := consumerCli.BootstrapContracts()
+	consumerContracts := consumerCli.BootstrapContracts(x)
 	converterPortID := wasmkeeper.PortIDForContract(consumerContracts.converter)
 	// add some fees so that we can distribute something
 	x.ConsumerChain.DefaultMsgFees = sdk.NewCoins(sdk.NewCoin(x.ConsumerDenom, math.NewInt(1_000_000)))

tests/e2e/mvp_test.go

@@ -36,7 +36,6 @@ func TestMVP(t *testing.T) {
 	// ...
 	x := setupExampleChains(t)
 	consumerCli, consumerContracts, providerCli := setupMeshSecurity(t, x)
-
 	// then the active set should be stored in the ext staking contract
 	// and contain all active validator addresses
 	qRsp := providerCli.QueryExtStaking(Query{"list_active_validators": {}})

tests/e2e/slashing_test.go

@@ -1,13 +1,14 @@
 package e2e
 
 import (
-	"cosmossdk.io/math"
 	"encoding/base64"
 	"fmt"
+	"testing"
+
+	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestSlashingScenario1(t *testing.T) {
@@ -17,7 +18,6 @@ func TestSlashingScenario1(t *testing.T) {
 	// - We use millions instead of unit tokens.
 	x := setupExampleChains(t)
 	consumerCli, _, providerCli := setupMeshSecurity(t, x)
-
 	// Provider chain
 	// ==============
 	// Deposit - A user deposits the vault denom to provide some collateral to their account
@@ -91,6 +91,7 @@ func TestSlashingScenario1(t *testing.T) {
 	// Assert that the validator's stake has been slashed
 	// and that the validator has been jailed
 	validator1, found = x.ConsumerApp.StakingKeeper.GetValidator(ctx, myExtValidator1)
+	require.True(t, found)
 	require.True(t, validator1.IsJailed())
 	require.Equal(t, validator1.GetTokens(), sdk.NewInt(41_400_000)) // 10% slash
 
@@ -117,7 +118,6 @@ func TestSlashingScenario2(t *testing.T) {
 	// - We use millions instead of unit tokens.
 	x := setupExampleChains(t)
 	consumerCli, _, providerCli := setupMeshSecurity(t, x)
-
 	// Provider chain
 	// ==============
 	// Deposit - A user deposits the vault denom to provide some collateral to their account
@@ -178,6 +178,7 @@ func TestSlashingScenario2(t *testing.T) {
 	// Assert that the validator's stake has been slashed
 	// and that the validator has been jailed
 	validator1, found = x.ConsumerApp.StakingKeeper.GetValidator(ctx, myExtValidator1)
+	require.True(t, found)
 	require.True(t, validator1.IsJailed())
 	require.Equal(t, validator1.GetTokens(), sdk.NewInt(81_900_000)) // 10% slash
 
@@ -204,7 +205,6 @@ func TestSlashingScenario3(t *testing.T) {
 	// - We use millions instead of unit tokens.
 	x := setupExampleChains(t)
 	consumerCli, _, providerCli := setupMeshSecurity(t, x)
-
 	// Provider chain
 	// ==============
 	// Deposit - A user deposits the vault denom to provide some collateral to their account
@@ -265,6 +265,7 @@ func TestSlashingScenario3(t *testing.T) {
 	// Assert that the validator's stake has been slashed
 	// and that the validator has been jailed
 	validator1, found = x.ConsumerApp.StakingKeeper.GetValidator(ctx, myExtValidator1)
+	require.True(t, found)
 	require.True(t, validator1.IsJailed())
 	require.Equal(t, validator1.GetTokens(), sdk.NewInt(61_700_000)) // 10% slash (plus 50_000 rounding)
 

tests/e2e/test_client.go

@@ -1,6 +1,7 @@
 package e2e
 
 import (
+	"context"
 	"encoding/base64"
 	"fmt"
 	"strconv"
@@ -20,9 +21,11 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
 	"github.com/osmosis-labs/mesh-security-sdk/demo/app"
 	"github.com/osmosis-labs/mesh-security-sdk/x/meshsecurity"
+	"github.com/osmosis-labs/mesh-security-sdk/x/meshsecurity/keeper"
 	"github.com/osmosis-labs/mesh-security-sdk/x/meshsecurity/types"
 )
 
@@ -353,7 +356,7 @@ type ConsumerContract struct {
 	converter sdk.AccAddress
 }
 
-func (p *TestConsumerClient) BootstrapContracts() ConsumerContract {
+func (p *TestConsumerClient) BootstrapContracts(x example) ConsumerContract {
 	// modify end-blocker to fail fast in tests
 	msModule := p.app.ModuleManager.Modules[types.ModuleName].(*meshsecurity.AppModule)
 	msModule.SetAsyncTaskRspHandler(meshsecurity.PanicOnErrorExecutionResponseHandler())
@@ -370,8 +373,8 @@ func (p *TestConsumerClient) BootstrapContracts() ConsumerContract {
 	virtStakeCodeID := p.chain.StoreCodeFile(buildPathToWasm("mesh_virtual_staking.wasm")).CodeID
 	// instantiate converter
 	codeID = p.chain.StoreCodeFile(buildPathToWasm("mesh_converter.wasm")).CodeID
-	initMsg = []byte(fmt.Sprintf(`{"price_feed": %q, "discount": %q, "remote_denom": %q,"virtual_staking_code_id": %d}`,
-		priceFeedContract.String(), discount, remoteDenom, virtStakeCodeID))
+	initMsg = []byte(fmt.Sprintf(`{"price_feed": %q, "discount": %q, "remote_denom": %q,"virtual_staking_code_id": %d, "max_retrieve": %d}`,
+		priceFeedContract.String(), discount, remoteDenom, virtStakeCodeID, x.MaxRetrieve))
 	converterContract := InstantiateContract(p.t, p.chain, codeID, initMsg)
 
 	staking := Querier(p.t, p.chain)(converterContract.String(), Query{"config": {}})["virtual_staking"]
@@ -404,6 +407,15 @@ func (p *TestConsumerClient) ExecNewEpoch() {
 	}
 }
 
+func (p *TestConsumerClient) ExecSetMaxCap(cap sdk.Coin) {
+	msgServer := keeper.NewMsgServer(p.app.MeshSecKeeper)
+	msgServer.SetVirtualStakingMaxCap(p.chain.GetContext(), &types.MsgSetVirtualStakingMaxCap{
+		Authority: authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		Contract:  p.contracts.staking.String(),
+		MaxCap:    cap,
+	})
+}
+
 // MustEnableVirtualStaking add authority to mint/burn virtual tokens gov proposal
 func (p *TestConsumerClient) MustEnableVirtualStaking(maxCap sdk.Coin) {
 	govProposal := &types.MsgSetVirtualStakingMaxCap{
@@ -423,7 +435,7 @@ func (p *TestConsumerClient) MustExecGovProposal(msg *types.MsgSetVirtualStaking
 func (p *TestConsumerClient) QueryMaxCap() types.QueryVirtualStakingMaxCapLimitResponse {
 	q := baseapp.QueryServiceTestHelper{GRPCQueryRouter: p.app.GRPCQueryRouter(), Ctx: p.chain.GetContext()}
 	var rsp types.QueryVirtualStakingMaxCapLimitResponse
-	err := q.Invoke(nil, "/osmosis.meshsecurity.v1beta1.Query/VirtualStakingMaxCapLimit", &types.QueryVirtualStakingMaxCapLimitRequest{Address: p.contracts.staking.String()}, &rsp)
+	err := q.Invoke(context.TODO(), "/osmosis.meshsecurity.v1beta1.Query/VirtualStakingMaxCapLimit", &types.QueryVirtualStakingMaxCapLimitRequest{Address: p.contracts.staking.String()}, &rsp)
 	require.NoError(p.t, err)
 	return rsp
 }