Problem: min-gas-price change in ethermint not merged (#322)

* Problem: min-gas-price change in ethermint not merged

Solution:
- merge ethermint main to custom fork

* changelog

* update contract bytecode

* fix gravity test

CHANGELOG.md

@@ -21,6 +21,7 @@
 
 ### Improvements
 - [cronos#210](https://github.com/crypto-org-chain/cronos/pull/210) re-enabling gravity bridge conditionally
+- [cronos#322](https://github.com/crypto-org-chain/cronos/pull/322) Merge min-gas-price change in ethermint: don't check min-gas-price for EVM tx when feemarket enabled.
 
 ### Bug Fixes
 - [cronos#287](https://github.com/crypto-org-chain/cronos/pull/287) call upgrade handler before sealing app

go.mod

@@ -164,7 +164,7 @@ replace (
 	// See https://github.com/tecbot/gorocksdb/pull/216
 	github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.1.1
 
-	github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-2
+	github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-3
 
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )

go.sum

@@ -245,8 +245,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-2 h1:1v0CFqtCFNx67c7GHf7/T6qh41yCo/CXl+M2WE5v828=
-github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-2/go.mod h1:mDIs9UkvLmjjg6cJX0dyO2GKn0GP6cuq4AfbDnFZl/4=
+github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-3 h1:O3pyvDcKjlA82J3lMzm07e06Lhi2SH6AHu8609effkM=
+github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-3/go.mod h1:mDIs9UkvLmjjg6cJX0dyO2GKn0GP6cuq4AfbDnFZl/4=
 github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks h1:d2MOrJQE6lZQ+nUznUaSlE8/QQZ4j5rkv5hw2DnCt50=
 github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks/go.mod h1:XUmW7wmubCRhIEAGtMGS+5IjiSSmcAwihoN/yPGd6Kk=
 github.com/crypto-org-chain/keyring v1.1.6-fixes h1:AUFSu56NY6XobY6XfRoDx6v3loiOrHK5MNUm32GEjwA=

gomod2nix.toml

@@ -3668,13 +3668,13 @@
     sha256 = "1sgjf2vaq554ybc0cwkzn17cz2ibzph2rq0dgaw21c2hym09437x"
 
 ["github.com/tharsis/ethermint"]
-  sumVersion = "v0.10.0-alpha1-cronos-2"
+  sumVersion = "v0.10.0-alpha1-cronos-3"
   vendorPath = "github.com/crypto-org-chain/ethermint"
   ["github.com/tharsis/ethermint".fetch]
     type = "git"
     url = "https://github.com/crypto-org-chain/ethermint"
-    rev = "41019c613ecb111a77592864297720701c7ec0da"
-    sha256 = "0s607cwkdwdd81ci4fkszzsk4s4r6i0w4xlrq8yiwyxhhwknn7qm"
+    rev = "1bd9ad9a6ad11381c50b162e89d60ecea4a06110"
+    sha256 = "14vwv1j53y1whhwz4scrjhnasr7nr9k6axz19wcjgxnwyl516xbi"
 
 ["github.com/tidwall/gjson"]
   sumVersion = "v1.6.7"

integration_tests/configs/disable_auto_deployment.yaml

@@ -36,4 +36,5 @@ cronos_777-1:
               amount: "1"
       feemarket:
         params:
-          no_base_fee: true
+          no_base_fee: false
+          initial_base_fee: 100000000000

scripts/cronos-experimental-devnet.yaml

@@ -33,9 +33,6 @@ cronos_777-1:
       evm:
         params:
           evm_denom: basetcro
-      feemarket:
-        params:
-          no_base_fee: true
       cronos:
         params:
           cronos_admin: crc12luku6uxehhak02py4rcz65zu0swh7wjsrw0pp
@@ -53,3 +50,7 @@ cronos_777-1:
         params:
           receive_enabled: true
           send_enabled: true
+      feemarket:
+        params:
+          no_base_fee: false
+          initial_base_fee: 100000000000