txcatcher 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c43d229ba733c395f0dbf5cac76eade727cb2a9
-  data.tar.gz: fa0dd26fc337d4d6c94ed4c595655afa6fd2203a
+  metadata.gz: b6cac40db729a4877b1ac15405b50354360e3da0
+  data.tar.gz: 4cae9a975eede3fe04c7594a1ed02ea6060264a4
 SHA512:
-  metadata.gz: 90682b9fba3a7f11d2a99cbdae37466382297012578ca83cec11d49e5fd706d03088afc29385835905a9d6840b3b54fa4777bddd4fc93a25b6d4b0a011d83a98
-  data.tar.gz: 3d457be8d079ff1984bcb3fd300a5ba9b9e07d84fb1c28decc6097038982b1355be3fb92b836a3bd1b3f57403ddebfe46b8511168a09f01d37f0d0d800fc4b9b
+  metadata.gz: 2c49ea263e88f953ea1511cbf7709fe8988e6cf0504edd4eb70893df6c6b28cdad3bad1edb49e39f7cd3e53788347669b41a886bb0ed935c30f5b16d2bb92b88
+  data.tar.gz: c20d6feefdd431b05d44c04c0d9162d9815bcbec2adcd28465d559bae065530e2ef10ee5ab3f964d6f8b9c36e317139d1cf39317f3d03f4d092cce1cf396f3ab

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/txcatcher/server.rb

@@ -17,6 +17,8 @@ module TxCatcher
         address(path)
       elsif path.start_with? "/tx/send"
         broadcast_tx(params["rawtx"])
+      elsif path.start_with? "/feerate"
+        feerate(params["blocks_target"] || 2)
       elsif path == "/" || path.empty?
         [200, {}, "TxCatcher server, #{TxCatcher::Config.rpcnode["name"]}, current_block_height: #{TxCatcher.current_block_height}"]
       else
@@ -32,8 +34,8 @@ module TxCatcher
       if address
         transactions_ids = address.deposits.map { |d| d.transaction.txid }
         deposits = address.deposits.map do |d|
-          t.update(protected: true) unless t.protected
           t = d.transaction
+          t.update(protected: true) unless t.protected
           t.update_block_height!
           {
             txid:          t.txid,
@@ -78,6 +80,18 @@ module TxCatcher
       [200, {}, tx.to_json]
     end
 
+    def feerate(blocks_target)
+      result = TxCatcher.rpc_node.estimatesmartfee(blocks_target.to_i)
+
+      # This is for older versions of bitcoind/litecoind clients
+      if result.to_s.include?("error")
+        result = TxCatcher.rpc_node.estimatefee(blocks_target.to_i)
+        result = { "feerate" => result, "blocks" => blocks_target}
+      end
+
+      [200, {}, result["feerate"].to_s]
+    end
+
   end
 
 end

data/txcatcher.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: txcatcher 0.1.7 ruby lib
+# stub: txcatcher 0.1.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "txcatcher"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txcatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath