feat: add triggerERC20Payment

packages/smart-contracts/src/contracts/ERC20SingleRequestProxy.sol

@@ -36,6 +36,14 @@ contract ERC20SingleRequestProxy {
 
   receive() external payable {
     require(msg.value == 0, 'This function is only for triggering the transfer');
+    _processPayment();
+  }
+
+  function triggerERC20Payment() external {
+    _processPayment();
+  }
+
+  function _processPayment() internal {
     IERC20 token = IERC20(tokenAddress);
     uint256 balance = token.balanceOf(address(this));
     uint256 paymentAmount = balance;
@@ -60,8 +68,8 @@ contract ERC20SingleRequestProxy {
    * @notice Rescues any trapped  funds by sending them to the payee
    * @dev Can be called by anyone, but funds are always sent to the payee
    */
-  function rescueFunds() external {
-    IERC20 token = IERC20(tokenAddress);
+  function rescueFunds(address _tokenAddress) external {
+    IERC20 token = IERC20(_tokenAddress);
     uint256 balance = token.balanceOf(address(this));
     require(balance > 0, 'No funds to rescue');
     bool success = SafeERC20.safeTransfer(token, payee, balance);

packages/smart-contracts/test/contracts/ERC20SingleRequestProxy.test.ts

@@ -76,7 +76,7 @@ describe('contract: ERC20SingleRequestProxy', () => {
     expect(await erc20SingleRequestProxy.erc20FeeProxy()).to.equal(erc20FeeProxy.address);
   });
 
-  it('should process a payment correctly', async () => {
+  it('should process a payment correctly via recieve', async () => {
     const paymentAmount = BN.from(100).mul(BASE_DECIMAL);
     const totalAmount = paymentAmount.add(feeAmount);
 
@@ -114,9 +114,8 @@ describe('contract: ERC20SingleRequestProxy', () => {
     expect(feeRecipientBalanceAfter).to.equal(feeAmount);
   });
 
-  it('should process a partial payment correctly', async () => {
-    // Pay 10 tokens instead of 100
-    const paymentAmount = BN.from(10).mul(BASE_DECIMAL);
+  it('should process a payment correctly via triggerERC20Payment', async () => {
+    const paymentAmount = BN.from(100).mul(BASE_DECIMAL);
     const totalAmount = paymentAmount.add(feeAmount);
 
     await testToken.connect(user1).transfer(erc20SingleRequestProxy.address, totalAmount);
@@ -126,12 +125,7 @@ describe('contract: ERC20SingleRequestProxy', () => {
     );
     expect(erc20SingleRequestProxyBalanceBefore).to.equal(totalAmount);
 
-    await expect(
-      user1.sendTransaction({
-        to: erc20SingleRequestProxy.address,
-        value: 0,
-      }),
-    )
+    await expect(erc20SingleRequestProxy.triggerERC20Payment())
       .to.emit(erc20FeeProxy, 'TransferWithReferenceAndFee')
       .withArgs(
         testToken.address,
@@ -153,6 +147,10 @@ describe('contract: ERC20SingleRequestProxy', () => {
     expect(feeRecipientBalanceAfter).to.equal(feeAmount);
   });
 
+  it.skip('should process a partial payment correctly', async () => {
+    // Smart contract does not keep track of the payment amount, it accepts any amount of tokens
+  });
+
   it('should process a payment with a non-standard ERC20', async () => {
     const usdtFeeAmount = BN.from(10).mul(USDT_DECIMAL);
     const usdtProxy = await new ERC20SingleRequestProxy__factory(deployer).deploy(
@@ -265,7 +263,7 @@ describe('contract: ERC20SingleRequestProxy', () => {
 
     const payeeBalanceBefore = await testToken.balanceOf(user2Addr);
 
-    await erc20SingleRequestProxy.rescueFunds();
+    await erc20SingleRequestProxy.rescueFunds(testToken.address);
 
     const contractBalanceAfter = await testToken.balanceOf(erc20SingleRequestProxy.address);
     expect(contractBalanceAfter).to.equal(0);