Update hyli main

Author: maxgttph

Cargo.lock

@@ -1,14 +1,15 @@
+use anyhow::Context;
 use client_sdk::transaction_builder::TxExecutorHandler;
-use sdk::{utils::as_hyle_output, Blob, Calldata, ZkContract};
+use sdk::{utils::as_hyle_output, Blob, Calldata, RegisterContractEffect, ZkContract};
 
 use crate::Wallet;
 
 impl TxExecutorHandler for Wallet {
-    fn build_commitment_metadata(&self, _blob: &Blob) -> Result<Vec<u8>, String> {
-        borsh::to_vec(self).map_err(|e| e.to_string())
+    fn build_commitment_metadata(&self, _blob: &Blob) -> anyhow::Result<Vec<u8>> {
+        borsh::to_vec(self).context("Failed to serialize Wallet")
     }
 
-    fn handle(&mut self, calldata: &Calldata) -> Result<sdk::HyleOutput, String> {
+    fn handle(&mut self, calldata: &Calldata) -> anyhow::Result<sdk::HyleOutput> {
         let initial_state_commitment = <Self as ZkContract>::commit(self);
         let mut res = <Self as ZkContract>::execute(self, calldata);
         let next_state_commitment = <Self as ZkContract>::commit(self);
@@ -19,4 +20,11 @@ impl TxExecutorHandler for Wallet {
             &mut res,
         ))
     }
+
+    fn construct_state(
+        _register_blob: &RegisterContractEffect,
+        _metadata: &Option<Vec<u8>>,
+    ) -> anyhow::Result<Self> {
+        Ok(Self::default())
+    }
 }

contracts/wallet/src/client/tx_executor_handler.rs

@@ -7,6 +7,7 @@ use hyle_smt_token::SmtTokenAction;
 use sdk::BlobIndex;
 use sdk::Calldata;
 use sdk::Hashed;
+use sdk::RegisterContractEffect;
 use std::collections::BTreeMap;
 
 use client_sdk::contract_indexer::axum;
@@ -95,13 +96,20 @@ impl HyllarHistory {
 }
 
 impl TxExecutorHandler for HyllarHistory {
-    fn handle(&mut self, calldata: &sdk::Calldata) -> anyhow::Result<sdk::HyleOutput, String> {
+    fn handle(&mut self, calldata: &sdk::Calldata) -> anyhow::Result<sdk::HyleOutput> {
         self.oranj.handle(calldata)
     }
 
-    fn build_commitment_metadata(&self, blob: &sdk::Blob) -> anyhow::Result<Vec<u8>, String> {
+    fn build_commitment_metadata(&self, blob: &sdk::Blob) -> anyhow::Result<Vec<u8>> {
         self.oranj.build_commitment_metadata(blob)
     }
+
+    fn construct_state(
+        _register_blob: &RegisterContractEffect,
+        _metadata: &Option<Vec<u8>>,
+    ) -> anyhow::Result<Self> {
+        Ok(Default::default())
+    }
 }
 
 impl ContractHandler<Vec<HistoryEvent>> for HyllarHistory {

server/src/history.rs

@@ -47,7 +47,7 @@ async fn init_contract(
                 program_id: ProgramId(contract.program_id.to_vec()),
                 state_commitment: contract.initial_state,
                 contract_name: contract.name.clone(),
-                timeout_window: None,
+                ..Default::default()
             })
             .await?;
             wait_contract_state(indexer, &contract.name).await?;