stellar-base 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa23fad0329efcda8cb73f539a3adc91b735d573937b0ba392fd9c992dc3e067
-  data.tar.gz: 24d04f5f147f3c28cb3bcaed0388b4400746893b1fda8148a1da1eee690bbf80
+  metadata.gz: 2062b56ea0a8fd01a7917fe0e602098d9233896c0189bc3551ce594397f394a4
+  data.tar.gz: 9dfca2d0f18a86ec0d36c3b7e97fd9c75e61339c39d0f4a7c834129ad48bdf46
 SHA512:
-  metadata.gz: a03b5ee1650f1c98d93f014d6d5e3ceabdd0470913a76704e590a770359b3881e0d841ce7da0fd9136affd7b950a3819a3cc7bb5d4f285c83414f43ce408c532
-  data.tar.gz: f81d001d2cb2da33752e039419d0ae151ab55820f41c8a7e06fbb3b4ac631eb9010aee5bd4252dce0cfa552281cdda986a2f35d862fb9098257d27a057ee57ec
+  metadata.gz: fcf5bca3ecc1b9bfc27198bf8d0712a4c0f4780ef851f8894c67a5bdaea13ae82b34696618ba298f31ddec9f726f298d6e6242b8474a29d1a225cbd206bb1bc0
+  data.tar.gz: 92f331fdad439135cac96063346ce2e1426efe1766a73e8c2151e87ecd7f7a351b76028569566a84431887ee67e45b8437f8824defb50fd051cbc99f02d75e52

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
 - 2.2.6
 - 2.3.3
 - 2.4.0
+- 2.5.1
 script: bundle exec rake travis
 notifications:
   slack:

data/README.md

@@ -58,15 +58,15 @@ This library also provides an impementation of Stellar's "StrKey" encoding (RFC-
 
 ```ruby
 
-Stellar::Util::StrCheck.check_encode(:account_id, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF") # => "GD777777777764TU"
-Stellar::Util::StrCheck.check_encode(:seed, "\x00\x00\x00\x00\x00\x00\x39") # => "SAAAAAAAAAADST3H"
+Stellar::Util::StrKey.check_encode(:account_id, "\xFF\xFF\xFF\xFF\xFF\xFF\xFF") # => "GD777777777764TU"
+Stellar::Util::StrKey.check_encode(:seed, "\x00\x00\x00\x00\x00\x00\x39") # => "SAAAAAAAAAADST3H"
 
 # To prevent interpretation mistakes, you must pass the expected version byte
 # when decoding a check_encoded value
 
 encoded = Stellar::Util::StrCheck.check_encode(:account_id, "\x61\x6b\x04\xab\x8b\xf6\x1b")
-Stellar::Util::StrCheck.check_decode(:account_id, encoded) # => "\x61\x6b\x04\xab\x8b\xf6\x1b"
-Stellar::Util::StrCheck.check_decode(:seed, encoded) # => throws ArgumentError: Unexpected version: :account_id
+Stellar::Util::StrKey.check_decode(:account_id, encoded) # => "\x61\x6b\x04\xab\x8b\xf6\x1b"
+Stellar::Util::StrKey.check_decode(:seed, encoded) # => throws ArgumentError: Unexpected version: :account_id
 
 ```
 

data/lib/stellar-base.rb

@@ -22,6 +22,7 @@ require_relative './stellar/key_pair'
 require_relative './stellar/operation'
 require_relative './stellar/path_payment_result'
 require_relative './stellar/price'
+require_relative './stellar/signer_key'
 require_relative './stellar/thresholds'
 require_relative './stellar/transaction'
 require_relative './stellar/transaction_envelope'

data/lib/stellar/base/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.15.0"
+    VERSION = "0.16.0"
   end
 end

data/lib/stellar/signer_key.rb

@@ -0,0 +1,40 @@
+module Stellar
+  class SignerKey
+
+    def self.ed25519(keypair)
+      raise ArgumentError, "Bad keypair" unless keypair.is_a?(KeyPair)
+      new(:signer_key_type_ed25519, keypair.raw_public_key)
+    end
+
+
+    def self.preauthorized_transaction(tx)
+      new(:signer_key_type_pre_auth_tx, tx.hash)
+    end
+
+
+    def self.onetime_signer(preimage)
+      hash_x = Digest::SHA256.digest(preimage)
+      new(:signer_key_type_hash_x, hash_x)
+    end
+
+    def to_s
+      case switch
+      when SignerKeyType.signer_key_type_ed25519
+        address = Stellar::Convert.pk_to_address(self)
+        "ed25519: #{address}"
+      when SignerKeyType.signer_key_type_pre_auth_tx
+        tx = Stellar::Convert.to_hex(pre_auth_tx!)
+        "pre_auth_tx: #{tx}"
+      when SignerKeyType.signer_key_type_hash_x
+        hx = Stellar::Convert.to_hex(hash_x!)
+        "hash_x: #{hx}"
+      end
+    end
+
+    def inspect
+      label = switch.to_s
+      "#<Stellar::SignerKey #{to_s}>"
+    end
+
+  end
+end

data/lib/stellar/transaction.rb

@@ -169,7 +169,7 @@ module Stellar
     def to_operations
       cloned = Marshal.load Marshal.dump(operations)
       operations.each do |op|
-        op.source_account = self.source_account
+        op.source_account ||= self.source_account
       end
     end
 

data/lib/stellar/transaction_envelope.rb

@@ -28,5 +28,12 @@ module Stellar
     def hash
       Digest::SHA256.digest(to_xdr)
     end
+
+    def merge(other)
+      merged_tx = tx.merge(other.tx)
+      merged_tx.signatures = [signatures, other.signatures]
+      merged_tx
+    end
+
   end
 end

data/ruby-stellar-base.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["generated", "lib"]
 
-  spec.add_dependency "xdr", "~> 2.0.0"
+  spec.add_dependency "xdr", "~> 3.0.0"
   spec.add_dependency "digest-crc"
   spec.add_dependency "base32"
   spec.add_dependency "rbnacl"
-  spec.add_dependency "rbnacl-libsodium", "~> 1.0.3"
-  spec.add_dependency "activesupport", ">= 4.2.7"
+  spec.add_dependency "rbnacl-libsodium", "~> 1.0.16"
+  spec.add_dependency "activesupport", ">= 5.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: digest-crc
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.16
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -399,6 +399,7 @@ files:
 - lib/stellar/operation.rb
 - lib/stellar/path_payment_result.rb
 - lib/stellar/price.rb
+- lib/stellar/signer_key.rb
 - lib/stellar/thresholds.rb
 - lib/stellar/transaction.rb
 - lib/stellar/transaction_envelope.rb