refactor(contracts): <- add amount field in IPReceiver receiveUserData()

contracts/interfaces/IPReceiver.sol

@@ -10,7 +10,8 @@ interface IPReceiver {
     /*
      * @dev Function called when userData.length > 0 when minting the pToken
      *
+     * @param amount
      * @param userData
      */
-    function receiveUserData(bytes calldata userData) external;
+    function receiveUserData(uint256 amount, bytes calldata userData) external;
 }

contracts/pToken.sol

@@ -90,7 +90,7 @@ contract PToken is
             // This way, a user also has the option include userData even when minting to an externally owned account.
             // Here excessivelySafeCall executes a low-level call which does not revert the caller transaction if the callee reverts,
             // with the increased protection for returnbombing, i.e. the returndata copy is limited to 256 bytes.
-            bytes memory data = abi.encodeWithSelector(IPReceiver.receiveUserData.selector, userData);
+            bytes memory data = abi.encodeWithSelector(IPReceiver.receiveUserData.selector, value, userData);
             (bool success,) = recipient.excessivelySafeCall(gasleft() - gasReserve, 0, 0, data);
             if (!success) emit ReceiveUserDataFailed();
         }

contracts/pTokenNoGSN.sol

@@ -93,7 +93,7 @@ contract PTokenNoGSN is
             // This way, a user also has the option include userData even when minting to an externally owned account.
             // Here excessivelySafeCall executes a low-level call which does not revert the caller transaction if the callee reverts,
             // with the increased protection for returnbombing, i.e. the returndata copy is limited to 256 bytes.
-            bytes memory data = abi.encodeWithSelector(IPReceiver.receiveUserData.selector, userData);
+            bytes memory data = abi.encodeWithSelector(IPReceiver.receiveUserData.selector, value, userData);
             (bool success,) = recipient.excessivelySafeCall(gasleft() - gasReserve, 0, 0, data);
             if (!success) emit ReceiveUserDataFailed();
         }

contracts/test-contracts/PReceiver.sol

@@ -3,31 +3,31 @@ pragma solidity ^0.6.2;
 import {IPReceiver} from "../interfaces/IPReceiver.sol";
 
 contract PReceiver is IPReceiver {
-    event UserData(bytes data);
+    event UserData(uint256 amount, bytes data);
 
-    function receiveUserData(bytes calldata userData) external override {
-        emit UserData(userData);
+    function receiveUserData(uint256 amount, bytes calldata userData) external override {
+        emit UserData(amount, userData);
     }
 }
 
 contract PReceiverReverting is IPReceiver {
-    function receiveUserData(bytes calldata) external override {
+    function receiveUserData(uint256, bytes calldata) external override {
         require(false, "Revert!");
     }
 }
 
 contract NotImplementingReceiveUserDataFxn {}
 
 contract PReceiverRevertingReturnBombing is IPReceiver {
-    function receiveUserData(bytes calldata) external override {
+    function receiveUserData(uint256, bytes calldata) external override {
         assembly {
             return(0, 1000000)
         }
     }
 }
 
 contract PReceiverRevertingReturnBombingReverting is IPReceiver {
-    function receiveUserData(bytes calldata) external override {
+    function receiveUserData(uint256, bytes calldata) external override {
         assembly {
             revert(0, 1000000)
         }

test/05-ptoken.test.js

@@ -182,6 +182,7 @@ USE_GSN.map(_useGSN =>
         assertMintEvent(events, recipientContract.address, OWNER.address, AMOUNT, data, operatorData)
         const userDataEvent = recipientContract.interface.parseLog(events.at(-1))
         assert.strictEqual(userDataEvent.name, 'UserData')
+        assert.strictEqual(userDataEvent.args.amount.toNumber(), AMOUNT)
         assert.strictEqual(userDataEvent.args.data, data)
       })