Merge branch 'develop'

Author: se3000

README.md

@@ -52,7 +52,7 @@ Then sign the transaction:
 ```ruby
 tx.sign key
 ```
-Get the raw transaction with `tx.hex`, and broadcast it through any Ethereum node.
+Get the raw transaction with `tx.hex`, and broadcast it through any Ethereum node. Or, just get the TXID with `tx.hash`.
 
 
 ## Contributing

lib/eth/tx.rb

@@ -41,7 +41,7 @@ def encoded
     end
 
     def hex
-      bin_to_hex encoded
+      Utils.bin_to_hex encoded
     end
 
     def sign(key)
@@ -70,6 +70,10 @@ def signature
       end.join if [v, r, s].all?
     end
 
+    def hash
+      Utils.bin_to_hex Utils.keccak256_rlp(self)
+    end
+
 
     private
 

lib/eth/version.rb

@@ -1,3 +1,3 @@
 module Eth
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

spec/eth/tx_spec.rb

@@ -59,7 +59,7 @@
     end
 
     it "also accepts hex" do
-      tx2 = Eth::Tx.decode(Eth::Utils.bin_to_hex tx1.encoded)
+      tx2 = Eth::Tx.decode(tx1.hex)
       expect(tx2).to eq(tx1)
     end
   end
@@ -131,4 +131,17 @@
       it { is_expected.to be_nil }
     end
   end
+
+  describe "#hash" do
+    let(:txid1) { '66734e70ea28eaa28eb1bace4ca87573c48f52cca7590459ad20dc58bae1a819' }
+    let(:txid2) { '7151f5b0d229c62a5076de4133ba06fffc033e25bf99691c3e0a0a99c5a64538' }
+    let(:txids) { [txid1, txid2] }
+
+    it "hashes the serialized full transaction" do
+      txids.each do |txid|
+        tx = Eth::Tx.decode read_hex_fixture(txid)
+        expect(tx.hash).to eq(txid)
+      end
+    end
+  end
 end

spec/fixtures/66734e70ea28eaa28eb1bace4ca87573c48f52cca7590459ad20dc58bae1a819.hex

@@ -0,0 +1 @@
+f871831007e28505d21dba0082c350949757b0f208aebeb22b9f7a73c152654b2de1acc0808a8b1472453633352e36351ca066bbc9b2b4d5621de654df7391a29b884e89eda63c57bd903fffee0f8d2bbbc0a068b91d3ac9e74772f49cb53052df9d6038838959bb33a30248589dbe12895403

spec/fixtures/7151f5b0d229c62a5076de4133ba06fffc033e25bf99691c3e0a0a99c5a64538.hex

@@ -0,0 +1 @@
+f871831007e08505d21dba0082c3509491d21117ce2056b62e42a422186e098ceab56f86808a8b1472453633372e35301ca0b0fa8b20828178ce382a1029f264065bcc8fcff36f28bff5430e7d2d6e5a78baa01156a157cb4bad439cbbd1e0fe74e7d028b280b124dd572f8035a9ec69736bc7

spec/spec_helper.rb

@@ -2,10 +2,22 @@
 require 'eth'
 require 'securerandom'
 
-def bin_to_hex(string)
-  string.unpack("H*")[0]
+module Helpers
+
+  def bin_to_hex(string)
+    string.unpack("H*")[0]
+  end
+
+  def hex_to_bin(string)
+    [string].pack("H*")
+  end
+
+  def read_hex_fixture(name)
+    File.read("./spec/fixtures/#{name}.hex").strip
+  end
+
 end
 
-def hex_to_bin(string)
-  [string].pack("H*")
+RSpec.configure do |c|
+  c.include Helpers
 end