Use evm_address from mirror node query of recently deployed contracts to populate the transaction receipt result (#686)

* Get the contract's evm_address

Signed-off-by: nikolay <[email protected]>

* Add test with evm address

Signed-off-by: nikolay <[email protected]>

Signed-off-by: nikolay <[email protected]>

Author: natanasow

packages/relay/src/lib/eth.ts

@@ -1006,11 +1006,12 @@ export class EthImpl implements Eth {
         receiptResponse.max_fee_per_gas === undefined || receiptResponse.max_fee_per_gas == '0x'
           ? receiptResponse.gas_price
           : receiptResponse.max_fee_per_gas;
-      const createdContract =
-        receiptResponse.created_contract_ids.length > 0
-          ? EthImpl.prepend0x(ContractId.fromString(receiptResponse.created_contract_ids[0]).toSolidityAddress())
-          : undefined;
 
+      let createdContract;
+      if (receiptResponse.created_contract_ids.length) {
+        const contract = await this.mirrorNodeClient.getContract(receiptResponse.created_contract_ids[0]);
+        createdContract = contract?.evm_address ?? EthImpl.prepend0x(ContractId.fromString(receiptResponse.created_contract_ids[0]).toSolidityAddress());
+      }
 
       // support stricter go-eth client which requires the transaction hash property on logs
       const logs = receiptResponse.logs.map(log => {

packages/relay/tests/lib/eth.spec.ts

@@ -2136,6 +2136,7 @@ describe('Eth', async function () {
     ethImpl = new EthImpl(null, mirrorNodeInstance, logger);
   });
 
+  const contractEvmAddress = '0xd8db0b1dbf8ba6721ef5256ad5fe07d72d1d04b9';
   const defaultTxHash = '0x4a563af33c4871b51a8b108aa2fe1dd5280a30dfb7236170ae5e5e7957eb6392';
   const defaultTransaction = {
     "accessList": undefined,
@@ -2353,6 +2354,7 @@ describe('Eth', async function () {
     it('valid receipt on match', async function () {
       // mirror node request mocks
       mock.onGet(`contracts/results/${defaultTxHash}`).reply(200, defaultDetailedContractResultByHash);
+      mock.onGet(`contracts/${defaultDetailedContractResultByHash.created_contract_ids[0]}`).reply(404);
       const receipt = await ethImpl.getTransactionReceipt(defaultTxHash);
 
       // Assert the data format
@@ -2390,6 +2392,24 @@ describe('Eth', async function () {
       expect(receipt.effectiveGasPrice).to.eq(defaultReceipt.effectiveGasPrice);
     });
 
+    it('valid receipt with evm address on match', async function() {
+      // mirror node request mocks
+      mock.onGet(`contracts/results/${defaultTxHash}`).reply(200, defaultDetailedContractResultByHash);
+      mock.onGet(`contracts/${defaultDetailedContractResultByHash.created_contract_ids[0]}`).reply(200, {
+        evm_address: contractEvmAddress
+      });
+      const receipt = await ethImpl.getTransactionReceipt(defaultTxHash);
+
+      expect(receipt).to.exist;
+      if (receipt == null) return;
+
+      expect(validateHash(receipt.from, 40)).to.eq(true);
+      if (receipt.contractAddress) {
+        expect(validateHash(receipt.contractAddress, 40)).to.eq(true);
+      }
+      expect(receipt.contractAddress).to.eq(contractEvmAddress);
+    });
+
     it("Handles null effectiveGasPrice", async function() {
       const contractResult = {
         ...defaultDetailedContractResultByHash,
@@ -2398,6 +2418,7 @@ describe('Eth', async function () {
       };
 
       mock.onGet(`contracts/results/${defaultTxHash}`).reply(200, contractResult);
+      mock.onGet(`contracts/${defaultDetailedContractResultByHash.created_contract_ids[0]}`).reply(404);
       const receipt = await ethImpl.getTransactionReceipt(defaultTxHash);
 
       expect(receipt).to.exist;
@@ -2412,6 +2433,7 @@ describe('Eth', async function () {
         bloom: '0x'
       };
       mock.onGet(`contracts/results/${defaultTxHash}`).reply(200, receiptWith0xBloom);
+      mock.onGet(`contracts/${defaultDetailedContractResultByHash.created_contract_ids[0]}`).reply(404);
       const receipt = await ethImpl.getTransactionReceipt(defaultTxHash);
 
       expect(receipt).to.exist;
@@ -2426,6 +2448,7 @@ describe('Eth', async function () {
       };
 
       mock.onGet(`contracts/results/${defaultTxHash}`).reply(200, receiptWithErrorMessage);
+      mock.onGet(`contracts/${defaultDetailedContractResultByHash.created_contract_ids[0]}`).reply(404);
       const receipt = await ethImpl.getTransactionReceipt(defaultTxHash);
 
       expect(receipt).to.exist;
@@ -2438,6 +2461,7 @@ describe('Eth', async function () {
         gas_used: null
       };
       mock.onGet(`contracts/results/${defaultTxHash}`).reply(200, receiptWithNullGasUsed);
+      mock.onGet(`contracts/${defaultDetailedContractResultByHash.created_contract_ids[0]}`).reply(404);
       const receipt = await ethImpl.getTransactionReceipt(defaultTxHash);
 
       expect(receipt).to.exist;

packages/relay/tests/lib/openrpc.spec.ts

@@ -327,6 +327,7 @@ describe("Open RPC Specification", function () {
     });
 
     it('should execute "eth_getTransactionReceipt"', async function () {
+        mock.onGet(`contracts/${defaultDetailedContractResultByHash.created_contract_ids[0]}`).reply(404);
         const response = await ethImpl.getTransactionReceipt(defaultTxHash);
 
         validateResponseSchema(methodsResponseSchema.eth_getTransactionReceipt, response);