add more useful columns to transaction

app/models/cita_sync/persist.rb

@@ -26,14 +26,28 @@ def save_transaction(hash, block = nil)
         result = data["result"]
         return if result.nil?
         block ||= Block.find_by_block_number(CitaSync::Basic.hex_str_to_number(result["blockNumber"]))
-        Transaction.create(
+        content = result["content"]
+        message = Message.new(content)
+        transaction = Transaction.new(
           cita_hash: result["hash"],
-          content: result["content"],
+          content: content,
           block_number: result["blockNumber"],
           block_hash: result["blockHash"],
           index: result["index"],
-          block: block
+          block: block,
+          from: message.from,
+          to: message.to,
+          data: message.data,
+          value: message.value
         )
+        receipt_data = CitaSync::Api.get_transaction_receipt(hash)
+        receipt_result = receipt_data["result"]
+        unless receipt_result.nil?
+          transaction.contract_address = receipt_result["contractAddress"]
+          transaction.gas_used = receipt_result["gasUsed"]
+        end
+        transaction.save
+        transaction
       end
 
       # save a meta data
@@ -94,11 +108,14 @@ def save_abi(addr, block_number)
 
       # save one block with it's transactions and meta data
       def save_block_with_infos(block_number_hex_str)
-        block = save_block(block_number_hex_str)
-        _meta_data = save_meta_data(block_number_hex_str, block)
-        hashes = block.transactions.map { |t| t&.with_indifferent_access[:hash] }
-        hashes.each do |hash|
-          save_transaction(hash, block)
+        # merge to one commit, can be faster
+        ApplicationRecord.transaction do
+          block = save_block(block_number_hex_str)
+          _meta_data = save_meta_data(block_number_hex_str, block)
+          hashes = block.transactions.map { |t| t&.with_indifferent_access[:hash] }
+          hashes.each do |hash|
+            save_transaction(hash, block)
+          end
         end
       end
 

db/migrate/20180711075733_add_columns_to_transactions.rb

@@ -0,0 +1,10 @@
+class AddColumnsToTransactions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :transactions, :from, :string
+    add_column :transactions, :to, :string
+    add_column :transactions, :data, :text
+    add_column :transactions, :value, :string
+    add_column :transactions, :contract_address, :string
+    add_column :transactions, :gas_used, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_07_09_091027) do
+ActiveRecord::Schema.define(version: 2018_07_11_075733) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -71,6 +71,12 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "block_id"
+    t.string "from"
+    t.string "to"
+    t.text "data"
+    t.string "value"
+    t.string "contract_address"
+    t.string "gas_used"
     t.index ["block_id"], name: "index_transactions_on_block_id"
     t.index ["cita_hash"], name: "index_transactions_on_cita_hash", unique: true
   end

lib/blockchain.proto

@@ -77,14 +77,14 @@ message BlockBody {
     repeated SignedTransaction transactions = 1;
 }
 
-message Block {
+message ProtoBlock {
     uint32 version = 1;
     BlockHeader header = 2;
     BlockBody body = 3;
 }
 
 message BlockWithProof {
-    Block blk = 1;
+    ProtoBlock blk = 1;
     Proof proof = 2;
 }
 

test/models/cita_sync/persist_test.rb

@@ -68,6 +68,15 @@ def mock_get_transaction
     stub_request_wrapper("getTransaction", ["0xee969624a87a51fc4acc958a3bb83ca32539ee54ebb4215668fe1029eeab59d4"], result)
   end
 
+  def mock_get_transaction_receipt
+    result = {
+      "contractAddress": "0x89be88054e2ee94911549be521ab1241c7700a1b",
+      "gasUsed": "0x2d483"
+    }
+
+    stub_request_wrapper("getTransactionReceipt", ["0xee969624a87a51fc4acc958a3bb83ca32539ee54ebb4215668fe1029eeab59d4"], result)
+  end
+
   def mock_get_meta_data
     result = {
       "blockInterval": 3000,
@@ -108,6 +117,7 @@ def mock_get_abi
     mock_get_block_by_number_zero
     mock_get_block_by_number_one
     mock_get_transaction
+    mock_get_transaction_receipt
     mock_get_meta_data
     mock_get_balance
     mock_get_abi