Merge branch 'main' into feat/enable-08-wasm

CHANGELOG.md

@@ -85,6 +85,7 @@ throwing an error and (2) ERC20 transfers with other operations that don't bring
 about the expected resulting balance for the transfer recipient.
 - [#2092](https://github.com/NibiruChain/nibiru/pull/2092) - feat(evm): add validation for wasm multi message execution
 - [#2068](https://github.com/NibiruChain/nibiru/pull/2068) - feat: enable wasm light clients on IBC (08-wasm)
+- [#2101](https://github.com/NibiruChain/nibiru/pull/2101) - fix(evm): tx receipt proper marshalling
 
 #### Nibiru EVM | Before Audit 1 - 2024-10-18
 

eth/rpc/backend/tx_info.go

@@ -2,6 +2,7 @@
 package backend
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
 	"math/big"
@@ -134,10 +135,39 @@ func (b *Backend) getTransactionByHashPending(txHash gethcommon.Hash) (*rpc.EthT
 type TransactionReceipt struct {
 	gethcore.Receipt
 
-	ContractAddress   *gethcommon.Address `json:"contractAddress,omitempty"`
+	ContractAddress   *gethcommon.Address
 	From              gethcommon.Address
 	To                *gethcommon.Address
-	EffectiveGasPrice *big.Int
+	EffectiveGasPrice *hexutil.Big
+}
+
+// MarshalJSON is necessary because without it non gethcore.Receipt fields are omitted
+func (r *TransactionReceipt) MarshalJSON() ([]byte, error) {
+	// Marshal / unmarshal gethcore.Receipt to produce map[string]interface{}
+	receiptJson, err := json.Marshal(r.Receipt)
+	if err != nil {
+		return nil, err
+	}
+
+	var output map[string]interface{}
+	if err := json.Unmarshal(receiptJson, &output); err != nil {
+		return nil, err
+	}
+
+	// Add extra (non gethcore.Receipt) fields:
+	if r.ContractAddress != nil && *r.ContractAddress != (gethcommon.Address{}) {
+		output["contractAddress"] = r.ContractAddress
+	}
+	if r.From != (gethcommon.Address{}) {
+		output["from"] = r.From
+	}
+	if r.To != nil {
+		output["to"] = r.To
+	}
+	if r.EffectiveGasPrice != nil {
+		output["effectiveGasPrice"] = r.EffectiveGasPrice
+	}
+	return json.Marshal(output)
 }
 
 // GetTransactionReceipt returns the transaction receipt identified by hash.
@@ -253,7 +283,7 @@ func (b *Backend) GetTransactionReceipt(hash gethcommon.Hash) (*TransactionRecei
 			// tolerate the error for pruned node.
 			b.logger.Error("fetch basefee failed, node is pruned?", "height", res.Height, "error", err)
 		} else {
-			receipt.EffectiveGasPrice = dynamicTx.EffectiveGasPriceWeiPerGas(baseFeeWei)
+			receipt.EffectiveGasPrice = (*hexutil.Big)(dynamicTx.EffectiveGasPriceWeiPerGas(baseFeeWei))
 		}
 	}
 	return &receipt, nil

eth/rpc/backend/tx_info_test.go

@@ -202,10 +202,10 @@ func (s *BackendSuite) TestReceiptMarshalJson() {
 		ContractAddress:   nil,
 		From:              evmtest.NewEthPrivAcc().EthAddr,
 		To:                &toAddr,
-		EffectiveGasPrice: big.NewInt(1),
+		EffectiveGasPrice: (*hexutil.Big)(big.NewInt(1)),
 	}
 
-	jsonBz, err := json.Marshal(tr)
+	jsonBz, err := tr.MarshalJSON()
 	s.Require().NoError(err)
 
 	gethReceipt := new(gethcore.Receipt)

evm-e2e/.prettierrc

@@ -0,0 +1,10 @@
+{
+  "semi": true,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 120,
+  "tabWidth": 2,
+  "importOrder": ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true
+}

evm-e2e/contracts/EventsEmitter.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.24;
+
+contract EventsEmitter {
+    event TestEvent(address indexed sender, uint256 value);
+
+    function emitEvent(uint256 value) public {
+        emit TestEvent(msg.sender, value);
+    }
+}