log gas usage

Author: jayantk

target_chains/ethereum/contracts/contracts/entropy/Entropy.sol

@@ -669,23 +669,6 @@ abstract contract Entropy is IEntropy, EntropyState {
             }
         } else {
             // This case uses the checks-effects-interactions pattern to avoid reentry attacks
-            emit RevealedWithCallback(
-                EntropyStructConverter.toV1Request(req),
-                userRandomNumber,
-                providerRevelation,
-                randomNumber
-            );
-            emit EntropyEventsV2.Revealed(
-                provider,
-                req.requester,
-                req.sequenceNumber,
-                randomNumber,
-                false,
-                bytes(""),
-                0, // gas usage not tracked in the old no-gas-limit flow.
-                bytes("")
-            );
-
             clearRequest(provider, sequenceNumber);
 
             // Check if the requester is a contract account.
@@ -694,13 +677,32 @@ abstract contract Entropy is IEntropy, EntropyState {
             assembly {
                 len := extcodesize(callAddress)
             }
+            uint256 startingGas = gasleft();            
             if (len != 0) {
                 IEntropyConsumer(callAddress)._entropyCallback(
                     sequenceNumber,
                     provider,
                     randomNumber
                 );
             }
+            uint32 gasUsed = SafeCast.toUint32(startingGas - gasleft());
+
+            emit RevealedWithCallback(
+                EntropyStructConverter.toV1Request(req),
+                userRandomNumber,
+                providerRevelation,
+                randomNumber
+            );
+            emit EntropyEventsV2.Revealed(
+                provider,
+                req.requester,
+                req.sequenceNumber,
+                randomNumber,
+                false,
+                bytes(""),
+                gasUsed,
+                bytes("")
+            );
         }
     }
 

target_chains/ethereum/contracts/forge-test/Entropy.t.sol

@@ -1866,12 +1866,10 @@ contract EntropyTest is Test, EntropyTestUtils, EntropyEvents, EntropyEventsV2 {
 
             // callback gas usage is approximate and only triggered when the provider has set a gas limit.
             // Note: this condition is somewhat janky, but we hit the stack limit so can't put in any more local variables :(
-            assertTrue(
-                random.getProviderInfoV2(provider1).defaultGasLimit == 0 ||
+            assertTrue(                
                     ((callbackGasUsage * 90) / 100 < callbackGasUsed)
             );
-            assertTrue(
-                random.getProviderInfoV2(provider1).defaultGasLimit == 0 ||
+            assertTrue(                
                     (callbackGasUsed < (callbackGasUsage * 110) / 100)
             );
             assertEq(extraArgs, bytes(""));