From 5534a6754ed870b99aa8f936eae108ea27e67679 Mon Sep 17 00:00:00 2001 From: elenadimitrova Date: Tue, 3 Nov 2020 16:27:20 +0200 Subject: [PATCH] Independently compile contracts with ABIEncoderV2 due to https://github.com/ethereum/solidity/issues/9573 --- .../{ => ApprovedTransfer}/ApprovedTransfer.sol | 10 +++++----- .../{ => RelayerManager}/RelayerManager.sol | 14 +++++++------- .../{ => TokenExchanger}/TokenExchanger.sol | 10 +++++----- .../{ => TransferManager}/TransferManager.sol | 14 +++++++------- package.json | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) rename contracts/modules/{ => ApprovedTransfer}/ApprovedTransfer.sol (96%) rename contracts/modules/{ => RelayerManager}/RelayerManager.sol (97%) rename contracts/modules/{ => TokenExchanger}/TokenExchanger.sol (98%) rename contracts/modules/{ => TransferManager}/TransferManager.sol (98%) diff --git a/contracts/modules/ApprovedTransfer.sol b/contracts/modules/ApprovedTransfer/ApprovedTransfer.sol similarity index 96% rename from contracts/modules/ApprovedTransfer.sol rename to contracts/modules/ApprovedTransfer/ApprovedTransfer.sol index 1cddec440..4f1d5bcf4 100644 --- a/contracts/modules/ApprovedTransfer.sol +++ b/contracts/modules/ApprovedTransfer/ApprovedTransfer.sol @@ -17,11 +17,11 @@ pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; -import "./common/Utils.sol"; -import "./common/LimitUtils.sol"; -import "./common/BaseTransfer.sol"; -import "../infrastructure/storage/ILimitStorage.sol"; -import "../infrastructure/storage/IGuardianStorage.sol"; +import "../common/Utils.sol"; +import "../common/LimitUtils.sol"; +import "../common/BaseTransfer.sol"; +import "../../infrastructure/storage/ILimitStorage.sol"; +import "../../infrastructure/storage/IGuardianStorage.sol"; /** * @title ApprovedTransfer diff --git a/contracts/modules/RelayerManager.sol b/contracts/modules/RelayerManager/RelayerManager.sol similarity index 97% rename from contracts/modules/RelayerManager.sol rename to contracts/modules/RelayerManager/RelayerManager.sol index f05b36e8e..64ccf3cf4 100644 --- a/contracts/modules/RelayerManager.sol +++ b/contracts/modules/RelayerManager/RelayerManager.sol @@ -17,13 +17,13 @@ pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; -import "./common/Utils.sol"; -import "./common/BaseFeature.sol"; -import "./common/GuardianUtils.sol"; -import "./common/LimitUtils.sol"; -import "../infrastructure/storage/ILimitStorage.sol"; -import "../infrastructure/ITokenPriceRegistry.sol"; -import "../infrastructure/storage/IGuardianStorage.sol"; +import "../common/Utils.sol"; +import "../common/BaseFeature.sol"; +import "../common/GuardianUtils.sol"; +import "../common/LimitUtils.sol"; +import "../../infrastructure/storage/ILimitStorage.sol"; +import "../../infrastructure/ITokenPriceRegistry.sol"; +import "../../infrastructure/storage/IGuardianStorage.sol"; /** * @title RelayerManager diff --git a/contracts/modules/TokenExchanger.sol b/contracts/modules/TokenExchanger/TokenExchanger.sol similarity index 98% rename from contracts/modules/TokenExchanger.sol rename to contracts/modules/TokenExchanger/TokenExchanger.sol index 402c37337..38bb01921 100644 --- a/contracts/modules/TokenExchanger.sol +++ b/contracts/modules/TokenExchanger/TokenExchanger.sol @@ -17,11 +17,11 @@ pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; -import "./common/BaseFeature.sol"; -import "../../lib/other/ERC20.sol"; -import "../../lib/paraswap/IAugustusSwapper.sol"; -import "../infrastructure/ITokenPriceRegistry.sol"; -import "../infrastructure/IDexRegistry.sol"; +import "../common/BaseFeature.sol"; +import "../../../lib/other/ERC20.sol"; +import "../../../lib/paraswap/IAugustusSwapper.sol"; +import "../../infrastructure/ITokenPriceRegistry.sol"; +import "../../infrastructure/IDexRegistry.sol"; /** * @title TokenExchanger diff --git a/contracts/modules/TransferManager.sol b/contracts/modules/TransferManager/TransferManager.sol similarity index 98% rename from contracts/modules/TransferManager.sol rename to contracts/modules/TransferManager/TransferManager.sol index 1b209e9de..4ec179b29 100644 --- a/contracts/modules/TransferManager.sol +++ b/contracts/modules/TransferManager/TransferManager.sol @@ -17,13 +17,13 @@ pragma solidity ^0.6.12; pragma experimental ABIEncoderV2; -import "./common/Utils.sol"; -import "./common/BaseTransfer.sol"; -import "./common/LimitUtils.sol"; -import "../infrastructure/storage/ILimitStorage.sol"; -import "../infrastructure/storage/ITransferStorage.sol"; -import "../infrastructure/ITokenPriceRegistry.sol"; -import "../../lib/other/ERC20.sol"; +import "../common/Utils.sol"; +import "../common/BaseTransfer.sol"; +import "../common/LimitUtils.sol"; +import "../../infrastructure/storage/ILimitStorage.sol"; +import "../../infrastructure/storage/ITransferStorage.sol"; +import "../../infrastructure/ITokenPriceRegistry.sol"; +import "../../../lib/other/ERC20.sol"; /** * @title TransferManager diff --git a/package.json b/package.json index 8889bd1cc..82ba2c15d 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "compile:infrastructure_0.5": "npx etherlime compile --workingDirectory contracts/infrastructure_0.5 --solcVersion 0.5.4 --runs=999", "compile:infrastructure_0.6": "npx etherlime compile --workingDirectory contracts/infrastructure --runs=999", "compile:infrastructure": "npm run compile:infrastructure_0.5 && npm run compile:infrastructure_0.6", - "compile:modules": "npx etherlime compile --workingDirectory contracts/modules --runs=999", + "compile:modules": "npx etherlime compile --workingDirectory contracts/modules --runs=999 && npx etherlime compile --workingDirectory contracts/modules/ApprovedTransfer --runs=999 && npx etherlime compile --workingDirectory contracts/modules/RelayerManager --runs=999 && npx etherlime compile --workingDirectory contracts/modules/TransferManager --runs=999 && npx etherlime compile --workingDirectory contracts/modules/TokenExchanger --runs=999", "compile:wallet": "npx etherlime compile --workingDirectory contracts/wallet --runs=999", "compile:test": "npx etherlime compile --workingDirectory contracts-test --runs=999", "compile": "npm run compile:infrastructure && npm run compile:modules && npm run compile:wallet",