chore: rename cross chain to crosschain (#750)

PundiAI · Oct 18, 2024 · 74e58db · 74e58db
1 parent 694f87b
commit 74e58db
Show file tree

Hide file tree

Showing 37 changed files with 410 additions and 411 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -88,7 +88,7 @@ import (
 	trontypes "github.com/functionx/fx-core/v8/x/tron/types"
 )
 
-type CrossChainKeepers struct {
+type CrosschainKeepers struct {
 	BscKeeper       crosschainkeeper.Keeper
 	PolygonKeeper   crosschainkeeper.Keeper
 	AvalancheKeeper crosschainkeeper.Keeper
@@ -99,7 +99,7 @@ type CrossChainKeepers struct {
 	Layer2Keeper    crosschainkeeper.Keeper
 }
 
-func (c CrossChainKeepers) ToSlice() []crosschainkeeper.Keeper {
+func (c CrosschainKeepers) ToSlice() []crosschainkeeper.Keeper {
 	return []crosschainkeeper.Keeper{
 		c.BscKeeper, c.PolygonKeeper, c.AvalancheKeeper, c.EthKeeper,
 		c.TronKeeper, c.ArbitrumKeeper, c.OptimismKeeper, c.Layer2Keeper,
@@ -140,7 +140,7 @@ type AppKeepers struct {
 	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
 
 	CrosschainRouterKeeper crosschainkeeper.RouterKeeper
-	CrossChainKeepers
+	CrosschainKeepers
 
 	EvmKeeper       *fxevmkeeper.Keeper
 	FeeMarketKeeper feemarketkeeper.Keeper
@@ -329,8 +329,8 @@ func NewAppKeeper(
 		appKeepers.GetSubspace(feemarkettypes.ModuleName),
 	)
 
-	// cross chain precompile
-	precompileRouter := crosschainprecompile.NewRouter()
+	// crosschain precompile
+	crosschainPrecompileRouter := crosschainprecompile.NewRouter()
 	evmKeeper := evmkeeper.NewKeeper(
 		appCodec,
 		appKeepers.keys[evmtypes.StoreKey],
@@ -345,7 +345,7 @@ func NewAppKeeper(
 		[]evmkeeper.CustomContractFn{
 			func(_ sdk.Context, _ ethparams.Rules) vm.PrecompiledContract {
 				return crosschainprecompile.NewPrecompiledContract(
-					appKeepers.BankKeeper, appKeepers.GovKeeper, precompileRouter)
+					appKeepers.BankKeeper, appKeepers.GovKeeper, crosschainPrecompileRouter)
 			},
 			func(_ sdk.Context, _ ethparams.Rules) vm.PrecompiledContract {
 				return stakingprecompile.NewPrecompiledContract(
@@ -371,7 +371,7 @@ func NewAppKeeper(
 		authAddr,
 	)
 
-	// init cross chain module
+	// init crosschain module
 	appKeepers.BscKeeper = crosschainkeeper.NewKeeper(
 		appCodec,
 		bsctypes.ModuleName,
@@ -507,8 +507,8 @@ func NewAppKeeper(
 
 	appKeepers.CrosschainRouterKeeper = crosschainkeeper.NewRouterKeeper(crosschainRouter)
 
-	// cross chain precompile
-	precompileRouter.
+	// crosschain precompile
+	crosschainPrecompileRouter.
 		AddRoute(bsctypes.ModuleName, appKeepers.BscKeeper).
 		AddRoute(polygontypes.ModuleName, appKeepers.PolygonKeeper).
 		AddRoute(avalanchetypes.ModuleName, appKeepers.AvalancheKeeper).
@@ -517,6 +517,7 @@ func NewAppKeeper(
 		AddRoute(optimismtypes.ModuleName, appKeepers.OptimismKeeper).
 		AddRoute(layer2types.ModuleName, appKeepers.Layer2Keeper).
 		AddRoute(trontypes.ModuleName, appKeepers.TronKeeper)
+	crosschainPrecompileRouter.Seal()
 
 	// register the proposal types
 	govRouter := govv1beta1.NewRouter()
@@ -550,8 +551,7 @@ func NewAppKeeper(
 		appCodec,
 		authAddr,
 	)
-	appKeepers.IBCMiddlewareKeeper = ibcmiddlewarekeeper.NewKeeper(appCodec, appKeepers.EvmKeeper,
-		appKeepers.EthKeeper) // TODO: replace by crosschain keeper
+	appKeepers.IBCMiddlewareKeeper = ibcmiddlewarekeeper.NewKeeper(appCodec, appKeepers.EvmKeeper, appKeepers.EthKeeper)
 	ibcTransferModule := ibctransfer.NewIBCModule(appKeepers.IBCTransferKeeper)
 	transferIBCModule := ibcmiddleware.NewIBCMiddleware(appKeepers.IBCMiddlewareKeeper, appKeepers.IBCKeeper.ChannelKeeper, ibcTransferModule)
 

diff --git a/app/modules.go b/app/modules.go
@@ -129,7 +129,7 @@ func appModules(
 		layer2.NewAppModule(app.Layer2Keeper),
 		fxevm.NewAppModule(app.EvmKeeper, app.AccountKeeper, app.GetSubspace(evmtypes.ModuleName)),
 		feemarket.NewAppModule(app.FeeMarketKeeper, app.GetSubspace(feemarkettypes.ModuleName)),
-		erc20.NewAppModule(app.GetKey(erc20types.StoreKey), appCodec, app.Erc20Keeper, app.BankKeeper, app.CrossChainKeepers.ToSlice()),
+		erc20.NewAppModule(app.GetKey(erc20types.StoreKey), appCodec, app.Erc20Keeper, app.BankKeeper, app.CrosschainKeepers.ToSlice()),
 		migrate.NewAppModule(app.MigrateKeeper),
 		ibctransfer.NewAppModule(app.IBCTransferKeeper),
 		consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper),

diff --git a/contract/ICrossChain.go → contract/ICrosschain.go b/contract/ICrossChain.go → contract/ICrosschain.go
diff --git a/contract/compile.sh b/contract/compile.sh
@@ -31,8 +31,8 @@ echo "===> Compiling contracts"
 [[ ! -d "$project_dir/contract/artifacts" ]] && mkdir -p "$project_dir/contract/artifacts"
 
 # add core contracts
-contracts=(WFXUpgradable FIP20Upgradable ICrossChain IStaking IFxBridgeLogic IBridgeCallback IError IBridgeFeeQuote)
-contracts_test=(CrossChainTest StakingTest)
+contracts=(WFXUpgradable FIP20Upgradable ICrosschain IStaking IFxBridgeLogic IBridgeCallback IError IBridgeFeeQuote)
+contracts_test=(CrosschainTest StakingTest)
 # add 3rd party contracts
 contracts+=(ERC1967Proxy)
 contracts_test+=(ERC721TokenTest)

diff --git a/contract/contract.go b/contract/contract.go
@@ -14,7 +14,7 @@ const (
 	WFXLogicAddress   = "0x0000000000000000000000000000000000001002"
 
 	StakingAddress    = "0x0000000000000000000000000000000000001003"
-	CrossChainAddress = "0x0000000000000000000000000000000000001004"
+	CrosschainAddress = "0x0000000000000000000000000000000000001004"
 )
 
 var (

diff --git a/solidity/contracts/bridge/BridgeFeeOracle.sol b/solidity/contracts/bridge/BridgeFeeOracle.sol
@@ -7,7 +7,7 @@ import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/U
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 import {EnumerableSetUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/structs/EnumerableSetUpgradeable.sol";
 import {IBridgeFeeOracle} from "./IBridgeFee.sol";
-import {ICrossChain} from "./ICrossChain.sol";
+import {ICrosschain} from "./ICrosschain.sol";
 
 contract BridgeFeeOracle is
     IBridgeFeeOracle,
@@ -20,7 +20,7 @@ contract BridgeFeeOracle is
 
     bytes32 public constant QUOTE_ROLE = keccak256("QUOTE_ROLE");
 
-    address public crossChainContract;
+    address public crosschainContract;
     address public defaultOracle;
 
     struct State {
@@ -36,7 +36,7 @@ contract BridgeFeeOracle is
         __UUPSUpgradeable_init();
         __ReentrancyGuard_init();
 
-        crossChainContract = _crossChain;
+        crosschainContract = _crossChain;
 
         _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
@@ -53,11 +53,11 @@ contract BridgeFeeOracle is
     ) external onlyRole(QUOTE_ROLE) nonReentrant returns (bool) {
         if (oracleStatus[_oracle].isActive) return true;
         if (oracleStatus[_oracle].isBlacklisted) return false;
-        if (!ICrossChain(crossChainContract).hasOracle(_chainName, _oracle)) {
+        if (!ICrosschain(crosschainContract).hasOracle(_chainName, _oracle)) {
             return false;
         }
         if (
-            !ICrossChain(crossChainContract).isOracleOnline(_chainName, _oracle)
+            !ICrosschain(crosschainContract).isOracleOnline(_chainName, _oracle)
         ) {
             return false;
         }

diff --git a/solidity/contracts/bridge/ICrossChain.sol → solidity/contracts/bridge/ICrosschain.sol b/solidity/contracts/bridge/ICrossChain.sol → solidity/contracts/bridge/ICrosschain.sol
@@ -6,7 +6,7 @@ import {IBridgeCall} from "./IBridgeCall.sol";
 
 // NOTE: if using an interface to invoke the precompiled contract
 // need to use solidity version 0.8.10 and later.
-interface ICrossChain is IBridgeCall {
+interface ICrosschain is IBridgeCall {
     // Deprecated: please use `IBridgeCall.bridgeCall`
     function crossChain(
         address _token,

diff --git a/solidity/contracts/test/CrossChainTest.sol → solidity/contracts/test/CrosschainTest.sol b/solidity/contracts/test/CrossChainTest.sol → solidity/contracts/test/CrosschainTest.sol
@@ -3,13 +3,13 @@
 pragma solidity ^0.8.0;
 
 /* solhint-disable no-global-import */
-import "../bridge/ICrossChain.sol";
+import "../bridge/ICrosschain.sol";
 import "../fip20/IFIP20Upgradable.sol";
 
 /* solhint-enable no-global-import */
 /* solhint-disable custom-errors */
 
-contract CrossChainTest {
+contract CrosschainTest {
     address public constant CROSS_CHAIN_ADDRESS =
         address(0x0000000000000000000000000000000000001004);
 
@@ -50,7 +50,7 @@ contract CrossChainTest {
         }
 
         return
-            ICrossChain(CROSS_CHAIN_ADDRESS).crossChain{value: msg.value}(
+            ICrosschain(CROSS_CHAIN_ADDRESS).crossChain{value: msg.value}(
                 _token,
                 _receipt,
                 _amount,
@@ -65,7 +65,7 @@ contract CrossChainTest {
         bytes32 _target
     ) external view returns (uint256) {
         return
-            ICrossChain(CROSS_CHAIN_ADDRESS).bridgeCoinAmount(_token, _target);
+            ICrosschain(CROSS_CHAIN_ADDRESS).bridgeCoinAmount(_token, _target);
     }
 
     function bridgeCall(
@@ -79,7 +79,7 @@ contract CrossChainTest {
         bytes memory _memo
     ) internal returns (uint256) {
         return
-            ICrossChain(CROSS_CHAIN_ADDRESS).bridgeCall(
+            ICrosschain(CROSS_CHAIN_ADDRESS).bridgeCall(
                 _dstChain,
                 _receiver,
                 _tokens,