V4 candidate 4 remove create template and ask question

packages/contracts/development/contracts/IRealityETH.sol

@@ -3,8 +3,11 @@
 pragma solidity 0.8.20;
 
 import {IRealityETHCore} from "./IRealityETHCore.sol";
+
+// Features removed in v4
 import {IRealityETHCommitReveal} from "./IRealityETHCommitReveal.sol";
+import {IRealityETHCreateTemplateAndAskQuestion} from "./IRealityETHCreateTemplateAndAskQuestion.sol";
 
 /* solhint-disable func-name-mixedcase */
 
-interface IRealityETH is IRealityETHCore, IRealityETHCommitReveal {}
+interface IRealityETH is IRealityETHCore, IRealityETHCommitReveal, IRealityETHCreateTemplateAndAskQuestion {}

packages/contracts/development/contracts/IRealityETHCore.sol

@@ -77,7 +77,6 @@ interface IRealityETHCore is IBalanceHolder, IRealityETHErrors {
     function submitAnswerByArbitrator(bytes32 question_id, bytes32 answer, address answerer) external;
     function askQuestion(uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external payable returns (bytes32);
     function askQuestionWithMinBond(uint256 template_id, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce, uint256 min_bond) external payable returns (bytes32);
-    function createTemplateAndAskQuestion(string calldata content, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external payable returns (bytes32);
     function fundAnswerBounty(bytes32 question_id) external payable;
     function reopenQuestion(
         uint256 template_id,

packages/contracts/development/contracts/IRealityETHCore_ERC20.sol

@@ -86,7 +86,6 @@ interface IRealityETHCore_ERC20 is IBalanceHolder_ERC20, IRealityETHErrors_ERC20
     ) external;
     function claimWinnings(bytes32 question_id, bytes32[] calldata history_hashes, address[] calldata addrs, uint256[] calldata bonds, bytes32[] calldata answers) external;
     function createTemplate(string calldata content) external returns (uint256);
-    function createTemplateAndAskQuestion(string calldata content, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external returns (bytes32);
     function fundAnswerBountyERC20(bytes32 question_id, uint256 tokens) external;
     function notifyOfArbitrationRequest(bytes32 question_id, address requester, uint256 max_previous) external;
     function reopenQuestionERC20(

packages/contracts/development/contracts/IRealityETHCreateTemplateAndAskQuestion.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+pragma solidity 0.8.20;
+
+// This function was removed from reality.eth in version 4.
+interface IRealityETHCreateTemplateAndAskQuestion {
+    function createTemplateAndAskQuestion(string calldata content, string calldata question, address arbitrator, uint32 timeout, uint32 opening_ts, uint256 nonce) external payable returns (bytes32);
+}

packages/contracts/development/contracts/IRealityETH_ERC20.sol

@@ -2,9 +2,11 @@
 
 pragma solidity 0.8.20;
 
+// Features removed in v4
 import {IRealityETHCore_ERC20} from "./IRealityETHCore_ERC20.sol";
 import {IRealityETHCommitReveal_ERC20} from "./IRealityETHCommitReveal_ERC20.sol";
+import {IRealityETHCreateTemplateAndAskQuestion} from "./IRealityETHCreateTemplateAndAskQuestion.sol";
 
 /* solhint-disable func-name-mixedcase */
 
-interface IRealityETH_ERC20 is IRealityETHCore_ERC20, IRealityETHCommitReveal_ERC20 {}
+interface IRealityETH_ERC20 is IRealityETHCore_ERC20, IRealityETHCommitReveal_ERC20, IRealityETHCreateTemplateAndAskQuestion {}

packages/contracts/development/contracts/RealityETH-4.0.sol

@@ -127,34 +127,6 @@ contract RealityETH_v4_0 is BalanceHolder, IRealityETHCore, IRealityETHHistoryVe
         return id;
     }
 
-    /// @notice Create a new reusable template and use it to ask a question
-    /// @dev Template data is only stored in the event logs, but its block number is kept in contract storage.
-    /// @param content The template content
-    /// @param question A string containing the parameters that will be passed into the template to make the question
-    /// @param arbitrator The arbitration contract that will have the final word on the answer if there is a dispute
-    /// @param timeout How long the contract should wait after the answer is changed before finalizing on that answer
-    /// @param opening_ts If set, the earliest time it should be possible to answer the question.
-    /// @param nonce A user-specified nonce used in the question ID. Change it to repeat a question.
-    /// @return The ID of the newly-created template, which is created sequentially.
-    function createTemplateAndAskQuestion(
-        string memory content,
-        string memory question,
-        address arbitrator,
-        uint32 timeout,
-        uint32 opening_ts,
-        uint256 nonce
-    )
-        public
-        payable
-        returns (
-            // stateNotCreated is enforced by the internal _askQuestion
-            bytes32
-        )
-    {
-        uint256 template_id = createTemplate(content);
-        return askQuestion(template_id, question, arbitrator, timeout, opening_ts, nonce);
-    }
-
     /// @notice Ask a new question and return the ID
     /// @dev Template data is only stored in the event logs, but its block number is kept in contract storage.
     /// @param template_id The ID number of the template the question will use

packages/contracts/development/contracts/RealityETH_ERC20-4.0.sol

@@ -136,33 +136,6 @@ contract RealityETH_ERC20_v4_0 is BalanceHolder_ERC20, IRealityETHCore_ERC20, IR
         return id;
     }
 
-    /// @notice Create a new reusable template and use it to ask a question
-    /// @dev Template data is only stored in the event logs, but its block number is kept in contract storage.
-    /// @param content The template content
-    /// @param question A string containing the parameters that will be passed into the template to make the question
-    /// @param arbitrator The arbitration contract that will have the final word on the answer if there is a dispute
-    /// @param timeout How long the contract should wait after the answer is changed before finalizing on that answer
-    /// @param opening_ts If set, the earliest time it should be possible to answer the question.
-    /// @param nonce A user-specified nonce used in the question ID. Change it to repeat a question.
-    /// @return The ID of the newly-created template, which is created sequentially.
-    function createTemplateAndAskQuestion(
-        string memory content,
-        string memory question,
-        address arbitrator,
-        uint32 timeout,
-        uint32 opening_ts,
-        uint256 nonce
-    )
-        public
-        returns (
-            // stateNotCreated is enforced by the internal _askQuestion
-            bytes32
-        )
-    {
-        uint256 template_id = createTemplate(content);
-        return askQuestion(template_id, question, arbitrator, timeout, opening_ts, nonce);
-    }
-
     /// @notice Ask a new question without a bounty and return the ID
     /// @dev Template data is only stored in the event logs, but its block number is kept in contract storage.
     /// @dev Calling without the token param will only work if there is no arbitrator-set question fee.