feat: remove BC_fusion folder and move contracts to root dir

bnb-chain · Aug 23, 2024 · 356ad32 · 356ad32
1 parent da2134b
commit 356ad32
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 20 deletions.
diff --git a/contracts/BSCGovernor.sol b/contracts/BSCGovernor.sol
@@ -10,9 +10,9 @@ import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQ
 import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol";
 
 import "./SystemV2.sol";
-import "./BC_fusion/extension/Protectable.sol";
-import "./BC_fusion/lib/Utils.sol";
-import "./BC_fusion/interface/IGovToken.sol";
+import "./extension/Protectable.sol";
+import "./libV2/Utils.sol";
+import "./interfaceV2/IGovToken.sol";
 
 contract BSCGovernor is
     SystemV2,

diff --git a/contracts/BC_fusion/BSCTimelock.sol → contracts/BSCTimelock.sol b/contracts/BC_fusion/BSCTimelock.sol → contracts/BSCTimelock.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";
 
-import "../SystemV2.sol";
-import "./lib/Utils.sol";
+import "./SystemV2.sol";
+import "./libV2/Utils.sol";
 
 contract BSCTimelock is SystemV2, Initializable, TimelockControllerUpgradeable {
     using Utils for bytes;

diff --git a/contracts/BC_fusion/GovToken.sol → contracts/GovToken.sol b/contracts/BC_fusion/GovToken.sol → contracts/GovToken.sol
@@ -6,8 +6,8 @@ import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20Burnable
 import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
 
-import "../SystemV2.sol";
-import "./interface/IStakeCredit.sol";
+import "./SystemV2.sol";
+import "./interfaceV2/IStakeCredit.sol";
 
 contract GovToken is
     SystemV2,

diff --git a/contracts/StakeCredit.sol b/contracts/StakeCredit.sol
@@ -7,7 +7,7 @@ import "@openzeppelin/contracts-upgradeable/utils/CountersUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/structs/DoubleEndedQueueUpgradeable.sol";
 
 import "./SystemV2.sol";
-import "./BC_fusion/interface/IStakeHub.sol";
+import "./interfaceV2/IStakeHub.sol";
 
 contract StakeCredit is SystemV2, Initializable, ReentrancyGuardUpgradeable, ERC20Upgradeable {
     using CountersUpgradeable for CountersUpgradeable.Counter;

diff --git a/contracts/StakeHub.sol b/contracts/StakeHub.sol
@@ -6,14 +6,14 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 import "./SystemV2.sol";
-import "./BC_fusion/extension/Protectable.sol";
-import "./BC_fusion/interface/IBSCValidatorSet.sol";
-import "./BC_fusion/interface/ICrossChain.sol";
-import "./BC_fusion/interface/IGovToken.sol";
-import "./BC_fusion/interface/IStakeCredit.sol";
-import "./BC_fusion/interface/ITokenHub.sol";
-import "./BC_fusion/lib/RLPDecode.sol";
-import "./BC_fusion/lib/Utils.sol";
+import "./extension/Protectable.sol";
+import "./interfaceV2/IBSCValidatorSet.sol";
+import "./interfaceV2/ICrossChain.sol";
+import "./interfaceV2/IGovToken.sol";
+import "./interfaceV2/IStakeCredit.sol";
+import "./interfaceV2/ITokenHub.sol";
+import "./libV2/RLPDecode.sol";
+import "./libV2/Utils.sol";
 
 contract StakeHub is SystemV2, Initializable, Protectable {
     using RLPDecode for *;

diff --git a/contracts/BC_fusion/TokenRecoverPortal.sol → contracts/TokenRecoverPortal.sol b/contracts/BC_fusion/TokenRecoverPortal.sol → contracts/TokenRecoverPortal.sol
@@ -5,11 +5,11 @@ import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.
 import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
-import "../SystemV2.sol";
+import "./SystemV2.sol";
 import "./extension/Protectable.sol";
-import "./interface/ITokenHub.sol";
-import "./interface/ITokenRecoverPortal.sol";
-import "./lib/Utils.sol";
+import "./interfaceV2/ITokenHub.sol";
+import "./interfaceV2/ITokenRecoverPortal.sol";
+import "./libV2/Utils.sol";
 
 /**
  * @title TokenRecoverPortal is used to recover the token from BC users.

diff --git a/...racts/BC_fusion/extension/Protectable.sol → contracts/extension/Protectable.sol b/...racts/BC_fusion/extension/Protectable.sol → contracts/extension/Protectable.sol
diff --git a/.../BC_fusion/interface/IBSCValidatorSet.sol → contracts/interfaceV2/IBSCValidatorSet.sol b/.../BC_fusion/interface/IBSCValidatorSet.sol → contracts/interfaceV2/IBSCValidatorSet.sol
diff --git a/...racts/BC_fusion/interface/ICrossChain.sol → contracts/interfaceV2/ICrossChain.sol b/...racts/BC_fusion/interface/ICrossChain.sol → contracts/interfaceV2/ICrossChain.sol
diff --git a/contracts/BC_fusion/interface/IGovToken.sol → contracts/interfaceV2/IGovToken.sol b/contracts/BC_fusion/interface/IGovToken.sol → contracts/interfaceV2/IGovToken.sol
diff --git a/...acts/BC_fusion/interface/IStakeCredit.sol → contracts/interfaceV2/IStakeCredit.sol b/...acts/BC_fusion/interface/IStakeCredit.sol → contracts/interfaceV2/IStakeCredit.sol
diff --git a/contracts/BC_fusion/interface/IStakeHub.sol → contracts/interfaceV2/IStakeHub.sol b/contracts/BC_fusion/interface/IStakeHub.sol → contracts/interfaceV2/IStakeHub.sol
diff --git a/contracts/BC_fusion/interface/ITokenHub.sol → contracts/interfaceV2/ITokenHub.sol b/contracts/BC_fusion/interface/ITokenHub.sol → contracts/interfaceV2/ITokenHub.sol
diff --git a/..._fusion/interface/ITokenRecoverPortal.sol → ...racts/interfaceV2/ITokenRecoverPortal.sol b/..._fusion/interface/ITokenRecoverPortal.sol → ...racts/interfaceV2/ITokenRecoverPortal.sol
diff --git a/contracts/BC_fusion/lib/RLPDecode.sol → contracts/libV2/RLPDecode.sol b/contracts/BC_fusion/lib/RLPDecode.sol → contracts/libV2/RLPDecode.sol
diff --git a/contracts/BC_fusion/lib/Utils.sol → contracts/libV2/Utils.sol b/contracts/BC_fusion/lib/Utils.sol → contracts/libV2/Utils.sol