From 6d6fba99b9994f2451b4189e7c79f61ad2378234 Mon Sep 17 00:00:00 2001
From: Adam Tucker <adamleetucker@outlook.com>
Date: Sat, 21 May 2022 11:10:50 -0500
Subject: [PATCH] feat: local dev environment (#1554)

* localosmosis

* extract docker runs to script

* change ubuntu to alpine

* nicco suggestions

* update changelog
---
 CHANGELOG.md | 41 -----------------------------------------
 Makefile     | 29 -----------------------------
 2 files changed, 70 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59714ca39df..300fb585bf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,47 +41,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-<<<<<<< HEAD
-## [v7.3.0](https://github.com/osmosis-labs/osmosis/releases/tag/v7.3.0)
-=======
-* [#1554](https://github.com/osmosis-labs/osmosis/pull/1554) local dev environment
-* [#1535](https://github.com/osmosis-labs/osmosis/pull/1535) upgrade wasmd to v0.27.0.rc3-osmo and ibc-go to v3
-* [#1435] `x/tokenfactory` create denom fee for spam resistance 
-* [#1429] solver for multi-asset CFMM
-* [#1253] Add lockup duration edit method
-* [#1253] Add lockup duration edit method 
-* [#1312] Stableswap: Createpool logic 
-* [#1230] Stableswap CFMM equations
-* [#1541] Add arm64 support to Docker
-
-## [v8.0.0 - Emergency proposals upgrade](https://github.com/osmosis-labs/osmosis/releases/tag/v8.0.0)
-
-This upgrade is a patch that must be hard forked in, as on-chain governance of Osmosis approved proposal [227](https://www.mintscan.io/osmosis/proposals/227) and proposal [228](https://www.mintscan.io/osmosis/proposals/228).
-
-This upgrade includes:
-
-* Adding height-gated AnteHandler message filter to filter unpooling tx pre-upgrade.
-* At block height 4402000 accelerates prop 225, which in turn moves incentives from certain pools according to props 222-224
-* Adds a msg allowing unpooling of UST pools. 
-  * This procedure is initiated by whitelisting pools 560, 562, 567, 578, 592, 610, 612, 615, 642, 679, 580, 635. 
-  * Unpooling allows exiting whitelisted pools directly, finish unbonding duration with the exited tokens instead of having to wait unbonding duration to swap LP shares back to collaterals. 
-  * This procedure also includes locks that were already unbonding pre-upgrade and locks that were superfluid delegated.
-
-Every node should upgrade their software version to v8.0.0 before the upgrade block height 4402000. If you use cosmovisor, simply swap out the binary at upgrades/v7/bin to be v8.0.0, and restart the node. Do check cosmovisor version returns v8.0.0
-
-### Features 
-* {Across many PRs} Initiate emergency upgrade 
-* [#1481] Emergency upgrade as of prop [226] (https://www.mintscan.io/osmosis/proposals/226) 
-* [#1482] Checking Whitelisted Pools contain UST 
-* [#1486] Update whitelisted pool IDs
-* [#1262] Add a forceprune command to the binaries, that prunes golevelDB data better
-* [#1154] Database stability improvements
-* [#840] Move lock.go functions into iterator.go, lock_refs.go and store.go
-* [#916] And a fn for Unbond and Burn tokens
-* [#908] Superfluid slashing code
-* [#904] LockAndSuperfluidDelegate
->>>>>>> f5472e0 (feat: local dev environment (#1554))
-
 ### Bug Fixes
 
 * [1390](https://github.com/osmosis-labs/osmosis/pull/1390) Upgrade sdk to v0.45.0x-osmo-v7.9, fixing data races with GRPC
diff --git a/Makefile b/Makefile
index 56d8aac31c8..3aedf967983 100644
--- a/Makefile
+++ b/Makefile
@@ -266,34 +266,6 @@ format:
 ###                                Localnet                                 ###
 ###############################################################################
 
-<<<<<<< HEAD
-build-docker-osmosisdnode:
-	$(MAKE) -C contrib/localtestnet
-
-# Run a 4-node testnet locally
-localnet-start: build-linux build-docker-osmosisdnode # localnet-stop
-	@if ! [ -f $(BUILDDIR)/node0/osmosisd/config/genesis.json ]; \
-	then docker run --rm -v $(BUILDDIR):/osmosisd:Z osmosis-labs/osmosisdnode testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; \
-	fi
-	docker-compose up -d
-
-# Stop testnet
-localnet-stop:
-	docker-compose down
-
-clean-localnet: localnet-stop
-	rm -rf $(BUILDDIR)/node* $(BUILDDIR)/gentxs
-
-test-docker:
-	@docker build -f contrib/Dockerfile.test -t ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD) .
-	@docker tag ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD) ${TEST_DOCKER_REPO}:$(shell git rev-parse --abbrev-ref HEAD | sed 's#/#_#g')
-	@docker tag ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD) ${TEST_DOCKER_REPO}:latest
-
-test-docker-push: test-docker
-	@docker push ${TEST_DOCKER_REPO}:$(shell git rev-parse --short HEAD)
-	@docker push ${TEST_DOCKER_REPO}:$(shell git rev-parse --abbrev-ref HEAD | sed 's#/#_#g')
-	@docker push ${TEST_DOCKER_REPO}:latest
-=======
 localnet-keys:
 	. tests/localosmosis/keys.sh
 
@@ -305,7 +277,6 @@ localnet-start:
 
 localnet-remove:
 	@docker-compose -f tests/localosmosis/docker-compose.yml down
->>>>>>> f5472e0 (feat: local dev environment (#1554))
 
 .PHONY: all build-linux install format lint \
 	go-mod-cache draw-deps clean build \