test: add test forward value with lsp17

Author: skimaharvey

contracts/Mocks/FallbackExtensions/TransferExtension.sol

@@ -13,4 +13,6 @@ contract TransferExtension {
         );
         balances[msgSender] = amount;
     }
+
+    function receiveFund() public payable {}
 }

tests/LSP17ContractExtension/LSP17Extendable.behaviour.ts

@@ -162,39 +162,43 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
     });
 
     describe('when making a call with sending value', () => {
-      it('should pass and emit UniversalReceiver', async () => {
-        const amountSent = 200;
+      describe('when extension is not payable', () => {
+        it('should pass and emit UniversalReceiver', async () => {
+          const amountSent = 200;
 
-        const tx = await context.accounts[0].sendTransaction({
-          to: context.contract.address,
-          value: amountSent,
-        });
+          const tx = await context.accounts[0].sendTransaction({
+            to: context.contract.address,
+            value: amountSent,
+          });
+
+          const isSupportingLSP0 = await context.contract.supportsInterface(
+            INTERFACE_IDS.LSP0ERC725Account,
+          );
 
-        const isSupportingLSP0 = await context.contract.supportsInterface(
-          INTERFACE_IDS.LSP0ERC725Account,
-        );
-
-        const isSupportingLSP9 = await context.contract.supportsInterface(INTERFACE_IDS.LSP9Vault);
-
-        let emittedTypeId;
-        if (isSupportingLSP0) {
-          emittedTypeId = LSP1_TYPE_IDS.LSP0ValueReceived;
-        } else if (isSupportingLSP9) {
-          emittedTypeId = LSP1_TYPE_IDS.LSP9ValueReceived;
-        }
-
-        expect(tx)
-          .to.emit(context.contract, 'UniversalReceiver')
-          .withArgs(
-            context.accounts[0].address,
-            amountSent,
-            emittedTypeId,
-            '0x',
-            abiCoder.encode(
-              ['bytes', 'bytes'],
-              [ethers.utils.hexlify(ethers.utils.toUtf8Bytes('LSP1: typeId out of scope')), '0x'],
-            ),
+          const isSupportingLSP9 = await context.contract.supportsInterface(
+            INTERFACE_IDS.LSP9Vault,
           );
+
+          let emittedTypeId;
+          if (isSupportingLSP0) {
+            emittedTypeId = LSP1_TYPE_IDS.LSP0ValueReceived;
+          } else if (isSupportingLSP9) {
+            emittedTypeId = LSP1_TYPE_IDS.LSP9ValueReceived;
+          }
+
+          expect(tx)
+            .to.emit(context.contract, 'UniversalReceiver')
+            .withArgs(
+              context.accounts[0].address,
+              amountSent,
+              emittedTypeId,
+              '0x',
+              abiCoder.encode(
+                ['bytes', 'bytes'],
+                [ethers.utils.hexlify(ethers.utils.toUtf8Bytes('LSP1: typeId out of scope')), '0x'],
+              ),
+            );
+        });
       });
     });
   });
@@ -457,6 +461,35 @@ export const shouldBehaveLikeLSP17 = (buildContext: () => Promise<LSP17TestConte
           });
         });
 
+        describe('when the extension function is payable', () => {
+          it('should forward the value to the extension', async () => {
+            const transferExtension = await new TransferExtension__factory(
+              context.accounts[0],
+            ).deploy();
+
+            await context.contract
+              .connect(context.deployParams.owner)
+              .setData(transferFunctionExtensionHandlerKey, transferExtension.address);
+
+            const amountTransferred = 20;
+
+            const transferFunctionSignature =
+              transferFunctionSelector +
+              abiCoder.encode(['uint256'], [amountTransferred]).substring(2);
+
+            await context.accounts[0].sendTransaction({
+              to: context.contract.address,
+              data: transferFunctionSignature,
+            });
+
+            const balanceAfter = await transferExtension.callStatic.balances(
+              context.accounts[0].address,
+            );
+
+            expect(balanceAfter).to.equal(amountTransferred);
+          });
+        });
+
         describe('when calling an extension that returns a string', () => {
           let nameExtension: FakeContract;
 

tests/LSP17ContractExtension/LSP17Extendable.test.ts

@@ -17,7 +17,7 @@ describe('LSP17Extendable - Basic Implementation', () => {
   let exampleExtension: EmitEventExtension;
   let errorsExtension: RevertErrorsTestExtension;
 
-  const selectorWithExtension =
+  const selectorWithExtensionAndNoTransferValue =
     EmitEventExtension__factory.createInterface().getSighash('emitEvent');
   const selectorWithNoExtension = '0xdeadbeef';
 
@@ -43,12 +43,32 @@ describe('LSP17Extendable - Basic Implementation', () => {
     exampleExtension = await new EmitEventExtension__factory(accounts[0]).deploy();
     errorsExtension = await new RevertErrorsTestExtension__factory(accounts[0]).deploy();
 
-    await lsp17Implementation.setExtension(selectorWithExtension, exampleExtension.address);
-
-    await lsp17Implementation.setExtension(selectorRevertCustomError, errorsExtension.address);
-    await lsp17Implementation.setExtension(selectorRevertErrorString, errorsExtension.address);
-    await lsp17Implementation.setExtension(selectorRevertPanicError, errorsExtension.address);
-    await lsp17Implementation.setExtension(selectorRevertNoErrorData, errorsExtension.address);
+    await lsp17Implementation.setExtension(
+      selectorWithExtensionAndNoTransferValue,
+      exampleExtension.address,
+      false,
+    );
+
+    await lsp17Implementation.setExtension(
+      selectorRevertCustomError,
+      errorsExtension.address,
+      false,
+    );
+    await lsp17Implementation.setExtension(
+      selectorRevertErrorString,
+      errorsExtension.address,
+      false,
+    );
+    await lsp17Implementation.setExtension(
+      selectorRevertPanicError,
+      errorsExtension.address,
+      false,
+    );
+    await lsp17Implementation.setExtension(
+      selectorRevertNoErrorData,
+      errorsExtension.address,
+      false,
+    );
   });
 
   // make sure storage is cleared before running each test
@@ -74,7 +94,7 @@ describe('LSP17Extendable - Basic Implementation', () => {
         await expect(
           accounts[0].sendTransaction({
             to: lsp17Implementation.address,
-            data: selectorWithExtension,
+            data: selectorWithExtensionAndNoTransferValue,
           }),
         ).to.emit(exampleExtension, 'EventEmittedInExtension');
       });
@@ -89,7 +109,7 @@ describe('LSP17Extendable - Basic Implementation', () => {
 
           await accounts[0].sendTransaction({
             to: lsp17Implementation.address,
-            data: selectorWithExtension,
+            data: selectorWithExtensionAndNoTransferValue,
           });
 
           const storageAfter = await lsp17Implementation.getStorageData();