fix: 🐛 manage API v6 case in Eth::estimate_gas

Author: manuelmauro

client/rpc/src/eth/execute.rs

@@ -694,6 +694,7 @@ where
 					value,
 					data,
 					access_list,
+					authorization_list,
 					..
 				} = request;
 
@@ -767,8 +768,8 @@ where
 							.map_err(|err| internal_err(format!("execution fatal: {err:?}")))?;
 
 							(info.exit_reason, info.value, info.used_gas)
-						} else {
-							// Post-london + access list support
+						} else if api_version == 5 {
+							// Post-london + access list support (version 5)
 							let encoded_params = Encode::encode(&(
 								&from.unwrap_or_default(),
 								&to,
@@ -821,6 +822,78 @@ where
 								.map_err(|err| internal_err(format!("execution fatal: {err:?}")))?;
 
 							(info.exit_reason, info.value, info.used_gas.effective)
+						} else if api_version == 6 {
+							// Pectra - authorization list support (EIP-7702)
+							let access_list = access_list
+								.unwrap_or_default()
+								.into_iter()
+								.map(|item| (item.address, item.storage_keys))
+								.collect::<Vec<(sp_core::H160, Vec<H256>)>>();
+
+							let authorization_list = authorization_list
+								.unwrap_or_default()
+								.iter()
+								.map(|d| {
+									(
+										U256::from(d.chain_id),
+										d.address,
+										d.nonce,
+										d.authorizing_address(),
+									)
+								})
+								.collect::<Vec<(U256, H160, U256, H160)>>();
+
+							let encoded_params = Encode::encode(&(
+								&from.unwrap_or_default(),
+								&to,
+								&data,
+								&value.unwrap_or_default(),
+								&gas_limit,
+								&max_fee_per_gas,
+								&max_priority_fee_per_gas,
+								&None::<Option<U256>>,
+								&estimate_mode,
+								&Some(
+									access_list
+								),
+								&Some(authorization_list),
+							));
+
+							// Proof size recording
+							let recorder: sp_trie::recorder::Recorder<HashingFor<B>> = Default::default();
+							let ext = sp_trie::proof_size_extension::ProofSizeExt::new(recorder.clone());
+							let mut exts = Extensions::new();
+							exts.register(ext);
+
+							let params = CallApiAtParams {
+								at: substrate_hash,
+								function: "EthereumRuntimeRPCApi_call",
+								arguments: encoded_params,
+								overlayed_changes: &RefCell::new(Default::default()),
+								call_context: CallContext::Offchain,
+								recorder: &Some(recorder),
+								extensions: &RefCell::new(exts),
+							};
+
+							let info = self
+								.client
+								.call_api_at(params)
+								.and_then(|r| {
+									Result::map_err(
+										<Result<ExecutionInfoV2::<Vec<u8>>, DispatchError> as Decode>::decode(&mut &r[..]),
+										|error| sp_api::ApiError::FailedToDecodeReturnValue {
+											function: "EthereumRuntimeRPCApi_call",
+											error,
+											raw: r
+										},
+									)
+								})
+								.map_err(|err| internal_err(format!("runtime error: {err}")))?
+								.map_err(|err| internal_err(format!("execution fatal: {err:?}")))?;
+
+							(info.exit_reason, info.value, info.used_gas.effective)
+						} else {
+							unreachable!("invalid version");
 						}
 					}
 					None => {
@@ -884,8 +957,8 @@ where
 							.map_err(|err| internal_err(format!("execution fatal: {err:?}")))?;
 
 							(info.exit_reason, Vec::new(), info.used_gas)
-						} else {
-							// Post-london + access list support
+						} else if api_version == 5 {
+							// Post-london + access list support (version 5)
 							let encoded_params = Encode::encode(&(
 								&from.unwrap_or_default(),
 								&data,
@@ -937,6 +1010,77 @@ where
 							.map_err(|err| internal_err(format!("execution fatal: {err:?}")))?;
 
 							(info.exit_reason, Vec::new(), info.used_gas.effective)
+						} else if api_version == 6 {
+							// Pectra - authorization list support (EIP-7702)
+							let access_list = access_list
+								.unwrap_or_default()
+								.into_iter()
+								.map(|item| (item.address, item.storage_keys))
+								.collect::<Vec<(sp_core::H160, Vec<H256>)>>();
+
+							let authorization_list = authorization_list
+								.unwrap_or_default()
+								.iter()
+								.map(|d| {
+								(
+									U256::from(d.chain_id),
+									d.address,
+									d.nonce,
+									d.authorizing_address(),
+								)
+								})
+								.collect::<Vec<(U256, H160, U256, H160)>>();
+
+							let encoded_params = Encode::encode(&(
+								&from.unwrap_or_default(),
+								&data,
+								&value.unwrap_or_default(),
+								&gas_limit,
+								&max_fee_per_gas,
+								&max_priority_fee_per_gas,
+								&None::<Option<U256>>,
+								&estimate_mode,
+								&Some(
+									access_list
+								),
+								&Some(authorization_list),
+							));
+
+							// Enable proof size recording
+							let recorder: sp_trie::recorder::Recorder<HashingFor<B>> = Default::default();
+							let ext = sp_trie::proof_size_extension::ProofSizeExt::new(recorder.clone());
+							let mut exts = Extensions::new();
+							exts.register(ext);
+
+							let params = CallApiAtParams {
+								at: substrate_hash,
+								function: "EthereumRuntimeRPCApi_create",
+								arguments: encoded_params,
+								overlayed_changes: &RefCell::new(Default::default()),
+								call_context: CallContext::Offchain,
+								recorder: &Some(recorder),
+								extensions: &RefCell::new(exts),
+							};
+
+							let info = self
+							.client
+							.call_api_at(params)
+							.and_then(|r| {
+								Result::map_err(
+									<Result<ExecutionInfoV2::<H160>, DispatchError> as Decode>::decode(&mut &r[..]),
+									|error| sp_api::ApiError::FailedToDecodeReturnValue {
+										function: "EthereumRuntimeRPCApi_create",
+										error,
+										raw: r
+									},
+								)
+							})
+							.map_err(|err| internal_err(format!("runtime error: {err}")))?
+							.map_err(|err| internal_err(format!("execution fatal: {err:?}")))?;
+
+							(info.exit_reason, Vec::new(), info.used_gas.effective)
+						} else {
+							unreachable!("invalid version");
 						}
 					}
 				};