fix(contracts): <- use excessivelySafeCall() instead of call()

pnetwork-association · Feb 16, 2024 · c2ba176 · c2ba176
1 parent e64ae6d
commit c2ba176
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/contracts/pToken.sol b/contracts/pToken.sol
@@ -13,6 +13,8 @@ contract PToken is
     ERC777GSNUpgradeable,
     ERC777WithAdminOperatorUpgradeable
 {
+    using ExcessivelySafeCall for address;
+
     bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
     bytes4 public ORIGIN_CHAIN_ID;
 
@@ -79,6 +81,7 @@ contract PToken is
             recipient != address(this) ,
             "Recipient cannot be the token contract address!"
         );
+        uint256 gasReserve = 1000; // enough gas to ensure we eventually emit, and return
         _mint(recipient, value, userData, operatorData);
         if (userData.length > 0) {
             // pNetwork aims to deliver cross chain messages successfully regardless of what the user may do with them.
@@ -88,7 +91,7 @@ contract PToken is
             // a try/catch block fails to catch the revert caused if the receiver is not in fact a contract.
             // This way, a user also has the option include userData even when minting to an externally owned account.
             bytes memory data = abi.encodeWithSelector(IPReceiver.receiveUserData.selector, userData);
-            (bool success, ) = recipient.call(data);
+            (bool success,) = recipient.excessivelySafeCall(gasleft() - gasReserve, 0, 256, data);
             if (!success) emit ReceiveUserDataFailed();
         }
         return true;

diff --git a/contracts/pTokenNoGSN.sol b/contracts/pTokenNoGSN.sol
@@ -17,6 +17,8 @@ contract PTokenNoGSN is
     AccessControlUpgradeable,
     ERC777WithAdminOperatorUpgradeable
 {
+    using ExcessivelySafeCall for address;
+
     bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
     bytes4 public ORIGIN_CHAIN_ID;
 
@@ -82,6 +84,7 @@ contract PTokenNoGSN is
             recipient != address(this) ,
             "Recipient cannot be the token contract address!"
         );
+        uint256 gasReserve = 1000; // enough gas to ensure we eventually emit, and return
         _mint(recipient, value, userData, operatorData);
         if (userData.length > 0) {
             // pNetwork aims to deliver cross chain messages successfully regardless of what the user may do with them.
@@ -91,7 +94,7 @@ contract PTokenNoGSN is
             // a try/catch block fails to catch the revert caused if the receiver is not in fact a contract.
             // This way, a user also has the option include userData even when minting to an externally owned account.
             bytes memory data = abi.encodeWithSelector(IPReceiver.receiveUserData.selector, userData);
-            (bool success, ) = recipient.call(data);
+            (bool success,) = recipient.excessivelySafeCall(gasleft() - gasReserve, 0, 256, data);
             if (!success) emit ReceiveUserDataFailed();
         }
         return true;