feat: rollup rework

src/clua-htif.cpp

@@ -34,14 +34,15 @@ int clua_htif_export(lua_State *L, int ctxidx) {
         named_constant{HTIF_YIELD_AUTOMATIC, "HTIF_YIELD_AUTOMATIC"},
         named_constant{HTIF_YIELD_MANUAL, "HTIF_YIELD_MANUAL"},
         named_constant{HTIF_YIELD_REASON_PROGRESS, "HTIF_YIELD_REASON_PROGRESS"},
-        named_constant{HTIF_YIELD_REASON_RX_ACCEPTED, "HTIF_YIELD_REASON_RX_ACCEPTED"},
-        named_constant{HTIF_YIELD_REASON_RX_REJECTED, "HTIF_YIELD_REASON_RX_REJECTED"},
-        named_constant{HTIF_YIELD_REASON_TX_VOUCHER, "HTIF_YIELD_REASON_TX_VOUCHER"},
-        named_constant{HTIF_YIELD_REASON_TX_NOTICE, "HTIF_YIELD_REASON_TX_NOTICE"},
-        named_constant{HTIF_YIELD_REASON_TX_REPORT, "HTIF_YIELD_REASON_TX_REPORT"},
-        named_constant{HTIF_YIELD_REASON_TX_EXCEPTION, "HTIF_YIELD_REASON_TX_EXCEPTION"},
+        named_constant{HTIF_YIELD_REASON_RX_ACCEPTED_DEF, "HTIF_YIELD_REASON_RX_ACCEPTED"},
+        named_constant{HTIF_YIELD_REASON_RX_REJECTED_DEF, "HTIF_YIELD_REASON_RX_REJECTED"},
+        named_constant{HTIF_YIELD_REASON_TX_OUTPUT_DEF, "HTIF_YIELD_REASON_TX_OUTPUT"},
+        named_constant{HTIF_YIELD_REASON_TX_VERIFIABLE_OUTPUT_DEF, "HTIF_YIELD_REASON_TX_VERIFIABLE_OUTPUT"},
+        named_constant{HTIF_YIELD_REASON_TX_EXCEPTION_DEF, "HTIF_YIELD_REASON_TX_EXCEPTION"},
         named_constant{HTIF_CONSOLE_GETCHAR, "HTIF_CONSOLE_GETCHAR"},
         named_constant{HTIF_CONSOLE_PUTCHAR, "HTIF_CONSOLE_PUTCHAR"},
+        named_constant{HTIF_YIELD_REASON_ADVANCE_STATE_DEF, "HTIF_YIELD_REASON_ADVANCE_STATE"},
+        named_constant{HTIF_YIELD_REASON_INSPECT_STATE_DEF, "HTIF_YIELD_REASON_INSPECT_STATE"},
     };
     for (const auto &c : constants) {
         lua_pushinteger(L, static_cast<lua_Integer>(c.value));

src/clua-machine-util.cpp

@@ -835,12 +835,6 @@ static void push_cm_rollup_config(lua_State *L, const cm_rollup_config *r) {
     lua_setfield(L, -2, "rx_buffer");                   // rollup
     push_cm_memory_range_config(L, &r->tx_buffer);      // rollup tx_buffer
     lua_setfield(L, -2, "tx_buffer");                   // rollup
-    push_cm_memory_range_config(L, &r->input_metadata); // rollup input_metadata
-    lua_setfield(L, -2, "input_metadata");              // rollup
-    push_cm_memory_range_config(L, &r->voucher_hashes); // rollup voucher_hashes
-    lua_setfield(L, -2, "voucher_hashes");              // rollup
-    push_cm_memory_range_config(L, &r->notice_hashes);  // rollup notice_hashes
-    lua_setfield(L, -2, "notice_hashes");               // rollup
 }
 
 /// \brief Pushes cm_flash_drive_configs to the Lua stack
@@ -982,15 +976,6 @@ static void check_cm_rollup_config(lua_State *L, int tabidx, cm_rollup_config *r
     lua_pop(L, 1);
     lua_getfield(L, -1, "tx_buffer");
     clua_check_cm_memory_range_config(L, -1, "rollup rx buffer", &r->tx_buffer);
-    lua_pop(L, 1);
-    lua_getfield(L, -1, "input_metadata");
-    clua_check_cm_memory_range_config(L, -1, "rollup input metadata", &r->input_metadata);
-    lua_pop(L, 1);
-    lua_getfield(L, -1, "voucher_hashes");
-    clua_check_cm_memory_range_config(L, -1, "rollup voucher hashes", &r->voucher_hashes);
-    lua_pop(L, 1);
-    lua_getfield(L, -1, "notice_hashes");
-    clua_check_cm_memory_range_config(L, -1, "rollup notice hashes", &r->notice_hashes);
     lua_pop(L, 2);
 }
 

src/dtb.cpp

@@ -168,21 +168,6 @@ void dtb_init(const machine_config &c, unsigned char *dtb_start, uint64_t dtb_le
                 fdt.prop_u64_list<2>("reg", {r.tx_buffer.start, r.tx_buffer.length});
                 fdt.end_node();
             }
-            { // input_metadata
-                fdt.begin_node_num("input_metadata", r.input_metadata.start);
-                fdt.prop_u64_list<2>("reg", {r.input_metadata.start, r.input_metadata.length});
-                fdt.end_node();
-            }
-            { // voucher_hashes
-                fdt.begin_node_num("voucher_hashes", r.voucher_hashes.start);
-                fdt.prop_u64_list<2>("reg", {r.voucher_hashes.start, r.voucher_hashes.length});
-                fdt.end_node();
-            }
-            { // notice_hashes
-                fdt.begin_node_num("notice_hashes", r.notice_hashes.start);
-                fdt.prop_u64_list<2>("reg", {r.notice_hashes.start, r.notice_hashes.length});
-                fdt.end_node();
-            }
             fdt.end_node();
         }
 

