fix merge conflicts, add docker-build command

CHANGELOG.md

@@ -36,27 +36,44 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
-<<<<<<< HEAD
-### State Machine Breaking
-[\#1158](https://github.com/Kava-Labs/kava/pull/1158) Split existing auction `bid_duration` parameter into `forward_bid_duration` and `reverse_bid_duration`
-=======
-### Features
 - (metrics) [#1668] Adds non-state breaking x/metrics module for custom telemetry.
 
-### Bug Fixes
-- (evmutil) [#1655] Initialize x/evmutil module account in InitGenesis
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
+## [v0.18.2](https://github.com/Kava-Labs/kava/releases/tag/v0.18.2)
+
+* Update to go 1.18, cosmos v0.45.9, and tendermint v0.34.21
+* Update ci & docker to go 1.18
+* Config updates for iavl changes and broadcast mode flag
+* Ensure fast node is disable if config value is not set in order to
+  avoid fast node upgrade for nodes that do not update their app.toml
+* Update to new circle ci image instead of using legacy image
+* Remove previous ics23 package -- now used directly from cosmos-sdk repo
+
+## [v0.18.1](https://github.com/Kava-Labs/kava/releases/tag/v0.18.1)
+
+Patch for IBC Security Advisory Dragonberry: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702
+
+## [v0.18.0](https://github.com/Kava-Labs/kava/releases/tag/v0.18.0)
+
+Security upgrade patch release for kava 10.
+
+## [v0.17.3](https://github.com/Kava-Labs/kava/releases/tag/v0.17.3)
+
+Release of Kava EVM & the first binary with chain id `kava_2222-10`.
+
+See Release for full details:
+* [v0.17.3](https://github.com/Kava-Labs/kava/releases/tag/v0.17.3)
+* [v0.17.1](https://github.com/Kava-Labs/kava/releases/tag/v0.17.1)
 
 ## [v0.16.1](https://github.com/Kava-Labs/kava/releases/tag/v0.16.1)
 
 ### State Machine Breaking
 
-[\#1152](https://github.com/Kava-Labs/kava/pull/1152) Fix MultiSpend Proposal With Async Upgrade Time 
+[\#1152](https://github.com/Kava-Labs/kava/pull/1152) Fix MultiSpend Proposal With Async Upgrade Time
 
 ## [v0.16.0](https://github.com/Kava-Labs/kava/releases/tag/v0.16.0)
 
 ### State Machine Breaking
-[\#1106](https://github.com/Kava-Labs/kava/pull/1106) Upgrades app to cosmos-sdk v0.44.x and adds IBC and ICS-20 modules. 
+[\#1106](https://github.com/Kava-Labs/kava/pull/1106) Upgrades app to cosmos-sdk v0.44.x and adds IBC and ICS-20 modules.
 
 ## [v0.13.0]
 

Makefile

@@ -156,6 +156,9 @@ format:
 ###                                Localnet                                 ###
 ###############################################################################
 
+docker-build:
+	DOCKER_BUILDKIT=1 $(DOCKER) build -t kava/kava:local .
+
 build-docker-local-kava:
 	@$(MAKE) -C networks/local
 

app/app.go

@@ -126,14 +126,8 @@ import (
 	kavadistclient "github.com/kava-labs/kava/x/kavadist/client"
 	kavadistkeeper "github.com/kava-labs/kava/x/kavadist/keeper"
 	kavadisttypes "github.com/kava-labs/kava/x/kavadist/types"
-<<<<<<< HEAD
-=======
-	"github.com/kava-labs/kava/x/liquid"
-	liquidkeeper "github.com/kava-labs/kava/x/liquid/keeper"
-	liquidtypes "github.com/kava-labs/kava/x/liquid/types"
 	metrics "github.com/kava-labs/kava/x/metrics"
 	metricstypes "github.com/kava-labs/kava/x/metrics/types"
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	pricefeed "github.com/kava-labs/kava/x/pricefeed"
 	pricefeedkeeper "github.com/kava-labs/kava/x/pricefeed/keeper"
 	pricefeedtypes "github.com/kava-labs/kava/x/pricefeed/types"
@@ -201,16 +195,8 @@ var (
 		savings.AppModuleBasic{},
 		validatorvesting.AppModuleBasic{},
 		evmutil.AppModuleBasic{},
-<<<<<<< HEAD
 		bridge.AppModuleBasic{},
-=======
-		liquid.AppModuleBasic{},
-		earn.AppModuleBasic{},
-		router.AppModuleBasic{},
-		mint.AppModuleBasic{},
-		community.AppModuleBasic{},
 		metrics.AppModuleBasic{},
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	)
 
 	// module account permissions
@@ -714,17 +700,8 @@ func NewApp(
 		incentive.NewAppModule(app.incentiveKeeper, app.accountKeeper, app.bankKeeper, app.cdpKeeper),
 		evmutil.NewAppModule(app.evmutilKeeper, app.bankKeeper),
 		savings.NewAppModule(app.savingsKeeper, app.accountKeeper, app.bankKeeper),
-<<<<<<< HEAD
 		bridge.NewAppModule(app.bridgeKeeper, app.accountKeeper),
-=======
-		liquid.NewAppModule(app.liquidKeeper),
-		earn.NewAppModule(app.earnKeeper, app.accountKeeper, app.bankKeeper),
-		router.NewAppModule(app.routerKeeper),
-		// nil InflationCalculationFn, use SDK's default inflation function
-		mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil),
-		community.NewAppModule(app.communityKeeper, app.accountKeeper),
 		metrics.NewAppModule(options.TelemetryOptions),
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	)
 
 	// Warning: Some begin blockers must run before others. Ensure the dependencies are understood before modifying this list.
@@ -811,16 +788,8 @@ func NewApp(
 		authz.ModuleName,
 		evmutiltypes.ModuleName,
 		savingstypes.ModuleName,
-<<<<<<< HEAD
 		bridgetypes.ModuleName,
-=======
-		liquidtypes.ModuleName,
-		earntypes.ModuleName,
-		routertypes.ModuleName,
-		minttypes.ModuleName,
-		communitytypes.ModuleName,
 		metricstypes.ModuleName,
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	)
 
 	// Warning: Some init genesis methods must run before others. Ensure the dependencies are understood before modifying this list
@@ -859,12 +828,7 @@ func NewApp(
 		paramstypes.ModuleName,
 		upgradetypes.ModuleName,
 		validatorvestingtypes.ModuleName,
-<<<<<<< HEAD
-=======
-		liquidtypes.ModuleName,
-		routertypes.ModuleName,
 		metricstypes.ModuleName,
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	)
 
 	app.mm.RegisterInvariants(&app.crisisKeeper)

go.mod

@@ -3,35 +3,18 @@ module github.com/kava-labs/kava
 go 1.18
 
 require (
-<<<<<<< HEAD
 	github.com/cosmos/cosmos-proto v1.0.0-alpha6
 	github.com/cosmos/cosmos-sdk v0.45.9
 	github.com/cosmos/ibc-go/v3 v3.0.0
 	github.com/ethereum/go-ethereum v1.10.16
-=======
-	cosmossdk.io/errors v1.0.0-beta.7
-	cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4
-	github.com/cenkalti/backoff/v4 v4.1.3
-	github.com/cosmos/cosmos-proto v1.0.0-beta.3
-	github.com/cosmos/cosmos-sdk v0.46.11
-	github.com/cosmos/go-bip39 v1.0.0
-	github.com/cosmos/ibc-go/v6 v6.1.1
-	github.com/ethereum/go-ethereum v1.10.26
-	github.com/evmos/ethermint v0.21.0
 	github.com/go-kit/kit v0.12.0
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-<<<<<<< HEAD
 	github.com/kava-labs/kava-bridge v0.2.0
-=======
-	github.com/linxGnu/grocksdb v1.8.0
-	github.com/pelletier/go-toml/v2 v2.0.6
-	github.com/prometheus/client_golang v1.14.0
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
+	github.com/prometheus/client_golang v1.12.2
 	github.com/spf13/cast v1.5.0
 	github.com/spf13/cobra v1.5.0
 	github.com/stretchr/testify v1.8.0
@@ -81,11 +64,6 @@ require (
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
-<<<<<<< HEAD
-	github.com/go-kit/kit v0.12.0 // indirect
-=======
-	github.com/gin-gonic/gin v1.8.1 // indirect
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
@@ -136,16 +114,9 @@ require (
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-<<<<<<< HEAD
-	github.com/prometheus/client_golang v1.12.2 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.34.0 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-=======
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.40.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
->>>>>>> 9a0aed76 (feat(x/metrics): add module for emiting custom chain metrics (#1668))
 	github.com/prometheus/tsdb v0.7.1 // indirect
 	github.com/rakyll/statik v0.1.7 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect