hive_sql 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc58e527a62f06dd3c1965553ce95b385170373f32f49cfd3d08dab53e9541c
-  data.tar.gz: 953234f4a4548da4b3ab4c3d46ef7e3e49c2346fa6c3858e6618d57648a2dadb
+  metadata.gz: 6a69a495f4ca59bbda3187a5e67811b164d545001e45aa48559fd3c71dc7a9b5
+  data.tar.gz: b94bed8fdba6e7ffb967ef8fa2cb0c4c39f13d3c9ae9559456c3dd34b7dd5d7d
 SHA512:
-  metadata.gz: 91e0adc7e812497c1ce7335eac25d8df66c72e4fe1c0c43216397d132971dbb52824c38284f9d89624a63a803c5561aa7379dd9875c365bfe95c71eababf6944
-  data.tar.gz: 73f2d1539ffec1fe0fdb1d13dba4445a13d53d273ccbbc7d986daf1ee253f4461d354b8dfb29d1f41903158857a52da81f41c1eaab917568522e07c52a4fe390
+  metadata.gz: b49ed0517155beb3a03374d94587b457a1e2c8a55a80856a7e2d707410b80fd147ef1de13a5dd4f361fa092e818310f477915b2302b3ec8666abb22c9157b6fa
+  data.tar.gz: b60eace66ec04cbfd0502e001de0223ef6c5650775f727e0d96a9e92216ed42c61db3586a14892727fa25d58934638cb190ee271cff5adcc8ae5eb32648a03c0

data/Rakefile

@@ -78,6 +78,46 @@ namespace :created do
   end
 end
 
+namespace :deleted do
+  desc 'Lists comments deleted grouped by author and date.'
+  task :comments, [:author, :days_ago, :minimum_deletes] do |t, args|
+    now = Time.now.utc
+    author = args[:author]
+    after_timestamp = now - ((args[:days_ago] || '7').to_i * 86400)
+    minimum_deletes = (args[:minimum_deletes] || '1').to_i
+    
+    delete_comments = HiveSQL::Tx::DeleteComment.all
+    
+    if !!author || author == '%'
+      unless author == '%'
+        delete_comments = delete_comments.where(author: author)
+      end
+    elsif author =~ /.*%.*/
+      delete_comments = delete_comments.where('author LIKE ?', author)
+    end
+    
+    delete_comments = delete_comments.where('timestamp > ?', after_timestamp)
+    rewards = HiveSQL::Vo::AuthorReward.where(author: delete_comments.select(:author), permlink: delete_comments.select(:permlink))
+    delete_comments = delete_comments.group('CAST(timestamp AS DATE)', :author)
+    delete_comments = delete_comments.order('cast_timestamp_as_date ASC')
+    
+    delete_comments = delete_comments.count
+    
+    if minimum_deletes > 1
+      delete_comments = delete_comments.select{|k, v| v >= minimum_deletes}
+    end
+    
+    puts "# Daily deleted comment count by #{author.nil? ? 'all account authors' : author} since #{after_timestamp} ..."
+    ap delete_comments
+    puts "# Total deleted comments: #{delete_comments.values.sum}"
+    
+    puts "# Author reward impact:"
+    puts "# HBD: #{rewards.sum(:hbd_payout)}"
+    puts "# HIVE: #{rewards.sum(:hive_payout)}"
+    puts "# VESTS: #{rewards.sum(:vesting_payout)}"
+  end
+end
+
 desc 'Lists sum of transfers grouped by date, from, and to.'
 task :transfers, [:minimum_amount, :symbol, :days_ago] do |t, args|
   now = Time.now.utc
@@ -231,7 +271,7 @@ namespace :crosscheck do
   task :transfers, [:account] do |t, args|
     exchanges = %w(bittrex poloniex openledger blocktrades deepcrypto8 gopax
       binanceexchange teambitwala changelly hitbtc-exchange korbit roomofsatoshi
-      shapeshiftio)
+      shapeshiftio huobi-withdrawal bithumbrecv2 user.dunamu hot.dunamu)
     account = args[:account]
     
     if account.nil? || account == ''
@@ -408,7 +448,14 @@ namespace :rewards do
     when 'VESTS' then rewards.sum(:vesting_payout)
     when 'MVESTS'
       rewards.sum('vesting_payout / 1000000')
