Merge main to withdraw-to and add interfaces to fxTokens

Author: QEDK

contracts/examples/erc721-transfer/FxERC721ChildTunnel.sol

@@ -129,6 +129,8 @@ contract FxERC721ChildTunnel is FxBaseChildTunnel, Create2, IERC721Receiver {
             "FxERC721ChildTunnel: NO_MAPPED_TOKEN"
         );
 
+        require(msg.sender == childTokenContract.ownerOf(tokenId));
+
         // withdraw tokens
         childTokenContract.burn(tokenId);
 

contracts/tokens/IFxERC1155.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-interface IFxERC1155 {
+import {IERC1155} from "../lib/IERC1155.sol";
+
+interface IFxERC1155 is IERC1155 {
     function fxManager() external returns (address);
 
     function initialize(

contracts/tokens/IFxERC20.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-interface IFxERC20 {
+import {IERC20} from "../lib/IERC20.sol";
+
+interface IFxERC20 is IERC20 {
     function fxManager() external returns (address);
 
     function connectedToken() external returns (address);

contracts/tokens/IFxERC721.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-interface IFxERC721 {
+import {IERC721} from "../lib/IERC721.sol";
+
+interface IFxERC721 is IERC721 {
     function fxManager() external returns (address);
 
     function connectedToken() external returns (address);