src/htif.h

@@ -88,9 +88,8 @@ enum HTIF_yield_reason : uint64_t {
     HTIF_YIELD_REASON_PROGRESS = HTIF_YIELD_REASON_PROGRESS_DEF,
     HTIF_YIELD_REASON_RX_ACCEPTED = HTIF_YIELD_REASON_RX_ACCEPTED_DEF,
     HTIF_YIELD_REASON_RX_REJECTED = HTIF_YIELD_REASON_RX_REJECTED_DEF,
-    HTIF_YIELD_REASON_TX_VOUCHER = HTIF_YIELD_REASON_TX_VOUCHER_DEF,
-    HTIF_YIELD_REASON_TX_NOTICE = HTIF_YIELD_REASON_TX_NOTICE_DEF,
-    HTIF_YIELD_REASON_TX_REPORT = HTIF_YIELD_REASON_TX_REPORT_DEF,
+    HTIF_YIELD_REASON_TX_OUTPUT = HTIF_YIELD_REASON_TX_OUTPUT_DEF,
+    HTIF_YIELD_REASON_TX_VERIFIABLE_OUTPUT = HTIF_YIELD_REASON_TX_VERIFIABLE_OUTPUT_DEF,
     HTIF_YIELD_REASON_TX_EXCEPTION = HTIF_YIELD_REASON_TX_EXCEPTION_DEF,
 };
 /// \brief Mapping between CSRs and their relative addresses in HTIF memory

src/json-util.cpp