-    else; puts "Unknown symbol: #{symbol}.  Symbols supported: HBD, HIVE, VESTS, MVESTS"
+    when 'HP'
+      properties = HiveSQL::DynamicGlobalProperties.first
+      total_vesting_fund_hive = properties.total_vesting_fund_hive.to_f
+      total_vesting_shares_mvest = properties.total_vesting_shares.to_f / 1e6
+      base_per_mvest = total_vesting_fund_hive / total_vesting_shares_mvest
+
+      rewards.sum("(vesting_payout / 1000000) * #{base_per_mvest}")
+    else; puts "Unknown symbol: #{symbol}.  Symbols supported: HBD, HIVE, VESTS, MVESTS, HP"
     end
     
     ap rewards
@@ -440,13 +487,24 @@ namespace :rewards do
       puts "Daily curation reward #{symbol} sum grouped by date since #{after_timestamp} ..."
     end
     
-    case symbol
+    rewards = case symbol
     when 'VESTS'
-      ap rewards.sum("TRY_PARSE(REPLACE(reward, ' VESTS', '') AS float)")
+      rewards.sum("TRY_PARSE(REPLACE(reward, ' VESTS', '') AS float)")
     when 'MVESTS'
-      ap rewards.sum("TRY_PARSE(REPLACE(reward, ' VESTS', '') AS float) / 1000000")
-    else; puts "Unknown symbol: #{symbol}.  Symbols supported: VESTS, MVESTS"
+      rewards.sum("TRY_PARSE(REPLACE(reward, ' VESTS', '') AS float) / 1000000")
+    when 'HP'
+      properties = HiveSQL::DynamicGlobalProperties.first
+      total_vesting_fund_hive = properties.total_vesting_fund_hive.to_f
+      total_vesting_shares_mvest = properties.total_vesting_shares.to_f / 1e6
+      base_per_mvest = total_vesting_fund_hive / total_vesting_shares_mvest
+
+      rewards.sum("(TRY_PARSE(REPLACE(reward, ' VESTS', '') AS float) / 1000000) * #{base_per_mvest}")
+    else; puts "Unknown symbol: #{symbol}.  Symbols supported: VESTS, MVESTS, HP"
     end
+    
+    ap rewards
+    sum = rewards.values.sum
+    puts "# Total rewards: %.3f %s (average: %.3f per day)" % [sum, symbol, (sum / rewards.size)]
   end
 end
 
@@ -524,7 +582,7 @@ end
 
 desc <<~EOF
   Top comments by what ... 
-  Allowed \"what\" options: upvoted downvoted
+  Allowed \"what\" options: voter upvoted downvoted
 EOF
 task :top, [:what, :limit] do |t, args|
   what = args[:what].to_s.downcase.to_sym
@@ -532,6 +590,13 @@ task :top, [:what, :limit] do |t, args|
   since = 1.week.ago
   
   case what
+  when :voter
+    votes = HiveSQL::Tx::Vote.after(since)
+    votes = votes.group(:voter)
+    votes = votes.order('count_all DESC')
+    votes = votes.limit(limit)
+    
+    ap votes.count
   when :upvoted, :downvoted
     comments = HiveSQL::Comment.after(since)
     comments = if what == :upvoted
@@ -553,6 +618,8 @@ task :top, [:what, :limit] do |t, args|
       
       puts "#{v}; #{created.round(2)} days ago: #{url}"
     end
+  else
+    exec 'rake -D top | head -3'
   end
 end
 
@@ -602,20 +669,124 @@ task :proposal_pay, [:minimum_payment, :days_ago] do |t, args|
   puts "Average daily payments: #{'%.3f' % average_daily_payments} #{symbol}"
 end
 
