Skip to content

Commit

Permalink
chore: merge osmo-v22/v0.47.5 into "main" (#501)
Browse files Browse the repository at this point in the history
* De-dup param getting

* Disable DenomOwners tracking

* Fix some tests

* chore(types): replace amino json encoder with stdlib

* feat: config option to log gRPC queries (#503)

* config option to log gRPC queries

* clarify gRPC log comment

* create var

* remove quotes

* go mod tidy

* chore: fix CI (#509)

* ci

* lints and remove some unnecessary CI jobs

* update tests go mod

* more lints

* remove denom owners since not implemented in osmosis

* more lints

* fix test values

* implement nolint again

* more test fixes

* add back labeler as v4

* remove tabs and slash

* update json to const

* move file locations

* push

* fix seq num issue

* Update tests/e2e/auth/vesting/suite.go

* add back pwd

* remove sonarcloud

---------

Co-authored-by: Matt, Park <[email protected]>

* Fix CI(#511)

* perf: CacheCtx speedups (#504)

* CacheKV speedups

* Remove extra btree alloc

* fix(x/feegrant)!: limit expired feegrant pruning to 200 per block (cosmos#19314) (#512)

Co-authored-by: MSalopek <[email protected]>

* feat: add testnetify logic (#506)

* add testnetify logic

* clarify explanation

* handle errors

* remove testnet app creator

* simplify some logic

* remove redundancy

* lints

* gci imports

* add set store loader method

* trigger upgrade flag

* add extra comments to the CLI command

* skip confirmation (#516)

---------

Co-authored-by: Adam Tucker <[email protected]>
Co-authored-by: Adam Tucker <[email protected]>
Co-authored-by: Matt, Park <[email protected]>
Co-authored-by: MSalopek <[email protected]>
  • Loading branch information
5 people authored Feb 8, 2024
1 parent 73e35ba commit b794dab
Show file tree
Hide file tree
Showing 38 changed files with 597 additions and 380 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/dependencies-review.yml

This file was deleted.

9 changes: 5 additions & 4 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ permissions:
jobs:
labeler:
permissions:
contents: read # for actions/labeler to determine modified files
pull-requests: write # for actions/labeler to add labels to PRs
contents: read # for actions/labeler to determine modified files
pull-requests: write # for actions/labeler to add labels to PRs
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@main
- uses: actions/labeler@v4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml
repo-token: "${{ secrets.GITHUB_TOKEN }}"
22 changes: 0 additions & 22 deletions .github/workflows/lint-pr.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .github/workflows/project.yml

This file was deleted.

16 changes: 1 addition & 15 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,6 @@ jobs:
with:
name: "${{ github.sha }}-e2e-coverage"
continue-on-error: true
- name: sonarcloud
if: env.GIT_DIFF
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

liveness-test:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -270,12 +264,4 @@ jobs:
if: env.GIT_DIFF
run: |
cd simapp
go test -mod=readonly -timeout 30m -tags='app_v1 norace ledger test_ledger_mock rocksdb_build' ./...
- name: sonarcloud
if: env.GIT_DIFF
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
with:
projectBaseDir: simapp/
go test -mod=readonly -timeout 30m -tags='app_v1 norace ledger test_ledger_mock rocksdb_build' ./...
2 changes: 1 addition & 1 deletion baseapp/block_gas_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func TestBaseApp_BlockGas(t *testing.T) {
require.Equal(t, []byte("ok"), okValue)
}
// check block gas is always consumed
baseGas := uint64(51682) // baseGas is the gas consumed before tx msg
baseGas := uint64(47842) // baseGas is the gas consumed before tx msg
expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas)
if expGasConsumed > uint64(simtestutil.DefaultConsensusParams.Block.MaxGas) {
// capped by gasLimit
Expand Down
5 changes: 5 additions & 0 deletions baseapp/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ func SetChainID(chainID string) func(*BaseApp) {
return func(app *BaseApp) { app.chainID = chainID }
}

// SetStoreLoader allows us to customize the rootMultiStore initialization.
func SetStoreLoader(loader StoreLoader) func(*BaseApp) {
return func(app *BaseApp) { app.SetStoreLoader(loader) }
}

func (app *BaseApp) SetName(name string) {
if app.sealed {
panic("SetName() on sealed BaseApp")
Expand Down
Loading

0 comments on commit b794dab

Please sign in to comment.