@@ -916,9 +916,6 @@ void ju_get_opt_field(const nlohmann::json &j, const K &key, rollup_config &valu
     const auto new_path = path + to_string(key) + "/";
     ju_get_field(jconfig, "rx_buffer"s, value.rx_buffer, new_path);
     ju_get_field(jconfig, "tx_buffer"s, value.tx_buffer, new_path);
-    ju_get_field(jconfig, "input_metadata"s, value.input_metadata, new_path);
-    ju_get_field(jconfig, "voucher_hashes"s, value.voucher_hashes, new_path);
-    ju_get_field(jconfig, "notice_hashes"s, value.notice_hashes, new_path);
 }
 
 template void ju_get_opt_field<uint64_t>(const nlohmann::json &j, const uint64_t &key, rollup_config &value,
@@ -940,9 +937,6 @@ void ju_get_opt_field(const nlohmann::json &j, const K &key, std::optional<rollu
     auto &value = optional.value();
     ju_get_field(jconfig, "rx_buffer"s, value.rx_buffer, new_path);
     ju_get_field(jconfig, "tx_buffer"s, value.tx_buffer, new_path);
-    ju_get_field(jconfig, "input_metadata"s, value.input_metadata, new_path);
-    ju_get_field(jconfig, "voucher_hashes"s, value.voucher_hashes, new_path);
-    ju_get_field(jconfig, "notice_hashes"s, value.notice_hashes, new_path);
 }
 
 template void ju_get_opt_field<uint64_t>(const nlohmann::json &j, const uint64_t &key,
@@ -1159,9 +1153,6 @@ void to_json(nlohmann::json &j, const rollup_config &config) {
     j = nlohmann::json{
         {"rx_buffer", config.rx_buffer},
         {"tx_buffer", config.tx_buffer},
-        {"input_metadata", config.input_metadata},
-        {"voucher_hashes", config.voucher_hashes},
-        {"notice_hashes", config.notice_hashes},
     };
 }
 

src/jsonrpc-discover.json

@@ -1584,15 +1584,6 @@
           },
           "tx_buffer": {
             "$ref": "#/components/schemas/MemoryRangeConfig"
-          },
-          "input_metadata": {
-            "$ref": "#/components/schemas/MemoryRangeConfig"
-          },
-          "voucher_hashes": {
-            "$ref": "#/components/schemas/MemoryRangeConfig"
-          },
-          "notice_hashes": {
-            "$ref": "#/components/schemas/MemoryRangeConfig"
           }
         }
       },

src/machine-c-api.cpp

@@ -286,8 +286,7 @@ static std::optional<cartesi::rollup_config> convert_from_c(const cm_rollup_conf
         return {};
     }
     cartesi::rollup_config new_cpp_rollup_config{convert_from_c(&c_config->rx_buffer),
-        convert_from_c(&c_config->tx_buffer), convert_from_c(&c_config->input_metadata),
-        convert_from_c(&c_config->voucher_hashes), convert_from_c(&c_config->notice_hashes)};
+        convert_from_c(&c_config->tx_buffer)};
     return new_cpp_rollup_config;
 }
 
@@ -299,9 +298,6 @@ static cm_rollup_config convert_to_c(const std::optional<cartesi::rollup_config>
     }
     new_c_rollup_config.rx_buffer = convert_to_c(cpp_config->rx_buffer);
     new_c_rollup_config.tx_buffer = convert_to_c(cpp_config->tx_buffer);
-    new_c_rollup_config.input_metadata = convert_to_c(cpp_config->input_metadata);
-    new_c_rollup_config.voucher_hashes = convert_to_c(cpp_config->voucher_hashes);
-    new_c_rollup_config.notice_hashes = convert_to_c(cpp_config->notice_hashes);
     return new_c_rollup_config;
 }
 
