WIP: even more agglayer testing

Author: GWSzeto

remappings.txt

@@ -1,3 +1,29 @@
+@ensdomains/=lib/creator-token-contracts/node_modules/@ensdomains/
+
+@opensea/tstorish/=lib/creator-token-standards/lib/tstorish/src/
+@openzeppelin/contracts-upgradeable/=lib/lxly-bridge-and-call/lib/openzeppelin-contracts-upgradeable/contracts/
+@openzeppelin/=lib/lxly-bridge-and-call/lib/openzeppelin-contracts/contracts/
+
+@rari-capital/solmate/=lib/PermitC/lib/solmate/
+@zkevm/=lib/lxly-bridge-and-call/lib/zkevm-contracts/contracts/
+ERC721A-Upgradeable/=lib/ERC721A-Upgradeable/contracts/
+PermitC/=lib/PermitC/src/
+creator-token-contracts/=lib/creator-token-contracts/contracts/
+creator-token-standards/=lib/creator-token-standards/src/
+erc4626-tests/=lib/lxly-bridge-and-call/lib/openzeppelin-contracts/lib/erc4626-tests/
+erc721a/=lib/erc721a/contracts/
+eth-gas-reporter/=lib/creator-token-contracts/node_modules/eth-gas-reporter/
+forge-gas-metering/=lib/PermitC/lib/forge-gas-metering/
+hardhat/=lib/creator-token-contracts/node_modules/hardhat/
+lxly-bridge-and-call/=lib/lxly-bridge-and-call/
+murky/=lib/creator-token-contracts/lib/murky/src/
+openzeppelin-contracts-upgradeable/=lib/lxly-bridge-and-call/lib/openzeppelin-contracts-upgradeable/
+openzeppelin-contracts/=lib/lxly-bridge-and-call/lib/openzeppelin-contracts/
+openzeppelin/=lib/lxly-bridge-and-call/lib/openzeppelin-contracts/contracts/
+solady/=lib/solady/src/
+zkevm-contracts/=lib/lxly-bridge-and-call/lib/zkevm-contracts/contracts/
+
+
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
 @solady/=lib/solady/src/

script/agglayer/Agglayer.s.sol

@@ -49,14 +49,24 @@ contract MintTestNFT is Script {
         console.log("polygonAgglayer deployed to:", address(polygonAgglayer));
 
         bytes memory mintableEncodedInstallParams = abi.encode(deployerAddress);
-        bytes memory polygonAgglayerEncodedInstallParams = abi.encode(address(polygonAgglayer));
+        bytes memory polygonAgglayerEncodedInstallParams = abi.encode(agglayerBridgeExtension);
+        console.log("polygonAgglayerEncodedInstallParams");
+        console.logBytes(polygonAgglayerEncodedInstallParams);
 
         modules[0] = address(mintableModule);
         modules[1] = address(polygonAgglayer);
 
         moduleData[0] = mintableEncodedInstallParams;
         moduleData[1] = polygonAgglayerEncodedInstallParams;
 
+        console.log("moduleData");
+        console.logBytes(moduleData[0]);
+        console.logBytes(moduleData[1]);
+
+        console.log("modules");
+        console.logAddress(modules[0]);
+        console.logAddress(modules[1]);
+
         core = new ERC20Core("test", "TEST", "", deployerAddress, modules, moduleData);
         console.log("core deployed to:", address(core));
 
@@ -67,7 +77,7 @@ contract MintTestNFT is Script {
         core.approve(agglayerBridgeExtension, 100);
         console.log("Approved agglayer bridge extension");
 
-        bytes memory extraArgs = abi.encode(deployerAddress, true, address(core), 100);
+        bytes memory extraArgs = abi.encode(deployerAddress, true, address(core), 100, "");
         bytes memory payload = abi.encodeWithSelector(
             bytes4(keccak256("mint(address,uint256)")),
             deployerAddress,

src/module/token/crosschain/PolygonAgglayer.sol

@@ -42,11 +42,14 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
             FallbackFunction({selector: this.setRouter.selector, permissionBits: Role._MANAGER_ROLE});
         config.fallbackFunctions[2] =
             FallbackFunction({selector: this.sendCrossChainTransaction.selector, permissionBits: 0});
+
+        config.registerInstallationCallback = true;
     }
 
     /// @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;
     }
 
@@ -83,19 +86,23 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
         bytes calldata _payload,
         bytes calldata _extraArgs
     ) external payable override {
-        address router = _polygonAgglayerStorage().router;
-        (address _fallbackAddress, bool _forceUpdateGlobalExitRoot, address _token, uint256 _amount) =
-            abi.decode(_extraArgs, (address, bool, address, uint256));
+        (
+            address _fallbackAddress,
+            bool _forceUpdateGlobalExitRoot,
+            address _token,
+            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);
-        console.log("fallbackAddress", _fallbackAddress);
-        console.log("forceUpdateGlobalExitRoot", _forceUpdateGlobalExitRoot);
 
-        IBridgeAndCall(router).bridgeAndCall(
+        // IBridgeAndCall(_polygonAgglayerStorage().router).bridgeAndCall(
+        _bridgeAndCall(
             _token,
             _amount,
+            permitData,
             uint32(_destinationChain),
             _callAddress,
             _fallbackAddress,
@@ -107,6 +114,21 @@ contract PolygonAgglayerCrossChain is Module, CrossChain {
         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);
+        IBridgeAndCall(_polygonAgglayerStorage().router).bridgeAndCall(
+            _token,
+            _amount,
+            permitData,
+            _destinationChain,
+            _callAddress,
+            _fallbackAddress,
+            _payload,
+            _forceUpdateGlobalExitRoot
+        );
+    }
+            
+
     /*//////////////////////////////////////////////////////////////
                             INTERNAL FUNCTIONS
     //////////////////////////////////////////////////////////////*/