fix: add check on evm transaction tip (#1928) and fix: check authorisation address in the blocklist (#1924)

randy-cro · randy-cro · commit 5475caa7cbd0 · 2025-12-09T16:37:40.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
 ### Bug fixes
 
 * [#1918](https://github.com/crypto-org-chain/cronos/pull/1918) Chore: cleanup and improve x/mint params validation and test in cosmos-sdk
+* [#1924](https://github.com/crypto-org-chain/cronos/pull/1924) Fix: check authorisation address in the blocklist
+* [#1928](https://github.com/crypto-org-chain/ethermint/pull/1928) Fix: add check on evm transaction tip
 
 *Nov 30, 2025*
 
diff --git a/app/block_address.go b/app/block_address.go
@@ -62,6 +62,10 @@ func (bad BlockAddressesDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula
 								return ctx, fmt.Errorf("signer is blocked: %s", addr.String())
 							}
 						}
+						// check the target address
+						if _, ok := bad.blockedMap[sdk.AccAddress(auth.Address.Bytes()).String()]; ok {
+							return ctx, fmt.Errorf("authorisation address is blocked: %s", sdk.AccAddress(auth.Address.Bytes()).String())
+						}
 					}
 				}
 			}
diff --git a/app/proposal.go b/app/proposal.go
@@ -198,6 +198,14 @@ func (h *ProposalHandler) ValidateTransaction(tx sdk.Tx, txBz []byte) error {
 							return fmt.Errorf("signer is blocked: %s", addr.String())
 						}
 					}
+					// check the target address
+					encoded, err := h.addressCodec.BytesToString(auth.Address.Bytes())
+					if err != nil {
+						return fmt.Errorf("invalid bech32 address: %s, err: %w", auth.Address, err)
+					}
+					if _, ok := h.blocklist[encoded]; ok {
+						return fmt.Errorf("authorisation address is blocked: %s", encoded)
+					}
 				}
 			}
 		}
diff --git a/default.nix b/default.nix
@@ -11,7 +11,7 @@
   nativeByteOrder ? true, # nativeByteOrder mode will panic on big endian machines
 }:
 let
-  version = "v1.6.0";
+  version = "v1.6.1";
   pname = "cronosd";
   tags = [
     "ledger"
diff --git a/go.mod b/go.mod
@@ -307,7 +307,7 @@ replace (
 	// release/v1.15
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20250815065500-a4fbafcae0dd
 	// release/v0.22.x-cronosv1.6-optstaking
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.0.0-20251124090103-12d426c14aea
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.0.0-20251209082631-9310d036187d
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
diff --git a/go.sum b/go.sum
@@ -912,8 +912,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254
 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
 github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254 h1:JzLOFRiKsDtLJt5h0M0jkEIPDKvFFyja7VEp7gG6O9U=
 github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
-github.com/crypto-org-chain/ethermint v0.0.0-20251124090103-12d426c14aea h1:H1hoG9J3ElBeAL3RzJufa0VvR6+hEqXDvp+ME7sKhpI=
-github.com/crypto-org-chain/ethermint v0.0.0-20251124090103-12d426c14aea/go.mod h1:/E17R2sdjWWygJJP+ZSh3CkfJD2U8Z4HbA85iObApoc=
+github.com/crypto-org-chain/ethermint v0.0.0-20251209082631-9310d036187d h1:VR4tgpFlr3M5g0IoUoIKZz/8BIGmYJVMb2HjS/VO7ho=
+github.com/crypto-org-chain/ethermint v0.0.0-20251209082631-9310d036187d/go.mod h1:/E17R2sdjWWygJJP+ZSh3CkfJD2U8Z4HbA85iObApoc=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6 h1:6KPEi8dWkDSBddQb4NAvEXmNnTXymF3yVeTaT4Hz1iU=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20250815065500-a4fbafcae0dd h1:ebSnzvM9yKVGFjvoGly7LFQQCS2HuOWMCvQyByJ52Gs=
diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -315,8 +315,8 @@ schema = 3
     version = "v0.2.2"
     hash = "sha256-0MLfSJKdeK3Z7tWAXTdzwB4091dmyxIX38S5SKH5QAw="
   [mod."github.com/evmos/ethermint"]
-    version = "v0.0.0-20251124090103-12d426c14aea"
-    hash = "sha256-4C9kaSpyzHGtM1mY5UC6HiWpZZDoG2P/2vNQ/zO9bzc="
+    version = "v0.0.0-20251209082631-9310d036187d"
+    hash = "sha256-HOeM1ZgA3m6w3zrxMTKBplrMt5sF744UHeLrE9ubDi4="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/fatih/color"]
     version = "v1.17.0"

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ func (bad BlockAddressesDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simula`
`62`	`62`	`return ctx, fmt.Errorf("signer is blocked: %s", addr.String())`
`63`	`63`	`}`
`64`	`64`	`}`
	`65`	`+ // check the target address`
	`66`	`+ if _, ok := bad.blockedMap[sdk.AccAddress(auth.Address.Bytes()).String()]; ok {`
	`67`	`+ return ctx, fmt.Errorf("authorisation address is blocked: %s", sdk.AccAddress(auth.Address.Bytes()).String())`
	`68`	`+ }`
`65`	`69`	`}`
`66`	`70`	`}`
`67`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,14 @@ func (h *ProposalHandler) ValidateTransaction(tx sdk.Tx, txBz []byte) error {`
`198`	`198`	`return fmt.Errorf("signer is blocked: %s", addr.String())`
`199`	`199`	`}`
`200`	`200`	`}`
	`201`	`+ // check the target address`
	`202`	`+ encoded, err := h.addressCodec.BytesToString(auth.Address.Bytes())`
	`203`	`+ if err != nil {`
	`204`	`+ return fmt.Errorf("invalid bech32 address: %s, err: %w", auth.Address, err)`
	`205`	`+ }`
	`206`	`+ if _, ok := h.blocklist[encoded]; ok {`
	`207`	`+ return fmt.Errorf("authorisation address is blocked: %s", encoded)`
	`208`	`+ }`
`201`	`209`	`}`
`202`	`210`	`}`
`203`	`211`	`}`