+desc 'Lists sum of HBD interest grouped by date, from, and to.'
+task :interest, [:minimum_payment, :days_ago] do |t, args|
+  now = Time.now.utc
+  minimum_payment = (args[:minimum_payment] || '0.001').to_f
+  days_ago = (args[:days_ago] || '30').to_i
+  after_timestamp = now - days_ago * 86400
+  
+  payments = HiveSQL::Vo::Interest.all
+  payments = payments.where('Interest > ?', minimum_payment)
+  payments = payments.where('timestamp > ?', after_timestamp)
+  duration = payments.minimum(:timestamp)
+  
+  payments = payments.group('CAST(timestamp AS DATE)')
+  payments = payments.order('cast_timestamp_as_date ASC')
+  
+  puts "# Daily interest payment sum #{'%.3f HBD' % minimum_payment} and over, since #{after_timestamp} ..."
+  ap payments.sum(:Interest)
+  
+  actual_days = ((((Time.now - duration)) / 60) / 60) / 24
+  interst_sum = payments.sum(:Interest).values.sum
+  average_daily_payments = interst_sum / actual_days
+  puts "Total interest paid for period #{'%.3f HBD' % interst_sum}; average daily payments: #{'%.3f HBD' % average_daily_payments} (days: #{actual_days})"
+end
+
 # Doesn't look like this table exists.
-# desc 'List conversion HBD conversion request sums grouped by day.'
-# task :convert, [:days_ago] do |t, args|
-#   now = Time.now.utc
-#   after_timestamp = now - ((args[:days_ago] || '3.5').to_f * 86400)
-# 
-#   converts = HiveSQL::Vo::FillConvertRequest
-#   converts = converts.where('timestamp > ?', after_timestamp)
-#   converts = converts.group('CAST(timestamp AS DATE)')
-#   converts = converts.order('cast_timestamp_as_date ASC')
-# 
-#   puts "Daily conversion requests failled sum grouped by date since #{after_timestamp} ..."
-#   ap converts.sum(:amount)
-# end
+desc 'List conversion HBD conversion request sums grouped by day.'
+task :convert, [:days_ago] do |t, args|
+  now = Time.now.utc
+  after_timestamp = now - ((args[:days_ago] || '3.5').to_f * 86400)
+
+  converts = HiveSQL::Vo::FillConvertRequest
+  converts = converts.where('timestamp > ?', after_timestamp)
+  converts = converts.group('CAST(timestamp AS DATE)')
+  converts = converts.order('cast_timestamp_as_date ASC')
+
+  puts "# Daily HBD conversion requests sum grouped by date since #{after_timestamp} ..."
+  ap converts.sum(:amount_in)
+end
+
+# Doesn't look like this table exists.
+desc 'List daily activity of account, for specified days (default 90)'
+task :activity, [:account_name, :days_ago] do |t, args|
+  now = Time.now.utc
+  after_timestamp = now - ((args[:days_ago] || '90').to_f * 86400)
+  account_name = args[:account_name]
+
+  trx = HiveSQL::Transaction.by(account_name)
+  trx = trx.joins(:block).where('timestamp > ?', after_timestamp)
+  trx = trx.group('type')
+  trx = trx.order('count_type ASC')
+
+  puts "# Daily transactions by #{account_name} for type count grouped by type since #{after_timestamp} ..."
+  ap trx.count(:type)
+end
+
+namespace :witnesses do
+  desc 'Count witnesses that have signed blocks, group by day.'
+  task :count, [:days_ago] do |t, args|
+    now = Time.now.utc
+    days_ago = (args[:days_ago] || '3.5').to_f
+    after_timestamp = now - (days_ago * 86400)
+
+    blocks = HiveSQL::Block
+    blocks = blocks.where('timestamp > ?', after_timestamp)
+    duration = blocks.minimum(:timestamp)
+    total_witness_count = blocks.distinct.count(:witness)
+    blocks = blocks.group('CAST(timestamp AS DATE)')
+    blocks = blocks.order('cast_timestamp_as_date ASC')
+    
+    actual_days = ((((Time.now - duration)) / 60) / 60) / 24
+    
+    puts "Witness count that signed blocks grouped by date since #{after_timestamp} ..."
+    ap blocks.distinct.count(:witness)
+    puts "# Total unique witnesses: %d (average: %.1f per day)" % [total_witness_count, (blocks.distinct.count(:witness).values.sum) / actual_days]
+  end
+
+  desc 'Witness accounts that have signed blocks, group by day.'
+  task :accounts, [:days_ago] do |t, args|
+    now = Time.now.utc
+    days_ago = (args[:days_ago] || '3.5').to_f
+    after_timestamp = now - (days_ago * 86400)
+
+    blocks = HiveSQL::Block
+    blocks = blocks.where('timestamp > ?', after_timestamp)
+    duration = blocks.minimum(:timestamp)
+    total_witness_count = blocks.distinct.count(:witness)
+    blocks = blocks.group(:witness)
+    blocks = blocks.order('1 ASC')
+    
+    actual_days = ((((Time.now - duration)) / 60) / 60) / 24
+    
+    puts "Witness count that signed blocks grouped by date since #{after_timestamp} ..."
+    ap blocks.distinct.count(:all)
+    puts "# Total unique witnesses: %d" % [total_witness_count]
+  end
+
+  desc 'New witness accounts that have signed blocks, group by day.'
+  task :new_accounts, [:days_ago] do |t, args|
+    now = Time.now.utc
+    days_ago = (args[:days_ago] || '3.5').to_f
+    after_timestamp = now - (days_ago * 86400)
+
+    blocks = HiveSQL::Block
+    previous_blocks = blocks.where('timestamp <= ?', after_timestamp).limit(9600) # about one day of blocks
+    previous_blocks = previous_blocks.order(block_num: :desc)
+    blocks = blocks.where('timestamp > ?', after_timestamp).where.not(witness: previous_blocks.select(:witness))
+    duration = blocks.minimum(:timestamp)
+    total_witness_count = blocks.distinct.count(:witness)
+    blocks = blocks.group(:witness)
+    blocks = blocks.order('1 ASC')
+    
+    actual_days = ((((Time.now - duration)) / 60) / 60) / 24
+    
+    puts "New witness count that signed blocks grouped by date since #{after_timestamp} ..."
+    ap blocks.distinct.count(:all)
+    puts "# Total unique witnesses: %d" % [total_witness_count]
+  end
+end
 
 desc 'Build a new version of the hive_sql gem.'
 task :build do

