Skip to content

Commit

Permalink
Merge branch 'main' into trinity/tombstoned-validator-unbonding
Browse files Browse the repository at this point in the history
  • Loading branch information
vuong177 committed Sep 5, 2024
2 parents a510aaa + 7360399 commit dfea0ef
Show file tree
Hide file tree
Showing 50 changed files with 1,186 additions and 482 deletions.
18 changes: 18 additions & 0 deletions docs/proto/proto-docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down
155 changes: 155 additions & 0 deletions note.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"stake": {
"delegator": "cosmos1ph3tq3s5afcg6z4c4mpd9kdklt9a8j7gw8sygn",
"validator": "cosmosvaloper1gtnfjqp6pgkdu6szu5rzk4h5z5d54fadcfsv90",
"stake": {
"denom": "stake",
"amount": "20000000"
},
"tx_id": 2
}
}

[
Execute {
contract_addr: "cosmos1qg5ega6dykkxc307y25pecuufrjkxkaggkkxh7nad0vhyhtuhw3s6ufdm4",
msg: {
"internal_unstake":{
"delegator":"cosmos1whqnmupfwm3gfmvjegy0j69z42mfngmg2q8emj",
"validator":"cosmosvaloper1jgaec5l7glsy2l37n25kmqj7p9hrfzsh43df3u",
"amount":{"denom":"stake","amount":"22500000"}}
},
funds: []
},
Execute {
contract_addr: "cosmos1qg5ega6dykkxc307y25pecuufrjkxkaggkkxh7nad0vhyhtuhw3s6ufdm4",
msg: {
"internal_unstake":{
"delegator":"cosmos1whqnmupfwm3gfmvjegy0j69z42mfngmg2q8emj",
"validator":"cosmosvaloper1mt78w786v2qz24skefvv6x3xulq4495egj33yc",
"amount":{"denom":"stake","amount":"9000000"}}}, funds: [] }]

panic:
failed to execute scheduled task for contract
"cosmos1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3s493rn8":
execution: {Loading CosmWasm module: execute}: panic [recovered]

