chore: resolve conflicts

CHANGELOG.md

@@ -112,6 +112,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#2008](https://github.com/NibiruChain/nibiru/pull/2008) - refactor(evm): clean up precompile setups 
 - [#2013](https://github.com/NibiruChain/nibiru/pull/2013) - chore(evm): Set appropriate gas value for the required gas of the "IFunToken.sol" precompile.
 - [#2014](https://github.com/NibiruChain/nibiru/pull/2014) - feat(evm): Emit block bloom event in EndBlock hook.
+- [#2019](https://github.com/NibiruChain/nibiru/pull/2019) - chore(evm): enabled debug rpc api on localnet.
 - [#2020](https://github.com/NibiruChain/nibiru/pull/2020) - test(evm): e2e tests for debug namespace
 
 #### Dapp modules: perp, spot, oracle, etc

contrib/make/build.mk

@@ -70,7 +70,9 @@ ldflags := $(strip $(ldflags))
 BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
 CGO_CFLAGS  := -I$(TEMPDIR)/include
 CGO_LDFLAGS := -L$(TEMPDIR)/lib
-ifneq ($(OS_NAME),darwin)
+ifeq ($(OS_NAME),darwin)
+	CGO_LDFLAGS += -lrocksdb -lstdc++ -lz -lbz2
+else
 	CGO_LDFLAGS += -static -lm -lbz2
 endif
 

contrib/scripts/localnet.sh

@@ -162,6 +162,9 @@ sed -i $SEDOPTION '/\[grpc\]/,+3 s/enable = false/enable = true/' $CHAIN_DIR/con
 echo_info "config/app.toml: Enabling JSON API server"
 sed -i $SEDOPTION '/\[json\-rpc\]/,+3 s/enable = false/enable = true/' $CHAIN_DIR/config/app.toml
 
+echo_info "config/app.toml: Enabling debug evm api"
+sed -i $SEDOPTION '/\[json\-rpc\]/,+13 s/api = "eth,net,web3"/api = "eth,net,web3,debug"/' $CHAIN_DIR/config/app.toml
+
 # Enable Swagger Docs
 echo_info "config/app.toml: Enabling Swagger Docs"
 sed -i $SEDOPTION 's/swagger = false/swagger = true/' $CHAIN_DIR/config/app.toml