data/lib/hive_sql/models/account.rb

@@ -29,6 +29,11 @@ module HiveSQL
     has_many :subscriptions, foreign_key: :subscriber, class_name: 'HiveSQL::CommunitySubscriber', primary_key: :name
     has_many :subscribed_communities, through: :subscriptions, source: :community_record
     
+    has_many :proposals, foreign_key: :creator, class_name: 'HiveSQL::Proposal', primary_key: :name
+    
+    has_many :proposal_votes, foreign_key: :voter, class_name: 'HiveSQL::ProposalApproval', primary_key: :name
+    has_many :approved_proposals, through: :proposal_votes, source: :proposal
+    
     scope :before, lambda { |before, field = 'created'| where("#{field} < ?", before) }
     scope :after, lambda { |after, field = 'created'| where("#{field} > ?", after) }
     scope :today, -> { after(1.day.ago) }

data/lib/hive_sql/models/block.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module HiveSQL
   class Block < HiveSQL::SqlBase
 
@@ -5,7 +7,17 @@ module HiveSQL
     self.primary_key = :block_num
     
     has_many :transactions, foreign_key: :block_num
-
+    
+    # You have the actual trx_id that the blockchain knows about and you would
+    # like to get this corresponding block.  Well, HiveSQL doesn't store that,
+    # so we have to do an RPC lookup.
+    scope :trx_id, lambda { |trx_id|
+      block_num = JSON[open("http://anyx.io/v1/account_history_api/get_transaction?id=#{trx_id}").read].tap do |tx|
+        tx['block_num']
+      end
+      
+      where(block_num: block_num)
+    }
   end
 end
 

data/lib/hive_sql/models/comment.rb

@@ -25,8 +25,11 @@ module HiveSQL
     
     scope :normalized_json, -> { where("json_metadata LIKE '{%}' AND ISJSON(json_metadata) > 0") }
     
