feat: add carrier resource and forwarder calldata field (#30)

* feat: add field for carrier resource and forwarder calldata

* fix compilation errors

---------

Co-authored-by: Xuyang Song <xuyangsong@hotmail.com>

Author: heueristik

aarm/src/action.rs

@@ -21,13 +21,26 @@ use serde::{Deserialize, Serialize};
 pub struct Action {
     pub compliance_units: Vec<Receipt>,
     pub logic_proofs: Vec<LogicProof>,
+    pub resource_forwarder_calldata_pairs: Vec<(Resource, ForwarderCalldata)>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct ForwarderCalldata {
+    untrusted_forwarder: [u8; 20],
+    input: Vec<u8>,
+    output: Vec<u8>,
 }
 
 impl Action {
-    pub fn new(compliance_units: Vec<Receipt>, logic_proofs: Vec<LogicProof>) -> Self {
+    pub fn new(
+        compliance_units: Vec<Receipt>,
+        logic_proofs: Vec<LogicProof>,
+        resource_forwarder_calldata_pairs: Vec<(Resource, ForwarderCalldata)>,
+    ) -> Self {
         Action {
             compliance_units,
             logic_proofs,
+            resource_forwarder_calldata_pairs,
         }
     }
 
@@ -39,6 +52,10 @@ impl Action {
         &self.logic_proofs
     }
 
+    pub fn get_resource_forwarder_calldata_pairs(&self) -> &Vec<(Resource, ForwarderCalldata)> {
+        &self.resource_forwarder_calldata_pairs
+    }
+
     pub fn verify(&self) -> bool {
         for receipt in &self.compliance_units {
             if !verify_proof(receipt, COMPLIANCE_GUEST_ID) {
@@ -150,8 +167,13 @@ pub fn create_an_action(nonce: u8) -> (Action, DeltaWitness) {
 
     let compliance_units = vec![compliance_receipt];
     let logic_proofs = vec![consumed_logic_proof, created_logic_proof];
+    let resource_forwarder_calldata_pairs = vec![];
 
-    let action = Action::new(compliance_units, logic_proofs);
+    let action = Action::new(
+        compliance_units,
+        logic_proofs,
+        resource_forwarder_calldata_pairs,
+    );
     assert!(action.verify());
 
     let delta_witness = DeltaWitness::from_scalars(&[compliance_witness.rcv]);

aarm/src/evm_adapter.rs

@@ -1,7 +1,9 @@
+use crate::action::ForwarderCalldata;
 use crate::{
     action::Action,
     transaction::{Delta, Transaction},
 };
+use aarm_core::resource::Resource;
 use aarm_core::{
     compliance::ComplianceInstance,
     logic_instance::{ExpirableBlob, LogicInstance},
@@ -23,6 +25,7 @@ pub struct AdapterTransaction {
 pub struct AdapterAction {
     pub compliance_units: Vec<AdapterComplianceUnit>,
     pub logic_proofs: Vec<AdapterLogicProof>,
+    pub resource_forwarder_calldata_pairs: Vec<(Resource, ForwarderCalldata)>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -109,6 +112,7 @@ impl From<Action> for AdapterAction {
         AdapterAction {
             compliance_units,
             logic_proofs,
+            resource_forwarder_calldata_pairs: action.resource_forwarder_calldata_pairs,
         }
     }
 }

aarm_core/src/nullifier_key.rs

@@ -33,7 +33,7 @@ impl NullifierKey {
 }
 
 /// Commitment to nullifier key
-#[derive(Clone, Copy, Eq, PartialEq, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Default, Serialize, Deserialize)]
 pub struct NullifierKeyCommitment(Digest);
 
 impl NullifierKeyCommitment {

aarm_core/src/resource.rs

@@ -12,7 +12,7 @@ use risc0_zkvm::sha::{rust_crypto::Sha256 as Sha256Type, Digest, Impl, Sha256, D
 use serde::{Deserialize, Serialize};
 
 /// A resource that can be created and consumed
-#[derive(Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct Resource {
     // a succinct representation of the predicate associated with the resource
     pub logic_ref: Digest,

examples/kudo_application/kudo_tx/src/burn.rs

@@ -91,6 +91,7 @@ where
                         ephemeral_kudo_proof,
                         ephemeral_denomination_proof,
                     ],
+                    vec![],
                 ),
                 DeltaWitness::from_scalars(&[delta_witness_1, delta_witness_2]),
             )

examples/kudo_application/kudo_tx/src/issue.rs

@@ -114,6 +114,7 @@ where
                         ephemeral_denomination_proof,
                         padding_resource_proof,
                     ],
+                    vec![],
                 ),
                 DeltaWitness::from_scalars(&[delta_witness_1, delta_witness_2, delta_witness_3]),
             )

examples/kudo_application/kudo_tx/src/swap.rs

@@ -127,6 +127,7 @@ where
                         padding_resource_proof,
                         receive_logic_proof,
                     ],
+                    vec![],
                 ),
                 DeltaWitness::from_scalars(&[delta_witness_1, delta_witness_2, delta_witness_3]),
             )

examples/kudo_application/kudo_tx/src/transfer.rs

@@ -121,6 +121,7 @@ where
                         padding_resource_proof,
                         receive_logic_proof,
                     ],
+                    vec![],
                 ),
                 DeltaWitness::from_scalars(&[delta_witness_1, delta_witness_2, delta_witness_3]),
             )