Skip to content

Commit 3de2b42

Browse files
authored
Merge branch 'main' into cli_args
2 parents 1c45d71 + 0ade7e4 commit 3de2b42

32 files changed

+2615
-1027
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
8484
* (x/bank) [\#716](https://github.com/line/lbm-sdk/pull/716) remove useless DenomMetadata key function
8585
* (x/foundation) [\#704](https://github.com/line/lbm-sdk/pull/704) update x/foundation params
8686
* (x/wasm) [\#695](https://github.com/line/lbm-sdk/pull/695) fix to prevent external filesystem dependency of simulation
87+
* (x/foundation) [\#729](https://github.com/line/lbm-sdk/pull/729) add UpdateParams to x/foundation
8788

8889
### Bug Fixes
8990
* (x/wasm) [\#453](https://github.com/line/lbm-sdk/pull/453) modify wasm grpc query api path
@@ -104,10 +105,13 @@ Ref: https://keepachangelog.com/en/1.0.0/
104105
* (global) [\#694](https://github.com/line/lbm-sdk/pull/694) replace deprecated functions since go 1.16 or 1.17
105106
* (x/bankplus) [\#705](https://github.com/line/lbm-sdk/pull/705) add missing blockedAddr checking in bankplus
106107
* (x/foundation) [\#712](https://github.com/line/lbm-sdk/pull/712) fix x/foundation EndBlocker
108+
* (x/feegrant) [\#720](https://github.com/line/lbm-sdk/pull/720) remove potential runtime panic in x/feegrant
107109
* (baseapp) [\#724](https://github.com/line/lbm-sdk/pull/724) add checking pubkey type from validator params
108110
* (x/staking) [\#726](https://github.com/line/lbm-sdk/pull/726) check allowedList size in StakeAuthorization.Accept()
109111
* (x/staking) [\#728](https://github.com/line/lbm-sdk/pull/728) fix typo in unbondingToUnbonded() panic
112+
* (crypto) [\#731](https://github.com/line/lbm-sdk/pull/731) remove VRFProve function
110113
* (x/foundation) [\#732](https://github.com/line/lbm-sdk/pull/732) add verification on accounts into x/foundation Grants cli
114+
* (x/foundation) [\#730](https://github.com/line/lbm-sdk/pull/730) prune stale x/foundation proposals at voting period end
111115
* (client) [\#734](https://github.com/line/lbm-sdk/pull/734) add restrictions on the number of args in the CLIs
112116

113117
### Breaking Changes
@@ -133,3 +137,4 @@ Ref: https://keepachangelog.com/en/1.0.0/
133137
* (docs) [\#483](https://github.com/line/lbm-sdk/pull/483) update documents on x/stakingplus
134138
* (docs) [\#490](https://github.com/line/lbm-sdk/pull/490) update documents on x/consortium
135139
* (docs) [\#602](https://github.com/line/lbm-sdk/pull/602) update outdated events in specs
140+
* (docs) [\#721](https://github.com/line/lbm-sdk/pull/721) update x/foundation specification

crypto/ledger/ledger_secp256k1.go

-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"os"
66

77
"github.com/btcsuite/btcd/btcec"
8-
"github.com/line/ostracon/crypto"
98
"github.com/pkg/errors"
109

1110
tmbtcec "github.com/tendermint/btcd/btcec"
@@ -91,10 +90,6 @@ func (pkl PrivKeyLedgerSecp256k1) PubKey() types.PubKey {
9190
return pkl.CachedPubKey
9291
}
9392

94-
func (pkl PrivKeyLedgerSecp256k1) VRFProve(seed []byte) (crypto.Proof, error) {
95-
return nil, nil
96-
}
97-
9893
// Sign returns a secp256k1 signature for the corresponding message
9994
func (pkl PrivKeyLedgerSecp256k1) Sign(message []byte) ([]byte, error) {
10095
device, err := getDevice()

docs/core/proto-docs.md

+52-42
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,6 @@
11141114
- [Proposal](#lbm.foundation.v1.Proposal)
11151115
- [TallyResult](#lbm.foundation.v1.TallyResult)
11161116
- [ThresholdDecisionPolicy](#lbm.foundation.v1.ThresholdDecisionPolicy)
1117-
- [UpdateFoundationParamsProposal](#lbm.foundation.v1.UpdateFoundationParamsProposal)
11181117
- [Vote](#lbm.foundation.v1.Vote)
11191118

11201119
- [ProposalExecutorResult](#lbm.foundation.v1.ProposalExecutorResult)
@@ -1130,8 +1129,8 @@
11301129
- [EventRevoke](#lbm.foundation.v1.EventRevoke)
11311130
- [EventSubmitProposal](#lbm.foundation.v1.EventSubmitProposal)
11321131
- [EventUpdateDecisionPolicy](#lbm.foundation.v1.EventUpdateDecisionPolicy)
1133-
- [EventUpdateFoundationParams](#lbm.foundation.v1.EventUpdateFoundationParams)
11341132
- [EventUpdateMembers](#lbm.foundation.v1.EventUpdateMembers)
1133+
- [EventUpdateParams](#lbm.foundation.v1.EventUpdateParams)
11351134
- [EventVote](#lbm.foundation.v1.EventVote)
11361135
- [EventWithdrawFromTreasury](#lbm.foundation.v1.EventWithdrawFromTreasury)
11371136
- [EventWithdrawProposal](#lbm.foundation.v1.EventWithdrawProposal)
@@ -1187,6 +1186,8 @@
11871186
- [MsgUpdateDecisionPolicyResponse](#lbm.foundation.v1.MsgUpdateDecisionPolicyResponse)
11881187
- [MsgUpdateMembers](#lbm.foundation.v1.MsgUpdateMembers)
11891188
- [MsgUpdateMembersResponse](#lbm.foundation.v1.MsgUpdateMembersResponse)
1189+
- [MsgUpdateParams](#lbm.foundation.v1.MsgUpdateParams)
1190+
- [MsgUpdateParamsResponse](#lbm.foundation.v1.MsgUpdateParamsResponse)
11901191
- [MsgVote](#lbm.foundation.v1.MsgVote)
11911192
- [MsgVoteResponse](#lbm.foundation.v1.MsgVoteResponse)
11921193
- [MsgWithdrawFromTreasury](#lbm.foundation.v1.MsgWithdrawFromTreasury)
@@ -16986,25 +16987,6 @@ satisfies the two following conditions:
1698616987

1698716988

1698816989

16989-
<a name="lbm.foundation.v1.UpdateFoundationParamsProposal"></a>
16990-
16991-
### UpdateFoundationParamsProposal
16992-
UpdateFoundationParamsProposal details a proposal to update params of foundation module.
16993-
16994-
16995-
| Field | Type | Label | Description |
16996-
| ----- | ---- | ----- | ----------- |
16997-
| `title` | [string](#string) | | |
16998-
| `description` | [string](#string) | | |
16999-
| `params` | [Params](#lbm.foundation.v1.Params) | | params defines the x/foundation parameters to update.
17000-
17001-
Note: All parameters must be supplied. |
17002-
17003-
17004-
17005-
17006-
17007-
1700816990
<a name="lbm.foundation.v1.Vote"></a>
1700916991

1701016992
### Vote
@@ -17212,30 +17194,30 @@ EventUpdateDecisionPolicy is an event emitted when the decision policy have been
1721217194

1721317195

1721417196

17215-
<a name="lbm.foundation.v1.EventUpdateFoundationParams"></a>
17197+
<a name="lbm.foundation.v1.EventUpdateMembers"></a>
1721617198

17217-
### EventUpdateFoundationParams
17218-
EventUpdateFoundationParams is emitted after updating foundation parameters.
17199+
### EventUpdateMembers
17200+
EventUpdateMembers is an event emitted when the members have been updated.
1721917201

1722017202

1722117203
| Field | Type | Label | Description |
1722217204
| ----- | ---- | ----- | ----------- |
17223-
| `params` | [Params](#lbm.foundation.v1.Params) | | |
17205+
| `member_updates` | [MemberRequest](#lbm.foundation.v1.MemberRequest) | repeated | |
1722417206

1722517207

1722617208

1722717209

1722817210

1722917211

17230-
<a name="lbm.foundation.v1.EventUpdateMembers"></a>
17212+
<a name="lbm.foundation.v1.EventUpdateParams"></a>
1723117213

17232-
### EventUpdateMembers
17233-
EventUpdateMembers is an event emitted when the members have been updated.
17214+
### EventUpdateParams
17215+
EventUpdateParams is emitted after updating foundation parameters.
1723417216

1723517217

1723617218
| Field | Type | Label | Description |
1723717219
| ----- | ---- | ----- | ----------- |
17238-
| `member_updates` | [MemberRequest](#lbm.foundation.v1.MemberRequest) | repeated | |
17220+
| `params` | [Params](#lbm.foundation.v1.Params) | | |
1723917221

1724017222

1724117223

@@ -17775,7 +17757,7 @@ MsgExecResponse is the Msg/Exec request type.
1777517757
<a name="lbm.foundation.v1.MsgFundTreasury"></a>
1777617758

1777717759
### MsgFundTreasury
17778-
MsgFundTreasury represents a message to fund the treasury.
17760+
MsgFundTreasury is the Msg/FundTreasury request type.
1777917761

1778017762

1778117763
| Field | Type | Label | Description |
@@ -17791,7 +17773,7 @@ MsgFundTreasury represents a message to fund the treasury.
1779117773
<a name="lbm.foundation.v1.MsgFundTreasuryResponse"></a>
1779217774

1779317775
### MsgFundTreasuryResponse
17794-
MsgFundTreasuryResponse defines the Msg/FundTreasury response type.
17776+
MsgFundTreasuryResponse is the Msg/FundTreasury response type.
1779517777

1779617778

1779717779

@@ -17801,7 +17783,7 @@ MsgFundTreasuryResponse defines the Msg/FundTreasury response type.
1780117783
<a name="lbm.foundation.v1.MsgGovMint"></a>
1780217784

1780317785
### MsgGovMint
17804-
MsgGovMint represents a message to mint coins to the treasury.
17786+
MsgGovMint is the Msg/GovMint request type.
1780517787

1780617788

1780717789
| Field | Type | Label | Description |
@@ -17817,7 +17799,7 @@ MsgGovMint represents a message to mint coins to the treasury.
1781717799
<a name="lbm.foundation.v1.MsgGovMintResponse"></a>
1781817800

1781917801
### MsgGovMintResponse
17820-
MsgGovMintResponse defines the Msg/GovMint response type.
17802+
MsgGovMintResponse is the Msg/GovMint response type.
1782117803

1782217804

1782317805

@@ -17827,7 +17809,7 @@ MsgGovMintResponse defines the Msg/GovMint response type.
1782717809
<a name="lbm.foundation.v1.MsgGrant"></a>
1782817810

1782917811
### MsgGrant
17830-
MsgGrant is a request type for Grant method. It declares authorization to the grantee
17812+
MsgGrant is the Msg/Grant request type.
1783117813
on behalf of the foundation.
1783217814

1783317815

@@ -17845,7 +17827,7 @@ on behalf of the foundation.
1784517827
<a name="lbm.foundation.v1.MsgGrantResponse"></a>
1784617828

1784717829
### MsgGrantResponse
17848-
MsgGrantResponse defines the Msg/MsgGrant response type.
17830+
MsgGrantResponse is the Msg/MsgGrant response type.
1784917831

1785017832

1785117833

@@ -17880,8 +17862,7 @@ MsgLeaveFoundationResponse is the Msg/LeaveFoundation response type.
1788017862
<a name="lbm.foundation.v1.MsgRevoke"></a>
1788117863

1788217864
### MsgRevoke
17883-
MsgRevoke revokes any authorization with the provided sdk.Msg type
17884-
to the grantee on behalf of the foundation.
17865+
MsgRevoke is the Msg/Revoke request type.
1788517866

1788617867

1788717868
| Field | Type | Label | Description |
@@ -17898,7 +17879,7 @@ to the grantee on behalf of the foundation.
1789817879
<a name="lbm.foundation.v1.MsgRevokeResponse"></a>
1789917880

1790017881
### MsgRevokeResponse
17901-
MsgRevokeResponse defines the Msg/MsgRevokeResponse response type.
17882+
MsgRevokeResponse is the Msg/MsgRevokeResponse response type.
1790217883

1790317884

1790417885

@@ -17990,6 +17971,34 @@ MsgUpdateMembersResponse is the Msg/UpdateMembers response type.
1799017971

1799117972

1799217973

17974+
<a name="lbm.foundation.v1.MsgUpdateParams"></a>
17975+
17976+
### MsgUpdateParams
17977+
MsgUpdateParams is the Msg/UpdateParams request type.
17978+
17979+
17980+
| Field | Type | Label | Description |
17981+
| ----- | ---- | ----- | ----------- |
17982+
| `authority` | [string](#string) | | authority is the address of the operator account. |
17983+
| `params` | [Params](#lbm.foundation.v1.Params) | | params defines the x/foundation parameters to update.
17984+
17985+
NOTE: All parameters must be supplied. |
17986+
17987+
17988+
17989+
17990+
17991+
17992+
<a name="lbm.foundation.v1.MsgUpdateParamsResponse"></a>
17993+
17994+
### MsgUpdateParamsResponse
17995+
MsgUpdateParamsResponse is the Msg/UpdateParams response type.
17996+
17997+
17998+
17999+
18000+
18001+
1799318002
<a name="lbm.foundation.v1.MsgVote"></a>
1799418003

1799518004
### MsgVote
@@ -18022,7 +18031,7 @@ MsgVoteResponse is the Msg/Vote response type.
1802218031
<a name="lbm.foundation.v1.MsgWithdrawFromTreasury"></a>
1802318032

1802418033
### MsgWithdrawFromTreasury
18025-
MsgWithdrawFromTreasury represents a message to withdraw coins from the treasury.
18034+
MsgWithdrawFromTreasury is the Msg/WithdrawFromTreasury request type.
1802618035

1802718036

1802818037
| Field | Type | Label | Description |
@@ -18039,7 +18048,7 @@ MsgWithdrawFromTreasury represents a message to withdraw coins from the treasury
1803918048
<a name="lbm.foundation.v1.MsgWithdrawFromTreasuryResponse"></a>
1804018049

1804118050
### MsgWithdrawFromTreasuryResponse
18042-
MsgWithdrawFromTreasuryResponse defines the Msg/WithdrawFromTreasury response type.
18051+
MsgWithdrawFromTreasuryResponse is the Msg/WithdrawFromTreasury response type.
1804318052

1804418053

1804518054

@@ -18097,6 +18106,7 @@ Msg defines the foundation Msg service.
1809718106

1809818107
| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint |
1809918108
| ----------- | ------------ | ------------- | ------------| ------- | -------- |
18109+
| `UpdateParams` | [MsgUpdateParams](#lbm.foundation.v1.MsgUpdateParams) | [MsgUpdateParamsResponse](#lbm.foundation.v1.MsgUpdateParamsResponse) | UpdateParams defines an operation for updating the x/foundation module parameters. | |
1810018110
| `FundTreasury` | [MsgFundTreasury](#lbm.foundation.v1.MsgFundTreasury) | [MsgFundTreasuryResponse](#lbm.foundation.v1.MsgFundTreasuryResponse) | FundTreasury defines a method to fund the treasury. | |
1810118111
| `WithdrawFromTreasury` | [MsgWithdrawFromTreasury](#lbm.foundation.v1.MsgWithdrawFromTreasury) | [MsgWithdrawFromTreasuryResponse](#lbm.foundation.v1.MsgWithdrawFromTreasuryResponse) | WithdrawFromTreasury defines a method to withdraw coins from the treasury. | |
1810218112
| `UpdateMembers` | [MsgUpdateMembers](#lbm.foundation.v1.MsgUpdateMembers) | [MsgUpdateMembersResponse](#lbm.foundation.v1.MsgUpdateMembersResponse) | UpdateMembers updates the foundation members. | |
@@ -18106,8 +18116,8 @@ Msg defines the foundation Msg service.
1810618116
| `Vote` | [MsgVote](#lbm.foundation.v1.MsgVote) | [MsgVoteResponse](#lbm.foundation.v1.MsgVoteResponse) | Vote allows a voter to vote on a proposal. | |
1810718117
| `Exec` | [MsgExec](#lbm.foundation.v1.MsgExec) | [MsgExecResponse](#lbm.foundation.v1.MsgExecResponse) | Exec executes a proposal. | |
1810818118
| `LeaveFoundation` | [MsgLeaveFoundation](#lbm.foundation.v1.MsgLeaveFoundation) | [MsgLeaveFoundationResponse](#lbm.foundation.v1.MsgLeaveFoundationResponse) | LeaveFoundation allows a member to leave the foundation. | |
18109-
| `Grant` | [MsgGrant](#lbm.foundation.v1.MsgGrant) | [MsgGrantResponse](#lbm.foundation.v1.MsgGrantResponse) | Grant grants the provided authorization to the grantee with authority of the foundation. If there is already a grant for the given (granter, grantee, Authorization) tuple, then the grant will be overwritten. | |
18110-
| `Revoke` | [MsgRevoke](#lbm.foundation.v1.MsgRevoke) | [MsgRevokeResponse](#lbm.foundation.v1.MsgRevokeResponse) | Revoke revokes any authorization corresponding to the provided method name on the granter that has been granted to the grantee. | |
18119+
| `Grant` | [MsgGrant](#lbm.foundation.v1.MsgGrant) | [MsgGrantResponse](#lbm.foundation.v1.MsgGrantResponse) | Grant grants the provided authorization to the grantee with authority of the foundation. If there is already a grant for the given (grantee, Authorization) tuple, then the grant will be overwritten. | |
18120+
| `Revoke` | [MsgRevoke](#lbm.foundation.v1.MsgRevoke) | [MsgRevokeResponse](#lbm.foundation.v1.MsgRevokeResponse) | Revoke revokes any authorization corresponding to the provided method name that has been granted to the grantee. | |
1811118121
| `GovMint` | [MsgGovMint](#lbm.foundation.v1.MsgGovMint) | [MsgGovMintResponse](#lbm.foundation.v1.MsgGovMintResponse) | GovMint defines a gov mint coins to the treasury. | |
1811218122

1811318123
<!-- end services -->

proto/lbm/foundation/v1/event.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import "cosmos_proto/cosmos.proto";
1111
import "cosmos/base/v1beta1/coin.proto";
1212
import "lbm/foundation/v1/foundation.proto";
1313

14-
// EventUpdateFoundationParams is emitted after updating foundation parameters.
15-
message EventUpdateFoundationParams {
14+
// EventUpdateParams is emitted after updating foundation parameters.
15+
message EventUpdateParams {
1616
Params params = 1 [(gogoproto.nullable) = false];
1717
}
1818

proto/lbm/foundation/v1/foundation.proto

-15
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@ message Params {
1818
repeated string censored_msg_type_urls = 2;
1919
}
2020

21-
// UpdateFoundationParamsProposal details a proposal to update params of foundation module.
22-
message UpdateFoundationParamsProposal {
23-
option (gogoproto.equal) = false;
24-
option (gogoproto.goproto_getters) = false;
25-
option (gogoproto.goproto_stringer) = false;
26-
27-
string title = 1;
28-
string description = 2;
29-
30-
// params defines the x/foundation parameters to update.
31-
//
32-
// Note: All parameters must be supplied.
33-
Params params = 3 [(gogoproto.nullable) = false];
34-
}
35-
3621
// Member represents a foundation member with an account address and metadata.
3722
message Member {
3823
// address is the member's account address.

0 commit comments

Comments
 (0)