-    scope :app, lambda { |app|
-      normalized_json.where("JSON_VALUE(json_metadata, '$.app') LIKE ?", "#{app}/%")
+    scope :app, lambda { |app, forward = true|
+      r = normalized_json.where("JSON_VALUE(json_metadata, '$.app') LIKE ?", "#{app}/%")
+      r = where.not(id: r.select(:id)) unless forward
+      
+      r
     }
     
     scope :app_version, lambda { |version|
@@ -37,12 +40,15 @@ module HiveSQL
     scope :author, lambda {|author| joins(:author_record).where(author: author)}
     
     scope :tagged, lambda { |tag, options = {exclude_category: false}|
+      tag = [tag].flatten
       exclude_category = !!options[:exclude_category]
+      tagged_posts = HiveSQL::Tag.where(tag: tag).select(:comment_ID)
+      tagged_posts = tagged_posts.where("comment_ID > ?", minimum(:ID))
       
       if exclude_category
-        where(id: HiveSQL::Tag.where(tag: tag).select(:comment_ID))
+        where(id: tagged_posts.select(:comment_ID))
       else
-        where("ID IN(?) OR category = ?", HiveSQL::Tag.where(tag: tag).select(:comment_ID), tag)
+        where("ID IN(?) OR category = ?", tagged_posts.select(:comment_ID), tag.first)
       end
     }
     
@@ -66,6 +72,32 @@ module HiveSQL
       where("JSON_VALUE(beneficiaries, '$.account') IN(?)", [account].flatten)
     }
     
+    scope :query, lambda { |query, forward = true|
+      query = [query].flatten.map{|q| "%#{q}%"}
+      condition = []
+      sub_conditions = []
+      
+      sub_conditions << "LOWER(author) LIKE ?"
+      sub_conditions << "LOWER(permlink) LIKE ?"
+      sub_conditions << "LOWER(category) LIKE ?"
+      sub_conditions << "LOWER(parent_author) LIKE ?"
+      sub_conditions << "LOWER(parent_permlink) LIKE ?"
+      sub_conditions << "LOWER(title) LIKE ?"
+      sub_conditions << "LOWER(body) LIKE ?"
+      sub_conditions << "LOWER(json_metadata) LIKE ?"
+      sub_conditions << "LOWER(beneficiaries) LIKE ?"
+      sub_conditions << "LOWER(root_title) LIKE ?"
+      
+      query.each do |q|
+        condition += sub_conditions
+      end
+      
+      r = where(condition.join(' OR '), *(query * sub_conditions.size))
+      r = where.not(id: r.select(:id)) unless forward
+      
+      r
+    }
+    
     def self.find_by_author(author)
       where(author: author).first
     end
@@ -85,6 +117,10 @@ module HiveSQL
     def tag_names
       tags.pluck(:tag)
     end
+    
+    def hydrated_json_metadata
+      JSON[json_metadata] rescue {}
+    end
   end
 end
 

data/lib/hive_sql/models/dynamic_global_properties.rb

@@ -18,17 +18,23 @@ end
 #   num_pow_witnesses: integer,
 #   virtual_supply: money,
 #   current_supply: money,
+#   current_supply_symbol: varchar,
 #   confidential_supply: money,
+#   confidential_supply_symbol: varchar,
 #   current_hbd_supply: money,
+#   current_hbd_supply_symbol: varchar,
 #   confidential_hbd_supply: money,
 #   total_vesting_fund_hive: money,
 #   total_vesting_fund_hive_symbol: varchar,
 #   total_vesting_shares: money,
 #   total_vesting_shares_symbol: varchar,
 #   total_reward_fund_hive: money,
+#   total_reward_fund_hive_symbol: varchar,
 #   total_reward_shares2: varchar,
 #   pending_rewarded_vesting_shares: varchar,
+#   pending_rewarded_vesting_shares_symbol: varchar,
 #   pending_rewarded_vesting_hive: varchar,
+#   pending_rewarded_vesting_hive_symbol: varchar,
 #   hbd_interest_rate: integer,
 #   hbd_print_rate: integer,
 #   average_block_size: integer,
@@ -41,5 +47,24 @@ end
 #   vote_power_reserve_rate: integer,
 #   current_reserve_ratio: integer,
 #   vote_regeneration_per_day: integer,
-#   hive_per_vest: money
+#   hive_per_vest: money,
+#   required_actions_partition_percent: integer,
+#   target_votes_per_period: integer,
+#   delegation_return_period: integer,
+#   reverse_auction_seconds: integer,
+#   available_account_subsidies: integer,
+#   hbd_stop_percent: integer,
+#   hbd_start_percent: integer,
+#   next_maintenance_time: timestamp,
+#   last_budget_time: timestamp,
+#   content_reward_percent: integer,
+#   vesting_reward_percent: integer,
+#   sps_fund_percent: integer,
+#   sps_interval_ledger: integer,
+#   sps_interval_ledger_symbol: varchar,
+#   downvote_pool_percent: integer,
+#   smt_creation_fee: money,
+#   smt_creation_fee_symbol: varchar,
+#   price_hive_usd: money,
+#   price_hbd_usd: money
 # )

data/lib/hive_sql/models/proposal.rb

@@ -0,0 +1,26 @@
+module HiveSQL
+  class Proposal < HiveSQL::SqlBase
+    self.table_name = :Proposals
+    
+    belongs_to :creator_record, foreign_key: :creator, class_name: 'HiveSQL::Account', primary_key: :name
+    belongs_to :receiver_record, foreign_key: :receiver, class_name: 'HiveSQL::Account', primary_key: :name
+    has_many :approvals, foreign_key: :proposal_id, class_name: 'HiveSQL::ProposalApproval', primary_key: :id
+    has_many :voters, through: :approvals, source: :voter
+  end
+end
+
+# Structure
+#
+# HiveSQL::Follower(
+#   id integer,
+#   creator varchar,
+#   receiver varchar,
+#   start_date timestamp,
+#   end_date timestamp,
+#   daily_pay money,
+#   daily_pay_symbol varchar(3),
+#   subject varchar,
+#   permlink varchar,
+#   total_votes integer,
+#   deleted boolean
+# )

data/lib/hive_sql/models/proposal_approval.rb

@@ -0,0 +1,15 @@
+module HiveSQL
+  class ProposalApproval < HiveSQL::SqlBase
+    self.table_name = :ProposalsApprovals
+    
+    belongs_to :proposal, foreign_key: :proposal_id, class_name: 'Proposal', primary_key: :id
+    belongs_to :voter_record, foreign_key: :voter, class_name: 'Account', primary_key: :name
+  end
+end
+
+# Structure
+#
+# HiveSQL::Follower(
+#   proposal_id integer,
+#   voter varchar
+# )

data/lib/hive_sql/models/reblog.rb

@@ -3,8 +3,8 @@ module HiveSQL
 
     self.table_name = :Reblogs
     
-    belongs_to :account, foreign_key: :account, class_name: 'Account', primary_key: :name
-    belongs_to :author_account, foreign_key: :author, class_name: 'Account', primary_key: :name
+    belongs_to :account_record, foreign_key: :account, class_name: 'Account', primary_key: :name
+    belongs_to :author_record, foreign_key: :author, class_name: 'Account', primary_key: :name
     
     def comment; Comment::find_by(author: author, permlink: permlink); end
   end

data/lib/hive_sql/models/transaction.rb

@@ -14,6 +14,20 @@ module HiveSQL
     
     scope :type, lambda { |type| where(type: type) }
     
+    scope :by, lambda {|account_name|
+      account_name = [account_name].flatten
+      sub_selects = []
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountCreates WHERE creator IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountRecovers WHERE recovery_account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountUpdates WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountWitnessProxies WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxAccountWitnessVotes WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxClaimRewardBalances WHERE account IN (?))'
+      sub_selects << 'tx_id IN (SELECT tx_id FROM TxComments WHERE author IN (?))'
+      
+      where(sub_selects.join(' OR '), *([account_name] * sub_selects.size))
+    }
+    
     # So you have a Transaction#tx_id and you want to know what the operation was
     # that lead to it.  Well, that's tricky because all of the ops are in their
     # own tables.  This method will (slowly) try to find the appropriate table.

