refactor!: change some precompile input and output to tuple (#1642)

* refactor: change some precompile input and output to tuple * change get_cell output * fix unit test * update call ckb vm
axonweb3 · Dec 19, 2023 · 6fe6ac7 · 6fe6ac7
1 parent 2af06c3
commit 6fe6ac7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/core/executor/src/precompiles/call_ckb_vm.rs b/core/executor/src/precompiles/call_ckb_vm.rs
@@ -55,11 +55,11 @@ impl PrecompileContract for CallCkbVM {
 
 fn parse_input(input: &[u8]) -> Result<(CellDep, Vec<Bytes>), PrecompileFailure> {
     let payload =
-        <CallCkbVmPayload as AbiDecode>::decode(input).map_err(|_| err!(_, "decode input"))?;
+        <(CallCkbVmPayload,) as AbiDecode>::decode(input).map_err(|_| err!(_, "decode input"))?;
 
     Ok((
-        payload.cell,
-        payload.inputs.into_iter().map(|i| i.0).collect(),
+        payload.0.cell,
+        payload.0.inputs.into_iter().map(|i| i.0).collect(),
     ))
 }
 

diff --git a/core/executor/src/precompiles/ckb_mbt_verify.rs b/core/executor/src/precompiles/ckb_mbt_verify.rs
@@ -67,7 +67,9 @@ impl PrecompileContract for CMBTVerify {
 }
 
 fn parse_input(input: &[u8]) -> Result<VerifyProofPayload, PrecompileFailure> {
-    <VerifyProofPayload as AbiDecode>::decode(input).map_err(|_| err!(_, "decode input"))
+    <(VerifyProofPayload,) as AbiDecode>::decode(input)
+        .map(|r| r.0)
+        .map_err(|_| err!(_, "decode input"))
 }
 
 fn inner_verify_proof(payload: VerifyProofPayload) -> Result<(), PrecompileFailure> {

diff --git a/core/executor/src/precompiles/get_cell.rs b/core/executor/src/precompiles/get_cell.rs
@@ -52,7 +52,7 @@ impl PrecompileContract for GetCell {
         Ok((
             PrecompileOutput {
                 exit_status: ExitSucceed::Returned,
-                output:      cell_opt.unwrap().encode(),
+                output:      AbiEncode::encode((cell_opt.unwrap(),)),
             },
             gas,
         ))

diff --git a/core/executor/src/precompiles/get_header.rs b/core/executor/src/precompiles/get_header.rs
@@ -1,10 +1,11 @@
-use ethers::abi::AbiDecode;
+use ethers::abi::{AbiDecode, AbiEncode};
 use evm::executor::stack::{PrecompileFailure, PrecompileOutput};
 use evm::{Context, ExitError, ExitSucceed};
 
 use protocol::types::{H160, H256};
 
 use crate::precompiles::{axon_precompile_address, PrecompileContract};
+use crate::system_contract::ckb_light_client::ckb_light_client_abi;
 use crate::{err, system_contract::ckb_light_client::CkbHeaderReader, CURRENT_HEADER_CELL_ROOT};
 
 #[derive(Default, Clone)]
@@ -39,10 +40,13 @@ impl PrecompileContract for GetHeader {
             return err!("get header return None");
         }
 
+        let header =
+            <ckb_light_client_abi::Header as AbiDecode>::decode(header_opt.unwrap()).unwrap();
+
         Ok((
             PrecompileOutput {
                 exit_status: ExitSucceed::Returned,
-                output:      header_opt.unwrap(),
+                output:      AbiEncode::encode((header,)),
             },
             gas,
         ))

diff --git a/core/executor/src/precompiles/tests.rs b/core/executor/src/precompiles/tests.rs
@@ -303,11 +303,11 @@ fn test_verify_cmbt_proof() {
         proof:                 witness_proof,
     };
 
-    let input = AbiEncode::encode(raw_tx_payload);
+    let input = AbiEncode::encode((raw_tx_payload,));
     let output = vec![1u8];
     test_precompile!(CMBTVerify, &input, output, 56000);
 
-    let input = AbiEncode::encode(witness_payload);
+    let input = AbiEncode::encode((witness_payload,));
     let output = vec![1u8];
     test_precompile!(CMBTVerify, &input, output, 56000);
 }