Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(campaign): remove MsgAddVestingOptions #827

Merged
merged 13 commits into from
Jun 10, 2022
Merged

refactor(campaign): remove MsgAddVestingOptions #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3c9a31d
rebase branch and resolve conflicts
May 31, 2022
203b48c
clean up proto
Jun 1, 2022
a015cdf
cleanup types
Jun 1, 2022
1096078
cleanup types
Jun 1, 2022
a346cd9
cleanup testutil
Jun 1, 2022
b10fb56
remaining removals
Jun 1, 2022
50010db
remove remaining refs
Jun 7, 2022
ebaf6d3
merge
Jun 8, 2022
61f3aa9
Merge branch 'develop' into refactor/remove-add-vesting-options
Pantani Jun 9, 2022
cb474d3
Merge branch 'develop' into refactor/remove-add-vesting-options
Pantani Jun 9, 2022
9f9d325
use cli pr 2549
lumtis Jun 10, 2022
cb44d7a
fix invariant test
lumtis Jun 10, 2022
5e3e0c9
fix genesis tests
lumtis Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/golang/protobuf v1.5.2
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/ignite-hq/cli v0.21.0
github.com/ignite-hq/cli v0.22.1-0.20220610070456-1b33c09fceb7
github.com/pkg/errors v0.9.1
github.com/spf13/cast v1.4.1
github.com/spf13/cobra v1.4.0
Expand Down Expand Up @@ -38,6 +38,7 @@ require (
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/btcsuite/btcd v0.22.0-beta // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
Expand Down Expand Up @@ -159,9 +160,9 @@ require (
go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
Expand Down
13 changes: 8 additions & 5 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
Expand Down Expand Up @@ -898,8 +900,8 @@ github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHL
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ignite-hq/cli v0.21.0 h1:o8fxQQVFJ/LBmcfp2b7glhMAYZ9DN/p1iY2SVaJPcIA=
github.com/ignite-hq/cli v0.21.0/go.mod h1:OpVQxPUuWyWN9OyEv3HlYU08uqp75RmceAlkN5uK0NI=
github.com/ignite-hq/cli v0.22.1-0.20220610070456-1b33c09fceb7 h1:2HUkG2SzDJ8K7//JNFwtx4D3V1HxGRtHaEku5gdstts=
github.com/ignite-hq/cli v0.22.1-0.20220610070456-1b33c09fceb7/go.mod h1:KpUW5KOrkZpfYF/1wPC3wVAj1An1d2nX7SKbcEM/1ds=
github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
Expand Down Expand Up @@ -1798,8 +1800,8 @@ golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -1955,8 +1957,9 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 h1:A9i04dxx7Cribqbs8jf3FQLogkL/CV2YN7hj9KWJCkc=
golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand Down
2 changes: 1 addition & 1 deletion proto/campaign/events.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package tendermint.spn.campaign;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "campaign/mainnet_vesting_account.proto";
import "campaign/vesting.proto";

option go_package = "github.com/tendermint/spn/x/campaign/types";

Expand Down
7 changes: 3 additions & 4 deletions proto/campaign/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package tendermint.spn.campaign;
// this line is used by starport scaffolding # genesis/proto/import
import "gogoproto/gogo.proto";
import "campaign/campaign_chains.proto";
import "campaign/mainnet_vesting_account.proto";
import "campaign/vesting.proto";
import "campaign/campaign.proto";
import "campaign/mainnet_account.proto";
import "campaign/params.proto";
Expand All @@ -17,8 +17,7 @@ message GenesisState {
uint64 campaignCounter = 2;
repeated CampaignChains campaignChainsList = 3 [(gogoproto.nullable) = false];
repeated MainnetAccount mainnetAccountList = 4 [(gogoproto.nullable) = false];
repeated MainnetVestingAccount mainnetVestingAccountList = 5 [(gogoproto.nullable) = false];
uint64 totalShares = 6;
Params params = 7 [(gogoproto.nullable) = false];
uint64 totalShares = 5;
Params params = 6 [(gogoproto.nullable) = false];
// this line is used by starport scaffolding # genesis/proto/state
}
31 changes: 1 addition & 30 deletions proto/campaign/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "gogoproto/gogo.proto";
import "campaign/campaign_chains.proto";
import "campaign/campaign_summary.proto";
import "campaign/campaign.proto";
import "campaign/mainnet_vesting_account.proto";
import "campaign/vesting.proto";
import "campaign/mainnet_account.proto";
import "campaign/params.proto";
// this line is used by starport scaffolding # 1
Expand Down Expand Up @@ -58,16 +58,6 @@ service Query {
option (google.api.http).get = "/tendermint/spn/campaign/mainnet_account_balance/{campaignID}";
}

// Queries a mainnetVestingAccount by index.
rpc MainnetVestingAccount(QueryGetMainnetVestingAccountRequest) returns (QueryGetMainnetVestingAccountResponse) {
option (google.api.http).get = "/tendermint/spn/campaign/mainnet_vesting_account/{campaignID}/{address}";
}

// Queries a list of mainnetVestingAccount items.
rpc MainnetVestingAccountAll(QueryAllMainnetVestingAccountRequest) returns (QueryAllMainnetVestingAccountResponse) {
option (google.api.http).get = "/tendermint/spn/campaign/mainnet_vesting_account/{campaignID}";
}

// Queries a campaign summary
rpc CampaignSummary(QueryCampaignSummaryRequest) returns (QueryCampaignSummaryResponse) {
option (google.api.http).get = "/tendermint/spn/campaign/campaign_summary/{campaignID}";
Expand Down Expand Up @@ -176,25 +166,6 @@ message QueryAllMainnetAccountBalanceResponse {
cosmos.base.query.v1beta1.PageResponse pagination = 2;
}

message QueryGetMainnetVestingAccountRequest {
uint64 campaignID = 1;
string address = 2;
}

message QueryGetMainnetVestingAccountResponse {
MainnetVestingAccount mainnetVestingAccount = 1 [(gogoproto.nullable) = false];
}

message QueryAllMainnetVestingAccountRequest {
uint64 campaignID = 1;
cosmos.base.query.v1beta1.PageRequest pagination = 2;
}

message QueryAllMainnetVestingAccountResponse {
repeated MainnetVestingAccount mainnetVestingAccount = 1 [(gogoproto.nullable) = false];
cosmos.base.query.v1beta1.PageResponse pagination = 2;
}

message QueryCampaignSummaryRequest {
uint64 campaignID = 1;
}
Expand Down
12 changes: 1 addition & 11 deletions proto/campaign/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package tendermint.spn.campaign;
// this line is used by starport scaffolding # proto/tx/import
import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "campaign/mainnet_vesting_account.proto";
import "campaign/vesting.proto";
import "campaign/special_allocations.proto";

option go_package = "github.com/tendermint/spn/x/campaign/types";
Expand All @@ -16,7 +16,6 @@ service Msg {
rpc UpdateTotalSupply(MsgUpdateTotalSupply) returns (MsgUpdateTotalSupplyResponse);
rpc UpdateSpecialAllocations(MsgUpdateSpecialAllocations) returns (MsgUpdateSpecialAllocationsResponse);
rpc InitializeMainnet(MsgInitializeMainnet) returns (MsgInitializeMainnetResponse);
rpc AddVestingOptions(MsgAddVestingOptions) returns (MsgAddVestingOptionsResponse);
rpc MintVouchers(MsgMintVouchers) returns (MsgMintVouchersResponse);
rpc BurnVouchers(MsgBurnVouchers) returns (MsgBurnVouchersResponse);
rpc RedeemVouchers(MsgRedeemVouchers) returns (MsgRedeemVouchersResponse);
Expand Down Expand Up @@ -80,15 +79,6 @@ message MsgInitializeMainnetResponse {
uint64 mainnetID = 1;
}

message MsgAddVestingOptions {
string coordinator = 1;
uint64 campaignID = 2;
string address = 3;
ShareVestingOptions vestingOptions = 4 [(gogoproto.nullable) = false];
}

message MsgAddVestingOptionsResponse {}

message MsgMintVouchers {
string coordinator = 1;
uint64 campaignID = 2;
Expand Down
6 changes: 0 additions & 6 deletions proto/campaign/mainnet_vesting_account.proto → proto/campaign/vesting.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ option go_package = "github.com/tendermint/spn/x/campaign/types";
import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";

message MainnetVestingAccount {
uint64 campaignID = 1;
string address = 2;
ShareVestingOptions vestingOptions = 3 [(gogoproto.nullable) = false];
}

message ShareVestingOptions {
oneof options {ShareDelayedVesting delayedVesting = 1;}
}
Expand Down
24 changes: 0 additions & 24 deletions testutil/sample/campaign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,6 @@ func CustomShareVestingOptions(r *rand.Rand, shares campaign.Shares) campaign.Sh
return *campaign.NewShareDelayedVesting(shares, shares, Duration(r).Microseconds())
}

// MainnetVestingAccount returns a sample MainnetVestingAccount
func MainnetVestingAccount(r *rand.Rand, campaignID uint64, address string) campaign.MainnetVestingAccount {
return MainnetVestingAccountWithShares(r, campaignID, address, Shares(r))
}

// MainnetVestingAccountWithShares returns a sample MainnetVestingAccount with custom shares
func MainnetVestingAccountWithShares(
r *rand.Rand,
campaignID uint64,
address string,
shares campaign.Shares,
) campaign.MainnetVestingAccount {
return campaign.MainnetVestingAccount{
CampaignID: campaignID,
Address: address,
VestingOptions: CustomShareVestingOptions(r, shares),
}
}

// CampaignName returns a sample campaign name
func CampaignName(r *rand.Rand) string {
return String(r, 20)
Expand Down Expand Up @@ -144,19 +125,14 @@ func CampaignGenesisState(r *rand.Rand) campaign.GenesisState {
func CampaignGenesisStateWithAccounts(r *rand.Rand) campaign.GenesisState {
genState := CampaignGenesisState(r)
genState.MainnetAccountList = make([]campaign.MainnetAccount, 0)
genState.MainnetVestingAccountList = make([]campaign.MainnetVestingAccount, 0)

for i, c := range genState.CampaignList {
for j := 0; j < 5; j++ {
mainnetAccount := MainnetAccount(r, c.CampaignID, Address(r))
mainnetVestingAccount := MainnetVestingAccount(r, c.CampaignID, Address(r))
genState.MainnetAccountList = append(genState.MainnetAccountList, mainnetAccount)
genState.MainnetVestingAccountList = append(genState.MainnetVestingAccountList, mainnetVestingAccount)

// increase campaign allocated shares accordingly
c.AllocatedShares = campaign.IncreaseShares(c.AllocatedShares, mainnetAccount.Shares)
shares, _ := mainnetVestingAccount.GetTotalShares()
c.AllocatedShares = campaign.IncreaseShares(c.AllocatedShares, shares)
}
genState.CampaignList[i] = c
}
Expand Down
2 changes: 0 additions & 2 deletions x/campaign/client/cli/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
CmdListMainnetAccount(),
CmdShowMainnetAccountBalance(),
CmdListMainnetAccountBalance(),
CmdShowMainnetVestingAccount(),
CmdListMainnetVestingAccount(),
CmdShowCampaignSummary(),
CmdListCampaignSummary(),
CmdQueryParams(),
Expand Down
88 changes: 0 additions & 88 deletions x/campaign/client/cli/query_mainnet_vesting_account.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion x/campaign/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ func GetTxCmd() *cobra.Command {
CmdUpdateTotalSupply(),
CmdUpdateSpecialAllocations(),
CmdInitializeMainnet(),
CmdAddVestingOptions(),
CmdMintVouchers(),
CmdBurnVouchers(),
CmdUnredeemVouchers(),
Expand Down
Loading