refactor code

lukso-network · Sep 19, 2023 · 14d34a7 · 14d34a7
1 parent 1adf3fc
commit 14d34a7
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 54 deletions.
diff --git a/docs/guides/universal-receiver-delegate/create-custom-urd-1.md b/docs/guides/universal-receiver-delegate/create-custom-urd-1.md
@@ -142,64 +142,60 @@ contract LSP1URDForwarder is
         // CHECK that the caller is a LSP0 (UniversalProfile)
         // by checking its interface support
         if (
-            ERC165Checker.supportsERC165InterfaceUnchecked(
+            !ERC165Checker.supportsERC165InterfaceUnchecked(
                 msg.sender,
                 _INTERFACEID_LSP0
             )
         ) {
-            // GET the notifier (e.g., the LSP7 Token) from the calldata
-            address notifier = address(bytes20(msg.data[msg.data.length - 52:]));
-
-            // CHECK that notifier is a contract with a `balanceOf` method
-            // and that msg.sender (the UP) has a positive balance
-            if (notifier.code.length > 0) {
-                try ILSP7DigitalAsset(notifier).balanceOf(msg.sender) returns (
-                    uint256 balance
-                ) {
-                    if (balance == 0) {
-                        return "LSP1: balance is zero";
-                    }
-                } catch {
-                    return "LSP1: `balanceOf(address)` function not found";
+            return "Caller is not a LSP0";
+        }
+        // GET the notifier (e.g., the LSP7 Token) from the calldata
+        address notifier = address(bytes20(msg.data[msg.data.length - 52:]));
+
+        // CHECK that notifier is a contract with a `balanceOf` method
+        // and that msg.sender (the UP) has a positive balance
+        if (notifier.code.length > 0) {
+            try ILSP7DigitalAsset(notifier).balanceOf(msg.sender) returns (
+                uint256 balance
+            ) {
+                if (balance == 0) {
+                    return "LSP1: balance is zero";
                 }
+            } catch {
+                return "LSP1: `balanceOf(address)` function not found";
             }
+        }
 
-            // CHECK that the URD has been called because we received a LSP7 token
-            if (typeId == _TYPEID_LSP7_TOKENSRECIPIENT) {
-                // CHECK that the address of the LSP7 is whitelisted
-                if (allowlist[notifier]) {
-                    // extract data (we only need the amount that was transfered / minted)
-                    (, , uint256 amount, ) = abi.decode(
-                        data,
-                        (address, address, uint256, bytes)
-                    );
-
-                    // CHECK if amount is not too low
-                    if (amount < 100) {
-                        return "Amount is too low (< 100)";
-                    } else {
-                        uint256 tokensToTransfer = (amount * percentage) / 100;
-
-                        // Requirements for direct Transfer via UP:
-                        // - setData on PREFIX + _TYPEID_LSP7_TOKENSRECIPIENT with custom URD address
-                        // - setData on AddressPermissions:Permissions<customURDAddress> (=create a controller) with SUPER_CALL
-                        bytes memory encodedTx = abi.encodeWithSelector(
-                            ILSP7DigitalAsset.transfer.selector,
-                            msg.sender,
-                            recipient,
-                            tokensToTransfer,
-                            true,
-                            ""
-                        );
-                        IERC725X(msg.sender).execute(0, notifier, 0, encodedTx);
-                    }
-                } else {
-                    return "Token not in allowlist";
-                }
-            }
-            return "";
+        // CHECK that the address of the LSP7 is whitelisted
+        if (!allowlist[notifier]) {
+            return "Token not in allowlist";
+        }
+
+        // extract data (we only need the amount that was transfered / minted)
+        (, , uint256 amount, ) = abi.decode(
+            data,
+            (address, address, uint256, bytes)
+        );
+
+        // CHECK if amount is not too low
+        if (amount < 100) {
+            return "Amount is too low (< 100)";
         } else {
-            return "Caller is not a LSP0";
+            uint256 tokensToTransfer = (amount * percentage) / 100;
+
+            // Requirements for direct Transfer via UP:
+            // - setData on PREFIX + _TYPEID_LSP7_TOKENSRECIPIENT with custom URD address
+            // - setData on AddressPermissions:Permissions<customURDAddress> (=create a controller) with SUPER_CALL
+            bytes memory encodedTx = abi.encodeWithSelector(
+                ILSP7DigitalAsset.transfer.selector,
+                msg.sender,
+                recipient,
+                tokensToTransfer,
+                true,
+                ""
+            );
+            IERC725X(msg.sender).execute(0, notifier, 0, encodedTx);
+            return "";
         }
     }
 

diff --git a/docs/guides/universal-receiver-delegate/create-custom-urd-2.md b/docs/guides/universal-receiver-delegate/create-custom-urd-2.md
@@ -86,9 +86,12 @@ async function main() {
   const fullBytecode = CustomURDBytecode + params;
 
   // get the address of the contract that will be created
-  const CustomURDAddress = await UP.connect(signer)
-    .getFunction('execute')
-    .staticCall(1, ethers.ZeroAddress, 0, fullBytecode);
+  const CustomURDAddress = await UP.connect(signer).execute.staticCall(
+    1,
+    ethers.ZeroAddress,
+    0,
+    fullBytecode,
+  );
 
   // deploy LSP1URDForwarder as the UP (signed by the browser extension controller)
   const tx1 = await UP.connect(signer).execute(
@@ -135,7 +138,7 @@ async function main() {
   // console.log('values: ', dataValues);
 
   // execute the tx
-  const setDataBatchTx = await UP.connect(signer).getFunction('setDataBatch')(
+  const setDataBatchTx = await UP.connect(signer).setDataBatch(
     dataKeys,
     dataValues,
   );