zold 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0b9d4b798dc11ecf4b3b470b46f7ef8036f5468
-  data.tar.gz: 7870c6ccbc732c981849fd5efb49c517dfb3cc18
+  metadata.gz: 2c5ceb71c345cd90ff80e00029ac5a6d265c3bf3
+  data.tar.gz: 318ed11fd7706413ccb09eb014dcd0d776b832bc
 SHA512:
-  metadata.gz: 1812d627031af500210ebdfb18094ca91a90031e7dc587555d9c519fd823ed5eba7e7d58695f0fdc74dc4a7bef612f4b0ea569532a60f20916e149cb34822a70
-  data.tar.gz: f5425fa8b4b6d36c4b903c047c8093edde27bd6f71ee59616adef18fe9533c2133401c24d865ea7b52d6f5159e9c9f3b7ccc213256d4fad32dc00127b7094372
+  metadata.gz: 20d3b4781583bc883c2390336dd6411f661545a71e97e3cfe6c2fa29053db2b9ce0867503416f614394f301ee4bf19ff4064f0b96a74328e141561070eb7c708
+  data.tar.gz: 66ae4c87859accbedb9fafff33f25673df8bb265e6c3407b21cae730937254841ec4b7588db97aeb3da901fa3e08275962d4e313df9b2e80a46df74a3276f119

data/fixtures/id_rsa-2

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

data/fixtures/id_rsa-2.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDL9fiGWwnik7/ALYlCeyrpLYEWImSkd4Mtd8S8G7/G4/SJS/fVLI4Zx86vvXvyOto0yydxsp5+tBuDNmPZReeMXF9aSHsxzJmutXu6zzqbRcSYldcmJXDPlX7LTc4nJuhHRc21Za3HpcnmikFZMkLFMZueneRV/mhUVRO4HqBKKSCMVE0oTCwBpBC72LLoEuf8F8lYbwKB7HIxdpRzoT+kkike7nm5D/+72Nbo3mG4gJLr1rifkLcAV46VTxL3FZ5hAv0c28EcSbWHooMiMga5jQ2oN1uSk6YtBG0YPaaXJbWdEQryaGqahnODhtP2tvICJ8dKn+ZM8/CZc6HtcSKSJxcL0/MhRk4E7KKJphxMMhSlfoRHKruSS4qIpBEiOFG00RgTc7DxfI8q6N2w6tJPU60mfuVCz1O5ojb+BdxDZqYV97Dcx2lKvoPwpCoWzQ/fkoLa60HNUHfwX3KUVd1+CSnM0JsTbz452A3D/gA/xaVdOa0YN2TMTWWm5PZXogTcxMvFkVOVnRLJhKd2mVt7x/KXU7kOHIRHq9PnkNRhaxze1EdzeA/h9IAEarGcSivA6KCJ6ggRAZw4vBwRi7Fugz+J6DDVgbtNekF7UTkLg2yXEq5S/OHRpNVDgiEBgvNFgCDROSmUoUE8N7INU1S7rkWN1ecKS/TtWxkmXXKKRw== yegor@be.Dlink

data/lib/zold/signature.rb

@@ -18,10 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'digest'
 require_relative 'key'
 require_relative 'id'
 require_relative 'amount'
+require_relative 'txn'
 
 # The signature of a transaction.
 #
@@ -31,16 +31,33 @@ require_relative 'amount'
 module Zold
   # A signature
   class Signature
-    def sign(pvt, id, t)
-      pvt.sign(body(id, t))
+    # Sign the trasnsaction and return the signature.
+    # +pvt+:: Private RSA key
+    # +id+:: Paying wallet ID
+    # +txn+:: The transaction
+    def sign(pvt, id, txn)
+      raise 'pvt must be of type Key' unless pvt.is_a?(Key)
+      raise 'id must be of type Id' unless id.is_a?(Id)
+      raise 'txn must be of type Txn' unless txn.is_a?(Txn)
+      pvt.sign(body(id, txn))
     end
 
-    def valid?(pub, id, t)
-      pub.verify(t.sign, body(id, t))
+    # The transaction is valid? Returns true if it is.
+    # +pub+:: Public key of the wallet
+    # +id+:: Paying wallet ID
+    # +txn+: Transaction to validate
+    def valid?(pub, id, txn)
+      raise 'pub must be of type Key' unless pub.is_a?(Key)
+      raise 'id must be of type Id' unless id.is_a?(Id)
+      raise 'txn must be of type Txn' unless txn.is_a?(Txn)
+      pub.verify(txn.sign, body(id, txn))
     end
 
     private
 
+    # Create the body for transaction signature.
+    # +id+:: The paying wallet ID
+    # +t+:: Transaction, instance of Txn
     def body(id, t)
       [id, t.id, t.date.utc.iso8601, t.amount.to_i, t.prefix, t.bnf, t.details].join(' ')
     end

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.9.4'.freeze
+  VERSION = '0.9.5'.freeze
 end

data/lib/zold/wallet.rb

@@ -98,17 +98,18 @@ module Zold
       raise "The amount can't be negative: #{amount}" if amount.negative?
       raise 'The pvt has to be of type Key' unless pvt.is_a?(Key)
       prefix, target = invoice.split('@')
-      id = max + 1
+      tid = max + 1
       raise 'Too many transactions already, can\'t add more' if max > 0xffff
       txn = Txn.new(
-        id,
+        tid,
         Time.now,
         amount * -1,
         prefix,
         Id.new(target),
         details
       )
-      txn = txn.signed(pvt, self)
+      txn = txn.signed(pvt, id)
+      raise 'This is not the private right key for this wallet' unless Signature.new.valid?(key, id, txn)
       add(txn)
       txn
     end

data/test/test_wallet.rb

@@ -48,6 +48,17 @@ class TestWallet < Minitest::Test
     end
   end
 
+  def test_validate_key_on_payment
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      amount = Zold::Amount.new(zld: 39.99)
+      key = Zold::Key.new(file: 'fixtures/id_rsa-2')
+      assert_raises RuntimeError do
+        wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      end
+    end
+  end
+
   def test_adds_transaction_and_reads_back
     FakeHome.new.run do |home|
       wallet = home.create_wallet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -267,6 +267,8 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - fixtures/id_rsa
+- fixtures/id_rsa-2
+- fixtures/id_rsa-2.pub
 - fixtures/id_rsa.pub
 - fixtures/keys/1.pub
 - fixtures/keys/2