round 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e377e33cf32986ee469ccf7c60f396e05f436f9a
-  data.tar.gz: ffedd033550ba8633ebaf2ba67a6859006c78364
+  metadata.gz: eb0ea3854098e41908e3d476e21df3ce5165dec2
+  data.tar.gz: f5aac8616931dd4a58c02e3b4f86882e4d716e26
 SHA512:
-  metadata.gz: 26c9bed0c4c8dee92c7318b0a601a90c758db4679944f835bcf6b55fc5a54d91734c539533f763db64107a7145a3f8b6016a078954b064c88a5dce35a3e4cbaa
-  data.tar.gz: e4c83b2d6eef471e8176d4b8a710a05a539a08dfff2bdc4fa18771a6bbf8e834b76971da5abd990eebf9d6edee3bc89d64bfbe74853bd2377eaf1202842e3810
+  metadata.gz: ddadccacbd118d36974beb5f899187a7f88999ad2a0302a26bc81a2d031bc3f459f6724453a0a906d548f3d16df21e59706c9a376d222484e260f30d1385b422
+  data.tar.gz: 6d8edb4aed48f73e8d0a6c9c2bd0c724d631310ed03d76ff9d58d949a066b68d417b31de372aaadf9100103d1bfaead79c3d7918ed62fef26c6f048af8a3d6ff

data.tar.gz.sig

@@ -1,3 +1,2 @@
-���D�"D<{(̇�D�����B��?��T~��{����Io�f����-@>��M�	děyfރ�1��'�kާ�F��[Ǜ��X67����Ӎ_��C�X�A��&��m�۲8.��;6�Cj�(��RBe� ��7��f`���Se)��
-Dܵ�������x���w�U�9�@=���Q��z�f_8J��K���S���
-;��#e�_�j�~+/�ӆ��7�M��BYh���Y�dgt���^�1���
+V�B�>�2�:
+΃�eP����;��V�����yJ�JE�����m_A�=�����iҡ�(�z�^�P�e�ޱn˵ch���]=���{Р~/KG��eU
���b�ΜYX{H�8���͉k��.�6~š�`��KDgL���{�/�m�aN����R�i*��b`iݽ�[���Ȥsq��X5�ga3Y������)�����J������
17J��K����������|���!I�SU\�l�+�.���n����B����ď3ո

data/README.md

@@ -58,23 +58,17 @@ In this step you will learn how to instantiate the API client for the given netw
 	> require 'round'
 	```
 
-1. Create the client object using the sandbox stack
+1. Create the client object. 
 
 	```ruby
-	# the default client is set to sandbox the testnet stack
-	client = Round.client
-
-	# if you want to configure the client for production mainnet
-  client = Round.client(:mainnet)
+  client = Round.client
 	```
 
 [[top]](README.md#getting-started-tutorial)
 
-### 2. Configure your applicaiton and API Token
+### 2. Configure your application and API Token
 In this step your application and you will retrieve the API Token for the application and set your applications redirect url.  The url is used to push the user back to your app after they complete an out of band challenge.
 
-1. Set the redirect url by clicking in the options gear and selecting `add redirect url`
-
 1. In the [console](https://sandbox.gem.co) copy your `api_token` by clicking on show
 
 1. Go back to your shell session and set a variable for `api_token`
@@ -89,6 +83,12 @@ In this step your application and you will retrieve the API Token for the applic
 ### 3. Create your User and Wallet
 In this step you will create your own personal Gem user and wallet authorized on your application.  This is an end-user account, which will have a 2-of-3 multisig bitcoin wallet.
 
+1. Authenticate your client
+
+	```ruby
+	client.authenticate_identify(api_token: api_token)
+	```
+
 1. Create your user and wallet:
 
 	```ruby
@@ -99,12 +99,12 @@ In this step you will create your own personal Gem user and wallet authorized on
                       email: 'YOUR EMAIL ADDRESS',
                       passphrase: 'aReallyStrongPassphrase',
                       device_name: 'SOME DEVICE NAME',
-                      redirect_uri: 'http://something/user-device-approved')
+                      redirect_uri: 'http://something.com/user-device-approved')
                     )
 	```
 
-2. Your application should **store the device_token permanently** as this will be required to authenticate from your app as this user.
-3. You (acting as a user) will receive an email from Gem asking you to confirm your account and finish setup.  Please follow the instructions. At the end of the User sign up flow, you'll be redirected to the redirect_uri provided in users.create (if you provided one).
+1. Your application should **store the device_token permanently** as this will be required to authenticate from your app as this user.
+1. You (acting as a user) will receive an email from Gem asking you to confirm your account and finish setup.  Please follow the instructions. At the end of the User sign up flow, you'll be redirected to the redirect_uri provided in users.create (if you provided one).
 
 [[top]](README.md#getting-started-tutorial)
 
@@ -161,12 +161,12 @@ In this section you’ll learn how to create a payment a multi-signature payment
 1. Unlock the wallet:
 
 	```ruby
