Skip to content

Commit

Permalink
Merge branch 'main' into add_index_field
Browse files Browse the repository at this point in the history
* main:
  feat: add foundation treasury feature to x/foundation (#518)
  chore(deps): bump github.com/spf13/cast from 1.4.1 to 1.5.0 (#540)
  build(deps): bump github.com/hashicorp/go-getter from 1.4.1 to 1.5.11 in /cosmovisor (#525)

# Conflicts:
#	client/docs/statik/statik.go
  • Loading branch information
Jiyong Ha committed May 16, 2022
2 parents 8957c40 + 93ba6b0 commit e2a6c5c
Show file tree
Hide file tree
Showing 109 changed files with 33,619 additions and 7,396 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
### Features
* (x/wasm) [\#470](https://github.com/line/lbm-sdk/pull/470) remove contract activation control by actor
* (x/wasm) [\#513](https://github.com/line/lbm-sdk/pull/513) fix message representation for signing
* (x/foundation) [\#518](https://github.com/line/lbm-sdk/pull/518) add foundation treasury feature to x/foundation

### Improvements

Expand Down
2 changes: 1 addition & 1 deletion baseapp/block_gas_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
txBuilder.SetFeeAmount(feeAmount)
txBuilder.SetGasLimit(txtypes.MaxGasWanted) // tx validation checks that gasLimit can't be bigger than this

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

Expand Down
9 changes: 7 additions & 2 deletions client/docs/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,15 @@
"url": "./tmp-swagger-gen/lbm/wasm/v1/query.swagger.json"
},
{
"url": "./tmp-swagger-gen/lbm/consortium/v1/query.swagger.json",
"url": "./tmp-swagger-gen/lbm/foundation/v1/query.swagger.json",
"operationIds": {
"rename": {
"Params": "ConsortiumParams"
"Params": "FoundationParams",
"Proposal": "FoundationProposal",
"Proposals": "FoundationProposals",
"Vote": "FoundationVote",
"Votes": "FoundationVotes",
"TallyResult": "FoundationTallyResult"
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions client/docs/statik/statik.go

Large diffs are not rendered by default.

Loading

0 comments on commit e2a6c5c

Please sign in to comment.