prepared repo

rarimo · Oct 2, 2023 · a0faff2 · a0faff2
1 parent b6a542c
commit a0faff2
Show file tree

Hide file tree

Showing 19 changed files with 246 additions and 353 deletions.
diff --git a/README.md b/README.md
@@ -1 +1 @@
-# EVM Swap V2
+# EVM Swap Contracts V2
diff --git a/contracts/SwapDiamond.sol b/contracts/SwapDiamond.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "@dlsl/dev-modules/diamond/presets/OwnableDiamond/OwnableDiamond.sol";
+import "@solarity/solidity-lib/diamond/presets/OwnableDiamond/OwnableDiamond.sol";
 
 import "./SwapDiamondStorage.sol";
 

diff --git a/contracts/imports/Imports.sol b/contracts/imports/Imports.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "@rarimo/evm-bridge/tokens/ERC20MintableBurnable.sol";
-import "@rarimo/evm-bridge/tokens/ERC721MintableBurnable.sol";
-import "@rarimo/evm-bridge/tokens/ERC1155MintableBurnable.sol";
-import "@rarimo/evm-bridge/facade/BridgeFacade.sol";
-import "@rarimo/evm-bridge/bridge/Bridge.sol";
+import "@rarimo/evm-bridge-contracts/tokens/ERC20MintableBurnable.sol";
+import "@rarimo/evm-bridge-contracts/tokens/ERC721MintableBurnable.sol";
+import "@rarimo/evm-bridge-contracts/tokens/ERC1155MintableBurnable.sol";
+import "@rarimo/evm-bridge-contracts/facade/BridgeFacade.sol";
+import "@rarimo/evm-bridge-contracts/bridge/Bridge.sol";
diff --git a/contracts/integration-facets/routers/BridgeRouter.sol b/contracts/integration-facets/routers/BridgeRouter.sol
@@ -3,11 +3,11 @@ pragma solidity ^0.8.9;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "@dlsl/dev-modules/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
+import "@solarity/solidity-lib/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
 
-import "@rarimo/evm-bridge/interfaces/facade/IBridgeFacade.sol";
-import "@rarimo/evm-bridge/interfaces/bundle/IBundler.sol";
-import {Constants as BridgeConstants} from "@rarimo/evm-bridge/libs/Constants.sol";
+import "@rarimo/evm-bridge-contracts/interfaces/facade/IBridgeFacade.sol";
+import "@rarimo/evm-bridge-contracts/interfaces/bundle/IBundler.sol";
+import {Constants as BridgeConstants} from "@rarimo/evm-bridge-contracts/libs/Constants.sol";
 
 import "../../libs/Approver.sol";
 import "../../libs/Constants.sol";

diff --git a/contracts/integration-facets/routers/TraderJoeRouter.sol b/contracts/integration-facets/routers/TraderJoeRouter.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.9;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "@dlsl/dev-modules/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
+import "@solarity/solidity-lib/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
 
 import "@traderjoe-xyz/core/contracts/traderjoe/interfaces/IJoeRouter01.sol";
 

diff --git a/contracts/integration-facets/routers/UniswapV2Router.sol b/contracts/integration-facets/routers/UniswapV2Router.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.9;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "@dlsl/dev-modules/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
+import "@solarity/solidity-lib/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
 
 import "@uniswap/v2-periphery/contracts/interfaces/IUniswapV2Router01.sol";
 

diff --git a/contracts/integration-facets/routers/UniswapV3Router.sol b/contracts/integration-facets/routers/UniswapV3Router.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.9;
 
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "@dlsl/dev-modules/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
+import "@solarity/solidity-lib/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
 
 import "@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol";
 import "@uniswap/v3-periphery/contracts/interfaces/IPeripheryPayments.sol";

