the script works

Author: GWSzeto

script/agglayer/Agglayer.s.sol

@@ -1,16 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Script} from "forge-std/Script.sol";
 import {TestNFT} from "./TestNFT.sol";
+
+import {OwnableRoles} from "@solady/auth/OwnableRoles.sol";
+import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
 import {Role} from "src/Role.sol";
-import {PolygonAgglayerCrossChain} from "src/module/token/crosschain/PolygonAgglayer.sol";
 import {ERC20Core} from "src/core/token/ERC20Core.sol";
+import {PolygonAgglayerCrossChain} from "src/module/token/crosschain/PolygonAgglayer.sol";
 import {MintableERC20} from "src/module/token/minting/MintableERC20.sol";
-import {OwnableRoles} from "@solady/auth/OwnableRoles.sol";
 
 contract DeployTestNFT is Script {
+
     TestNFT public testNFT;
 
     function run() external {
@@ -22,9 +24,11 @@ contract DeployTestNFT is Script {
 
         vm.stopBroadcast();
     }
+
 }
 
 contract MintTestNFT is Script {
+
     TestNFT public testNFT;
     MintableERC20 public mintableModule;
     PolygonAgglayerCrossChain public polygonAgglayer;
@@ -42,7 +46,7 @@ contract MintTestNFT is Script {
 
         address[] memory modules = new address[](2);
         bytes[] memory moduleData = new bytes[](2);
-        
+
         mintableModule = new MintableERC20(address(0x0));
         polygonAgglayer = new PolygonAgglayerCrossChain();
         console.log("mintableModule deployed to:", address(mintableModule));
@@ -74,23 +78,17 @@ contract MintTestNFT is Script {
         core.mint(deployerAddress, 100, "");
         console.log("Minted test tokens to deployer");
 
-        core.approve(agglayerBridgeExtension, 100);
-        console.log("Approved agglayer bridge extension");
+        core.approve(address(core), 100);
+        console.log("Approved core");
 
         bytes memory extraArgs = abi.encode(deployerAddress, true, address(core), 100, "");
-        bytes memory payload = abi.encodeWithSelector(
-            bytes4(keccak256("mint(address,uint256)")),
-            deployerAddress,
-            1
-        );
-        
+        bytes memory payload = abi.encodeWithSelector(bytes4(keccak256("mint(address,uint256)")), deployerAddress, 1);
+
         PolygonAgglayerCrossChain(address(core)).sendCrossChainTransaction(
-            destinationChain,
-            testNFTAddress,
-            payload,
-            extraArgs
+            destinationChain, testNFTAddress, payload, extraArgs
         );
 
         vm.stopBroadcast();
     }
+
 }

src/core/token/ERC20Base.sol

@@ -204,6 +204,8 @@ contract ERC20Base is ERC20, Multicallable, Core, EIP712 {
         return super.transfer(to, amount);
     }
 
+    receive() external payable {}
+
     /**
      *  @notice Transfers tokens from a sender to a recipient.
      *  @param from The address to transfer tokens from.

src/module/token/crosschain/PolygonAgglayer.sol

@@ -6,7 +6,7 @@ import {Role} from "../../../Role.sol";
 
 import {CrossChain} from "./CrossChain.sol";
 import {IBridgeAndCall} from "@lxly-bridge-and-call/IBridgeAndCall.sol";
-import {console} from "forge-std/console.sol";
+import {IERC20} from "src/interface/IERC20.sol";
 
 library PolygonAgglayerCrossChainStorage {
 
@@ -49,7 +49,6 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
     /// @dev Called by a Core into an Module during the installation of the Module.
     function onInstall(bytes calldata data) external {
         address router = abi.decode(data, (address));
-        console.log("router in onInstall: ", router);
         _polygonAgglayerStorage().router = router;
     }
 
@@ -93,12 +92,7 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
             uint256 _amount,
             bytes memory permitData
         ) = abi.decode(_extraArgs, (address, bool, address, uint256, bytes));
-        console.log("token address", _token);
-        console.log("amount", _amount);
-        console.log("destinationChain", _destinationChain);
-        console.log("callAddress", _callAddress);
 
-        // IBridgeAndCall(_polygonAgglayerStorage().router).bridgeAndCall(
         _bridgeAndCall(
             _token,
             _amount,
@@ -109,13 +103,23 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
             _payload,
             _forceUpdateGlobalExitRoot
         );
-        console.log("bridgeAndCall called successfully");
 
         onCrossChainTransactionSent(_destinationChain, _callAddress, _payload, _extraArgs);
     }
 
-    function _bridgeAndCall(address _token, uint256 _amount, bytes memory permitData, uint32 _destinationChain, address _callAddress, address _fallbackAddress, bytes memory _payload, bool _forceUpdateGlobalExitRoot) internal {
-        console.log("router: ", _polygonAgglayerStorage().router);
+    function _bridgeAndCall(
+        address _token,
+        uint256 _amount,
+        bytes memory permitData,
+        uint32 _destinationChain,
+        address _callAddress,
+        address _fallbackAddress,
+        bytes memory _payload,
+        bool _forceUpdateGlobalExitRoot
+    ) internal {
+        IERC20(_token).transferFrom(msg.sender, address(this), _amount);
+        IERC20(_token).approve(_polygonAgglayerStorage().router, _amount);
+
         IBridgeAndCall(_polygonAgglayerStorage().router).bridgeAndCall(
             _token,
             _amount,
@@ -127,7 +131,6 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
             _forceUpdateGlobalExitRoot
         );
     }
-            
 
     /*//////////////////////////////////////////////////////////////
                             INTERNAL FUNCTIONS