stellar-base 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d47a957d6769b441707e5072b9de09576c87bb411787d10818e885680e59de69
-  data.tar.gz: '07820e81c7b00d7b6db48192095f5bd6ad497b3680383c85944030abaae60410'
+  metadata.gz: ee7c9178d44b90ea76adef982ec44927775101498a500fa0a00c7ec628bbffa9
+  data.tar.gz: 8135ebe14a37dcb84ae903bd428b038037f1a9feb35460265fac86f3f6c489a4
 SHA512:
-  metadata.gz: 19b5c2836eaafa4ce5b53e5c33f373bc995428111d1463ffa3571ec0e3411c1dbec6ca319ac5689c138a2dfdd01e07fa5d3cca08fff5ba7f827f3d4d1f71ca54
-  data.tar.gz: 342be2d0102eea5d6fe61e137a4609ff1e562639aa994eb908f9f025625ee4585a39a9cb09daaceba6824129cfc1812890577101cb62f1ede4c5d6da5e6c23ea
+  metadata.gz: 4c4b5b21650d187486994c7e22db39b1a7812897e2872492b7955b77843783087adfc7440b18cbc58f00e1c569075a05f6fa8c2a1801789a240b6ef71f011819
+  data.tar.gz: 69a634ed5af1faaa4b81ed9bc07da4977618435f8f1ec4c42e39d039ab12362dd76f27bd00eaf1cdf5bda66d2fdabf172b81cba423e554bddea94d8eeb1bc2a7

data/CHANGELOG.md

@@ -6,6 +6,18 @@ file.  This project adheres to [Semantic Versioning](http://semver.org/).
 As this project is pre 1.0, breaking changes may happen for minor version
 bumps.  A breaking change will get clearly notified in this log.
 
+## [0.23.1](https://github.com/stellar/ruby-stellar-sdk/compare/v0.23.1...v0.23.0) - 2020-06-18
+### Added
+- Transaction builder now builds V1 transactions
+- FeeBumpTransaction can wrap V0 transaction
+  
+## [0.23.0](https://github.com/stellar/ruby-stellar-sdk/compare/v0.23.0...v0.22.0) - 2020-06-11
+### Added
+- Stellar Protocol 13 support
+  - Fee-Bump transactions ([CAP-0015](https://github.com/stellar/stellar-protocol/blob/master/core/cap-0015.md))
+  - Multiplexed accounts ([CAP-0027](https://github.com/stellar/stellar-protocol/blob/master/core/cap-0027.md))
+  - Fine-Grained control on trustline authorization ([CAP-0018](https://github.com/stellar/stellar-protocol/blob/master/core/cap-0018.md))
+  
 ## [0.22.0](https://github.com/stellar/ruby-stellar-base/compare/v0.21.0...v0.22.0) - 2020-03-26
 ### Added
 - Add TransactionBuilder ([#54](https://github.com/stellar/ruby-stellar-base/issues/54))

data/README.md

@@ -12,15 +12,12 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'stellar-base'
-gem 'xdr', git: 'https://github.com/stellar/ruby-xdr.git', tag: 'v3.0.1'
 ```
 
 And then execute:
 
     $ bundle
 
-**Note** we need to add such explicit xdr dependency, because version 3.0.1 is not on RubyGems yet. When it's published, you can remove this line
-
 Also requires libsodium. Installable via `brew install libsodium` on OS X.
 
 ## Supported Ruby Versions

data/lib/stellar/transaction.rb

@@ -170,6 +170,24 @@ module Stellar
       end
     end
 
+    def to_v0
+      ed25519 = if source_account.switch == Stellar::CryptoKeyType.key_type_ed25519
+        source_account.ed25519!
+      else
+        source_account.med25519!.ed25519
+      end
+
+      TransactionV0.new(
+        source_account_ed25519: ed25519,
+        seq_num: seq_num,
+        operations: operations,
+        fee: fee,
+        memo: memo,
+        time_bounds: time_bounds,
+        ext: ext
+      )
+    end
+
     def signature_base
       tagged_tx = Stellar::TransactionSignaturePayload::TaggedTransaction.new(:envelope_type_tx, self)
       Stellar::TransactionSignaturePayload.new(

data/lib/stellar/transaction_builder.rb

@@ -7,8 +7,7 @@ module Stellar
       sequence_number:,
       base_fee: 100,
       time_bounds: nil,
-      memo: nil,
-      v1: false
+      memo: nil
     )
       raise ArgumentError, "Bad :source_account" unless source_account.is_a?(Stellar::KeyPair)
       raise ArgumentError, "Bad :sequence_number" unless sequence_number.is_a?(Integer) && sequence_number >= 0
@@ -21,7 +20,6 @@ module Stellar
       @time_bounds = time_bounds
       @memo = make_memo(memo)
       @operations = []
-      @v1 = v1
     end
 
     def build
@@ -34,6 +32,7 @@ module Stellar
       end
 
       attrs = {
+        source_account: @source_account.muxed_account,
         fee: @base_fee * @operations.length,
         seq_num: @sequence_number,
         time_bounds: @time_bounds,
@@ -42,21 +41,17 @@ module Stellar
         ext: Stellar::Transaction::Ext.new(0)
       }
 
-      tx = if @v1
-        attrs[:source_account] = @source_account.muxed_account
-        Stellar::Transaction.new(attrs)
-      else
-        attrs[:source_account_ed25519] = @source_account.raw_public_key
-        Stellar::TransactionV0.new(attrs)
-      end
-
       @sequence_number += 1
-      tx
+
+      Stellar::Transaction.new(attrs)
     end
 
     def build_fee_bump(inner_txe:)
-      if inner_txe.switch != Stellar::EnvelopeType.envelope_type_tx
-        raise "Invalid inner transaction type, it should be a `envelope_type_tx` but received a #{inner_tx.to_envelope.switch}."
+      p inner_txe.switch
+      if inner_txe.switch == Stellar::EnvelopeType.envelope_type_tx_v0
+        inner_txe = Stellar::TransactionEnvelope.v1(tx: inner_txe.tx.to_v1, signatures: inner_txe.signatures)
+      elsif inner_txe.switch != Stellar::EnvelopeType.envelope_type_tx
+        raise ArgumentError, "Invalid inner transaction type #{inner_txe.switch}"
       end
 
       inner_tx = inner_txe.tx
@@ -108,11 +103,7 @@ module Stellar
         @time_bounds = Stellar::TimeBounds.new(min_time: 0, max_time: nil)
       end
 
-      @time_bounds.max_time = if timeout == 0
-        timeout
-      else
-        Time.now.to_i + timeout
-      end
+      @time_bounds.max_time = timeout == 0 ? timeout : Time.now.to_i + timeout
 
       self
     end

data/lib/stellar/transaction_v0.rb

@@ -2,6 +2,18 @@ module Stellar
   class TransactionV0
     include Stellar::Concerns::Transaction
 
+    def to_v1
+      Transaction.new(
+        source_account: Stellar::MuxedAccount.new(:key_type_ed25519, source_account),
+        seq_num: seq_num,
+        operations: operations,
+        fee: fee,
+        memo: memo,
+        time_bounds: time_bounds,
+        ext: ext
+      )
+    end
+
     def to_envelope(*key_pairs)
       signatures = (key_pairs || []).map(&method(:sign_decorated))
 

data/lib/stellar/version.rb

@@ -1,5 +1,5 @@
 module Stellar
   module Base
-    VERSION = "0.23.0"
+    VERSION = "0.23.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stellar-base
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Scott Fleckenstein
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdr