Skip to content

Commit e2a6c5c

Browse files
author
Jiyong Ha
committed
Merge branch 'main' into add_index_field
* main: feat: add foundation treasury feature to x/foundation (Finschia#518) chore(deps): bump github.com/spf13/cast from 1.4.1 to 1.5.0 (Finschia#540) build(deps): bump github.com/hashicorp/go-getter from 1.4.1 to 1.5.11 in /cosmovisor (Finschia#525) # Conflicts: # client/docs/statik/statik.go
2 parents 8957c40 + 93ba6b0 commit e2a6c5c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+33619
-7396
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
4040
### Features
4141
* (x/wasm) [\#470](https://github.com/line/lbm-sdk/pull/470) remove contract activation control by actor
4242
* (x/wasm) [\#513](https://github.com/line/lbm-sdk/pull/513) fix message representation for signing
43+
* (x/foundation) [\#518](https://github.com/line/lbm-sdk/pull/518) add foundation treasury feature to x/foundation
4344

4445
### Improvements
4546

baseapp/block_gas_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
101101
txBuilder.SetFeeAmount(feeAmount)
102102
txBuilder.SetGasLimit(txtypes.MaxGasWanted) // tx validation checks that gasLimit can't be bigger than this
103103

104-
privs, accNums, accSeqs := []cryptotypes.PrivKey{priv1}, []uint64{7}, []uint64{0}
104+
privs, accNums, accSeqs := []cryptotypes.PrivKey{priv1}, []uint64{8}, []uint64{0}
105105
_, txBytes, err := createTestTx(encCfg.TxConfig, txBuilder, privs, accNums, accSeqs, ctx.ChainID())
106106
require.NoError(t, err)
107107

client/docs/config.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,15 @@
151151
"url": "./tmp-swagger-gen/lbm/wasm/v1/query.swagger.json"
152152
},
153153
{
154-
"url": "./tmp-swagger-gen/lbm/consortium/v1/query.swagger.json",
154+
"url": "./tmp-swagger-gen/lbm/foundation/v1/query.swagger.json",
155155
"operationIds": {
156156
"rename": {
157-
"Params": "ConsortiumParams"
157+
"Params": "FoundationParams",
158+
"Proposal": "FoundationProposal",
159+
"Proposals": "FoundationProposals",
160+
"Vote": "FoundationVote",
161+
"Votes": "FoundationVotes",
162+
"TallyResult": "FoundationTallyResult"
158163
}
159164
}
160165
},

client/docs/statik/statik.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)