bitcoinrb-grpc 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14a674b10187c411a04fffc871add50169f06db7670812c7e8ea81df0208e16
-  data.tar.gz: 7259ab262c29de7acc1ec01798731635c63247c3faeb69eeee24fe0d37ded098
+  metadata.gz: 5fd690cfb65d57221b690f52d81c51f720a587edb44da2974376c9662776cfaf
+  data.tar.gz: 7445feccbfac03004e8ed1a6185c127d3ded063562dffdff5864991b7a69201e
 SHA512:
-  metadata.gz: 26b335c3419c163165071696690e167d995fc53bac47c52da777180bddb48e80bff831d39f9bdc75988aff1c0faaae51f78692252ce51ee31737cb63581de665
-  data.tar.gz: c01904de80b687ccb4460e362b83edd10cfcf939dcaf716e6c9b34f6a3756b82ae23ebb177e005404d37edd78bcdbbb95d626ce4bdc48b851770dc9e50ee09fc
+  metadata.gz: 4c43a439477b4002c0c6bd6d2dea4f572a7a2556bb205ff4db066fcd77b95617354e87c538c6a5234094f57b596d5c73f5eb50ac69188a85b39813b2aaa850d9
+  data.tar.gz: 50220524bc52b4a4e8d22ef5a253678100850f31a778ad924882e47f38a5379462b7d03c8be1e0750ae3ecaf209956aaf14b4c214d17c4134967e33acfe6ca02

data/lib/bitcoin/grpc/grpc_pb.rb

@@ -90,7 +90,8 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   end
   add_message "bitcoin.grpc.WatchTokenRequest" do
     optional :id, :uint32, 1
-    optional :asset_type, :bytes, 2
+    optional :asset_type, :uint32, 2
+    optional :asset_id, :string, 3
   end
   add_message "bitcoin.grpc.WatchTokenResponse" do
     optional :id, :uint32, 1
@@ -158,7 +159,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :script_pubkey, :string, 5
   end
   add_message "bitcoin.grpc.AssetOutput" do
-    optional :asset_type, :bytes, 1
+    optional :asset_type, :uint32, 1
     optional :asset_id, :string, 2
     optional :asset_quantity, :uint64, 3
     optional :tx_hash, :string, 4

data/lib/bitcoin/grpc/server.rb

@@ -71,7 +71,7 @@ module Bitcoin
 
       def watch_token(request, call)
         logger.info("watch_token: #{request}")
-        utxo_handler << request
+        asset_handler << request
         response = []
         Receiver.spawn(:receiver, request, response, publisher, [Bitcoin::Grpc::EventTokenIssued, Bitcoin::Grpc::EventTokenTransfered])
         logger.info("watch_token: end")

data/lib/bitcoin/grpc/version.rb

@@ -1,5 +1,5 @@
 module Bitcoin
   module Grpc
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/bitcoin/wallet/asset_feature.rb

