Merge branch 'main' into new_staking

contracts/risc0-recursion/tests/recursion.rs

@@ -2,7 +2,6 @@ use std::collections::HashMap;
 
 use hyrun::{Cli, Context, ContractData};
 use risc0_recursion::ProofInput;
-use risc0_zkvm::sha::Digestible;
 use sdk::{HyleOutput, StateDigest};
 
 #[test_log::test(test)]

contracts/staking/staking.txt

@@ -1 +1 @@
-de5ae548062c24f22ceffc6b838d6dcd8a0b3a43cc15c6511cbd81f127924845
+b74f2308e46f81b4d317fb3fffcc7f17e86dabafec1d5dd1d4639da8e0f7b26f

src/genesis.rs

@@ -278,6 +278,15 @@ impl Genesis {
                         contract_name: "hydentity".into(),
                     },
                 )),
+                Transaction::wrap(TransactionData::RegisterContract(
+                    RegisterContractTransaction {
+                        owner: "hyle".into(),
+                        verifier: "risc0".into(),
+                        program_id: hyle_contracts::RISC0_RECURSION_ID.to_vec().into(),
+                        state_digest: hyle_contract_sdk::StateDigest(vec![]),
+                        contract_name: "risc0-recursion".into(),
+                    },
+                )),
             ],
             states,
         )

src/mempool/api.rs

@@ -36,7 +36,6 @@ pub async fn api(ctx: &CommonRunContext) -> Router<()> {
 
     Router::new()
         .route("/contract/register", post(send_contract_transaction))
-        //.route("/tx/send/stake", post(send_staking_transaction)) // TODO
         .route("/tx/send/blob", post(send_blob_transaction))
         .route("/tx/send/proof", post(send_proof_transaction))
         .route(
@@ -86,12 +85,17 @@ pub async fn send_proof_transaction(
     handle_send(state, TransactionData::Proof(payload)).await
 }
 
-//pub async fn send_staking_transaction(
-//    State(state): State<RouterState>,
-//    Json(payload): Json<Staker>,
-//) -> Result<impl IntoResponse, AppError> {
-//    handle_send(state, TransactionData::Stake(payload)).await
-//}
+pub async fn send_recursive_proof_transaction(
+    State(state): State<RouterState>,
+    Json(mut payload): Json<RecursiveProofTransaction>,
+) -> Result<impl IntoResponse, AppError> {
+    let proof_bytes = payload
+        .proof
+        .to_bytes()
+        .map_err(|err| AppError(StatusCode::BAD_REQUEST, anyhow!(err)))?;
+    payload.proof = ProofData::Bytes(proof_bytes);
+    handle_send(state, TransactionData::RecursiveProof(payload)).await
+}
 
 impl Clone for RouterState {
     fn clone(&self) -> Self {