Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions glueby.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_runtime_dependency 'tapyrus', '>= 0.3.1'
spec.add_runtime_dependency 'activerecord', '>= 7.0', '< 8.0'
spec.add_runtime_dependency 'tapyrus', '>= 0.3.7'
spec.add_runtime_dependency 'activerecord', '>= 7.0', '< 9.0'
spec.add_runtime_dependency 'kaminari'
spec.add_runtime_dependency 'mutex_m'
spec.add_runtime_dependency 'bigdecimal'
spec.add_development_dependency 'sqlite3', '~> 1.4'
spec.add_development_dependency 'sqlite3', '>= 2.1'
spec.add_development_dependency 'mysql2'
spec.add_development_dependency 'rails', '>= 7.0', '< 8.0'
spec.add_development_dependency 'rails', '>= 7.0', '< 9.0'
end
4 changes: 2 additions & 2 deletions lib/glueby/contract/active_record/timestamp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ module AR
class Timestamp < ::ActiveRecord::Base
include Glueby::GluebyLogger

enum status: { init: 0, unconfirmed: 1, confirmed: 2 }
enum timestamp_type: { simple: 0, trackable: 1 }
enum :status, { init: 0, unconfirmed: 1, confirmed: 2 }
enum :timestamp_type, { simple: 0, trackable: 1 }

attr_reader :tx

Expand Down
2 changes: 1 addition & 1 deletion lib/glueby/internal/wallet/active_record/key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Key < ::ActiveRecord::Base

belongs_to :wallet

enum purpose: { receive: 0, change: 1 }
enum :purpose, { receive: 0, change: 1 }

validates :purpose, presence: true
validates :private_key, uniqueness: { case_sensitive: false }
Expand Down
2 changes: 1 addition & 1 deletion lib/glueby/internal/wallet/active_record/utxo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Utxo < ::ActiveRecord::Base
validates :txid, uniqueness: { scope: :index, case_sensitive: false }
validate :check_dust_output

enum status: { init: 0, broadcasted: 1, finalized: 2 }
enum :status, { init: 0, broadcasted: 1, finalized: 2 }

def color_id
script = Tapyrus::Script.parse_from_payload(script_pubkey.htb)
Expand Down