@@ -708,9 +704,6 @@ void cm_delete_machine_config(const cm_machine_config *config) {
     delete[] config->tlb.image_filename;
     delete[] config->rollup.rx_buffer.image_filename;
     delete[] config->rollup.tx_buffer.image_filename;
-    delete[] config->rollup.input_metadata.image_filename;
-    delete[] config->rollup.voucher_hashes.image_filename;
-    delete[] config->rollup.notice_hashes.image_filename;
     delete[] config->uarch.ram.image_filename;
 
     delete config;

src/machine-c-api.h

@@ -235,9 +235,6 @@ typedef struct {                           // NOLINT(modernize-use-using)
     bool has_value;                        ///< Represents whether the rest of the struct have been filled
     cm_memory_range_config rx_buffer;      ///< RX buffer memory range
     cm_memory_range_config tx_buffer;      ///< TX buffer memory range
-    cm_memory_range_config input_metadata; ///< Input metadata memory range
-    cm_memory_range_config voucher_hashes; ///< Voucher hashes memory range
-    cm_memory_range_config notice_hashes;  ///< Notice hashes memory range
 } cm_rollup_config;
 
 /// \brief microarchitecture RAM configuration

src/machine-config.cpp

@@ -53,9 +53,6 @@ static void adjust_image_filenames(machine_config &c, const std::string &dir) {
         auto &r = c.rollup.value();
         r.rx_buffer.image_filename = c.get_image_filename(dir, r.rx_buffer);
         r.tx_buffer.image_filename = c.get_image_filename(dir, r.tx_buffer);
-        r.input_metadata.image_filename = c.get_image_filename(dir, r.input_metadata);
-        r.voucher_hashes.image_filename = c.get_image_filename(dir, r.voucher_hashes);
-        r.notice_hashes.image_filename = c.get_image_filename(dir, r.notice_hashes);
     }
 
     if (c.uarch.ram.length > 0) {

src/machine-config.h

@@ -118,9 +118,6 @@ struct htif_config final {
 struct rollup_config {                    // NOLINT(bugprone-exception-escape)
     memory_range_config rx_buffer{};      ///< RX buffer
     memory_range_config tx_buffer{};      ///< TX buffer
-    memory_range_config input_metadata{}; ///< Buffer for input metadata
-    memory_range_config voucher_hashes{}; ///< Buffer for the voucher hash array
-    memory_range_config notice_hashes{};  ///< Buffer for the notice hash array
 };
 
 /// \brief Machine state configuration

src/machine.cpp

@@ -103,33 +103,6 @@ const pma_entry::flags machine::m_rollup_tx_buffer_flags{
     PMA_ISTART_DID::rollup_tx_buffer // DID
 };
 
-const pma_entry::flags machine::m_rollup_input_metadata_flags{
-    true,                                 // R
-    false,                                // W
-    false,                                // X
-    true,                                 // IR
-    true,                                 // IW
-    PMA_ISTART_DID::rollup_input_metadata // DID
-};
-
-const pma_entry::flags machine::m_rollup_voucher_hashes_flags{
-    true,                                 // R
-    true,                                 // W
-    false,                                // X
-    true,                                 // IR
-    true,                                 // IW
-    PMA_ISTART_DID::rollup_voucher_hashes // DID
-};
-
-const pma_entry::flags machine::m_rollup_notice_hashes_flags{
-    true,                                // R
-    true,                                // W
-    false,                               // X
-    true,                                // IR
-    true,                                // IW
-    PMA_ISTART_DID::rollup_notice_hashes // DID
-};
-
 pma_entry machine::make_memory_range_pma_entry(const std::string &description, const memory_range_config &c) {
     if (c.image_filename.empty()) {
         return make_callocd_memory_pma_entry(description, c.start, c.length);
@@ -149,20 +122,6 @@ pma_entry machine::make_rollup_tx_buffer_pma_entry(const memory_range_config &c)
     return make_memory_range_pma_entry("rollup tx buffer memory range"s, c).set_flags(m_rollup_tx_buffer_flags);
 }
 
-pma_entry machine::make_rollup_input_metadata_pma_entry(const memory_range_config &c) {
-    return make_memory_range_pma_entry("rollup input metadata memory range"s, c)
-        .set_flags(m_rollup_input_metadata_flags);
-}
-
-pma_entry machine::make_rollup_voucher_hashes_pma_entry(const memory_range_config &c) {
-    return make_memory_range_pma_entry("rollup voucher hashes memory range"s, c)
-        .set_flags(m_rollup_voucher_hashes_flags);
-}
-
-pma_entry machine::make_rollup_notice_hashes_pma_entry(const memory_range_config &c) {
-    return make_memory_range_pma_entry("rollup notice hashes memory range"s, c).set_flags(m_rollup_notice_hashes_flags);
-}
-
 pma_entry &machine::register_pma_entry(pma_entry &&pma) {
     if (m_s.pmas.capacity() <= m_s.pmas.size()) { // NOLINT(readability-static-accessed-through-instance)
         throw std::runtime_error{"too many PMAs when adding "s + pma.get_description()};
@@ -208,12 +167,6 @@ static bool DID_is_protected(PMA_ISTART_DID DID) {
             return false;
         case PMA_ISTART_DID::rollup_tx_buffer:
             return false;
-        case PMA_ISTART_DID::rollup_input_metadata:
-            return false;
-        case PMA_ISTART_DID::rollup_voucher_hashes:
-            return false;
-        case PMA_ISTART_DID::rollup_notice_hashes:
-            return false;
         default:
             return true;
     }
@@ -381,17 +334,11 @@ machine::machine(const machine_config &c, const machine_runtime_config &r) :
     // Register rollup memory ranges
     if (m_c.rollup.has_value()) {
         if (m_c.rollup->rx_buffer.length == 0 || m_c.rollup->rx_buffer.start == 0 ||
-            m_c.rollup->tx_buffer.length == 0 || m_c.rollup->tx_buffer.start == 0 ||
-            m_c.rollup->input_metadata.length == 0 || m_c.rollup->input_metadata.start == 0 ||
-            m_c.rollup->voucher_hashes.length == 0 || m_c.rollup->voucher_hashes.start == 0 ||
-            m_c.rollup->notice_hashes.length == 0 || m_c.rollup->notice_hashes.start == 0) {
+            m_c.rollup->tx_buffer.length == 0 || m_c.rollup->tx_buffer.start == 0) {
             throw std::invalid_argument{"incomplete rollup configuration"};
         }
         register_pma_entry(make_rollup_tx_buffer_pma_entry(m_c.rollup->tx_buffer));
         register_pma_entry(make_rollup_rx_buffer_pma_entry(m_c.rollup->rx_buffer));
-        register_pma_entry(make_rollup_input_metadata_pma_entry(m_c.rollup->input_metadata));
-        register_pma_entry(make_rollup_voucher_hashes_pma_entry(m_c.rollup->voucher_hashes));
-        register_pma_entry(make_rollup_notice_hashes_pma_entry(m_c.rollup->notice_hashes));
     }
 
     // Register HTIF device
@@ -559,9 +506,6 @@ machine_config machine::get_serialization_config(void) const {
         auto &r = c.rollup.value();
         r.rx_buffer.image_filename.clear();
         r.tx_buffer.image_filename.clear();
-        r.input_metadata.image_filename.clear();
-        r.voucher_hashes.image_filename.clear();
-        r.notice_hashes.image_filename.clear();
     }
     c.uarch.processor.cycle = read_uarch_cycle();
     c.uarch.processor.halt_flag = read_uarch_halt_flag();
@@ -666,9 +610,6 @@ void machine::store_pmas(const machine_config &c, const std::string &dir) const
         const auto &r = c.rollup.value();
         store_memory_pma(find_pma_entry<uint64_t>(r.rx_buffer.start), dir);
         store_memory_pma(find_pma_entry<uint64_t>(r.tx_buffer.start), dir);
-        store_memory_pma(find_pma_entry<uint64_t>(r.input_metadata.start), dir);
-        store_memory_pma(find_pma_entry<uint64_t>(r.voucher_hashes.start), dir);
-        store_memory_pma(find_pma_entry<uint64_t>(r.notice_hashes.start), dir);
     }
     if (!m_uarch.get_state().ram.get_istart_E()) {
         store_memory_pma(m_uarch.get_state().ram, dir);

src/machine.h

@@ -64,9 +64,6 @@ class machine final {
     static const pma_entry::flags m_flash_drive_flags;           ///< PMA flags used for flash drives
     static const pma_entry::flags m_rollup_rx_buffer_flags;      ///< PMA flags used for rollup rx buffer
     static const pma_entry::flags m_rollup_tx_buffer_flags;      ///< PMA flags used for rollup tx buffer
-    static const pma_entry::flags m_rollup_input_metadata_flags; ///< PMA flags used for rollup input metadata
-    static const pma_entry::flags m_rollup_voucher_hashes_flags; ///< PMA flags used for rollup voucher hashes
-    static const pma_entry::flags m_rollup_notice_hashes_flags;  ///< PMA flags used for rollup notice hashes
 
     /// \brief Allocates a new PMA entry.
     /// \param pma PMA entry to add to machine.
@@ -95,21 +92,6 @@ class machine final {
     /// \returns New PMA entry with tx buffer flags already set.
     static pma_entry make_rollup_tx_buffer_pma_entry(const memory_range_config &c);
 
-    /// \brief Creates a new rollup input metadata PMA entry.
-    /// \param c Memory range configuration.
-    /// \returns New PMA entry with rollup input metadata flags already set.
-    static pma_entry make_rollup_input_metadata_pma_entry(const memory_range_config &c);
-
-    /// \brief Creates a new rollup voucher hashes PMA entry.
-    /// \param c Memory range configuration.
-    /// \returns New PMA entry with rollup voucher hashes flags already set.
-    static pma_entry make_rollup_voucher_hashes_pma_entry(const memory_range_config &c);
-
-    /// \brief Creates a new rollup notice hahes PMA entry.
-    /// \param c Memory range configuration.
-    /// \returns New PMA entry with rollup notice hashes flags already set.
-    static pma_entry make_rollup_notice_hashes_pma_entry(const memory_range_config &c);
-
     /// \brief Saves PMAs into files for serialization
     /// \param config Machine config to be stored
     /// \param directory Directory where PMAs will be stored

src/pma-constants.h

@@ -106,9 +106,6 @@ enum class PMA_ISTART_DID {
     HTIF = PMA_HTIF_DID_DEF,                                   ///< DID for HTIF device
     rollup_rx_buffer = PMA_ROLLUP_RX_BUFFER_DID_DEF,           ///< DID for rollup receive buffer
     rollup_tx_buffer = PMA_ROLLUP_TX_BUFFER_DID_DEF,           ///< DID for rollup transmit buffer
-    rollup_input_metadata = PMA_ROLLUP_INPUT_METADATA_DID_DEF, ///< DID for rollup input metadata memory range
-    rollup_voucher_hashes = PMA_ROLLUP_VOUCHER_HASHES_DID_DEF, ///< DID for rollup voucher hashes memory range
-    rollup_notice_hashes = PMA_ROLLUP_NOTICE_HASHES_DID_DEF,   ///< DID for rollup notice hashes memory range
 };
 
 } // namespace cartesi

src/protobuf-util.cpp

@@ -38,9 +38,6 @@ void set_proto_memory_range(const memory_range_config &m, CartesiMachine::Memory
 void set_proto_rollup(const rollup_config &r, CartesiMachine::RollupConfig *proto_r) {
     set_proto_memory_range(r.rx_buffer, proto_r->mutable_rx_buffer());
     set_proto_memory_range(r.tx_buffer, proto_r->mutable_tx_buffer());
-    set_proto_memory_range(r.input_metadata, proto_r->mutable_input_metadata());
-    set_proto_memory_range(r.voucher_hashes, proto_r->mutable_voucher_hashes());
-    set_proto_memory_range(r.notice_hashes, proto_r->mutable_notice_hashes());
 }
 
 void set_proto_machine_config(const machine_config &c, CartesiMachine::MachineConfig *proto_c) {
@@ -793,15 +790,6 @@ rollup_config get_proto_rollup_config(const CartesiMachine::RollupConfig &proto_
     if (proto_r.has_tx_buffer()) {
         r.tx_buffer = get_proto_memory_range_config(proto_r.tx_buffer());
     }
-    if (proto_r.has_input_metadata()) {
-        r.input_metadata = get_proto_memory_range_config(proto_r.input_metadata());
-    }
-    if (proto_r.has_voucher_hashes()) {
-        r.voucher_hashes = get_proto_memory_range_config(proto_r.voucher_hashes());
-    }
-    if (proto_r.has_input_metadata()) {
-        r.notice_hashes = get_proto_memory_range_config(proto_r.notice_hashes());
-    }
     return r;
 }