routes: map[
/cosmos.auth.v1beta1.MsgUpdateParams:0x10378c850
/cosmos.authz.v1beta1.MsgExec:0x10378c850
/cosmos.authz.v1beta1.MsgGrant:0x10378c850
/cosmos.authz.v1beta1.MsgRevoke:0x10378c850
/cosmos.bank.v1beta1.MsgMultiSend:0x10378c850
/cosmos.bank.v1beta1.MsgSend:0x10378c850
/cosmos.bank.v1beta1.MsgSetSendEnabled:0x10378c850
/cosmos.bank.v1beta1.MsgUpdateParams:0x10378c850
/cosmos.consensus.v1.MsgUpdateParams:0x10378c850
/cosmos.crisis.v1beta1.MsgUpdateParams:0x10378c850
/cosmos.crisis.v1beta1.MsgVerifyInvariant:0x10378c850
/cosmos.distribution.v1beta1.MsgCommunityPoolSpend:0x10378c850
/cosmos.distribution.v1beta1.MsgFundCommunityPool:0x10378c850
/cosmos.distribution.v1beta1.MsgSetWithdrawAddress:0x10378c850
/cosmos.distribution.v1beta1.MsgUpdateParams:0x10378c850
/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward:0x10378c850 /
cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission:0x10378c850
/cosmos.evidence.v1beta1.MsgSubmitEvidence:0x10378c850
/cosmos.feegrant.v1beta1.MsgGrantAllowance:0x10378c8
50 /cosmos.feegrant.v1beta1.MsgRevokeAllowance:0x10378c850
/cosmos.gov.v1.MsgDeposit:0x10378c850
/cosmos.gov.v1.MsgExecLegacyContent:0x10378c850
/cosmos.gov.v1.MsgSubmitProposal:0x10378c850
/cosmos.gov.v1.MsgUpdateParams:0x10378c850
/cosmos.gov.v1.MsgVote:0x10378c850
/cosmos.gov.v1.MsgVoteWeighted:0x10378c850
/cosmos.gov.v1beta1.MsgDeposit:0x10378c850
/cosmos.gov.v1beta1.MsgSubmitProposal:0x10378c850
/cosmos.gov.v1beta1.MsgVote:0x10378c850
/cosmos.gov.v1beta1.MsgVoteWeighted:0x10378c850
/cosmos.group.v1.MsgCreateGroup:0x10378c850
/cosmos.group.v1.MsgCreateGroupPolicy:0x10378c850
/cosmos.group.v1.MsgCreateGroupWithPolicy:0x10378c850
/cosmos.group.v1.MsgExec:0x10378c850
/cosmos.group.v1.MsgLeaveGroup:0x10378c850
/cosmos.group.v1.MsgSubmitProposal:0x10378c850
/cosmos.group.v1.MsgUpdateGroupAdmin:0x10378c850
/cosmos.group.v1.MsgUpdateGroupMembers:0x10378c850
/cosmos.group.v1.MsgUpdateGroupMetadata:0x10378c850
/cosmos.group.v1.MsgUpdateGroupPolicyAdmin:0x10378c850
/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy:0x10378c850
/cosmos.group.v1.MsgUpdateGroupPolicyMetadata:0x10378c850
/cosmos.group.v1.MsgVote:0x10378c850
/cosmos.group.v1.MsgWithdrawProposal:0x10378c850
/cosmos.mint.v1beta1.MsgUpdateParams:0x10378c850
/cosmos.nft.v1beta1.MsgSend:0x10378c850
/cosmos.slashing.v1beta1.MsgUnjail:0x10378c850
/cosmos.slashing.v1beta1.MsgUpdateParams:0x10378c850
/cosmos.staking.v1beta1.MsgBeginRedelegate:0x10378c850
/cosmos.staking.v1beta1.MsgCancelUnbondingDelegation:0x10378c850
/cosmos.staking.v1beta1.MsgCreateValidator:0x10378c850
/cosmos.staking.v1beta1.MsgDelegate:0x10378c850
/cosmos.staking.v1beta1.MsgEditValidator:0x10378c850
/cosmos.staking.v1beta1.MsgUndelegate:0x10378c850
/cosmos.staking.v1beta1.MsgUpdateParams:0x10378c850
/cosmos.upgrade.v1beta1.MsgCancelUpgrade:0x10378c850
/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade:0x10378c850
/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount:0x10378c850
/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount:0x10378c850
/cosmos.vesting.v1beta1.MsgCreateVestingAccount:0x10378c850
/cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddresses:0x10378c850
/cosmwasm.wasm.v1.MsgClearAdmin:0x10378c850
/cosmwasm.wasm.v1.MsgExecuteContract:0x10378c850
/cosmwasm.wasm.v1.MsgInstantiateContract:0x10378c850
/cosmwasm.wasm.v1.MsgInstantiateContract2:0x10378c850
/cosmwasm.wasm.v1.MsgMigrateContract:0x10378c850
/cosmwasm.wasm.v1.MsgPinCodes:0x10378c850
/cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddresses:0x10378c850
/cosmwasm.wasm.v1.MsgStoreAndInstantiateContract:0x10378c850
/cosmwasm.wasm.v1.MsgStoreAndMigrateContract:0x10378c850
/cosmwasm.wasm.v1.MsgStoreCode:0x10378c850
/cosmwasm.wasm.v1.MsgSudoContract:0x10378c850
/cosmwasm.wasm.v1.MsgUnpinCodes:0x10378c850
/cosmwasm.wasm.v1.MsgUpdateAdmin:0x10378c850
/cosmwasm.wasm.v1.MsgUpdateContractLabel:0x10378c850
/cosmwasm.wasm.v1.MsgUpdateInstantiateConfig:0x10378c850
/cosmwasm.wasm.v1.MsgUpdateParams:0x10378c850
/ibc.applications.fee.v1.MsgPayPacketFee:0x10378c850
/ibc.applications.fee.v1.MsgPayPacketFeeAsync:0x10378c850
/ibc.applications.fee.v1.MsgRegisterCounterpartyPayee:0x10378c850
/ibc.applications.fee.v1.MsgRegisterPayee:0x10378c850
/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount:0x10378c850
/ibc.applications.interchain_accounts.controller.v1.MsgSendTx:0x10378c850
/ibc.applications.transfer.v1.MsgTransfer:0x10378c850
/ibc.core.channel.v1.MsgAcknowledgement:0x10378c850
/ibc.core.channel.v1.MsgChannelCloseConfirm:0x10378c850
/ibc.core.channel.v1.MsgChannelCloseInit:0x10378c850
/ibc.core.channel.v1.MsgChannelOpenAck:0x10378c850
/ibc.core.channel.v1.MsgChannelOpenConfirm:0x10378c850
/ibc.core.channel.v1.MsgChannelOpenInit:0x10378c850
/ibc.core.channel.v1.MsgChannelOpenTry:0x10378c850
/ibc.core.channel.v1.MsgRecvPacket:0x10378c850
/ibc.core.channel.v1.MsgTimeout:0x10378c850
/ibc.core.channel.v1.MsgTimeoutOnClose:0x10378c850
/ibc.core.client.v1.MsgCreateClient:0x10378c850
/ibc.core.client.v1.MsgSubmitMisbehaviour:0x10378c850
/ibc.core.client.v1.MsgUpdateClient:0x10378c850
/ibc.core.client.v1.MsgUpgradeClient:0x10378c850
/ibc.core.connection.v1.MsgConnectionOpenAck:0x10378c850
/ibc.core.connection.v1.MsgConnectionOpenConfirm:0x10378c850
/ibc.core.connection.v1.MsgConnectionOpenInit:0x10378c850
/ibc.core.connection.v1.MsgConnectionOpenTry:0x10378c850
/osmosis.meshsecurity.v1beta1.MsgSetVirtualStakingMaxCap:0x10378c850]


