harmony-one#99 reduced OneBTC Contract size from 24KB to 21KB

hashmesan · Apr 25, 2022 · f697c0a · f697c0a
1 parent d41b561
commit f697c0a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/contract/bridge/contracts/TxValidate.sol b/contract/bridge/contracts/TxValidate.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity 0.6.12;
+
 import "@openzeppelin/contracts-upgradeable/math/MathUpgradeable.sol";
 import {BTCUtils} from "@interlay/bitcoin-spv-sol/contracts/BTCUtils.sol";
 import {BytesLib} from "@interlay/bitcoin-spv-sol/contracts/BytesLib.sol";
@@ -16,7 +17,7 @@ library TxValidate {
         address recipientBtcAddress,
         uint256 opReturnId,
         uint256 outputIndex
-    ) internal pure returns (uint256) {
+    ) external pure returns (uint256) {
         uint256 btcAmount;
         address btcAddress;
 

diff --git a/contract/bridge/contracts/crypto/Secp256k1.sol b/contract/bridge/contracts/crypto/Secp256k1.sol
@@ -25,7 +25,7 @@ library Secp256k1 {
         uint256 scale,
         uint256 Px,
         uint256 Py
-    ) internal pure returns (uint256, uint256) {
+    ) external pure returns (uint256, uint256) {
         require(scale % NN != 0, "invalid scale");
         return EllipticCurve.ecMul(scale, Px, Py, AA, PP);
     }

diff --git a/contract/bridge/migrations/3_deploy_onebtc.js b/contract/bridge/migrations/3_deploy_onebtc.js
@@ -2,11 +2,20 @@ const { deployProxy } = require('@openzeppelin/truffle-upgrades');
 const OneBtc = artifacts.require("OneBtc");
 const RelayMock = artifacts.require("RelayMock");
 const ExchangeRateOracleWrapper = artifacts.require("ExchangeRateOracleWrapper");
+const Secp256k1 = artifacts.require("Secp256k1");
+const TxValidate = artifacts.require("TxValidate");
 
 module.exports = async function(deployer) {
+
     const IRelay = await RelayMock.deployed();
     const IExchangeRateOracleWrapper = await ExchangeRateOracleWrapper.deployed();
+    const Secp256k1Lib = await deployer.deploy(Secp256k1);
+    OneBtc.link("Secp256k1", Secp256k1Lib.address);
 
-    const c = await deployProxy(OneBtc, [IRelay.address, IExchangeRateOracleWrapper.address], { deployer } );
+    const TxValidateLib = await deployer.deploy(TxValidate);
+    OneBtc.link("TxValidate", TxValidateLib.address);
+
+    const c = await deployProxy(OneBtc, [IRelay.address, IExchangeRateOracleWrapper.address], 
+                                    { deployer, unsafeAllowLinkedLibraries: true } );
     console.log(c.address)
 };
diff --git a/contract/bridge/scripts/deploy_onebtc.js b/contract/bridge/scripts/deploy_onebtc.js
@@ -7,7 +7,9 @@ async function main() {
         process.env.HMY_RELAY_CONTRACT
     );
 
-    const OneBtc = await ethers.getContractFactory("OneBtc");
+    const BtcLib = await ethers.getContractFactory("Secp256k1");
+    const btcLib = await BtcLib.deploy();
+    const OneBtc = await ethers.getContractFactory("OneBtc", {libraries: {"Secp256k1": btcLib.address}});
     const oneBtc = await OneBtc.deploy();
     await oneBtc.initialize(relay.address);
 

diff --git a/contract/bridge/test/Liquidation.test.js b/contract/bridge/test/Liquidation.test.js
@@ -7,6 +7,8 @@ const OneBtc = artifacts.require("OneBtc");
 const RelayMock = artifacts.require("RelayMock");
 const ExchangeRateOracleWrapper = artifacts.require("ExchangeRateOracleWrapper");
 const { issueTxMock } = require('./mock/btcTxMock');
+const Secp256k1 = artifacts.require("Secp256k1");
+const TxValidate = artifacts.require("TxValidate");
 
 const bitcoin = require('bitcoinjs-lib');
 const bn=b=>BigInt(`0x${b.toString('hex')}`);
@@ -39,7 +41,14 @@ contract("liquidation test", accounts => {
     before(async function() {
         relayMock = await RelayMock.new();
         exchangeRateOracleWrapper = await deployProxy(ExchangeRateOracleWrapper);
-        oneBtc = await deployProxy(OneBtc, [relayMock.address, exchangeRateOracleWrapper.address]);
+
+        const Secp256k1Lib = await Secp256k1.new();
+        OneBtc.link("Secp256k1", Secp256k1Lib.address);
+
+        const TxValidateLib = await TxValidate.new();
+        OneBtc.link("TxValidate", TxValidateLib.address);
+
+        oneBtc = await deployProxy(OneBtc, [RelayMock.address, ExchangeRateOracleWrapper.address],{unsafeAllowLinkedLibraries: true});
 
         // set BTC/ONE exchange rate
         await exchangeRateOracleWrapper.setExchangeRate(10); // 1 OneBtc = 10 ONE

diff --git a/contract/bridge/test/OneBTC.test.js b/contract/bridge/test/OneBTC.test.js
@@ -31,7 +31,7 @@ contract("issue/redeem test", accounts => {
     before(async function() {
         this.RelayMock = await RelayMock.new();
         this.ExchangeRateOracleWrapper = await deployProxy(ExchangeRateOracleWrapper);
-        this.OneBtc = await deployProxy(OneBtc, [this.RelayMock.address, this.ExchangeRateOracleWrapper.address]);
+        this.OneBtc = await deployProxy(OneBtc, [this.RelayMock.address, this.ExchangeRateOracleWrapper.address],{initializer: false, unsafeAllowLinkedLibraries: true});
 
         // set BTC/ONE exchange rate
         await this.ExchangeRateOracleWrapper.setExchangeRate(10); // 1 OneBtc = 10 ONE