hm

Author: jayantk

pnpm-lock.yaml

@@ -9,7 +9,7 @@ import "@pythnetwork/entropy-sdk-solidity/EntropyEvents.sol";
 import "@pythnetwork/entropy-sdk-solidity/IEntropy.sol";
 import "@pythnetwork/entropy-sdk-solidity/IEntropyConsumer.sol";
 import "@openzeppelin/contracts/utils/math/SafeCast.sol";
-import "ExcessivelySafeCall/ExcessivelySafeCall.sol";
+import "@nomad-xyz/excessively-safe-call/src/ExcessivelySafeCall.sol";
 import "./EntropyState.sol";
 
 // Entropy implements a secure 2-party random number generation procedure. The protocol
@@ -500,7 +500,6 @@ abstract contract Entropy is IEntropy, EntropyState {
             bytes memory ret;
             (success, ret) = callAddress.excessivelySafeCall(
                 gasleft(), // TODO: providers need to be able to configure this in the future.
-                0,
                 256, // copy at most 256 bytes of the return value into ret.
                 abi.encodeWithSelector(
                     IEntropyConsumer._entropyCallback.selector,

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

@@ -972,10 +972,6 @@ contract EntropyTest is Test, EntropyTestUtils, EntropyEvents {
         uint64 assignedSequenceNumber = consumer.requestEntropy{value: fee}(
             userRandomNumber
         );
-        EntropyStructs.Request memory req = random.getRequest(
-            provider1,
-            assignedSequenceNumber
-        );
 
         // On the first attempt, the transaction should succeed and emit CallbackFailed event.
         bytes memory revertReason = abi.encodeWithSelector(
@@ -1350,9 +1346,7 @@ contract EntropyConsumer is IEntropyConsumer {
         // Keep consuming gas until we reach our target
         while (currentGasUsed < targetGasUsage) {
             // Consume gas with a hash operation
-            bytes32 hash = keccak256(
-                abi.encodePacked(currentGasUsed, _randomness)
-            );
+            keccak256(abi.encodePacked(currentGasUsed, _randomness));
             currentGasUsed = startGas - gasleft();
         }
 

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

@@ -23,7 +23,7 @@
     "migrate": "truffle migrate",
     "receiver-submit-guardian-sets": "truffle exec scripts/receiverSubmitGuardianSetUpgrades.js",
     "verify": "truffle run verify $npm_config_module@$npm_config_contract_address --network $npm_config_network",
-    "install-forge-deps": "forge install foundry-rs/[email protected] nomad-xyz/ExcessivelySafeCall@81cd99c --no-git --no-commit",
+    "install-forge-deps": "forge install foundry-rs/[email protected] --no-git --no-commit",
     "coverage": "./coverage.sh",
     "test:format": "prettier --check .",
     "fix:format": "prettier --write ."
@@ -39,6 +39,7 @@
     "@openzeppelin/contracts": "=4.8.1",
     "@openzeppelin/contracts-upgradeable": "=4.8.1",
     "@openzeppelin/hardhat-upgrades": "^1.22.1",
+    "@nomad-xyz/excessively-safe-call": "^0.0.1-rc.1",
     "@pythnetwork/contract-manager": "workspace:*",
     "@pythnetwork/entropy-sdk-solidity": "workspace:*",
     "@pythnetwork/pyth-sdk-solidity": "workspace:*",

target_chains/ethereum/contracts/package.json

@@ -3,5 +3,5 @@
 @pythnetwork/=./node_modules/@pythnetwork/
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
-ExcessivelySafeCall=lib/ExcessivelySafeCall/src/
+@nomad-xyz=./node_modules/@nomad-xyz/
 truffle/=./node_modules/truffle/

target_chains/ethereum/contracts/remappings.txt

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache 2
+
 library EntropyConstants {
     // Status values for Request.status //
     // not a request with callback