aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-04-18 06:35:27 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:56:18 +0800
commitac0c35424b75bf365301819217960be2602e1c44 (patch)
tree0f848416b60c0eded3c2f5daa2fa893518b8e8d3 /packages/contracts/src
parent41242a66602f364dac712d04ebaaa969d296d4bc (diff)
downloaddexon-0x-contracts-ac0c35424b75bf365301819217960be2602e1c44.tar.gz
dexon-0x-contracts-ac0c35424b75bf365301819217960be2602e1c44.tar.zst
dexon-0x-contracts-ac0c35424b75bf365301819217960be2602e1c44.zip
Reverting earlier change: interfaces now inherit from other interfaces
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxy.sol4
-rw-r--r--packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxyDispatcher.sol8
2 files changed, 10 insertions, 2 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxy.sol
index 528915227..5e2ba4843 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxy.sol
@@ -18,7 +18,9 @@
pragma solidity ^0.4.21;
-contract IAssetProxy {
+import "../../../utils/Authorizable/IAuthorizable.sol";
+
+contract IAssetProxy is IAuthorizable {
/// @dev Transfers assets. Either succeeds or throws.
/// @param assetMetadata Byte array encoded for the respective asset proxy.
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxyDispatcher.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxyDispatcher.sol
index bd04539f6..912a413e8 100644
--- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxyDispatcher.sol
+++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/IAssetProxyDispatcher.sol
@@ -18,9 +18,15 @@
pragma solidity ^0.4.21;
+import "../../utils/Ownable/IOwnable.sol";
+import "../../utils/Authorizable/IAuthorizable.sol";
import "./IAssetProxy.sol";
-contract IAssetProxyDispatcher {
+contract IAssetProxyDispatcher is
+ IOwnable,
+ IAuthorizable,
+ IAssetProxy
+{
// Logs registration of new asset proxy
event AssetProxySet(