Merge branch 'master' into v2.0-stable-merge

Conflux-Chain · Apr 21, 2023 · 854043e · 854043e
2 parents 3c30a7e + 7e768f5
commit 854043e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/client/src/rpc/types/trace.rs b/client/src/rpc/types/trace.rs
@@ -380,7 +380,7 @@ impl LocalizedBlockTrace {
 pub struct EpochTrace {
     cfx_traces: Vec<LocalizedTrace>,
     eth_traces: Vec<EthLocalizedTrace>,
-    mirror_address_map: HashMap<RpcAddress, H160>,
+    mirror_address_map: HashMap<H160, RpcAddress>,
 }
 
 impl EpochTrace {
@@ -392,8 +392,8 @@ impl EpochTrace {
             if let Action::Call(action) = &t.action {
                 if action.to.hex_address == *CROSS_SPACE_CONTRACT_ADDRESS {
                     mirror_address_map.insert(
-                        action.from.clone(),
                         evm_map(action.from.hex_address).address,
+                        action.from.clone(),
                     );
                 }
             }