sibit 0.34.1 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469905d53f542975d0fe59c8b429289423762f4b36aca8b703928d54f5ba394f
-  data.tar.gz: c68a4237d70f25a11ea2e98c36d76c7b0917a6355353e6d23c22336eedd94f31
+  metadata.gz: 7ea3404e8f546263164e5b87826a723238cb6bd21589149429f9e3d5b32f0e5a
+  data.tar.gz: 81c897434a338c46c517c8de6d4fc69693f190b10beffe8ef43f909daa92e47d
 SHA512:
-  metadata.gz: f5aa717192c0417c572226c3a0f79924f61e5d70b0bc84efe53d0cc760c16515f3cd6ef63b00de57e4228dbcd82fdb60a269f35df858b0c1ff8bec81006db6bc
-  data.tar.gz: fe9f402e207051f02e31b54d0a4e41cca76efd2a0260fbc6dfb3fb69f1aa543af2a9af6045590bd653c6c26472c97fdb6d5ba3a8b5a98f4ca282e351d88f53ee
+  metadata.gz: 0f481815314355cdf7cad857fb35d9b08599e8b2a6e8aa175c33ec5e68962957b390033d8aafb01d580c1e33035376a52b6dee983d3fe31469b15f1be6868ae0
+  data.tar.gz: 1652d8c4bee002326b3f9e6b885e85cf750742b10b7de6fd71379f64331e07d94d6aefbc49cab2a71f8a0ab8a6b7606a7458eb395fec7e50a715a309db1ffa2d

data/lib/sibit/tx.rb

@@ -24,9 +24,10 @@ class Sibit
 
     attr_reader :inputs, :outputs
 
-    def initialize
+    def initialize(network: :mainnet)
       @inputs = []
       @outputs = []
+      @network = network
     end
 
     def add_input(hash:, index:, script:, key:, value: 0)
@@ -34,7 +35,7 @@ class Sibit
     end
 
     def add_output(value, address)
-      @outputs << Output.new(value, address)
+      @outputs << Output.new(value, address, @network)
     end
 
     def hash
@@ -103,20 +104,33 @@ class Sibit
     class Output
       attr_reader :value
 
-      def initialize(value, address)
+      def initialize(value, address, network = :mainnet)
         @value = value
         @address = address
+        @network = network
       end
 
       def script
         return segwit_script if segwit?
-        return p2pkh_script if %w[00 6f].include?(version)
-        return p2sh_script if %w[05 c4].include?(version)
-        raise(Sibit::Error, "Address '#{@address}' has an unsupported version byte 0x#{version}")
+        return p2pkh_script if version == (@network == :mainnet ? '00' : '6f')
+        return p2sh_script if version == (@network == :mainnet ? '05' : 'c4')
+        raise(
+          Sibit::Error,
+          "Address '#{@address}' has version byte 0x#{version}, " \
+          "which does not belong to the #{@network} network"
+        )
       end
 
       def segwit?
-        @address.downcase.start_with?('bc1', 'tb1', 'bcrt1')
+        down = @address.downcase
+        return true if down.start_with?(*(@network == :mainnet ? ['bc1'] : %w[tb1 bcrt1]))
+        if down.start_with?(*(@network == :mainnet ? %w[tb1 bcrt1] : ['bc1']))
+          raise(
+            Sibit::Error,
+            "Address '#{@address}' is a Bech32 address of a different network than #{@network}"
+          )
+        end
+        false
       end
 
       def script_hex

data/lib/sibit/txbuilder.rb

@@ -20,9 +20,10 @@ class Sibit
   class TxBuilder
     DUST = 546
 
-    def initialize
+    def initialize(network = :mainnet)
       @inputs = []
       @outputs = []
+      @network = network
     end
 
     def input
@@ -36,7 +37,7 @@ class Sibit
     end
 
     def tx(input_value:, leave_fee:, extra_fee:, change_address:)
-      txn = Tx.new
+      txn = Tx.new(network: @network)
       @inputs.each do |inp|
         txn.add_input(
           hash: inp.prev_out_hash,

data/lib/sibit/version.rb

@@ -8,5 +8,5 @@
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 class Sibit
-  VERSION = '0.34.1' unless defined?(VERSION)
+  VERSION = '0.34.2' unless defined?(VERSION)
 end

data/lib/sibit.rb

@@ -152,7 +152,7 @@ class Sibit
         [pub, k.priv]
       end
     satoshi = satoshi(amount)
-    builder = TxBuilder.new
+    builder = TxBuilder.new(network)
     unspent = 0
     size = 100
     utxos = @api.utxos(sources.keys).sort_by { |u| [u[:hash], u[:index]] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibit
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.34.2
 platform: ruby
 authors:
 - Yegor Bugayenko