WIP: more agglayer testing

Author: GWSzeto

script/agglayer/Agglayer.s.sol

@@ -6,7 +6,8 @@ import {TestNFT} from "./TestNFT.sol";
 import {console} from "forge-std/console.sol";
 import {Role} from "src/Role.sol";
 import {PolygonAgglayerCrossChain} from "src/module/token/crosschain/PolygonAgglayer.sol";
-import {ERC20Base} from "src/core/token/ERC20Base.sol";
+import {ERC20Core} from "src/core/token/ERC20Core.sol";
+import {MintableERC20} from "src/module/token/minting/MintableERC20.sol";
 import {OwnableRoles} from "@solady/auth/OwnableRoles.sol";
 
 contract DeployTestNFT is Script {
@@ -25,33 +26,57 @@ contract DeployTestNFT is Script {
 
 contract MintTestNFT is Script {
     TestNFT public testNFT;
-    ERC20Base public testToken;
+    MintableERC20 public mintableModule;
+    PolygonAgglayerCrossChain public polygonAgglayer;
+    ERC20Core public core;
+
+    address agglayerBridgeExtension = 0x2311BFA86Ae27FC10E1ad3f805A2F9d22Fc8a6a1;
 
     function run() external {
         uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
         address deployerAddress = vm.addr(deployerPrivateKey);
+        // address coreAddress = vm.envAddress("TEST_TOKEN_ADDRESS");
         address testNFTAddress = vm.envAddress("TEST_NFT_ADDRESS");
-        address testTokenAddress = vm.envAddress("TEST_TOKEN_ADDRESS");
         uint64 destinationChain = 2442;
         vm.startBroadcast(deployerPrivateKey);
 
-        testNFT = TestNFT(testNFTAddress);
-        testToken = ERC20Base(payable(testTokenAddress));
+        address[] memory modules = new address[](2);
+        bytes[] memory moduleData = new bytes[](2);
 
-        OwnableRoles(testTokenAddress).grantRoles(deployerAddress, Role._MINTER_ROLE);
-        testToken.mint(deployerAddress, 100, "");
+        mintableModule = new MintableERC20(address(0x0));
+        polygonAgglayer = new PolygonAgglayerCrossChain();
+        console.log("mintableModule deployed to:", address(mintableModule));
+        console.log("polygonAgglayer deployed to:", address(polygonAgglayer));
+
+        bytes memory mintableEncodedInstallParams = abi.encode(deployerAddress);
+        bytes memory polygonAgglayerEncodedInstallParams = abi.encode(address(polygonAgglayer));
+
+        modules[0] = address(mintableModule);
+        modules[1] = address(polygonAgglayer);
+
+        moduleData[0] = mintableEncodedInstallParams;
+        moduleData[1] = polygonAgglayerEncodedInstallParams;
+
+        core = new ERC20Core("test", "TEST", "", deployerAddress, modules, moduleData);
+        console.log("core deployed to:", address(core));
+
+        core.grantRoles(deployerAddress, Role._MINTER_ROLE);
+        core.mint(deployerAddress, 100, "");
         console.log("Minted test tokens to deployer");
 
-        bytes memory extraArgs = abi.encode(address(0), false, testToken, 100);
+        core.approve(agglayerBridgeExtension, 100);
+        console.log("Approved agglayer bridge extension");
+
+        bytes memory extraArgs = abi.encode(deployerAddress, true, address(core), 100);
         bytes memory payload = abi.encodeWithSelector(
             bytes4(keccak256("mint(address,uint256)")),
             deployerAddress,
             1
         );
-
-        PolygonAgglayerCrossChain(testTokenAddress).sendCrossChainTransaction(
+        
+        PolygonAgglayerCrossChain(address(core)).sendCrossChainTransaction(
             destinationChain,
-            address(testNFT),
+            testNFTAddress,
             payload,
             extraArgs
         );

src/module/token/crosschain/PolygonAgglayer.sol

@@ -6,6 +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";
 
 library PolygonAgglayerCrossChainStorage {
 
@@ -85,6 +86,12 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
         address router = _polygonAgglayerStorage().router;
         (address _fallbackAddress, bool _forceUpdateGlobalExitRoot, address _token, uint256 _amount) =
             abi.decode(_extraArgs, (address, bool, address, uint256));
+        console.log("token address", _token);
+        console.log("amount", _amount);
+        console.log("destinationChain", _destinationChain);
+        console.log("callAddress", _callAddress);
+        console.log("fallbackAddress", _fallbackAddress);
+        console.log("forceUpdateGlobalExitRoot", _forceUpdateGlobalExitRoot);
 
         IBridgeAndCall(router).bridgeAndCall(
             _token,
@@ -95,6 +102,7 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
             _payload,
             _forceUpdateGlobalExitRoot
         );
+        console.log("bridgeAndCall called successfully");
 
         onCrossChainTransactionSent(_destinationChain, _callAddress, _payload, _extraArgs);
     }