epm 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf17803b86f7df75b3bf30b52b66f510ad5e557f
-  data.tar.gz: 232c2be0557e75d4fece75cc9c21405cfebc67b7
+  metadata.gz: 658f199c04cc037f671f8cda22d5c5ad557eb7ea
+  data.tar.gz: 6014e7668e96680c13b8b815397c22ba5facd4d5
 SHA512:
-  metadata.gz: d213279d55c6644497b8e474d5e16512271ff86a314fa931472c0e7896959ccdd5ac250117e04a5c9db7ea82c90f16245629a445b8b8fa905c34c36f2fce8c1e
-  data.tar.gz: a237a74163ce7093dbc8f0776a87c25818923bb9161fcf0e289ae8e4a7144f83c4ea2f9134bda2b6383ad7383a77b5ada1785380371f3014c6297228994119e6
+  metadata.gz: 1a47a28b0eb75c1443d78bb91272a722602b0e3fd9c65320cdcda0ec982f51813ea3fb77026bfe98f47224c3a041443db02591c3efa5919d1e347abd17bc0b3a
+  data.tar.gz: 90631f58b50b9a00ff1933741d4d9b35f470eb968baf9a177f61b5af05b8eab7987261a66060d5c898a6f4a062c113b51dcc76feacc671b6f3128b10c7bc1755

data/README.md

@@ -24,15 +24,21 @@ This is a Ruby gem and will require that you have Ruby on your system (unless an
 
 Once you have ensured that you have Ruby on your system, `gem install epm`.
 
+Note, if you install the gem with `sudo gem install epm` then your user will not have access to the settings file when you run `epm setup`, so instead of running `epm setup` you will want do something along the lines of:
+
+```
+curl -o ~/.epm/epm-rpc.json https://raw.githubusercontent.com/project-douglas/epm/master/settings/epm-rpc.json
+```
+
 ## Important - Configure your Client
 
 **The first thing to do** when you have installed the EPM package is to configure the server. The epm config file is placed by default in `~/.epm/epm-rpc.json`. To install the default settings run:
 
 ```bash
-$ rake setup
+$ epm setup
 ```
 
-After running the rake command (rake is ruby's make), then you can edit the config file in whatever editor you use. Set your preferred settings to however you like them. After that you can use the Create and Transact commands freely.
+After running the epm setup command, then you can edit the config file in whatever editor you use. Set your preferred settings to however you like them. After that you can use the Create and Transact commands freely.
 
 ## Install Compilers
 

data/Rakefile

@@ -1,12 +1,6 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-desc "Sets up EPM so users can configure"
-task :setup do
-  require './lib/epm'
-  EPM::Settings.check
-end
-
 desc "Update Sublime Package"
 task :sublime do
   Dir.chdir(File.dirname(__FILE__))

data/bin/epm

@@ -119,3 +119,11 @@ command :restart do |c|
     print "Server has been restarted.\n"
   end
 end
+
+command :setup do |c|
+  c.syntax = 'epm setup'
+  c.description = 'Setup your EPM instance.'
+  c.action do
+    EPM::Settings.check
+  end
+end

data/lib/epm/create.rb

@@ -17,7 +17,7 @@ module EPM
           'xEndowment' => '',
           'bCode' => @contract,
           'xGas' => '100000',
-          'xGasPrice' => '100000000000000'
+          'xGasPrice' => ( @settings['gas-price'] || '100000000000000' )
         }
         post_body   = { 'method' => 'create', 'params' => params, 'id' => 'epm-rpc', "jsonrpc" => "2.0" }.to_json
       elsif @settings['preferred-client'] == ('go' || 'ethereal')
@@ -25,7 +25,7 @@ module EPM
           'body' => @contract,
           'value' => '',
           'gas' => '100000',
-          'gasprice' => '100000000000000'
+          'gasprice' => ( @settings['gas-price'] || '100000000000000' )
         }
         post_body   = { 'method' => 'EthereumApi.Create', 'params' => params, 'id' => 'epm-rpc', 'jsonrpc' => '2.0'}.to_json
       end

data/lib/epm/deploy.rb

@@ -38,6 +38,9 @@ module EPM
             log cmd.shift
           when 'set:'
             set_var cmd.shift
+          when 'endow:'
+            endow cmd.shift
+            sleep 1
           end
         end
       end
@@ -88,6 +91,16 @@ module EPM
       EPM::Transact.new(recipient, data, @settings).transact
     end
 
+    def endow command
+      recipient = command.shift
+      until ! recipient[/(\{\{.*?\}\})/]
+        recipient.gsub!($1, @brain[$1])
+      end
+      endowment = command.shift
+      p "Sending #{recipient} an endowment of: #{endowment}."
+      EPM::Transact.new(recipient, data, @settings).transact endowment
+    end
+
     def query command
       contract = command.shift
       address = command.shift

data/lib/epm/transact.rb

@@ -9,23 +9,23 @@ module EPM
       @data      = EPM::HexData.construct_data data
     end
 
-    def transact
+    def transact value=''
       if @settings['preferred-client'] == 'cpp'
         params = {
           'sec' => @settings["address-private-key"],
-          'xValue' => '',
+          'xValue' => value,
           'aDest' => @recipient,
           'bData' => @data,
           'xGas' => '100000',
-          'xGasPrice' => '100000000000000'
+          'xGasPrice' => ( @settings['gas-price'] || '100000000000000' )
         }
         post_body = { 'method' => 'transact', 'params' => params, 'id' => 'epm-rpc', "jsonrpc" => "2.0" }.to_json
       elsif @settings['preferred-client'] == ('go' || 'ethereal')
         params = {
           'recipient' => @recipient,
-          'value' => '',
+          'value' => value,
           'gas' => '100000',
-          'gasprice' => '100000000000000',
+          'gasprice' => ( @settings['gas-price'] || '100000000000000' ),
           'body' => @data,
         }
         post_body = { 'method' => 'EthereumApi.Transact', 'params' => params, 'id' => 'epm-rpc', "jsonrpc" => "2.0" }.to_json

data/lib/epm/utils.rb

@@ -81,6 +81,19 @@ module EPM
         FileUtils.mkdir(File.dirname settings_file)
       end
       FileUtils.cp settings_example, settings_file
+      settings = File.read settings_file
+      print "Before we begin, I need to ask you two personal questions:\n"
+      print "What is your primary account which I should be using to send transactions?\n\n"
+      account = STDIN.gets.chomp
+      print "Thanks. #{account} is what I will use.\n"
+      print "Thanks. Now what is the private key for that account which I should be using?\n\n"
+      secret = STDIN.gets.chomp
+      print "Thanks. #{secret} is what I will use.\n"
+      account = "0x#{account}" if account[0..1] != '0x'
+      secret = "0x#{secret}" if secret[0..1] != '0x'
+      settings.gsub!("0xact", account)
+      settings.gsub!("0xsec", secret)
+      File.open(settings_file, 'w'){|f| f.write(settings)}
     end
 
     def install_log_file

data/lib/epm/version.rb

@@ -1 +1 @@
-VERSION ||= "0.3.14"
+VERSION ||= "0.3.15"

data/settings/epm-rpc.json

@@ -12,6 +12,7 @@
   "directory": "~/.ethereum", // in cpp world Aleth defaults to this so change to a different directory to run eth headless in
   "eth-listen-port": "30303", // see the comment above
   "name": "name", // this is the client name
+  "gas-price": "100000000000000",
   "address-public-key": "0xact",
   "address-private-key": "0xsec"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epm
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Casey Kuhlman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander