imp(distribution): replace bech32 address with evm hex address for distribution precompile contract

CHANGELOG.md

@@ -59,6 +59,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (osmosis-outpost) [#2206](https://github.com/evmos/evmos/pull/2206) Update swap function input to custom struct.
 - (stride-outpost) [#2207](https://github.com/evmos/evmos/pull/2207) Update Stride Outpost to include additional arguments.
 - (incentives) [#2221](https://github.com/evmos/evmos/pull/2221) Burn the usage incentives pool balance during v16 upgrade.
+- (staking-precompile) [#2200](https://github.com/evmos/evmos/pull/2200) Replace bech32 address with evm hex address for staking precompile contract.
+- (staking-distribution) [#2241](https://github.com/evmos/evmos/pull/2241) Replace bech32 address with evm hex address for distribution precompile contract.
 
 ### API Breaking
 

precompiles/common/errors.go

@@ -16,6 +16,8 @@ const (
 	ErrInvalidDelegator = "invalid delegator address: %s"
 	// ErrInvalidValidator is raised when the Validator address is not valid.
 	ErrInvalidValidator = "invalid validator address: %s"
+	// ErrInvalidWithdrawer is raised when the withdrawer address is not valid.
+	ErrInvalidWithdrawer = "invalid withdrawer address: %s"
 	// ErrInvalidDenom is raised when the denom is not valid.
 	ErrInvalidDenom = "invalid denom: %s"
 	// ErrInvalidMsgType is raised when the transaction type is not valid for the given precompile.

precompiles/distribution/DistributionI.sol

@@ -22,13 +22,13 @@ struct ValidatorSlashEvent {
 }
 
 struct ValidatorDistributionInfo {
-    string operatorAddress;
+    address operatorAddress;
     DecCoin[] selfBondRewards;
     DecCoin[] commission;
 }
 
 struct DelegationDelegatorReward {
-    string validatorAddress;
+    address validatorAddress;
     DecCoin[] reward;
 }
 
@@ -50,7 +50,7 @@ interface DistributionI {
     /// @param withdrawerAddress the newly set withdrawer address
     event SetWithdrawerAddress(
         address indexed caller,
-        string withdrawerAddress
+        address indexed withdrawerAddress
     );
 
     /// @dev WithdrawDelegatorRewards defines an Event emitted when rewards from a delegation are withdrawn
@@ -67,7 +67,7 @@ interface DistributionI {
     /// @param validatorAddress is the address of the validator
     /// @param commission is the total commission earned by the validator
     event WithdrawValidatorCommission(
-        string indexed validatorAddress,
+        address indexed validatorAddress,
         uint256 commission
     );
 
@@ -89,7 +89,7 @@ interface DistributionI {
     /// the given delegator address
     function setWithdrawAddress(
         address delegatorAddress,
-        string memory withdrawerAddress
+        address withdrawerAddress
     ) external returns (bool success);
 
     /// @dev Withdraw the rewards of a delegator from a validator
@@ -98,22 +98,22 @@ interface DistributionI {
     /// @return amount The amount of Coin withdrawn
     function withdrawDelegatorRewards(
         address delegatorAddress,
-        string memory validatorAddress
+        address validatorAddress
     ) external returns (Coin[] calldata amount);
 
     /// @dev Withdraws the rewards commission of a validator.
     /// @param validatorAddress The address of the validator
     /// @return amount The amount of Coin withdrawn
     function withdrawValidatorCommission(
-        string memory validatorAddress
+        address validatorAddress
     ) external returns (Coin[] calldata amount);
 
     /// QUERIES
     /// @dev Queries validator commission and self-delegation rewards for validator.
     /// @param validatorAddress The address of the validator
     /// @return distributionInfo The validator's distribution info
     function validatorDistributionInfo(
-        string memory validatorAddress
+        address validatorAddress
     )
     external
     view
@@ -125,14 +125,14 @@ interface DistributionI {
     /// @param validatorAddress The address of the validator
     /// @return rewards The validator's outstanding rewards
     function validatorOutstandingRewards(
-        string memory validatorAddress
+        address validatorAddress
     ) external view returns (DecCoin[] calldata rewards);
 
     /// @dev Queries the accumulated commission for a validator.
     /// @param validatorAddress The address of the validator
     /// @return commission The validator's commission
     function validatorCommission(
-        string memory validatorAddress
+        address validatorAddress
     ) external view returns (DecCoin[] calldata commission);
 
     /// @dev Queries the slashing events for a validator in a given height interval
@@ -144,7 +144,7 @@ interface DistributionI {
     /// @return slashes The validator's slash events
     /// @return pageResponse The pagination response for the query
     function validatorSlashes(
-        string memory validatorAddress,
+        address validatorAddress,
         uint64 startingHeight,
         uint64 endingHeight,
         PageRequest calldata pageRequest
@@ -162,7 +162,7 @@ interface DistributionI {
     /// @return rewards The total rewards accrued by a delegation.
     function delegationRewards(
         address delegatorAddress,
-        string memory validatorAddress
+        address validatorAddress
     ) external view returns (DecCoin[] calldata rewards);
 
     /// @dev Queries the total rewards accrued by each validator, that a given
@@ -192,6 +192,6 @@ interface DistributionI {
     /// @return withdrawAddress The address capable of withdrawing rewards for the delegator.
     function delegatorWithdrawAddress(
         address delegatorAddress
-    ) external view returns (string memory withdrawAddress);
+    ) external view returns (address withdrawAddress);
 
 }

precompiles/distribution/abi.json

@@ -28,10 +28,10 @@
         "type": "address"
       },
       {
-        "indexed": false,
-        "internalType": "string",
+        "indexed": true,
+        "internalType": "address",
         "name": "withdrawerAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "SetWithdrawerAddress",
@@ -67,9 +67,9 @@
     "inputs": [
       {
         "indexed": true,
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       },
       {
         "indexed": false,
@@ -113,9 +113,9 @@
         "type": "address"
       },
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "delegationRewards",
@@ -159,9 +159,9 @@
       {
         "components": [
           {
-            "internalType": "string",
+            "internalType": "address",
             "name": "validatorAddress",
-            "type": "string"
+            "type": "address"
           },
           {
             "components": [
@@ -246,9 +246,9 @@
     "name": "delegatorWithdrawAddress",
     "outputs": [
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "withdrawAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "stateMutability": "view",
@@ -262,9 +262,9 @@
         "type": "address"
       },
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "withdrawerAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "setWithdrawAddress",
@@ -281,9 +281,9 @@
   {
     "inputs": [
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "validatorCommission",
@@ -317,19 +317,19 @@
   {
     "inputs": [
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "validatorDistributionInfo",
     "outputs": [
       {
         "components": [
           {
-            "internalType": "string",
+            "internalType": "address",
             "name": "operatorAddress",
-            "type": "string"
+            "type": "address"
           },
           {
             "components": [
@@ -387,9 +387,9 @@
   {
     "inputs": [
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "validatorOutstandingRewards",
@@ -423,9 +423,9 @@
   {
     "inputs": [
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       },
       {
         "internalType": "uint64",
@@ -530,9 +530,9 @@
         "type": "address"
       },
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "withdrawDelegatorRewards",
@@ -561,9 +561,9 @@
   {
     "inputs": [
       {
-        "internalType": "string",
+        "internalType": "address",
         "name": "validatorAddress",
-        "type": "string"
+        "type": "address"
       }
     ],
     "name": "withdrawValidatorCommission",

precompiles/distribution/distribution_test.go

@@ -76,7 +76,7 @@ func (s *PrecompileTestSuite) TestRun() {
 				input, err := s.precompile.Pack(
 					distribution.SetWithdrawAddressMethod,
 					s.address,
-					s.address.String(),
+					s.address,
 				)
 				s.Require().NoError(err, "failed to pack input")
 				return s.address, input
@@ -87,10 +87,9 @@ func (s *PrecompileTestSuite) TestRun() {
 		{
 			name: "pass - withdraw validator commissions transaction",
 			malleate: func() (common.Address, []byte) {
-				hexAddr := common.Bytes2Hex(s.address.Bytes())
-				valAddr, err := sdk.ValAddressFromHex(hexAddr)
-				s.Require().NoError(err)
-				caller := common.BytesToAddress(valAddr)
+				valHexAddr := s.address
+				valAddr := sdk.ValAddress(valHexAddr.Bytes())
+				caller := s.address
 
 				valCommission := sdk.DecCoins{sdk.NewDecCoinFromDec(utils.BaseDenom, math.LegacyNewDecWithPrec(1000000000000000000, 1))}
 				// set outstanding rewards
@@ -100,7 +99,7 @@ func (s *PrecompileTestSuite) TestRun() {
 
 				input, err := s.precompile.Pack(
 					distribution.WithdrawValidatorCommissionMethod,
-					valAddr.String(),
+					valHexAddr,
 				)
 				s.Require().NoError(err, "failed to pack input")
 				return caller, input
@@ -120,7 +119,7 @@ func (s *PrecompileTestSuite) TestRun() {
 				input, err := s.precompile.Pack(
 					distribution.WithdrawDelegatorRewardsMethod,
 					s.address,
-					valAddr.String(),
+					common.BytesToAddress(valAddr.Bytes()),
 				)
 				s.Require().NoError(err, "failed to pack input")
 

precompiles/distribution/events.go

@@ -61,30 +61,32 @@
 
 // EmitSetWithdrawAddressEvent creates a new event emitted on a SetWithdrawAddressMethod transaction.
 func (p Precompile) EmitSetWithdrawAddressEvent(ctx sdk.Context, stateDB vm.StateDB, caller common.Address, withdrawerAddress string) error {
+	withdrawerAddr, err := sdk.AccAddressFromBech32(withdrawerAddress)
+	if err != nil {
+		return err
+	}
+
 	// Prepare the event topics
 	event := p.ABI.Events[EventTypeSetWithdrawAddress]
-	topics := make([]common.Hash, 2)
+	topics := make([]common.Hash, 3)
 
 	// The first topic is always the signature of the event.
 	topics[0] = event.ID
 
-	var err error
 	topics[1], err = cmn.MakeTopic(caller)
 	if err != nil {
 		return err
 	}
 
-	// Pack the arguments to be used as the Data field
-	arguments := abi.Arguments{event.Inputs[1]}
-	packed, err := arguments.Pack(withdrawerAddress)
+	topics[2], err = cmn.MakeTopic(common.BytesToAddress(withdrawerAddr.Bytes()))
 	if err != nil {
 		return err
 	}
 
 	stateDB.AddLog(&ethtypes.Log{
 		Address:     p.Address(),
 		Topics:      topics,
-		Data:        packed,
+		Data:        nil,
 		BlockNumber: uint64(ctx.BlockHeight()),
 	})
 
@@ -130,7 +132,7 @@
 }
 
 // EmitWithdrawValidatorCommissionEvent creates a new event emitted on a WithdrawValidatorCommission transaction.
-func (p Precompile) EmitWithdrawValidatorCommissionEvent(ctx sdk.Context, stateDB vm.StateDB, validatorAddress string, coins sdk.Coins) error {
+func (p Precompile) EmitWithdrawValidatorCommissionEvent(ctx sdk.Context, stateDB vm.StateDB, validatorAddress common.Address, coins sdk.Coins) error {
 	// Prepare the event topics
 	event := p.ABI.Events[EventTypeWithdrawValidatorCommission]
 	topics := make([]common.Hash, 2)