renaming josojo-> realityETH

RealityETH · Jan 3, 2024 · bea2d5c · bea2d5c
1 parent 2b33e6b
commit bea2d5c
Show file tree

Hide file tree

Showing 25 changed files with 400 additions and 125 deletions.
diff --git a/contracts/ForkableBridge.sol b/contracts/ForkableBridge.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import {PolygonZkEVMBridge, IBasePolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {TokenWrapped} from "@josojo/zkevm-contracts/contracts/lib/TokenWrapped.sol";
+import {PolygonZkEVMBridge, IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IForkableBridge} from "./interfaces/IForkableBridge.sol";
 import {IForkonomicToken} from "./interfaces/IForkonomicToken.sol";

diff --git a/contracts/ForkableGlobalExitRoot.sol b/contracts/ForkableGlobalExitRoot.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import {PolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMGlobalExitRoot.sol";
-import {TokenWrapped} from "@josojo/zkevm-contracts/contracts/lib/TokenWrapped.sol";
+import {PolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMGlobalExitRoot.sol";
+import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";

diff --git a/contracts/ForkableZkEVM.sol b/contracts/ForkableZkEVM.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import {PolygonZkEVM} from "@josojo/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVM.sol";
-import {IPolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
-import {IVerifierRollup} from "@josojo/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {PolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVM.sol";
+import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
+import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
 
-import {TokenWrapped} from "@josojo/zkevm-contracts/contracts/lib/TokenWrapped.sol";
+import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {IForkableZkEVM} from "./interfaces/IForkableZkEVM.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";

diff --git a/contracts/ForkingManager.sol b/contracts/ForkingManager.sol
@@ -7,12 +7,12 @@ import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/Addr
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {IPolygonZkEVM} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
-import {IPolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
+import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
+import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {IBasePolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IVerifierRollup} from "@josojo/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
+import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";
 import {IForkableBridge} from "./interfaces/IForkableBridge.sol";
 import {IForkableZkEVM} from "./interfaces/IForkableZkEVM.sol";

diff --git a/contracts/L1GlobalChainInfoPublisher.sol b/contracts/L1GlobalChainInfoPublisher.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.20;
 
 import {IForkingManager} from "./interfaces/IForkingManager.sol";
 import {IForkableStructure} from "./interfaces/IForkableStructure.sol";
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IPolygonZkEVM} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
 
 contract L1GlobalChainInfoPublisher {
     /// @notice Function to send the data about a fork to a contract on L2.

diff --git a/contracts/L1GlobalForkRequester.sol b/contracts/L1GlobalForkRequester.sol
@@ -9,15 +9,15 @@ pragma solidity ^0.8.20;
 */
 
 import {IForkingManager} from "./interfaces/IForkingManager.sol";
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IPolygonZkEVM} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
 import {IForkonomicToken} from "./interfaces/IForkonomicToken.sol";
 
 // NB We'd normally use the interface IForkableBridge here but it causes an error:
 //  Error (5005): Linearization of inheritance graph impossible
 import {ForkableBridge} from "./ForkableBridge.sol";
 
-import {IBridgeMessageReceiver} from "@josojo/zkevm-contracts/contracts/interfaces/IBridgeMessageReceiver.sol";
+import {IBridgeMessageReceiver} from "@RealityETH/zkevm-contracts/contracts/interfaces/IBridgeMessageReceiver.sol";
 
 import {MoneyBox} from "./mixin/MoneyBox.sol";
 import {CalculateMoneyBoxAddress} from "./lib/CalculateMoneyBoxAddress.sol";

diff --git a/contracts/L2ChainInfo.sol b/contracts/L2ChainInfo.sol
@@ -11,7 +11,7 @@ It must be called after a fork until it's updated.
 Queries against it will revert until the update is done.
 */
 
-import {IBridgeMessageReceiver} from "@josojo/zkevm-contracts/contracts/interfaces/IBridgeMessageReceiver.sol";
+import {IBridgeMessageReceiver} from "@RealityETH/zkevm-contracts/contracts/interfaces/IBridgeMessageReceiver.sol";
 
 contract L2ChainInfo is IBridgeMessageReceiver {
     // These are the same for all forks

diff --git a/contracts/L2ForkArbitrator.sol b/contracts/L2ForkArbitrator.sol
@@ -10,8 +10,8 @@ import {L1GlobalForkRequester} from "./L1GlobalForkRequester.sol";
 import {IRealityETH} from "./interfaces/IRealityETH.sol";
 import {CalculateMoneyBoxAddress} from "./lib/CalculateMoneyBoxAddress.sol";
 
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IBridgeMessageReceiver} from "@josojo/zkevm-contracts/contracts/interfaces/IBridgeMessageReceiver.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {IBridgeMessageReceiver} from "@RealityETH/zkevm-contracts/contracts/interfaces/IBridgeMessageReceiver.sol";
 
 /*
 This contract is the arbitrator used by governance propositions for AdjudicationFramework contracts.

diff --git a/contracts/interfaces/IForkableBridge.sol b/contracts/interfaces/IForkableBridge.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.20;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IBasePolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/interfaces/IBasePolygonZkEVMGlobalExitRoot.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IBasePolygonZkEVMGlobalExitRoot.sol";
 import {IForkableStructure} from "./IForkableStructure.sol";
 
 interface IForkableBridge is IForkableStructure, IPolygonZkEVMBridge {

diff --git a/contracts/interfaces/IForkableGlobalExitRoot.sol b/contracts/interfaces/IForkableGlobalExitRoot.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IForkableStructure} from "./IForkableStructure.sol";
-import {IPolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
+import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
 
 interface IForkableGlobalExitRoot is
     IForkableStructure,

diff --git a/contracts/interfaces/IForkableZkEVM.sol b/contracts/interfaces/IForkableZkEVM.sol
@@ -2,11 +2,11 @@
 pragma solidity ^0.8.20;
 
 import {IForkableStructure} from "./IForkableStructure.sol";
-import {IPolygonZkEVM} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
-import {IPolygonZkEVMGlobalExitRoot} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
+import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
+import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {IVerifierRollup} from "@josojo/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
-import {IPolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
+import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
+import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
 
 interface IForkableZkEVM is IForkableStructure, IPolygonZkEVM {
     // @dev: This function is used to initialize the contract.

diff --git a/contracts/lib/BridgeAssetOperations.sol b/contracts/lib/BridgeAssetOperations.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
-import {PolygonZkEVMBridge} from "@josojo/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
-import {TokenWrapped} from "@josojo/zkevm-contracts/contracts/lib/TokenWrapped.sol";
+import {PolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
+import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
 import {ForkableBridge} from "../ForkableBridge.sol";
 import {IForkonomicToken} from "../interfaces/IForkonomicToken.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";