Merge e38b46d into 8d40fea

aragon · Jun 12, 2020 · b61b868 · b61b868
2 parents 8d40fea + e38b46d
commit b61b868
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 18 deletions.
diff --git a/contracts/common/IForwarder.sol b/contracts/common/IForwarder.sol
diff --git a/contracts/forwarding/IForwarder.sol b/contracts/forwarding/IForwarder.sol
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier:    MIT
+ */
+
+pragma solidity ^0.4.24;
+
+
+interface IForwarder {
+    function isForwarder() external pure returns (bool);
+
+    function canForward(address sender, bytes evmCallScript) external view returns (bool);
+
+    function forward(bytes evmCallScript) external;
+}
diff --git a/contracts/common/IForwarderFee.sol → contracts/forwarding/IForwarderFee.sol b/contracts/common/IForwarderFee.sol → contracts/forwarding/IForwarderFee.sol
diff --git a/contracts/forwarding/IForwarderPayable.sol b/contracts/forwarding/IForwarderPayable.sol
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier:    MIT
+ */
+
+pragma solidity ^0.4.24;
+
+
+interface IForwarderPayable {
+    function isForwarder() external pure returns (bool);
+
+    function canForward(address sender, bytes evmCallScript) external view returns (bool);
+
+    function forward(bytes evmCallScript) external payable;
+}
diff --git a/contracts/forwarding/IForwarderV2.sol b/contracts/forwarding/IForwarderV2.sol
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier:    MIT
+ */
+
+pragma solidity ^0.4.24;
+
+import "./IForwarderPayable.sol";
+
+
+// TODO: Cannot inherit interfaces in Solidity 0.4.24
+contract IForwarderV2 is IForwarderPayable {
+    function forward(bytes evmCallScript, bytes context) external payable;
+}