new receipt format for RPC at epoch 435

Author: vans163

ex/lib/api/db_chain.ex

@@ -54,8 +54,15 @@ defmodule DB.Chain do
           entry_bytes = RocksDB.get(map.entry_hash, db_handle(db_opts, :entry, %{}))
           entry = DB.Entry.by_hash(map.entry_hash, db_opts)
           tx_bytes = binary_part(entry_bytes, map.index_start, map.index_size)
+          receipt = if map[:result] do map[:result] else
+            r = map.receipt
+            result = RocksDB.ascii_dump(r.result)
+            logs = Enum.map(r.logs, & RocksDB.ascii_dump(&1))
+            Map.merge(r, %{result: result, logs: logs})
+          end
           TX.unpack(tx_bytes)
-          |> Map.put(:result, map[:result])
+          |> Map.put(:result, receipt)
+          |> Map.put(:receipt, receipt)
           |> Map.put(:metadata, %{entry_hash: map.entry_hash, entry_height: entry.header.height, entry_slot: entry.header.slot})
       end
   end

ex/lib/api/db_entry.ex

@@ -88,7 +88,7 @@ defmodule DB.Entry do
     db_opts[:rtx_commit] && RocksDB.transaction_commit(db_opts.rtx)
   end
 
-  def apply_into_main_chain(entry, muts_hash, muts_rev, receipts, root_receipts, root_contractstate, db_opts = %{rtx: _}) do
+  def apply_into_main_chain(entry, muts_hash, muts_rev, {logs, receipts}, root_receipts, root_contractstate, db_opts = %{rtx: _}) do
     entry_packed = Entry.pack_for_db(entry)
     RocksDB.put(entry.hash, entry_packed, db_handle(db_opts, :entry, %{}))
     RocksDB.put("by_height:#{pad_integer(entry.header.height)}:#{entry.hash}", entry.hash, db_handle(db_opts, :entry_meta, %{}))
@@ -102,21 +102,41 @@ defmodule DB.Entry do
     RocksDB.put("entry:#{entry.hash}:root_receipts", root_receipts, db_handle(db_opts, :entry_meta, %{}))
     RocksDB.put("entry:#{entry.hash}:root_contractstate", root_contractstate, db_handle(db_opts, :entry_meta, %{}))
 
-    Enum.each(Enum.zip(entry.txs, receipts), fn({txu, result})->
-      case :binary.match(entry_packed, TX.pack(txu)) do
-          {index_start, index_size} ->
-            tx_ptr = %{entry_hash: entry.hash, result: result, index_start: index_start, index_size: index_size}
-            |> RDB.vecpak_encode()
-            RocksDB.put(txu.hash, tx_ptr, db_handle(db_opts, :tx, %{}))
-
-            nonce_padded = pad_integer_20(txu.tx.nonce)
-            RocksDB.put("#{txu.tx.signer}:#{nonce_padded}", txu.hash, db_handle(db_opts, :tx_account_nonce, %{}))
-            TX.known_receivers(txu)
-            |> Enum.each(fn(receiver)->
-                RocksDB.put("#{receiver}:#{nonce_padded}", txu.hash, db_handle(db_opts, :tx_receiver_nonce, %{}))
-            end)
-        end
-    end)
+    if entry.header.height >= RDBProtocol.forkheight() do
+      receipts_by_txid = Map.new(receipts, fn r -> {r.txid, Map.drop(r, [:txid])} end)
+      Enum.each(entry.txs, fn(txu)->
+        receipt = Map.fetch!(receipts_by_txid, txu.hash)
+        case :binary.match(entry_packed, TX.pack(txu)) do
+            {index_start, index_size} ->
+              tx_ptr = %{entry_hash: entry.hash, receipt: receipt, index_start: index_start, index_size: index_size}
+              |> RDB.vecpak_encode()
+              RocksDB.put(txu.hash, tx_ptr, db_handle(db_opts, :tx, %{}))
+
+              nonce_padded = pad_integer_20(txu.tx.nonce)
+              RocksDB.put("#{txu.tx.signer}:#{nonce_padded}", txu.hash, db_handle(db_opts, :tx_account_nonce, %{}))
+              TX.known_receivers(txu)
+              |> Enum.each(fn(receiver)->
+                  RocksDB.put("#{receiver}:#{nonce_padded}", txu.hash, db_handle(db_opts, :tx_receiver_nonce, %{}))
+              end)
+          end
+      end)
+    else
+      Enum.each(Enum.zip(entry.txs, logs), fn({txu, result})->
+        case :binary.match(entry_packed, TX.pack(txu)) do
+            {index_start, index_size} ->
+              tx_ptr = %{entry_hash: entry.hash, result: result, index_start: index_start, index_size: index_size}
+              |> RDB.vecpak_encode()
+              RocksDB.put(txu.hash, tx_ptr, db_handle(db_opts, :tx, %{}))
+
+              nonce_padded = pad_integer_20(txu.tx.nonce)
+              RocksDB.put("#{txu.tx.signer}:#{nonce_padded}", txu.hash, db_handle(db_opts, :tx_account_nonce, %{}))
+              TX.known_receivers(txu)
+              |> Enum.each(fn(receiver)->
+                  RocksDB.put("#{receiver}:#{nonce_padded}", txu.hash, db_handle(db_opts, :tx_receiver_nonce, %{}))
+              end)
+          end
+      end)
+    end
   end
 
   def apply_into_main_chain_muts(hash, muts, db_opts = %{rtx: _}) do

ex/lib/consensus/fabric_gen.ex

@@ -347,7 +347,7 @@ defmodule FabricGen do
 
       RocksDB.put("temporal_tip", next_entry.hash, %{rtx: rtx, cf: cf.sysconf})
 
-      DB.Entry.apply_into_main_chain(next_entry, mutations_hash, m_rev, l, root_receipts, root_contractstate, %{rtx: rtx})
+      DB.Entry.apply_into_main_chain(next_entry, mutations_hash, m_rev, {l, receipts}, root_receipts, root_contractstate, %{rtx: rtx})
       if Application.fetch_env!(:ama, :archival_node) do
           DB.Entry.apply_into_main_chain_muts(next_entry.hash, m, %{rtx: rtx})
       end

ex/native/rdb/src/consensus/bic/protocol.rs

@@ -1,7 +1,7 @@
 use crate::consensus::bic::coin;
 use crate::consensus::consensus_kv;
 
-pub const FORKHEIGHT: u64 = 434_00000;
+pub const FORKHEIGHT: u64 = 435_00000;
 //pub const FORKHEIGHT: u64 = 0;
 
 pub const AMA_1_DOLLAR: i128 = 1_000_000_000;