data/lib/hive_sql/models/tx/account_witness_proxy.rb

@@ -10,7 +10,7 @@ module HiveSQL
         
         ids = active.map do |p|
           p.id unless AccountWitnessProxy.where(account: p.account).
-            where.not(proxy: p.Proxy).
+            where.not(proxy: p.proxy).
             where('timestamp > ?', p.timestamp).exists?
         end
         
@@ -26,6 +26,6 @@ end
 #   ID: integer,
 #   tx_id: integer,
 #   account: varchar,
-#   Proxy: varchar,
+#   proxy: varchar,
 #   timestamp: datetime
 # )

data/lib/hive_sql/models/tx/custom.rb

@@ -10,6 +10,7 @@ module HiveSQL
       scope :any_required_posting_auths, lambda { |required_posting_auth|
         where("? IN(JSON_VALUE(required_posting_auths, '$'))", required_posting_auth)
       }
+      scope :normalized_json, -> { where("ISJSON(json_metadata) > 0") }
     end
   end
 end

data/lib/hive_sql/models/tx/proposal_create.rb

@@ -0,0 +1,35 @@
+module HiveSQL
+  module Tx
+    class ProposalCreate < HiveSQL::SqlBase
+      belongs_to :voter_record, foreign_key: :account, primary_key: :voter, class_name: 'HiveSQL::Account'
+
+      self.table_name = :TxProposalCreates
+      
+      scope :proposal, lambda { |id, invert = false|
+        if !!invert
+          where("? NOT IN (SELECT value FROM OPENJSON(proposal_ids,'$'))", id)
+        else
+          where("? IN (SELECT value FROM OPENJSON(proposal_ids,'$'))", id)
+        end
+      }
+      
+      scope :approve, lambda {|approve = true| where(approve: approve)}
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Tx::ProposalCreate(
+#   ID: integer,
+#   tx_id: integer,
+#   creator: varchar,
+#   receiver: varchar,
+#   start_date: datetime
+#   end_date: datetime
+#   daily_pay: money,
+#   daily_pay_symbol: boolean,
+#   subject: varchar,
+#   permlink: varchar,
+#   timestamp: datetime
+# )

data/lib/hive_sql/models/tx/{update_proposal_vote.rb → proposal_vote_update.rb}

@@ -1,9 +1,9 @@
 module HiveSQL
   module Tx
-    class UpdateProposalVote < HiveSQL::SqlBase
+    class ProposalVoteUpdate < HiveSQL::SqlBase
       belongs_to :voter_record, foreign_key: :account, primary_key: :voter, class_name: 'HiveSQL::Account'
 
-      self.table_name = :TxUpdateProposalVotes
+      self.table_name = :TxProposalVoteUpdates
       
       scope :proposal, lambda { |id, invert = false|
         if !!invert
@@ -20,7 +20,7 @@ end
 
 # Structure
 #
-# HiveSQL::Tx::Vote(
+# HiveSQL::Tx::ProposalVoteUpdate(
 #   ID: integer,
 #   tx_id: integer,
 #   voter: varchar,

data/lib/hive_sql/models/vo/account_created.rb

@@ -0,0 +1,23 @@
+module HiveSQL
+  module Vo
+    class AccountCreated < HiveSQL::SqlBase
+
+      self.table_name = :VOAccountCreateds
+
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::AccountCreated(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   new_account_name: varchar,
+#   creator: varchar,
+#   initial_vesting_shares: money,
+#   initial_vesting_shares_symbol: varchar,
+#   initial_delegation: money,
+#   initial_delegation_symbol: varchar
+# )

data/lib/hive_sql/models/vo/changed_recovery_account.rb

@@ -0,0 +1,20 @@
+module HiveSQL
+  module Vo
+    class ChangedRecoveryAccount < HiveSQL::SqlBase
+
+      self.table_name = :VOChangedRecoveryAccounts
+
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::ChangedRecoveryAccount(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   account: varchar,
+#   old_recovery_account: varchar,
+#   new_recovery_account: varchar
+# )

data/lib/hive_sql/models/vo/clear_null_account_balance.rb

@@ -0,0 +1,21 @@
+module HiveSQL
+  module Vo
+    class ClearNullAccountBalance < HiveSQL::SqlBase
+
+      self.table_name = :VOClearNullAccountBalances
+      
+      def hydrated_total_cleared
+        JSON[total_cleared]
+      end
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::ClearNullAccountBalance(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   total_cleared: json
+# )

data/lib/hive_sql/models/vo/comments_vote.rb

@@ -0,0 +1,25 @@
+module HiveSQL
+  module Vo
+    class CommentsVote < HiveSQL::SqlBase
+
+      self.table_name = :VOCommentsVotes
+
+    end
+  end
+end
+
+# Structure
+#
+# HiveSQL::Vo::CommentsVote(
+#   ID: integer,
+#   block_num: integer,
+#   timestamp: datetime,
+#   voter: varchar,
+#   author: varchar,
+#   permlink: varchar
+#   weight: integer,
+#   rshares: integer,
+#   total_vote_weight: integer,
+#   pending_payout: money
+#   pending_payout_symbol: varchar
+# )

data/lib/hive_sql/models/vo/sps_fund.rb

@@ -14,5 +14,7 @@ end
 #   ID: integer,
 #   block_num: integer,
 #   timestamp: datetime,
-#   additional_funds: money
+#   receiver: varchar
+#   payment: money
+#   payment_symbol: varchar
 # )

data/lib/hive_sql/version.rb

@@ -1,3 +1,3 @@
 module HiveSQL
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/hive_sql.rb

@@ -14,6 +14,8 @@ require "hive_sql/models/community_role"
 require "hive_sql/models/delegation"
 require "hive_sql/models/dynamic_global_properties"
 require "hive_sql/models/follower"
+require "hive_sql/models/proposal"
+require "hive_sql/models/proposal_approval"
 require "hive_sql/models/reblog"
 require "hive_sql/models/tag"
 require "hive_sql/models/token"
@@ -41,7 +43,8 @@ require "hive_sql/models/tx/feed"
 require "hive_sql/models/tx/limit_order"
 require "hive_sql/models/tx/pow"
 require "hive_sql/models/tx/transfer"
-require "hive_sql/models/tx/update_proposal_vote"
+require "hive_sql/models/tx/proposal_create"
+require "hive_sql/models/tx/proposal_vote_update"
 require "hive_sql/models/tx/vote"
 require "hive_sql/models/tx/withdraw"
 require "hive_sql/models/tx/withdraw_vesting_route"
@@ -52,10 +55,14 @@ require "hive_sql/models/tx/custom/witness"
 require "hive_sql/models/tx/custom/reblog"
 require "hive_sql/models/tx/custom/community"
 
+require "hive_sql/models/vo/account_created"
 require "hive_sql/models/vo/author_reward"
+require "hive_sql/models/vo/changed_recovery_account"
+require "hive_sql/models/vo/clear_null_account_balance"
 require "hive_sql/models/vo/comment_benefactor_reward"
 require "hive_sql/models/vo/comment_payout_update"
 require "hive_sql/models/vo/comment_reward"
+require "hive_sql/models/vo/comments_vote"
 require "hive_sql/models/vo/curation_reward"
 require "hive_sql/models/vo/fill_convert_request"
 require "hive_sql/models/vo/fill_order"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive_sql
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Anthony Martin (inertia)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -34,42 +34,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: minitest-proveit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -174,22 +174,22 @@ dependencies:
   name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +267,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -274,26 +277,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: Rails compatible gem that provides full DB connection and models to HiveSQL.io
 email:
 - hive_sql@martin-studio.com
@@ -317,6 +323,8 @@ files:
 - lib/hive_sql/models/delegation.rb
 - lib/hive_sql/models/dynamic_global_properties.rb
 - lib/hive_sql/models/follower.rb
+- lib/hive_sql/models/proposal.rb
+- lib/hive_sql/models/proposal_approval.rb
 - lib/hive_sql/models/reblog.rb
 - lib/hive_sql/models/sql_base.rb
 - lib/hive_sql/models/tag.rb
@@ -345,16 +353,21 @@ files:
 - lib/hive_sql/models/tx/feed.rb
 - lib/hive_sql/models/tx/limit_order.rb
 - lib/hive_sql/models/tx/pow.rb
+- lib/hive_sql/models/tx/proposal_create.rb
+- lib/hive_sql/models/tx/proposal_vote_update.rb
 - lib/hive_sql/models/tx/transfer.rb
-- lib/hive_sql/models/tx/update_proposal_vote.rb
 - lib/hive_sql/models/tx/vote.rb
 - lib/hive_sql/models/tx/withdraw.rb
 - lib/hive_sql/models/tx/withdraw_vesting_route.rb
 - lib/hive_sql/models/tx/witness_update.rb
+- lib/hive_sql/models/vo/account_created.rb
 - lib/hive_sql/models/vo/author_reward.rb
+- lib/hive_sql/models/vo/changed_recovery_account.rb
+- lib/hive_sql/models/vo/clear_null_account_balance.rb
 - lib/hive_sql/models/vo/comment_benefactor_reward.rb
 - lib/hive_sql/models/vo/comment_payout_update.rb
 - lib/hive_sql/models/vo/comment_reward.rb
+- lib/hive_sql/models/vo/comments_vote.rb
 - lib/hive_sql/models/vo/curation_reward.rb
 - lib/hive_sql/models/vo/fill_convert_request.rb
 - lib/hive_sql/models/vo/fill_order.rb
@@ -388,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Ruby/Rails wrapper for HiveSQL.io