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

hashmesan · Apr 25, 2022 · 267a224 · 267a224
1 parent d5399cc
commit 267a224
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 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)
 };