WIP: middle of testing out agglayer content

Author: GWSzeto

script/agglayer/Agglayer.s.sol

@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Script} from "forge-std/Script.sol";
+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 {OwnableRoles} from "@solady/auth/OwnableRoles.sol";
+
+contract DeployTestNFT is Script {
+    TestNFT public testNFT;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
+        vm.startBroadcast(deployerPrivateKey);
+
+        testNFT = new TestNFT("TestNFT", "TNFT");
+        console.log("TestNFT deployed to:", address(testNFT));
+
+        vm.stopBroadcast();
+    }
+}
+
+contract MintTestNFT is Script {
+    TestNFT public testNFT;
+    ERC20Base public testToken;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("DEPLOYER_PRIVATE_KEY");
+        address deployerAddress = vm.addr(deployerPrivateKey);
+        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));
+        
+        OwnableRoles(testTokenAddress).grantRoles(deployerAddress, Role._MINTER_ROLE);
+        testToken.mint(deployerAddress, 100, "");
+        console.log("Minted test tokens to deployer");
+
+        bytes memory extraArgs = abi.encode(address(0), false, testToken, 100);
+        bytes memory payload = abi.encodeWithSelector(
+            bytes4(keccak256("mint(address,uint256)")),
+            deployerAddress,
+            1
+        );
+
+        PolygonAgglayerCrossChain(testTokenAddress).sendCrossChainTransaction(
+            destinationChain,
+            address(testNFT),
+            payload,
+            extraArgs
+        );
+
+        vm.stopBroadcast();
+    }
+}

script/agglayer/TestNFT.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {ERC721A} from "@erc721a/ERC721A.sol";
+
+contract TestNFT is ERC721A {
+    constructor(
+        string memory _name,
+        string memory _symbol
+    ) ERC721A(_name, _symbol) {}
+
+    function mint(address to, uint256 amount) public {
+        _mint(to, amount);
+    }
+}
+
+

src/module/token/crosschain/PolygonAgglayer.sol

@@ -6,7 +6,6 @@ import {Role} from "../../../Role.sol";
 
 import {CrossChain} from "./CrossChain.sol";
 import {IBridgeAndCall} from "@lxly-bridge-and-call/IBridgeAndCall.sol";
-import {PolygonZkEVMBridgeV2} from "@zkevm-contracts/v2/PolygonZkEVMBridgeV2.sol";
 
 library PolygonAgglayerCrossChainStorage {
 
@@ -16,7 +15,6 @@ library PolygonAgglayerCrossChainStorage {
 
     struct Data {
         address router;
-        address bridge;
     }
 
     function data() internal pure returns (Data storage data_) {
@@ -28,7 +26,7 @@ library PolygonAgglayerCrossChainStorage {
 
 }
 
-contract PolygonAgglayerCrossChainERC721 is Module, CrossChain {
+contract PolygonAgglayerCrossChain is Module, CrossChain {
 
     /*//////////////////////////////////////////////////////////////
                             EXTENSION CONFIG
@@ -47,9 +45,8 @@ contract PolygonAgglayerCrossChainERC721 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, address bridge) = abi.decode(data, (address, address));
+        address router = abi.decode(data, (address));
         _polygonAgglayerStorage().router = router;
-        _polygonAgglayerStorage().bridge = bridge;
     }
 
     /// @dev Called by a Core into an Module during the uninstallation of the Module.
@@ -86,28 +83,18 @@ contract PolygonAgglayerCrossChainERC721 is Module, CrossChain {
         bytes calldata _extraArgs
     ) external payable override {
         address router = _polygonAgglayerStorage().router;
-        (address _fallbackAddress, bool _forceUpdateGlobalExitRoot, address _token, uint256 _amount, bytes memory permitData) =
-            abi.decode(_extraArgs, (address, bool, address, uint256, bytes));
-
-        if (_token == address(0) && _amount == 0) {
-            PolygonZkEVMBridgeV2(router).bridgeMessage(
-                uint32(_destinationChain), _callAddress, _forceUpdateGlobalExitRoot, _payload
-            );
-        } else if (_payload.length == 0) {
-            PolygonZkEVMBridgeV2(router).bridgeAsset(
-                uint32(_destinationChain), _callAddress, _amount, _token, _forceUpdateGlobalExitRoot, _permitData)
-            );
-        } else {
-            IBridgeAndCall(router).bridgeAndCall(
-                _token,
-                _amount,
-                uint32(_destinationChain),
-                _callAddress,
-                _fallbackAddress,
-                _payload,
-                _forceUpdateGlobalExitRoot
-            );
-        }
+        (address _fallbackAddress, bool _forceUpdateGlobalExitRoot, address _token, uint256 _amount) =
+            abi.decode(_extraArgs, (address, bool, address, uint256));
+
+        IBridgeAndCall(router).bridgeAndCall(
+            _token,
+            _amount,
+            uint32(_destinationChain),
+            _callAddress,
+            _fallbackAddress,
+            _payload,
+            _forceUpdateGlobalExitRoot
+        );
 
         onCrossChainTransactionSent(_destinationChain, _callAddress, _payload, _extraArgs);
     }