add contracts v0.4 support, NFT support and eccm with chain-id

Author: zouxyan

contracts/core/assets/usdt/USDT.sol

@@ -1,8 +1,8 @@
-// /**
-//  *Submitted for verification at Etherscan.io on 2017-11-28
-// */
+/**
+ *Submitted for verification at Etherscan.io on 2017-11-28
+*/
 
-// pragma solidity ^0.4.17;
+pragma solidity ^0.5.0;
 
 // /**
 //  * @title SafeMath

contracts/core/cross_chain_manager/interface/IEthCrossChainManager.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity >=0.5.0;
 
 /**
  * @dev Interface of the EthCrossChainManager contract for business contract like LockProxy to request cross chain transaction

contracts/core/cross_chain_manager/interface/IEthCrossChainManagerProxy.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity >=0.5.0;
 
 /**
  * @dev Interface of the EthCrossChainManagerProxy for business contract like LockProxy to obtain the reliable EthCrossChainManager contract hash.

contracts/core/cross_chain_manager/interface/IUpgradableECCM.sol

@@ -9,4 +9,5 @@ interface IUpgradableECCM {
     function paused() external view returns (bool);
     function upgradeToNew(address) external returns (bool);
     function isOwner() external view returns (bool);
+    function setChainId(uint64 _newChainId) external returns (bool);
 }

contracts/core/cross_chain_manager/libs/EthCrossChainUtils.sol

@@ -111,7 +111,6 @@ library ECCUtils {
     function verifySig(bytes memory _rawHeader, bytes memory _sigList, address[] memory _keepers, uint _m) internal pure returns (bool){
         bytes32 hash = getHeaderHash(_rawHeader);
 
-        uint signed = 0;
         uint sigCount = _sigList.length / POLYCHAIN_SIGNATURE_LEN;
         address[] memory signers = new address[](sigCount);
         bytes32 r;

contracts/core/cross_chain_manager/logic/EthCrossChainManager.sol

@@ -8,14 +8,16 @@ import "./../upgrade/UpgradableECCM.sol";
 import "./../libs/EthCrossChainUtils.sol";
 import "./../interface/IEthCrossChainManager.sol";
 import "./../interface/IEthCrossChainData.sol";
+
 contract EthCrossChainManager is IEthCrossChainManager, UpgradableECCM {
     using SafeMath for uint256;
-
+    
     event InitGenesisBlockEvent(uint256 height, bytes rawHeader);
     event ChangeBookKeeperEvent(uint256 height, bytes rawHeader);
     event CrossChainEvent(address indexed sender, bytes txId, address proxyOrAssetContract, uint64 toChainId, bytes toContract, bytes rawdata);
     event VerifyHeaderAndExecuteTxEvent(uint64 fromChainID, bytes toContract, bytes crossChainTxHash, bytes fromChainTxHash);
-    constructor(address _eccd) UpgradableECCM(_eccd) public {}
+    
+    constructor(address _eccd, uint64 _chainId) UpgradableECCM(_eccd, _chainId) public {}
 
     /* @notice              sync Poly chain genesis block header to smart contrat
     *  @dev                 this function can only be called once, nextbookkeeper of rawHeader can't be empty
@@ -157,7 +159,7 @@ contract EthCrossChainManager is IEthCrossChainManager, UpgradableECCM {
         require(eccd.markFromChainTxExist(toMerkleValue.fromChainID, Utils.bytesToBytes32(toMerkleValue.txHash)), "Save crosschain tx exist failed!");
 
         // Ethereum ChainId is 2, we need to check the transaction is for Ethereum network
-        require(toMerkleValue.makeTxParam.toChainId == uint64(2), "This Tx is not aiming at Ethereum network!");
+        require(toMerkleValue.makeTxParam.toChainId == chainId, "This Tx is not aiming at Ethereum network!");
 
         // Obtain the targeting contract, so that Ethereum cross chain manager contract can trigger the executation of cross chain tx on Ethereum side
         address toContract = Utils.bytesToAddress(toMerkleValue.makeTxParam.toContract);

contracts/core/cross_chain_manager/logic/EthCrossChainManager_new_template.sol

@@ -15,7 +15,7 @@ contract NewEthCrossChainManager is IEthCrossChainManager, UpgradableECCM {
     event ChangeBookKeeperEvent(uint256 height, bytes rawHeader);
     event CrossChainEvent(address indexed sender, bytes txId, address proxyOrAssetContract, uint64 toChainId, bytes toContract, bytes rawdata);
     event VerifyHeaderAndExecuteTxEvent(uint64 fromChainID, bytes toContract, bytes crossChainTxHash, bytes fromChainTxHash);
-    constructor(address _eccd) UpgradableECCM(_eccd) public {}
+    constructor(address _eccd, uint64 _chainId) UpgradableECCM(_eccd, _chainId) public {}
 
     /* @notice              sync Poly chain genesis block header to smart contrat
     *  @dev                 this function can only be called once, nextbookkeeper of rawHeader can't be empty

contracts/core/cross_chain_manager/upgrade/EthCrossChainManagerProxy.sol

@@ -48,4 +48,11 @@ contract EthCrossChainManagerProxy is IEthCrossChainManagerProxy, Ownable, Pausa
     function getEthCrossChainManager() whenNotPaused public view returns (address) {
         return EthCrossChainManagerAddr_;
     }
+    function changeManagerChainID(uint64 _newChainId) onlyOwner whenPaused public {
+        IUpgradableECCM eccm = IUpgradableECCM(EthCrossChainManagerAddr_);
+        if (!eccm.paused()) {
+            require(eccm.pause(), "Pause old EthCrossChainManager contract failed!");
+        }
+        require(eccm.setChainId(_newChainId), "set chain ID failed. ");
+    }
 }

contracts/core/cross_chain_manager/upgrade/UpgradableECCM.sol

@@ -7,8 +7,11 @@ import "./../../../libs/ownership/Ownable.sol";
 
 contract UpgradableECCM is IUpgradableECCM, Ownable, Pausable {
     address public EthCrossChainDataAddress;
-    constructor (address ethCrossChainDataAddr) Pausable() Ownable()  public {
+    uint64 public chainId;
+
+    constructor (address ethCrossChainDataAddr, uint64 _chainId) Pausable() Ownable()  public {
         EthCrossChainDataAddress = ethCrossChainDataAddr;
+        chainId = _chainId;
     }
     function pause() onlyOwner public returns (bool) {
         if (!paused()) {
@@ -38,4 +41,9 @@ contract UpgradableECCM is IUpgradableECCM, Ownable, Pausable {
         eccd.transferOwnership(newEthCrossChainManagerAddress);
         return true;
     }
+
+    function setChainId(uint64 _newChainId) whenPaused onlyOwner public returns (bool) {
+        chainId = _newChainId;
+        return true;
+    }
 }

contracts/core/lock_proxy/LockProxy.sol

@@ -154,18 +154,18 @@ contract LockProxy is Ownable {
         return true;
     }
 
-    
     function _transferERC20ToContract(address fromAssetHash, address fromAddress, address toAddress, uint256 amount) internal returns (bool) {
-         IERC20 erc20Token = IERC20(fromAssetHash);
+        IERC20 erc20Token = IERC20(fromAssetHash);
         //  require(erc20Token.transferFrom(fromAddress, toAddress, amount), "trasnfer ERC20 Token failed!");
-         erc20Token.safeTransferFrom(fromAddress, toAddress, amount);
-         return true;
+        erc20Token.safeTransferFrom(fromAddress, toAddress, amount);
+        return true;
     }
+
     function _transferERC20FromContract(address toAssetHash, address toAddress, uint256 amount) internal returns (bool) {
-         IERC20 erc20Token = IERC20(toAssetHash);
+        IERC20 erc20Token = IERC20(toAssetHash);
         //  require(erc20Token.transfer(toAddress, amount), "trasnfer ERC20 Token failed!");
-         erc20Token.safeTransfer(toAddress, amount);
-         return true;
+        erc20Token.safeTransfer(toAddress, amount);
+        return true;
     }
 
     function _serializeTxArgs(TxArgs memory args) internal pure returns (bytes memory) {