@@ -15,7 +15,7 @@ module Bitcoin
         logger.info("UtxoDB#save_token:#{[asset_type, asset_id, asset_quantity, utxo.inspect]}")
         level_db.batch do
           asset_output = Bitcoin::Grpc::AssetOutput.new(
-            asset_type: [asset_type].pack('C'),
+            asset_type: asset_type,
             asset_id: asset_id,
             asset_quantity: asset_quantity,
             tx_hash: utxo.tx_hash,
@@ -28,6 +28,7 @@ module Bitcoin
           # out_point
           key = KEY_PREFIX[:asset_out_point] + out_point.to_payload.bth
           return if level_db.contains?(key)
+
           level_db.put(key, payload)
 
           # script_pubkey
@@ -54,11 +55,11 @@ module Bitcoin
           level_db.delete(key)
 
           if utxo.script_pubkey
-            key = KEY_PREFIX[:asset_script_pubkey] + asset_output.asset_type.bth + utxo.script_pubkey + out_point.to_payload.bth
+            key = KEY_PREFIX[:asset_script_pubkey] + [asset_output.asset_type].pack('C').bth + utxo.script_pubkey + out_point.to_payload.bth
             level_db.delete(key)
           end
 
-          key = KEY_PREFIX[:asset_height] + asset_output.asset_type.bth + [utxo.block_height].pack('N').bth + out_point.to_payload.bth
+          key = KEY_PREFIX[:asset_height] + [asset_output.asset_type].pack('C').bth + [utxo.block_height].pack('N').bth + out_point.to_payload.bth
           level_db.delete(key)
           return asset_output
         end

data/lib/bitcoin/wallet/asset_handler.rb

@@ -3,7 +3,7 @@
 module Bitcoin
   module Wallet
     class AssetHandler < Concurrent::Actor::RestartingContext
-      attr_reader :utxo_db, :publisher
+      attr_reader :utxo_db, :publisher, :watchings
 
       def initialize(spv, publisher)
         publisher << [:subscribe, Bitcoin::Grpc::EventUtxoSpent]
@@ -11,10 +11,13 @@ module Bitcoin
         @publisher = publisher
         @utxo_db = spv.wallet.utxo_db
         @logger = Bitcoin::Logger.create(:debug)
+        @watchings = []
       end
 
       def on_message(message)
         case message
+        when Bitcoin::Grpc::WatchTokenRequest
+          watchings << message
         when Bitcoin::Grpc::EventUtxoSpent
           tx = Bitcoin::Tx.parse_from_payload(message.tx_payload.htb)
           log(::Logger::DEBUG, "tx=#{tx}, open_assets?=#{tx.open_assets?}")
@@ -26,10 +29,12 @@ module Bitcoin
           when tx.open_assets?
             outputs = Bitcoin::Grpc::OapService.outputs_with_open_asset_id(message.tx_hash)
             begin
+              puts outputs
               if outputs
                 outputs.each do |output|
                   asset_id = output['asset_id']
                   next unless asset_id
+
                   asset_id_as_hex = Bitcoin::Base58.decode(asset_id)
                   asset_quantity = output['asset_quantity']
                   oa_output_type = output['oa_output_type']
@@ -37,13 +42,20 @@ module Bitcoin
                   out_point = Bitcoin::OutPoint.new(tx.tx_hash, output['n'])
                   utxo = utxo_db.get_utxo(out_point)
                   next unless utxo
+
                   asset_output = utxo_db.save_token(AssetFeature::AssetType::OPEN_ASSETS, asset_id_as_hex, asset_quantity, utxo)
                   next unless asset_output
-                  if oa_output_type == 'issuance'
-                    publisher << Bitcoin::Grpc::EventTokenIssued.new(request_id: 0, asset: asset_output)
-                  else
-                    publisher << Bitcoin::Grpc::EventTokenTransfered.new(request_id: 0, asset: asset_output)
+
+                  item_to_delete = []
+                  watchings.select { |item| item.asset_id == asset_id }.each do |item|
+                    if oa_output_type == 'issuance'
+                      publisher << Bitcoin::Grpc::EventTokenIssued.new(request_id: item.id, asset: asset_output)
+                    else
+                      publisher << Bitcoin::Grpc::EventTokenTransfered.new(request_id: item.id, asset: asset_output)
+                    end
+                    item_to_delete << item
                   end
+                  item_to_delete.each { |item| watchings.delete(item) }
                 end
               else
                 raise 'can not get asset_id'

data/proto/bitcoin/grpc/grpc.proto

@@ -120,7 +120,8 @@ message WatchUtxoSpentResponse {
 
 message WatchTokenRequest {
   uint32 id = 1;
-  bytes asset_type = 2;
+  uint32 asset_type = 2;
+  string asset_id = 3;
 }
 
 message WatchTokenResponse {
@@ -201,7 +202,7 @@ message Utxo {
 }
 
 message AssetOutput {
-  bytes asset_type = 1;
+  uint32 asset_type = 1;
   string asset_id = 2;
   uint64 asset_quantity = 3;
   string tx_hash = 4;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb-grpc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler