Merge pull request #71 from helix-bridge/xiaoch05-reconstruct-files

reconstruct files(#2)
helix-bridge · Apr 9, 2024 · 036054c · 036054c
2 parents fd6333f + c3264f7
commit 036054c
Show file tree

Hide file tree

Showing 42 changed files with 1,310 additions and 321 deletions.
diff --git a/helix-contract/contracts/messagers/LayerZeroMessager.sol b/helix-contract/contracts/messagers/LayerZeroMessager.sol
@@ -46,6 +46,10 @@ contract LayerZeroMessager is AccessController {
         whiteList[_caller] = _enable;
     }
 
+    function updateEndpoint(address _endpoint) external onlyDao {
+        endpoint = ILayerZeroEndpoint(_endpoint);
+    }
+
     function setRemoteMessager(uint256 _appRemoteChainId, uint16 _lzRemoteChainId, address _remoteMessager) onlyDao external {
         remoteMessagers[_appRemoteChainId] = RemoteMessager(_lzRemoteChainId, _remoteMessager);
         trustedRemotes[_lzRemoteChainId] = keccak256(abi.encodePacked(_remoteMessager, address(this)));

diff --git a/helix-contract/contracts/xtoken/interfaces/IBacking.sol b/helix-contract/contracts/xtoken/interfaces/IBacking.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/ICrossChainFilter.sol b/helix-contract/contracts/xtoken/interfaces/ICrossChainFilter.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IERC20.sol b/helix-contract/contracts/xtoken/interfaces/IERC20.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc1155Backing.sol b/helix-contract/contracts/xtoken/interfaces/IErc1155Backing.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc1155MappingToken.sol b/helix-contract/contracts/xtoken/interfaces/IErc1155MappingToken.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc1155MappingTokenFactory.sol b/helix-contract/contracts/xtoken/interfaces/IErc1155MappingTokenFactory.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc1155Metadata.sol b/helix-contract/contracts/xtoken/interfaces/IErc1155Metadata.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc20MappingTokenFactory.sol b/helix-contract/contracts/xtoken/interfaces/IErc20MappingTokenFactory.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc721AttrSerializer.sol b/helix-contract/contracts/xtoken/interfaces/IErc721AttrSerializer.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc721Backing.sol b/helix-contract/contracts/xtoken/interfaces/IErc721Backing.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc721MappingToken.sol b/helix-contract/contracts/xtoken/interfaces/IErc721MappingToken.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IErc721MappingTokenFactory.sol b/helix-contract/contracts/xtoken/interfaces/IErc721MappingTokenFactory.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IFeeMarket.sol b/helix-contract/contracts/xtoken/interfaces/IFeeMarket.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IGuard.sol b/helix-contract/contracts/xtoken/interfaces/IGuard.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IHelix2ParaMessageEndpoint.sol b/helix-contract/contracts/xtoken/interfaces/IHelix2ParaMessageEndpoint.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IHelixApp.sol b/helix-contract/contracts/xtoken/interfaces/IHelixApp.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IHelixMessageEndpoint.sol b/helix-contract/contracts/xtoken/interfaces/IHelixMessageEndpoint.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IHelixRouterMessageEndpoint.sol b/helix-contract/contracts/xtoken/interfaces/IHelixRouterMessageEndpoint.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IHelixSub2EthMessageEndpoint.sol b/helix-contract/contracts/xtoken/interfaces/IHelixSub2EthMessageEndpoint.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IHelixSub2SubMessageEndpoint.sol b/helix-contract/contracts/xtoken/interfaces/IHelixSub2SubMessageEndpoint.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IInboundLane.sol b/helix-contract/contracts/xtoken/interfaces/IInboundLane.sol
diff --git a/helix-contract/contracts/xtoken/interfaces/IOutboundLane.sol b/helix-contract/contracts/xtoken/interfaces/IOutboundLane.sol
diff --git a/helix-contract/package.json b/helix-contract/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build": "hardhat compile",
     "test": "npx hardhat test",
-    "deploy": "npx hardhat run",
+    "script": "npx hardhat run",
     "clean": "shx rm -rf cache artifacts abi",
     "flatten": "npx hardhat flatten",
     "flat": "npx hardhat flat",

diff --git a/helix-contract/script/api/create2.js b/helix-contract/script/api/create2.js
@@ -0,0 +1,20 @@
+var Create2 = {
+    getDeployedBytecode: function(factory, constructorTypes, constructorArgs) {
+        const abiCoder = ethers.utils.defaultAbiCoder;
+        const encodedParams = abiCoder.encode(constructorTypes, constructorArgs);
+        console.log(`constructor bytes: ${encodedParams.slice(2)}`);
+        const bytecode = `${factory.bytecode}${encodedParams.slice(2)}`;
+        return bytecode;
+    },
+    deploy: async function(deployAddress, wallet, bytecode, salt, gasLimit, saltText) {
+        const hexSalt = saltText ? '0x' + Buffer.from(salt).toString('hex') : ethers.utils.id(salt.toString());
+        const deployer = await ethers.getContractAt("Create2Deployer", deployAddress, wallet);
+        const result = await (await deployer.deploy(bytecode, hexSalt, {gasLimit: gasLimit})).wait();
+        const targetEvent = result.events.find((e) => e.event == 'Deployed');
+        const abiCoder = ethers.utils.defaultAbiCoder;
+        const eventParams = abiCoder.decode(["address", "uint256"], targetEvent.data);
+        return eventParams[0];
+    }
+}
+
+module.exports = Create2