bump v2.3.0

zjb0807 · zjb0807 · commit 1b9f8d59e9dc · 2022-06-19T19:43:58.000+08:00
diff --git a/contracts/dex/DEX.sol b/contracts/dex/DEX.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./IDEX.sol";
 
diff --git a/contracts/dex/IDEX.sol b/contracts/dex/IDEX.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface IDEX {
     event Swaped(address indexed sender, address[] path, uint256 supply_amount, uint256 target_amount);
diff --git a/contracts/evm-accounts/EVMAccounts.sol b/contracts/evm-accounts/EVMAccounts.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./IEVMAccounts.sol";
 
diff --git a/contracts/evm-accounts/IEVMAccounts.sol b/contracts/evm-accounts/IEVMAccounts.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface IEVMAccounts {
     event ClaimAccount(address indexed sender, bytes32 indexed accountId, address indexed evmAddress);
diff --git a/contracts/evm/EVM.sol b/contracts/evm/EVM.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./IEVM.sol";
 
diff --git a/contracts/evm/IEVM.sol b/contracts/evm/IEVM.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface IEVM {
     event TransferredMaintainer(address indexed contract_address, address indexed new_maintainer);
diff --git a/contracts/homa/Homa.sol b/contracts/homa/Homa.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./IHoma.sol";
 
diff --git a/contracts/homa/IHoma.sol b/contracts/homa/IHoma.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface IHoma {
     event Minted(address indexed sender, uint256 amount);
diff --git a/contracts/honzon/Honzon.sol b/contracts/honzon/Honzon.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./IHonzon.sol";
 
diff --git a/contracts/honzon/IHonzon.sol b/contracts/honzon/IHonzon.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface IHonzon {
     event AdjustedLoan(address indexed sender, address indexed currencyId, int128 collateralAdjustment, int128 debitAdjustment);
diff --git a/contracts/incentives/Incentives.sol b/contracts/incentives/Incentives.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./InterfaceIncentives.sol";
 
@@ -129,7 +129,7 @@ contract Incentives is InterfaceIncentives {
      * @dev Gets the pending rewards for a pool, actual reward could be deducted.
      * returns (balances), an array of reward balances corresponding to currencyIds
      */
-    function getPendingRewards(address[] calldata currencyIds, PoolId pool, address poolCurrencyId, address who)
+    function getPendingRewards(address[] memory currencyIds, PoolId pool, address poolCurrencyId, address who)
     public
     view
     override
diff --git a/contracts/incentives/InterfaceIncentives.sol b/contracts/incentives/InterfaceIncentives.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface InterfaceIncentives {
     event DepositedShare(address indexed sender, address indexed currencyId, uint256 amount);
diff --git a/contracts/nft/NFT.sol b/contracts/nft/NFT.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 library NFT {
     address constant private precompile = address(0x0000000000000000000000000000000000000401);
diff --git a/contracts/oracle/IOracle.sol b/contracts/oracle/IOracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface IOracle {
     // Get the price of the currency_id.
diff --git a/contracts/oracle/Oracle.sol b/contracts/oracle/Oracle.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./IOracle.sol";
 
diff --git a/contracts/package.json b/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/contracts",
-  "version": "4.3.0",
+  "version": "2.3.0",
   "description": "AcalaNetwork Smart Contract library for Solidity",
   "files": [
     "**/*.js",
diff --git a/contracts/schedule/ISchedule.sol b/contracts/schedule/ISchedule.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 interface ISchedule {
     event ScheduledCall(address indexed sender, address indexed contract_address, bytes task_id);
diff --git a/contracts/schedule/Schedule.sol b/contracts/schedule/Schedule.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 import "./ISchedule.sol";
 
diff --git a/contracts/token/MultiCurrency.sol b/contracts/token/MultiCurrency.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 library MultiCurrency {
     address constant private precompile = address(0x0000000000000000000000000000000000000400);
diff --git a/contracts/token/Token.sol b/contracts/token/Token.sol
@@ -3,9 +3,9 @@
 // Based on ERC20 implementation of @openzeppelin/contracts (v4.5.0):
 // https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.5.0/contracts/token/ERC20/ERC20.sol
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
-import "@openzeppelin/contracts/utils/math/SafeMath.sol";
+import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import "./MultiCurrency.sol";
@@ -147,9 +147,9 @@ contract Token is IERC20 {
         address owner = msg.sender;
         uint256 currentAllowance = _allowances[owner][spender];
         require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero");
-        unchecked {
+        //unchecked {
             _approve(owner, spender, currentAllowance - subtractedValue);
-        }
+        //}
 
         return true;
     }
@@ -212,11 +212,11 @@ contract Token is IERC20 {
         uint256 amount
     ) internal {
         uint256 currentAllowance = allowance(owner, spender);
-        if (currentAllowance != type(uint256).max) {
+        //if (currentAllowance != type(uint256).max) {
             require(currentAllowance >= amount, "ERC20: insufficient allowance");
-            unchecked {
+            //unchecked {
                 _approve(owner, spender, currentAllowance - amount);
-            }
-        }
+            //}
+        //}
     }
 }
diff --git a/contracts/utils/AcalaAddress.sol b/contracts/utils/AcalaAddress.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 contract ADDRESS {
 	address public constant ACA = 0x0000000000000000000100000000000000000000;
diff --git a/contracts/utils/KaruraAddress.sol b/contracts/utils/KaruraAddress.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 contract ADDRESS {
 	address public constant KAR = 0x0000000000000000000100000000000000000080;
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -7,7 +7,7 @@ import '@nomiclabs/hardhat-waffle'
 
 const config: HardhatUserConfig = {
   solidity: {
-    version: "0.8.4",
+    version: "0.6.2",
     settings: {
       optimizer: {
         enabled: true,
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.5",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
-    "@openzeppelin/contracts": "4.5.0",
+    "@openzeppelin/contracts": "3.0.0",
     "ethereum-waffle": "^3.4.4",
     "handlebars": "^4.7.7",
     "hardhat": "^2.9.3",
diff --git a/resources/address.sol.hbs b/resources/address.sol.hbs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.6.0;
 
 contract ADDRESS {
 	{{#each this}}
diff --git a/resources/bytecodes.json b/resources/bytecodes.json
diff --git a/yarn.lock b/yarn.lock
@@ -531,10 +531,10 @@
     "@types/sinon-chai" "^3.2.3"
     "@types/web3" "1.0.19"
 
-"@openzeppelin/contracts@4.5.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.5.0.tgz#3fd75d57de172b3743cdfc1206883f56430409cc"
-  integrity sha512-fdkzKPYMjrRiPK6K4y64e6GzULR7R7RwxSigHS8DDp7aWDeoReqsQI+cxHV1UuhAqX69L1lAaWDxenfP+xiqzA==
+"@openzeppelin/contracts@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.0.0.tgz#89bc0d32fc9eb257cf6499f2497a1b4a6715f186"
+  integrity sha512-u7oATjUK6jffDOoIjVQ7vJ2fnFKlfDS1CJzrMpp+YtGQ2fhdSk0kXjZTxk8Pj1SPVZRNES3yo0r144v8BsuRhQ==
 
 "@resolver-engine/core@^0.3.3":
   version "0.3.3"