Cannot unbond 49999999 tokens from validator cosmosvaloper1fhm5lj9wcvxwdxmgtz36mnjuhwtk7ly93c3rqg, not enough staked

data: {
"internal_unstake":{
"delegator":"cosmos1yw0saxm7nkwl0e8r3kqpar2a0vusdzcaku8mys",
"validator":"cosmosvaloper1szy96jnddalx7s686e4ylres02uv6a5dyxj82c",
"normalize_amount":{"denom":"stake","amount":"9000000"},
"inverted_amount":{"denom":"stake","amount":"19999999"}
}
}

failed to execute message; message index: 0: acknowledge packet callback failed: on ack: submessages: Error calling the VM: Error executing Wasm: Wasmer runtime error: RuntimeError:
Aborted: panicked at contracts/consumer/virtual-staking/src/contract.rs:519:9:
15 changes: 15 additions & 0 deletions proto/osmosis/meshsecurity/v1beta1/meshsecurity.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 0 additions & 8 deletions proto/osmosis/meshsecurity/v1beta1/scheduler.proto
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 19 additions & 0 deletions proto/osmosis/meshsecurityprovider/genesis.proto
Original file line number Diff line number Diff line change
@@ -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 ];
}
19 changes: 19 additions & 0 deletions proto/osmosis/meshsecurityprovider/query.proto
Original file line number Diff line number Diff line change
@@ -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 ]; }
31 changes: 31 additions & 0 deletions proto/osmosis/meshsecurityprovider/tx.proto
Original file line number Diff line number Diff line change
@@ -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 {}
7 changes: 3 additions & 4 deletions tests/e2e/README.md
Original file line number Diff line number Diff line change
@@ -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
```


```
4 changes: 3 additions & 1 deletion tests/e2e/e2e.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ type example struct {
ProviderDenom string
ConsumerDenom string
MyProvChainActor string
MaxRetrieve uint16
}

func setupExampleChains(t *testing.T) example {
Expand All @@ -120,6 +121,7 @@ func setupExampleChains(t *testing.T) example {
ProviderDenom: sdk.DefaultBondDenom,
ConsumerDenom: sdk.DefaultBondDenom,
MyProvChainActor: provChain.SenderAccount.GetAddress().String(),
MaxRetrieve: 50,
}
}

Expand All @@ -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)))
Expand Down
1 change: 0 additions & 1 deletion tests/e2e/mvp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}})
Expand Down
Loading

0 comments on commit dfea0ef

Please sign in to comment.