-	wallet.unlock(<YOUR PASSWORD>)
+	my_account.wallet.unlock(<YOUR PASSWORD>)
 	```
 1. Make a payment
 
 	```ruby
-	transaction = account.pay([{address: 'mxzdT4ShBudVtZbMqPMh9NVM3CS56Fp11s', amount: 25000}], 1, 'http://some-redirect-uri.com/)
+	transaction = my_account.pay([{address: 'mxzdT4ShBudVtZbMqPMh9NVM3CS56Fp11s', amount: 25000}], 1, 'http://some-redirect-uri.com/')
   puts transaction.mfa_uri # redirect your user to this URI to complete payment!
 	```
 

data/lib/round/account.rb

@@ -20,11 +20,10 @@ module Round
     end
 
     def pay(payees, confirmations, redirect_uri = nil, mfa_token: nil)
-      raise ArgumentError, 'Payees must be specified' unless payees
       raise 'You must unlock the wallet before attempting a transaction' unless @wallet.multiwallet
 
       payment = self.transactions.create(payees, confirmations, redirect_uri: redirect_uri)
-      signed = payment.sign(@wallet.multiwallet)
+      signed = payment.sign(@wallet.multiwallet, network: network.to_sym)
       if wallet.application
         mfa_token = mfa_token || @wallet.application.get_mfa
         signed.approve(mfa_token)
@@ -51,8 +50,11 @@ module Round
       Round::Account
     end
 
-    def create(name)
-      resource = @resource.create(name: name)
+    def create(name:, network:)
+      unless [:bitcoin_testnet, :bitcoin, :litecoin, :dogecoin].include?(network)
+        raise ArgumentError, 'Network must be :bitcoin_testnet, :dogecoin, :litecoin, :bitcoin.'
+      end
+      resource = @resource.create(name: name, network: network)
       account = Round::Account.new(resource: resource, wallet: @wallet, client: @client)
       add(account)
       account

data/lib/round/client.rb

@@ -7,30 +7,16 @@ module Round
   MAINNET_URL = 'https://api.gem.co'
   SANDBOX_URL = 'https://api-sandbox.gem.co'
 
-  NETWORKS = {
-    testnet: :bitcoin_testnet,
-    bitcoin_testnet: :bitcoin_testnet,
-    testnet3: :bitcoin_testnet,
-    bitcoin: :bitcoin,
-    mainnet: :bitcoin,
-  }
-
-  def self.client(network = :bitcoin_testnet, url = nil)
-    network = NETWORKS.fetch(network, :bitcoin_testnet)
-    url ||= network == :bitcoin_testnet ? SANDBOX_URL : MAINNET_URL
-
+  def self.client(url = MAINNET_URL)
     @patchboard ||= ::Patchboard.discover(url) { Client::Context.new }
-    Client.new(@patchboard.spawn, network)
+    Client.new(@patchboard.spawn)
   end
 
   class Client
     include Round::Helpers
 
-    attr_reader :network
-
-    def initialize(patchboard_client, network)
+    def initialize(patchboard_client)
       @patchboard_client = patchboard_client
-      @network = network
     end
 
     def authenticate_application(api_token:, admin_token:)

data/lib/round/transaction.rb

@@ -1,11 +1,12 @@
 module Round
   class Transaction < Round::Base
 
-    def sign(wallet)
+    def sign(wallet, network:)
       raise 'transaction is already signed' unless @resource['status'] == 'unsigned'
       raise 'a wallet is required to sign a transaction' unless wallet
+      network = :testnet3 if network == :bitcoin_testnet
 
-      transaction = CoinOp::Bit::Transaction.data(@resource)
+      transaction = CoinOp::Bit::Transaction.data(@resource, network: network)
       raise 'bad change address' unless wallet.valid_output?(transaction.outputs.last)
       
       @resource = @resource.update( 

data/lib/round/user.rb

@@ -30,13 +30,12 @@ module Round
 
    def create(first_name:, last_name:, email:, passphrase:,
               device_name:, redirect_uri: nil)
-      multiwallet = CoinOp::Bit::MultiWallet.generate([:primary], @client.network)
+      multiwallet = CoinOp::Bit::MultiWallet.generate([:primary])
       primary_seed = CoinOp::Encodings.hex(multiwallet.trees[:primary].seed)
       encrypted_seed = CoinOp::Crypto::PassphraseBox.encrypt(passphrase, primary_seed)
       wallet = {
         name: 'default',
-        network: @client.network,
-        primary_public_seed: multiwallet.trees[:primary].to_serialized_address,
+        primary_public_seed: multiwallet.trees[:primary].to_bip32,
         primary_private_seed: encrypted_seed
       }
       params = {

data/lib/round/version.rb

@@ -1,3 +1,3 @@
 module Round
-  VERSION = "0.7.0"
-end
+  VERSION = "0.8.0"
+end

data/lib/round/wallet.rb

@@ -23,10 +23,6 @@ module Round
       )
     end
 
-    def backup_key
-      @multiwallet.private_seed(:backup) 
-    end
-
     def accounts
       Round::AccountCollection.new(
         resource: @resource.accounts,
@@ -53,7 +49,12 @@ module Round
 
     def create(name, passphrase, network: 'bitcoin_testnet',
                multiwallet: CoinOp::Bit::MultiWallet.generate([:primary, :backup]))
-      wallet_resource = create_wallet_resource(multiwallet, passphrase, name, network)
+      backup = multiwallet.private_seed(:backup, network: :bitcoin)
+      multiwallet.drop_private(:backup)
+      backup_master = multiwallet.trees[:backup]
+      new_bmaster = MoneyTree::Master.new(public_key: backup_master.public_key, chain_code: backup_master.chain_code)
+      multiwallet.trees[:backup] = new_bmaster
+      wallet_resource = create_wallet_resource(multiwallet, passphrase, name)
       multiwallet.import(
         cosigner_public_seed: wallet_resource.cosigner_public_seed
       )
@@ -64,19 +65,18 @@ module Round
         client: @client
       )
       add(wallet)
-      wallet
+      [backup, wallet]
     end
 
-    def create_wallet_resource(multiwallet, passphrase, name, network)
+    def create_wallet_resource(multiwallet, passphrase, name)
       primary_seed = CoinOp::Encodings.hex(multiwallet.trees[:primary].seed)
       ## Encrypt the primary seed using a passphrase-derived key
       encrypted_seed = CoinOp::Crypto::PassphraseBox.encrypt(passphrase, primary_seed)
 
       @resource.create(
         name: name,
-        network: network,
-        backup_public_seed: multiwallet.trees[:backup].to_serialized_address,
-        primary_public_seed: multiwallet.trees[:primary].to_serialized_address,
+        backup_public_seed: multiwallet.trees[:backup].to_bip32,
+        primary_public_seed: multiwallet.trees[:primary].to_bip32,
         primary_private_seed: encrypted_seed
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: round
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Matthew King
@@ -31,7 +31,7 @@ cert_chain:
   tdc4VS7IlSRxlZ3dBOgiigy9GXpJ+7F831AqjxL39EPwdr7RguTNz+pi//RKaT/U
   IlpVB+Xfk0vQdP7iYfjGxDzUf0FACMjsR95waJmadKW1Iy6STw2hwPhYIQz1Hu1A
   -----END CERTIFICATE-----
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patchboard
@@ -81,42 +81,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rbnacl-libsodium
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: coin-op
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1 +1 @@
-(�P���qG#pz���uɠǒ
�܌�Y�ܫ����|{3\E��"OsX���E ��	@�}�
+�U�R̟�r���]��7�����o�<��Mo�1"��������o0G�5�����,�j�3A3����`l���׊=��P�a@ ���ZG�����6�=s=���w��f���8��ސ��qe;;��j��#�%��E�pL�_#rW�"�L(�gg����ά�ܗ�]�@sSn��<�����k�Ai6��V��M��)J+�x��|�T_
tR��A���O�V�kϲ0