add guard

helix-bridge · Dec 26, 2023 · 320d11e · 320d11e
1 parent 5161375
commit 320d11e
Show file tree

Hide file tree

Showing 4 changed files with 1,228 additions and 2 deletions.
diff --git a/helix-contract/address/xtoken-dev.json b/helix-contract/address/xtoken-dev.json
@@ -29,5 +29,8 @@
     },
     "xToken": {
         "tron": "TRXTkfGxTL8CjuGgz55BYkTAyVyiEMFY6F"
+    },
+    "guard": {
+        "sepolia": "0x8F207f0e9Ed3CC1487C5C8981213AD4482d4a972"
     }
 }
diff --git a/helix-contract/deploy/deploy_bytescode.js b/helix-contract/deploy/deploy_bytescode.js
@@ -43,6 +43,7 @@ async function getDefaultBridgeBytecode(networkUrl, version) {
 async function getLnProxyBridgeBytecode(w, version, logicFactory, logicAddress, proxyAdminAddress, args) {
     const salt = ethers.utils.hexZeroPad(ethers.utils.hexlify(ethers.utils.toUtf8Bytes(version)), 32);
     const calldata = ProxyDeployer.getInitializerData(logicFactory.interface, args, "initialize");
+    console.log(calldata);
     const proxyContract = await ethers.getContractFactory("TransparentUpgradeableProxy", w);
     const bytecode = Create2.getDeployedBytecode(proxyContract, ["address", "address", "bytes"], [logicAddress, proxyAdminAddress, calldata]);
     console.log(`get helix proxy bridge bytecode, salt ${salt}, bytecode ${bytecode}`);
@@ -63,13 +64,21 @@ async function getLnOppositeProxyBridgeBytecode(networkUrl, version, logicAddres
     return;
 }
 
+async function getxTokenIssuingProxyBridgeBytecode(networkUrl, version, logicAddress, proxyAdminAddress) {
+    const w = wallet(networkUrl);
+    const xTokenBaseFactory = await ethers.getContractFactory("xTokenBridgeBase", w);
+    await getLnProxyBridgeBytecode(w, version, xTokenBaseFactory, logicAddress, proxyAdminAddress, [w.address, version]);
+    return;
+}
+
 // 2. deploy mapping token factory
 async function main() {
     //await getHelixProxyAdminBytecode('https://rpc.ankr.com/eth_goerli', 'v1.0.0');
     //await getOppositeBridgeBytecode('https://rpc.ankr.com/eth_goerli', 'v1.0.0');
     //await getDefaultBridgeBytecode('https://rpc.ankr.com/eth_goerli', 'v1.0.0');
-    await getLnDefaultProxyBridgeBytecode('https://rpc.ankr.com/eth_goerli', 'v1.0.0', '0x8af688056c6614acb5A78c62e1f9f49022C0452f', '0x601dE3B81c7cE04BecE3b29e5cEe4F3251d250dB');
+    //await getLnDefaultProxyBridgeBytecode('https://rpc.ankr.com/eth_goerli', 'v1.0.0', '0x8af688056c6614acb5A78c62e1f9f49022C0452f', '0x601dE3B81c7cE04BecE3b29e5cEe4F3251d250dB');
     //await getLnOppositeProxyBridgeBytecode('https://rpc.ankr.com/eth_goerli', 'v1.0.0', '0x90873fa1bbd028F22277567530A22E05f7721D37', '0x601dE3B81c7cE04BecE3b29e5cEe4F3251d250dB');
+    await getxTokenIssuingProxyBridgeBytecode('https://rpc.ankr.com/eth_goerli', 'v1.0.0', "0x2279B98741D66ccbB1a9e8c80A571378a29afCf0", "0xa3D85134B8f8dB225D54AA4C5E4A25Bda3bD50eA");
 }
 
 main()

diff --git a/helix-contract/deploy/flatten-xtoken.sh b/helix-contract/deploy/flatten-xtoken.sh
@@ -3,5 +3,5 @@ mkdir -p $path
 yarn flat contracts/mapping-token/v3/base/xTokenBacking.sol --output $path/xTokenBacking.sol
 yarn flat contracts/mapping-token/v3/base/xTokenIssuing.sol --output $path/xTokenIssuing.sol
 yarn flat contracts/mapping-token/v3/base/xTokenErc20.sol --output $path/xTokenErc20.sol
-yarn flat contracts/mapping-token/v2/Guard.sol --output $path/Guard.sol
+yarn flat contracts/mapping-token/v3/GuardV3.sol --output $path/GuardV3.sol
 yarn flat contracts/messagers/MsglineMessager.sol --output $path/MsglineMessager.sol