diff --git a/contracts/integration-facets/routers/WrapRouter.sol b/contracts/integration-facets/routers/WrapRouter.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "@dlsl/dev-modules/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
+import "@solarity/solidity-lib/diamond/presets/OwnableDiamond/OwnableDiamondStorage.sol";
 
 import "../../libs/Resolver.sol";
 import "../../interfaces/tokens/IWrappedNative.sol";

diff --git a/contracts/master-facet/MasterRouter.sol b/contracts/master-facet/MasterRouter.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.9;
 import "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";
 import "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";
 
-import "@dlsl/dev-modules/diamond/DiamondStorage.sol";
+import "@solarity/solidity-lib/diamond/DiamondStorage.sol";
 
 import "../libs/Commands.sol";
 import "../libs/ErrorHelper.sol";

diff --git a/contracts/mock/dex/UniswapV3RouterMock.sol b/contracts/mock/dex/UniswapV3RouterMock.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "@dlsl/dev-modules/libs/arrays/ArrayHelper.sol";
+import "@solarity/solidity-lib/libs/arrays/ArrayHelper.sol";
 
 import "@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol";
 

diff --git a/contracts/package.json b/contracts/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@rarimo/evm-swap-contracts-v2",
+  "version": "1.0.0",
+  "author": "Rarimo Foundation",
+  "keywords": [
+    "solidity",
+    "ethereum",
+    "smart-contracts"
+  ],
+  "files": [
+    "**/*.sol",
+    "!mock/**/*",
+    "!imports/**/*"
+  ],
+  "dependencies": {
+    "@openzeppelin/contracts": "4.6.0",
+    "@openzeppelin/contracts-upgradeable": "4.6.0",
+    "@solarity/solidity-lib": "2.5.7",
+    "@rarimo/evm-bridge-contracts": "1.0.0"
+  }
+}
diff --git a/deploy/1_SwapDiamond.migration.ts b/deploy/1_SwapDiamond.migration.ts
@@ -1,4 +1,4 @@
-import { Deployer, Logger } from "@dlsl/hardhat-migrate";
+import { Deployer, Logger } from "@solarity/hardhat-migrate";
 import { artifacts } from "hardhat";
 import config from "@/deploy/config/config.json";
 

diff --git a/deploy/2_SetupFacets.migration.ts b/deploy/2_SetupFacets.migration.ts
@@ -1,4 +1,4 @@
-import { Deployer, Logger } from "@dlsl/hardhat-migrate";
+import { Deployer, Logger } from "@solarity/hardhat-migrate";
 import { artifacts } from "hardhat";
 import { SelectorType } from "@/test/utils/contants";
 import { getBuilder } from "@/test/utils/builder";

diff --git a/deploy/3_Setters.migration.ts b/deploy/3_Setters.migration.ts
@@ -1,4 +1,4 @@
-import { Deployer, Logger } from "@dlsl/hardhat-migrate";
+import { Deployer, Logger } from "@solarity/hardhat-migrate";
 import { artifacts } from "hardhat";
 import config from "@/deploy/config/config.json";
 

diff --git a/deploy/4_Ownership.migration.ts b/deploy/4_Ownership.migration.ts
@@ -1,4 +1,4 @@
-import { Deployer, Logger } from "@dlsl/hardhat-migrate";
+import { Deployer, Logger } from "@solarity/hardhat-migrate";
 import { artifacts } from "hardhat";
 import config from "@/deploy/config/config.json";
 

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -3,9 +3,9 @@ import "@nomiclabs/hardhat-truffle5";
 import "@nomiclabs/hardhat-ethers";
 import "@typechain/hardhat";
 import "@nomicfoundation/hardhat-chai-matchers";
-import "@dlsl/hardhat-migrate";
-import "@dlsl/hardhat-gobind";
-import "@dlsl/hardhat-markup";
+import "@solarity/hardhat-migrate";
+import "@solarity/hardhat-gobind";
+import "@solarity/hardhat-markup";
 import "hardhat-contract-sizer";
 import "hardhat-gas-reporter";
 import "solidity-coverage";