contracts: modify api versioning to new ContractsApi functions

frame/contracts/src/lib.rs

@@ -1359,18 +1359,6 @@ sp_api::decl_runtime_apis! {
 		Hash: Codec,
 		EventRecord: Codec,
 	{
-		/// Perform a call from a specified account to a given contract.
-		///
-		/// See [`crate::Pallet::bare_call`].
-		fn call(
-			origin: AccountId,
-			dest: AccountId,
-			value: Balance,
-			gas_limit: Option<Weight>,
-			storage_deposit_limit: Option<Balance>,
-			input_data: Vec<u8>,
-		) -> ContractExecResult<Balance>;
-
 		/// Perform a call from a specified account to a given contract.
 		///
 		/// See [`crate::Pallet::bare_call`].
@@ -1387,30 +1375,41 @@ sp_api::decl_runtime_apis! {
 		/// Instantiate a new contract.
 		///
 		/// See `[crate::Pallet::bare_instantiate]`.
-		fn instantiate(
+		#[api_version(3)]
+		fn instantiate_v3(
 			origin: AccountId,
 			value: Balance,
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			code: Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> ContractInstantiateResult<AccountId, Balance>;
+		) -> ContractInstantiateResultWEvents<AccountId, Balance, EventRecord>;
+
+		/// Perform a call from a specified account to a given contract.
+		///
+		/// See [`crate::Pallet::bare_call`].
+		fn call(
+			origin: AccountId,
+			dest: AccountId,
+			value: Balance,
+			gas_limit: Option<Weight>,
+			storage_deposit_limit: Option<Balance>,
+			input_data: Vec<u8>,
+		) -> ContractExecResult<Balance>;
 
 		/// Instantiate a new contract.
 		///
 		/// See `[crate::Pallet::bare_instantiate]`.
-		#[api_version(3)]
-		fn instantiate_v3(
+		fn instantiate(
 			origin: AccountId,
 			value: Balance,
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			code: Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> ContractInstantiateResultWEvents<AccountId, Balance, EventRecord>;
-
+		) -> ContractInstantiateResult<AccountId, Balance>;
 
 		/// Upload new code without instantiating a contract from it.
 		///