fix transfer call indexes

app-libs/stf/src/trusted_call.rs

@@ -24,11 +24,14 @@ use std::vec::Vec;
 use crate::{helpers::ensure_enclave_signer_account, StfError, TrustedOperation};
 use codec::{Compact, Decode, Encode};
 use frame_support::{ensure, traits::UnfilteredDispatchable};
+#[cfg(feature = "evm")]
+use ita_sgx_runtime::{AddressMapping, HashedAddressMapping};
 pub use ita_sgx_runtime::{Balance, Index};
 use ita_sgx_runtime::{Runtime, System};
 use itp_node_api::metadata::{provider::AccessNodeMetadata, NodeMetadataTrait};
 use itp_node_api_metadata::{
-	pallet_enclave_bridge::EnclaveBridgeCallIndexes, pallet_proxy::ProxyCallIndexes,
+	pallet_balances::BalancesCallIndexes, pallet_enclave_bridge::EnclaveBridgeCallIndexes,
+	pallet_proxy::ProxyCallIndexes,
 };
 use itp_stf_interface::ExecuteCall;
 use itp_stf_primitives::types::{AccountId, KeyPair, ShardIdentifier, Signature};
@@ -39,9 +42,6 @@ use sp_io::hashing::blake2_256;
 use sp_runtime::{traits::Verify, MultiAddress};
 use std::{format, prelude::v1::*, sync::Arc};
 
-#[cfg(feature = "evm")]
-use ita_sgx_runtime::{AddressMapping, HashedAddressMapping};
-
 #[cfg(feature = "evm")]
 use crate::evm_helpers::{create_code_hash, evm_create2_address, evm_create_address};
 
@@ -256,9 +256,8 @@ where
 				// todo: insert correct vault accountid here
 				let vault_address = Address::from(AccountId::from([0u8; 32]));
 				let vault_transfer_call = OpaqueCall::from_tuple(&(
-					//node_metadata_repo
-					//	.get_from_metadata(|m| m.transfer_keep_alive_call_indexes())??,
-					[0u8, 0u8],
+					node_metadata_repo
+						.get_from_metadata(|m| m.transfer_keep_alive_call_indexes())??,
 					Address::from(beneficiary),
 					Compact(value),
 				));

core-primitives/node-api/metadata/src/metadata_mocks.rs

@@ -156,15 +156,15 @@ impl ProxyCallIndexes for NodeMetadataMock {
 }
 
 impl BalancesCallIndexes for NodeMetadataMock {
-	fn transfer_call_index(&self) -> Result<[u8; 2]> {
+	fn transfer_call_indexes(&self) -> Result<[u8; 2]> {
 		Ok([self.balances_module, self.transfer])
 	}
 
-	fn transfer_keep_alive_call_index(&self) -> Result<[u8; 2]> {
+	fn transfer_keep_alive_call_indexes(&self) -> Result<[u8; 2]> {
 		Ok([self.balances_module, self.transfer_keep_alive])
 	}
 
-	fn transfer_allow_death_call_index(&self) -> Result<[u8; 2]> {
+	fn transfer_allow_death_call_indexes(&self) -> Result<[u8; 2]> {
 		Ok([self.balances_module, self.transfer_allow_death])
 	}
 }

core-primitives/node-api/metadata/src/pallet_balances.rs

@@ -21,23 +21,23 @@ use crate::{error::Result, NodeMetadata};
 const BALANCES: &str = "Balances";
 
 pub trait BalancesCallIndexes {
-	fn transfer_call_index(&self) -> Result<[u8; 2]>;
+	fn transfer_call_indexes(&self) -> Result<[u8; 2]>;
 
-	fn transfer_keep_alive_call_index(&self) -> Result<[u8; 2]>;
+	fn transfer_keep_alive_call_indexes(&self) -> Result<[u8; 2]>;
 
-	fn transfer_allow_death_call_index(&self) -> Result<[u8; 2]>;
+	fn transfer_allow_death_call_indexes(&self) -> Result<[u8; 2]>;
 }
 
 impl BalancesCallIndexes for NodeMetadata {
-	fn transfer_call_index(&self) -> Result<[u8; 2]> {
+	fn transfer_call_indexes(&self) -> Result<[u8; 2]> {
 		self.call_indexes(BALANCES, "transfer")
 	}
 
-	fn transfer_keep_alive_call_index(&self) -> Result<[u8; 2]> {
+	fn transfer_keep_alive_call_indexes(&self) -> Result<[u8; 2]> {
 		self.call_indexes(BALANCES, "transfer_keep_alive")
 	}
 
-	fn transfer_allow_death_call_index(&self) -> Result<[u8; 2]> {
+	fn transfer_allow_death_call_indexes(&self) -> Result<[u8; 2]> {
 		self.call_indexes(BALANCES, "transfer_allow_death")
 	}
 }

core/parentchain/indirect-calls-executor/src/filter_metadata.rs

@@ -174,10 +174,13 @@ where
 		let index = xt.call_index;
 		let call_args = &mut &xt.call_args[..];
 		log::trace!("[TransferToAliceShieldsFundsFilter] attempting to execute indirect call with index {:?}", index);
-		if index == metadata.transfer_call_index().ok()?
-			|| index == metadata.transfer_allow_death_call_index().ok()?
+		if index == metadata.transfer_call_indexes().ok()?
+			|| index == metadata.transfer_keep_alive_call_indexes().ok()?
+			|| index == metadata.transfer_allow_death_call_indexes().ok()?
 		{
-			log::debug!("found `transfer` or `transfer_allow_death` call.");
+			log::debug!(
+				"found `transfer` or `transfer_allow_death` or `transfer_keep_alive` call."
+			);
 			let args = decode_and_log_error::<TransferToAliceShieldsFundsArgs>(call_args)?;
 			if args.destination == ALICE_ACCOUNT_ID.into() {
 				Some(IndirectCall::TransferToAliceShieldsFunds(args))