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

Update docker sdk v0.50.x #2021

Merged
merged 6 commits into from
Jun 5, 2024
Merged

Update docker sdk v0.50.x #2021

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
740615a
Update ibcnet relayer.
Taztingo Jun 4, 2024
cc10e0d
Add missing chain ids. localnet and ibcnet could not correctly start …
Taztingo Jun 4, 2024
7da0b2e
Update changelog.
Taztingo Jun 4, 2024
6290f28
Merge main.
Taztingo Jun 4, 2024
f1f5d72
Remove duplicate period.
Taztingo Jun 4, 2024
46d6da4
Correct carlton changelog entry.
Taztingo Jun 4, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* `name` add `UpdateParams` endpoint and cli [#2004](https://github.com/provenance-io/provenance/pull/2004).
* Update the exchange `commitment-settlement-fee-calc` cli query to utilize the keyring [#2001](https://github.com/provenance-io/provenance/pull/2001).
* Implement the ProposalMsgs module interface for the internal/provwasm, ibcratelimit, oracle, and sanction modules [#1993](https://github.com/provenance-io/provenance/pull/1993.)
* Update ibcnet relayer to v2.5.2 and fix chain ids for localnet and ibcnet. [#2021](https://github.com/provenance-io/provenance/pull/2021).
nullpointer0x00 marked this conversation as resolved.
Show resolved Hide resolved
* Breakdown internal/helpers into multiple internal packages [#2019](https://github.com/provenance-io/provenance/pull/2019).

### Client Breaking
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ localnet-stop:
# Quick build using ibc environment and go platform target options.
RELAYER_MNEMONIC ?= "list judge day spike walk easily outer state fashion library review include leisure casino wagon zoo chuckle alien stock bargain stone wait squeeze fade"
RELAYER_KEY ?= tp18uev5722xrwpfd2hnqducmt3qdjsyktmtw558y
RELAYER_VERSION ?= v2.1.2
RELAYER_VERSION ?= v2.5.2
docker-build-ibc: vendor
docker build --target provenance-$(shell uname -m) --tag provenance-io/blockchain-ibc -f networks/ibc/blockchain-ibc/Dockerfile .
docker build --target relayer --tag provenance-io/blockchain-relayer -f networks/ibc/blockchain-relayer/Dockerfile --build-arg MNEMONIC=$(RELAYER_MNEMONIC) --build-arg VERSION=$(RELAYER_VERSION) .
Expand Down
15 changes: 15 additions & 0 deletions cmd/provenanced/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/crisis"
genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"

"github.com/provenance-io/provenance/app"
"github.com/provenance-io/provenance/app/params"
Expand Down Expand Up @@ -307,7 +308,21 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty
cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent)),
)

homeDir := cast.ToString(appOpts.Get(flags.FlagHome))
chainID := cast.ToString(appOpts.Get(flags.FlagChainID))
if chainID == "" {
// fallback to genesis chain-id
reader, err := os.Open(filepath.Join(homeDir, "config", "genesis.json"))
if err != nil {
panic(err)
}
defer reader.Close()

chainID, err = genutiltypes.ParseChainIDFromGenesis(reader)
if err != nil {
panic(fmt.Errorf("failed to parse chain-id from genesis file: %w", err))
}
}
Taztingo marked this conversation as resolved.
Show resolved Hide resolved

return app.New(
logger, db, traceStore, true, skipUpgradeHeights,
Expand Down
Loading