teth 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7635b781f5fd78703f5bbddb1dcea9fd0804eb0c
-  data.tar.gz: 47c054a1f298a4e8ff2645af025a1cc347a40945
+  metadata.gz: 043f398e22fcc354d5eb00e278f4b68b652abc28
+  data.tar.gz: c29c699f115c04c957b430857568da8f61aaa911
 SHA512:
-  metadata.gz: c8582ab1a8eb8152f4d61e7d6203cdacf6eac0d0182fe2b02db75af672f518de50a86fab6b4b96ab09908506ca9d3a984de40c5665e5772c688e3eabaf0f0a62
-  data.tar.gz: 411a9aee288dfb9c0d84f247afee074d02026277eec33dea92187fd8096b6d1c6262a9eab93490c988d40fe76d97629569468376d216cb9472a9cf77e68d1615
+  metadata.gz: d87429ea3b59ddaea5b3d7e56b05ae6ebe232ea3ade8cc507b71b05d8c6ee6307ba2f64c08d3c6ad413a48ee760fb0be1f66314f78f28fc1ac20e69b6f9b547b
+  data.tar.gz: dc5fc847cc0d7a5dccf21086770f6ad90656aef27a47cc13f46c473ecec6dfbc042fba83ff3078e96e7e582931a612614608d686ac9b2580693c5be4e4eec9d2

data/README.md

@@ -2,7 +2,7 @@
 Teth is a Ethereum smart contract test framework in ruby.It provides two testing environments: testing in ruby EVM and testing in geth.You don't need to understand ruby grammar, just enjoy syntactic sugar.
 
 ## Dependencies
-- Solidity ~> 0.3.6
+- Solidity ~> 0.4.1
 - Ruby ~> 2.2.2
 - Go-ethereum ~> 1.4.11
 
@@ -13,53 +13,182 @@ bundle install teth
 
 ## How to use
 
-Help command:
+#### Help command
 ```
 $ teth
+Usage: teth COMMAND [ARGS]
+The most common teth commands are:
+  new         Create a new Smart Contract application. "teth new my_app" creates a
+              new application called my_app in "./my_app" (short-cut alias: "n")
+  generate    Generate new solidity smart contract and test files. "teth generate token"
+              creates Token contract and corresponding test files. (short-cut alias: "g")
+  test        Run your ruby tests in ruby evm. (short-cut alias: "t")
+  init        Bootstraps and initialises a new genesis block. "teth init" creates data directory
+              for private chain.(short-cut alias: "i")
+  import_keys Import keys to private chain (short-cut alias: "ik")
+  build       Build contract (short-cut alias: "b")
+  migrate     Deploy contract on private chain (short-cut alias: "m")
+  server      Start geth server (short-cut alias: "s")
+  console     Start geth attach (short-cut alias: "c")
+  gtest       Run your javascript tests on geth (short-cut alias: "gt")
+
+All commands can be run with -h (or --help) for more information.
+
 ```
+#### Creeat project
 Create a new Smart Contract application
+```shell
+$ teth n examples
+Creating project examples...
+Resolving dependencies...
+Using ffi 1.9.14
+Using little-plugger 1.1.4
+Using multi_json 1.12.1
+Using digest-sha3 1.1.0
+Using ethash 0.2.0
+Using fiddler-rb 0.1.2
+Using lru_redux 1.1.0
+Using minitest 5.9.0
+Using rlp 0.7.3
+Using bundler 1.12.5
+Using bitcoin-secp256k1 0.4.0
+Using logging 2.1.0
+Using leveldb 0.1.9
+Using block_logger 0.1.2
+Using ruby-ethereum 0.9.5
+Using teth 0.1.1
+Bundle complete! 1 Gemfile dependency, 16 gems now installed.
+Use `bundle show [gemname]` to see where a bundled gem is installed.
+Done.
+
+$ cd examples
 ```
-$ teth n project
-$ cd project
-```
-Generate new Smart Contract and test file
+#### Generate new Smart Contract and test files
+```shell
+$ teth g token
+Creating Token contract file...
+Creating token test files...
+Done.
 ```
-$ teth g game
+This generates contract file `contracts/Token.sol`, and test files `tests/token_test.rb`, `gtests/Token_test.js`.
+
+Edit token contract and test file.
+
+`contracts/Token.sol`
+```javascript
+pragma solidity ^0.4.0;
+
+contract Token {
+    address issuer;
+    mapping (address => uint) balances;
+
+    event Issue(address account, uint amount);
+    event Transfer(address from, address to, uint amount);
+
+    function Token() {
+        issuer = msg.sender;
+    }
+
+    function issue(address account, uint amount) {
+        if (msg.sender != issuer) throw;
+        balances[account] += amount;
+        Issue(account, amount);
+    }
+
+    function transfer(address to, uint amount) {
+        if (balances[msg.sender] < amount) throw;
+
+        balances[msg.sender] -= amount;
+        balances[to] += amount;
+
+        Transfer(msg.sender, to, amount);
+    }
+
+    function getBalance(address account) constant returns (uint) {
+        return balances[account];
+    }
+}
+
 ```
-Run tests
+
+`tests/token_test.rb`
+```ruby
+require 'teth/minitest'
+
+class TokenTest < Teth::Minitest
+  def test_contract_deployed
+    assert_equal false, contract.address.nil?
+  end
+
+  def test_issue_balance
+    assert_equal 0, contract.getBalance(bob)
+    contract.issue bob, 100
+    assert_equal 100, contract.getBalance(bob)
+  end
+
+  def test_issue_exception
+    assert_raises(TransactionFailed) do
+      contract.issue bob, 100, sender: eve_privkey
+    end
+    assert_equal 0, contract.getBalance(bob)
+  end
+
+  def test_token_transfer
+    contract.issue bob, 100
+    contract.transfer carol, 90, sender: bob_privkey
+    assert_equal 90, contract.getBalance(carol)
+
+    assert_raises(TransactionFailed) { contract.transfer carol, 90, sender: bob_privkey }
+  end
+end
+
 ```
-$ teth t game
+
+#### Run tests in ruby evm
+```shell
+$ teth t token
+Test Token contract...
+Run options: --seed 2192
+
+# Running:
+
+....
+
+Finished in 1.935546s, 2.0666 runs/s, 3.6166 assertions/s.
+
+4 runs, 7 assertions, 0 failures, 0 errors, 0 skips
+Done.
 ```
 
-## Unit tests
+#### Unit tests
 You can wirte fast, simple tests.
 ```ruby
-class TokenTest < Minitest::Test
-  include Ethereum
+require 'teth/minitest'
 
-  def setup
-    @state = Tester::State.new
-    @solidity_code = File.read('./contracts/Token.sol')
-    @c = @state.abi_contract @solidity_code, language: :solidity
+class TokenTest < Teth::Minitest
+  def test_contract_deployed
+    assert_equal false, contract.address.nil?
   end
 
   def test_issue_balance
-    assert_equal 0, @c.getBalance(Tester::Fixture.accounts[2])
-    @c.issue Tester::Fixture.accounts[2], 100
-    assert_equal 100, @c.getBalance(Tester::Fixture.accounts[2])
+    assert_equal 0, contract.getBalance(bob)
+    contract.issue bob, 100
+    assert_equal 100, contract.getBalance(bob)
   end
 
   def test_issue_exception
-    assert_raises(TransactionFailed) { @c.issue Tester::Fixture.accounts[3], 100, sender: Tester::Fixture.keys[4] }
-    assert_equal 0, @c.getBalance(Tester::Fixture.accounts[3])
+    assert_raises(TransactionFailed) do
+      contract.issue bob, 100, sender: eve_privkey
+    end
+    assert_equal 0, contract.getBalance(bob)
   end
 
   def test_token_transfer
-    @c.issue Tester::Fixture.accounts[2], 100
-    @c.transfer Tester::Fixture.accounts[3], 90, sender: Tester::Fixture.keys[2]
-    assert_equal 90, @c.getBalance(Tester::Fixture.accounts[3])
+    contract.issue bob, 100
+    contract.transfer carol, 90, sender: bob_privkey
+    assert_equal 90, contract.getBalance(carol)
 
-    assert_raises(TransactionFailed) { @c.transfer Tester::Fixture.accounts[3], 90, sender: Tester::Fixture.keys[2] }
+    assert_raises(TransactionFailed) { contract.transfer carol, 90, sender: bob_privkey }
   end
 end
 
@@ -67,11 +196,298 @@ end
 More details:
 https://github.com/seattlerb/minitest
 
-## TODO
-- Extract test file require and others
-- Save migrate address
-- Migrate ARGV
-- Script for preload
-- Easy way to load contract on chain
-- Easy way to test on chain
-- ES6
+#### Init geth block
+```shell
+$ teth init
+Initialising a new genesis block...
+***** Using geth at: geth
+I0917 16:01:17.338908 ethdb/database.go:82] Alloted 16MB cache and 16 file handles to /Users/u2/cryptape/teth/examples/data/chaindata
+I0917 16:01:17.347151 cmd/geth/main.go:299] successfully wrote genesis block and/or chain rule set: 611596e7979cd4e7ca1531260fa706093a5492ecbdf58f20a39545397e424d04
+```
+#### Import keys to geth
+```shell
+$ teth ik
+Importing keys, this will take a while, please be patient......
+***** Using geth at: geth
+***** Import all pre-funded private keys
+Notice: No need to input your password. The default password is 123456
+spawn geth --datadir data account import ./private_keys/3ae88fe370c39384fc16da2c9e768cf5d2495b48.key
+Your new account is locked with a password. Please give a password. Do not forget this password.
+Passphrase:
+Repeat passphrase:
+Address: {3ae88fe370c39384fc16da2c9e768cf5d2495b48}
+Notice: No need to input your password. The default password is 123456
+spawn geth --datadir data account import ./private_keys/81063419f13cab5ac090cd8329d8fff9feead4a0.key
+Your new account is locked with a password. Please give a password. Do not forget this password.
+Passphrase:
+Repeat passphrase:
+Address: {81063419f13cab5ac090cd8329d8fff9feead4a0}
+Notice: No need to input your password. The default password is 123456
+spawn geth --datadir data account import ./private_keys/9da26fc2e1d6ad9fdd46138906b0104ae68a65d8.key
+Your new account is locked with a password. Please give a password. Do not forget this password.
+Passphrase:
+Repeat passphrase:
+Address: {9da26fc2e1d6ad9fdd46138906b0104ae68a65d8}
+***** Done.
+
+```
+Notice: *This will take a while, please be patient. No need to input your password.*
+
+#### Build contract
+```shell
+$ teth build token
+Building contract Token
+
+======= Token =======
+Gas estimation:
+construction:
+   20201 + 73400 = 93601
+external:
+
+
+-------------------------------------
+Enter Gas:
+400000
+Enter Value To Be Transferred:
+
+Enter Input:
+
+Done.
+```
+Build all contracts if no contract name provided.
+
+#### Start geth server
+```shell
+$ teth server
+***** Using geth at: geth
+Start geth server...
+I0917 16:17:16.882572 ethdb/database.go:82] Alloted 128MB cache and 1024 file handles to data/chaindata
+I0917 16:17:16.894415 ethdb/database.go:169] closed db:data/chaindata
+I0917 16:17:16.895446 ethdb/database.go:82] Alloted 128MB cache and 1024 file handles to data/chaindata
+I0917 16:17:16.946341 eth/backend.go:621] upgrading db log bloom bins
+I0917 16:17:16.946478 eth/backend.go:629] upgrade completed in 142.276µs
+I0917 16:17:16.946513 ethdb/database.go:82] Alloted 16MB cache and 16 file handles to data/dapp
+I0917 16:17:16.951072 eth/backend.go:172] Protocol Versions: [63 62], Network Id: 31415926
+I0917 16:17:16.951142 eth/backend.go:201] Blockchain DB Version: 3
+I0917 16:17:16.953641 core/blockchain.go:206] Last header: #0 [611596e7…] TD=131072
+I0917 16:17:16.953667 core/blockchain.go:207] Last block: #0 [611596e7…] TD=131072
+I0917 16:17:16.953678 core/blockchain.go:208] Fast block: #0 [611596e7…] TD=131072
+I0917 16:17:16.954420 p2p/server.go:313] Starting Server
+I0917 16:17:16.955324 p2p/server.go:556] Listening on [::]:30303
+I0917 16:17:16.957427 node/node.go:296] IPC endpoint opened: data/geth.ipc
+I0917 16:17:16.959797 node/node.go:366] HTTP endpoint opened: http://localhost:8545
+I0917 16:17:17.945231 cmd/geth/accountcmd.go:189] Unlocked account 3ae88fe370c39384fc16da2c9e768cf5d2495b48
+I0917 16:17:19.158064 p2p/nat/nat.go:111] mapped network port tcp:30303 -> 30303 (ethereum p2p) using UPNP IGDv1-IP1
+```
+#### Migrate
+Deploy your contract on geth, must keep teth sever started.
+```shell
+$ teth m
+Migrating contract token
+***** Using geth at: geth
+null
+Contract transaction send: TransactionHash: 0x3a9ca7a774a4bc5b3ba23b57f3c65a5debbfcbba422f902009909604ee668a63 waiting to be mined...
+Compiled Object : TokenCompiled
+Contract : TokenContract
+Contract Instance : Token
+true
+Contract mined! Address: 0x3a020580345e79e223580d8d6a50e063667f19b5
+Done.
+
+```
+This deploys contract on geth, and creates two files.One is `temp/db/Token.json` which keeps abi and address.
+```json
+{
+  "Token": {
+    "abi": [
+      {
+        "constant": false,
+        "inputs": [
+          {
+            "name": "account",
+            "type": "address"
+          },
+          {
+            "name": "amount",
+            "type": "uint256"
+          }
+        ],
+        "name": "issue",
+        "outputs": [
+
+        ],
+        "payable": false,
+        "type": "function"
+      },
+      {
+        "constant": false,
+        "inputs": [
+          {
+            "name": "to",
+            "type": "address"
+          },
+          {
+            "name": "amount",
+            "type": "uint256"
+          }
+        ],
+        "name": "transfer",
+        "outputs": [
+
+        ],
+        "payable": false,
+        "type": "function"
+      },
+      {
+        "constant": true,
+        "inputs": [
+          {
+            "name": "account",
+            "type": "address"
+          }
+        ],
+        "name": "getBalance",
+        "outputs": [
+          {
+            "name": "",
+            "type": "uint256"
+          }
+        ],
+        "payable": false,
+        "type": "function"
+      },
+      {
+        "inputs": [
+
+        ],
+        "type": "constructor"
+      },
+      {
+        "anonymous": false,
+        "inputs": [
+          {
+            "indexed": false,
+            "name": "account",
+            "type": "address"
+          },
+          {
+            "indexed": false,
+            "name": "amount",
+            "type": "uint256"
+          }
+        ],
+        "name": "Issue",
+        "type": "event"
+      },
+      {
+        "anonymous": false,
+        "inputs": [
+          {
+            "indexed": false,
+            "name": "from",
+            "type": "address"
+          },
+          {
+            "indexed": false,
+            "name": "to",
+            "type": "address"
+          },
+          {
+            "indexed": false,
+            "name": "amount",
+            "type": "uint256"
+          }
+        ],
+        "name": "Transfer",
+        "type": "event"
+      }
+    ],
+    "bin": "0x606060405260008054600160a060020a0319163317905561016f806100246000396000f3606060405260e060020a6000350463867904b48114610034578063a9059cbb1461005e578063f8b2cb4f14610092575b610002565b34610002576100bc600435602435600054600160a060020a0390811633909116146100be57610002565b34610002576100bc60043560243533600160a060020a03166000908152600160205260409020548190101561010f57610002565b3461000257600160a060020a03600435166000908152600160205260409020546060908152602090f35b005b600160a060020a03821660008181526001602052604090819020805484019055606091825260808390527fc65a3f767206d2fdcede0b094a4840e01c0dd0be1888b5ba800346eaa0123c1691a15050565b6040600081812080548490039055600160a060020a03808516808352929091208054840190553316606090815260809190915260a08290527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9080a1505056",
+    "devdoc": {
+      "methods": {
+      }
+    },
+    "userdoc": {
+      "methods": {
+      }
+    }
+  },
+  "address": "0x3a020580345e79e223580d8d6a50e063667f19b5"
+}
+```
+Another is `temp/migrations/Token.js`
+```javascript
+var TokenContract = web3.eth.contract([{"constant":false, "inputs":[{"name":"account", "type":"address"}, {"name":"amount", "type":"uint256"}], "name":"issue", "outputs":[], "payable":false, "type":"function"}, {"constant":false, "inputs":[{"name":"to", "type":"address"}, {"name":"amount", "type":"uint256"}], "name":"transfer", "outputs":[], "payable":false, "type":"function"}, {"constant":true, "inputs":[{"name":"account", "type":"address"}], "name":"getBalance", "outputs":[{"name":"", "type":"uint256"}], "payable":false, "type":"function"}, {"inputs":[], "type":"constructor"}, {"anonymous":false, "inputs":[{"indexed":false, "name":"account", "type":"address"}, {"indexed":false, "name":"amount", "type":"uint256"}], "name":"Issue", "type":"event"}, {"anonymous":false, "inputs":[{"indexed":false, "name":"from", "type":"address"}, {"indexed":false, "name":"to", "type":"address"}, {"indexed":false, "name":"amount", "type":"uint256"}], "name":"Transfer", "type":"event"}]);
+
+var Token = TokenContract.at('0x80d29fb7f81d2ccd77c708b6135389c9c08653dc');
+
+```
+Deploy all contracts if no contract name provided.
+
+#### Write your own javascript test
+`gtests/Token_test.js`
+```javascript
+loadScript('temp/migrations/Token.js');
+
+var balance = Token.getBalance.call(web3.eth.accounts[0], { from: web3.eth.accounts[0] })
+
+console.log("balance is: ", balance);
+
+Token.issue.sendTransaction(web3.eth.accounts[0], 10000, { from: web3.eth.accounts[0] }, function(err, tx){
+  if(err){
+    console.log("issue error!");
+  } else {
+    console.log("issue success. tx: ", tx);
+  }
+})
+
+miner.start();admin.sleepBlocks(2);miner.stop();
+
+balance = Token.getBalance.call(web3.eth.accounts[0], { from: web3.eth.accounts[0] })
+
+console.log("balance is: ", balance);
+
+```
+
+#### Run gtest
+```
+$ teth gt token
+***** Using geth at: geth
+Testing contract Token...
+balance is:  0
+issue success. tx:  0x7fd24d1903345d4f70208c41fc3a1bd71be63f8dd7db7c654f2d3a7c176b4031
+balance is:  10000
+true
+Done.
+```
+
+:beers:
+
+## Frequently Asked Questions
+
+#### Error: Account does not exist or account balance too low while `teth migrate token`
+This is just low balance for your accoutns. Just mining for a while will be ok.
+```shell
+$ teth c
+***** Using geth at: geth
+Starting geth attach...
+Welcome to the Geth JavaScript console!
+
+instance: Geth/v1.4.11-stable-fed692f6/darwin/go1.7
+coinbase: 0x3ae88fe370c39384fc16da2c9e768cf5d2495b48
+at block: 3 (Sat, 17 Sep 2016 17:42:50 CST)
+ datadir: data
+ modules: admin:1.0 debug:1.0 eth:1.0 miner:1.0 net:1.0 personal:1.0 rpc:1.0 txpool:1.0 web3:1.0
+
+> miner.start()
+true
+> web3.eth.getBalance(web3.eth.accounts[0])
+506406250000000000000
+> 
+
+```
+
+
+## TODO:
+
+- Add chai for js test

data/bin/teth

@@ -3,6 +3,7 @@
 require 'erb'
 require 'json'
 require 'fileutils'
+require 'ethereum'
 
 ARGV << "--help" if ARGV.empty?
 
@@ -16,7 +17,7 @@ ALIASES = {
   "m"  => "migrate",
   "s"  => "server",
   "c"  => "console",
-  "gt" => "geth_test"
+  "gt" => "gtest"
 }
 
 command = ARGV.shift
@@ -26,25 +27,27 @@ HELP_MESSAGE = <<-EOF
 Usage: teth COMMAND [ARGS]
 The most common teth commands are:
   new         Create a new Smart Contract application. "teth new my_app" creates a
-              new application called MyApp in "./my_app" (short-cut alias: "n")
-  generate    Generate new Smart Contract and test file (short-cut alias: "g")
-  test        Run tests (short-cut alias: "t")
-  init        Init private geth chain (short-cut alias: "i")
-  import_keys Import keys to chain (short-cut alias: "ik")
+              new application called my_app in "./my_app" (short-cut alias: "n")
+  generate    Generate new solidity smart contract and test files. "teth generate token"
+              creates Token contract and corresponding test files. (short-cut alias: "g")
+  test        Run your ruby tests in ruby evm. (short-cut alias: "t")
+  init        Bootstraps and initialises a new genesis block. "teth init" creates data directory
+              for private chain.(short-cut alias: "i")
+  import_keys Import keys to private chain (short-cut alias: "ik")
   build       Build contract (short-cut alias: "b")
-  migrate     Deploy contract on chain (short-cut alias: "m")
-  server      Start chain server (short-cut alias: "s")
-  console     Open Chain console (short-cut alias: "c")
-  geth_test   Test on chain (short-cut alias: "gt")
+  migrate     Deploy contract on private chain (short-cut alias: "m")
+  server      Start geth server (short-cut alias: "s")
+  console     Start geth attach (short-cut alias: "c")
+  gtest       Run your javascript tests on geth (short-cut alias: "gt")
 
 All commands can be run with -h (or --help) for more information.
 EOF
 
-KEYS_TEMPLATE = {
-  "3ae88fe370c39384fc16da2c9e768cf5d2495b48" => "095e53c9c20e23fd01eaad953c01da9e9d3ed9bebcfed8e5b2c2fce94037d963",
-  "81063419f13cab5ac090cd8329d8fff9feead4a0" => "5bc505a123a695176a9688ffe22798cfd40424c5b91c818e985574ea8ebda167",
-  "9da26fc2e1d6ad9fdd46138906b0104ae68a65d8" => "b6a03207128827eaae0d31d97a7a6243de31f2baf99eabd764e33389ecf436fc"
-}
+KEYS_TEMPLATE = [
+  ["3ae88fe370c39384fc16da2c9e768cf5d2495b48", "095e53c9c20e23fd01eaad953c01da9e9d3ed9bebcfed8e5b2c2fce94037d963"],
+  ["81063419f13cab5ac090cd8329d8fff9feead4a0", "5bc505a123a695176a9688ffe22798cfd40424c5b91c818e985574ea8ebda167"],
+  ["9da26fc2e1d6ad9fdd46138906b0104ae68a65d8", "b6a03207128827eaae0d31d97a7a6243de31f2baf99eabd764e33389ecf436fc"]
+]
 
 def gem_dir
   spec = Gem::Specification.find_by_name("teth")
@@ -55,22 +58,25 @@ def new
   name = ARGV.shift
   if name
     puts "Creating project #{name}..."
-    system("mkdir #{name} && cd #{name} && mkdir private_keys && mkdir builds && mkdir db && mkdir contracts && mkdir tests")
-
+    dirs_commands = %w{ private_keys builds temp contracts tests gtests}.map{ |d| "mkdir #{d}" }.join(" && ")
+    system("mkdir #{name} && cd #{name} && #{dirs_commands}")
+    system("cd #{name} && cd temp && mkdir db && mkdir migrations")
     gemfile = File.read("#{gem_dir}/lib/teth/erbs/Gemfile")
 
     File.open("#{name}/Gemfile", "w+") {|f| f.write(gemfile) }
     system("cd #{name} && bundle install")
 
-    KEYS_TEMPLATE.each do |k, v|
-      File.open("#{name}/private_keys/#{k}.key", "w+") { |f| f.write(v) }
+    KEYS_TEMPLATE.each do |k|
+      File.open("#{name}/private_keys/#{k[0]}.key", "w+") { |f| f.write(k[1]) }
     end
 
     FileUtils.cp("#{gem_dir}/lib/teth/templates/private_keys/import.sh", "#{name}/private_keys/import.sh")
     FileUtils.chmod 0700, "#{name}/private_keys/import.sh"
 
-    FileUtils.cp("#{gem_dir}/lib/teth/templates/genesis.json", "#{name}/genesis.json")
-    FileUtils.cp("#{gem_dir}/lib/teth/templates/rakefile", "#{name}/rakefile")
+    %w{genesis.json rakefile gitignore}.each do |f|
+      FileUtils.cp("#{gem_dir}/lib/teth/templates/#{f}", "#{name}/#{f}")
+    end
+    FileUtils.mv("#{name}/gitignore", "#{name}/.gitignore")
 
     FileUtils.cp_r("#{gem_dir}/lib/teth/templates/bin/", "#{name}")
     FileUtils.chmod_R 0700, "#{name}/bin/"
@@ -83,15 +89,28 @@ end
 def generate
   name = ARGV.shift
   if name
+    puts "Creating #{name.capitalize} contract file..."
     contract_template = ERB.new File.read("#{gem_dir}/lib/teth/erbs/contract.sol")
     contract = contract_template.result(binding)
+
+    version = Ethereum::Tester::Language.get(:solidity).compiler_version
+    semver = version.split('-').first
+    major, minor, patch = semver.split('.')
+    unless major.to_i < 1 && minor.to_i < 4
+      pragma = "pragma solidity ^#{major}.#{minor}.0;" # always set patch to 0
+      contract = "#{pragma}\n\n#{contract}"
+    end
+
     puts "Create #{name.capitalize}.sol contract file..."
     File.open("contracts/#{name.capitalize}.sol", "w+") { |f| f.write(contract) }
 
+    puts "Creating #{name} test files..."
     test_template = ERB.new File.read("#{gem_dir}/lib/teth/erbs/contract_test.rb")
     test = test_template.result(binding)
-    puts "Create #{name}_test.rb test file..."
-    File.open("tests/#{name.capitalize}_test.rb", "w+") {|f| f.write(test) }
+    File.open("tests/#{name}_test.rb", "w+") {|f| f.write(test) }
+    File.open("gtests/#{name.capitalize}_test.js", "w") do |f|
+      f.write("loadScript('temp/migrations/#{name.capitalize}.js');")
+    end
     puts "Done."
   else
     puts "Need contract name"
@@ -111,10 +130,12 @@ def test
 end
 
 def init
+  puts "Initialising a new genesis block..."
   system("./bin/init.sh")
 end
 
 def import_keys
+  puts "Importing keys, this will take a while, please be patient..."
   system("./bin/import_keys.sh")
 end
 
@@ -129,15 +150,43 @@ end
 
 def migrate
   name = ARGV.shift
-  system("./bin/migrate.sh #{name}")
+  if name
+    puts "Migrating contract #{name}"
+  else
+    puts "Migrating all contracts"
+  end
+  output = `./bin/migrate.sh #{name}`
+  puts output
+  contract = ""
+  output.split("\n").each do |o|
+    if o.match("Contract Instance")
+      contract = o.split("Contract Instance : ")[1]
+    end
+    if o.match("Contract mined!")
+      address = o.split("Address: ")[1]
+      data = File.read("temp/db/#{contract}.json")
+      data = JSON.parse data
+      data["address"] = address
+      File.open("temp/db/#{contract}.json", "w") do |f|
+        f.write(JSON.pretty_generate data)
+      end
+      File.open("temp/migrations/#{contract}.js", "w") do |f|
+        abi = data[contract]["abi"]
+        template = ERB.new File.read("#{gem_dir}/lib/teth/erbs/migration")
+        migration = template.result(binding)
+        f.write(migration.gsub("=>", ":"))
+      end
+    end
+  end
 end
 
 def console
   system("./bin/attach.sh")
 end
 
-def geth_test
-  system("./bin/test.sh")
+def gtest
+  name = ARGV.shift
+  system("./bin/test.sh #{name}")
 end
 
 def help

data/lib/teth/erbs/Gemfile

@@ -1 +1 @@
-gem 'teth', '>= 0.1.0'
+gem 'teth', '>= 0.2.0'

data/lib/teth/erbs/contract_test.rb

@@ -1,6 +1,9 @@
 require 'teth/minitest'
 
 class <%=name.capitalize%>Test < Teth::Minitest
-  print_logs false
-  print_events false
+
+  def test_something
+    assert !contract.address.nil?
+  end
+
 end

data/lib/teth/erbs/migration

@@ -0,0 +1,3 @@
+var <%= contract %>Contract = web3.eth.contract(<%= abi %>);
+
+var <%= contract %> = <%=contract%>Contract.at('<%= address %>');

data/lib/teth/minitest.rb

@@ -30,7 +30,7 @@ module Teth
       when /\.sol\z/
         type = :solidity
       when /\.se\z/
-        raise NotImplemented, "Serpent not supported yet"
+        type = :serpent
       else
         raise "Unknown contract source type: #{path}"
       end
@@ -41,7 +41,7 @@ module Teth
           if self.class.print_logs
             topics = log.topics.map {|t| heuristic_prettify Utils.int_to_big_endian(t) }
             data = heuristic_prettify(log.data)
-            puts "[Log] #{Utils.encode_hex(log.address)} >>> topics=#{topics} data=#{data}"
+            puts "[Log] #{Utils.encode_hex(log.address)} >>> topics=#{topics} data=#{data.inspect}"
           end
         else # user defined event
           if self.class.print_logs && self.class.print_events
@@ -108,22 +108,15 @@ module Teth
     end
 
     def privkey
-      account[0]
+      privkeys[0]
     end
 
     def pubkey
-      account[1]
+      pubkeys[0]
     end
 
     def address
-      account[2]
-    end
-
-    def account
-      return @account if @account
-
-      i = rand(self.class.account_num)
-      @account = [privkeys[i], pubkeys[i], addresses[i]]
+      addresses[0]
     end
 
     def privkeys

data/lib/teth/templates/bin/attach.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
 
 geth=${GETH:-geth}
+
+echo "***** Using geth at: $geth"
+
+echo "Starting geth attach..."
+
 $geth attach ipc:data/geth.ipc

data/lib/teth/templates/bin/build.sh

@@ -1,30 +1,25 @@
 #!/bin/bash
 if [ -z "$1" ]
 then
-  echo "Build all contracts ..."
+  echo "Building all contracts ..."
   for sol in `find ./contracts -name '*.sol'`
   do
-    filename="${sol}"
-    echo "Build ${filename}"
-    let len=${#filename}-16
-    # echo $len
-    jsfile="${filename:12:len}_compiled.js"
-    echo $jsfile
-    ./bin/solc_helper.rb $sol $jsfile
+    echo "Building contract ${sol}"
+    let len=${#sol}-16
+    jsfile="${sol:12:len}_compiled.js"
+    ./bin/solc_helper.rb ${sol} $jsfile
     mv $jsfile builds/
   done
   echo "Done."
 else
-  foo=$1
-  foo="$(tr '[:lower:]' '[:upper:]' <<< ${foo:0:1})${foo:1}"
-  sol="contracts/$1.sol"
-  filename="${sol}"
-  echo "Build ${filename}"
-  let len=${#filename}-16
-  # echo $len
-  jsfile="${foo}_compiled.js"
-  echo "Build $foo to $jsfile"
-  ./bin/solc_helper.rb $sol $jsfile
+  sol=$1
+  sol="$(tr '[:lower:]' '[:upper:]' <<< ${sol:0:1})${sol:1}"
+  echo "Building contract ${sol}"
+
+  file="contracts/${sol}.sol"
+  len=${#sol}-16
+  jsfile="${sol}_compiled.js"
+  ./bin/solc_helper.rb $file $jsfile
   mv $jsfile builds/
   echo "Done."
 fi

data/lib/teth/templates/bin/import_keys.sh

@@ -1,12 +1,14 @@
 #!/bin/sh
 
 geth=${GETH:-geth}
+
 echo "***** Using geth at: $geth"
 
 echo "***** Import all pre-funded private keys"
 
 for key in `find ./private_keys -name '*.key'`
 do
+  echo "Notice: No need to input your password. The default password is 123456"
   ./private_keys/import.sh $key $geth
 done
 

data/lib/teth/templates/bin/init.sh

@@ -1,2 +1,7 @@
 #! /bin/bash
-geth --datadir `pwd`/data init genesis.json
+
+geth=${GETH:-geth}
+
+echo "***** Using geth at: $geth"
+
+$geth --datadir `pwd`/data init genesis.json

data/lib/teth/templates/bin/migrate.sh

@@ -2,21 +2,22 @@
 
 geth=${GETH:-geth}
 
+echo "***** Using geth at: $geth"
+
 if [ -z "$1" ]
 then
-  echo "Migrate all contract ..."
   scripts=""
   for file in `find ./builds -name '*compiled.js'`
   do
     scripts="${scripts};loadScript('$file')"
   done
   scripts="${scripts};miner.start();admin.sleepBlocks(2);miner.stop()"
-  # echo "$scripts"
   $geth --exec "$scripts" attach ipc:data/geth.ipc
 else
   file=$1
   file="$(tr '[:lower:]' '[:upper:]' <<< ${file:0:1})${file:1}"
   file+="_compiled.js"
-  echo "Migrate $file ..."
   $geth --exec "loadScript('builds/$file');miner.start();admin.sleepBlocks(2);miner.stop()" attach ipc:data/geth.ipc
 fi
+
+echo "Done."

data/lib/teth/templates/bin/private_blockchain.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
-
 geth=${GETH:-geth}
 
+echo "***** Using geth at: $geth"
+
+echo "Start geth server..."
+
 $geth --datadir data --networkid 31415926 --rpc --rpccorsdomain "*" --nodiscover --unlock 3ae88fe370c39384fc16da2c9e768cf5d2495b48 --password <(echo -n 123456)

data/lib/teth/templates/bin/solc_helper.rb

@@ -99,6 +99,6 @@ File.open(javascript_file_name, 'w') do |f|
   f.write("console.log('Contract Instance : #{contract_instance_variable_name}');")
 end
 
-File.open("db/#{current_contract}.json", "w") do |f|
-  f.write(compiled_object.to_json)
+File.open("temp/db/#{current_contract}.json", "w") do |f|
+  f.write(JSON.pretty_generate compiled_object)
 end

data/lib/teth/templates/bin/test.sh

@@ -2,17 +2,25 @@
 
 geth=${GETH:-geth}
 
+echo "***** Using geth at: $geth"
+
 scripts=""
 
-for file in `find ./builds -name '*compiled.js'`
-do
-  scripts="${scripts};loadScript('$file')"
-done
+if [ -z "$1" ]
+then
+  echo "Testing all contracts on geth..."
+  for file in `find ./gtests -name '*.js'`
+  do
+    scripts="${scripts};loadScript('$file');"
+  done
+else
+  file=$1
+  file="$(tr '[:lower:]' '[:upper:]' <<< ${file:0:1})${file:1}"
+  echo "Testing contract $file..."
+  file+="_test.js"
+  scripts="loadScript('gtests/$file');"
+fi
 
-for file in `find ./test -name '*.js'`
-do
-  scripts="${scripts};loadScript('$file');"
-done
+$geth --exec "$scripts" attach ipc:data/geth.ipc
 
-echo $scripts
-$geth --datadir data --networkid 31415926 --rpc --rpccorsdomain "*" --nodiscover --unlock 3ae88fe370c39384fc16da2c9e768cf5d2495b48 --password <(echo -n 123456) --exec "$scripts" console 2>> ./logfile
+echo "Done."

data/lib/teth/templates/gitignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+data
+temp

data/lib/teth/templates/private_keys/import.sh

@@ -6,6 +6,6 @@ set geth [lindex $argv 1];
 spawn $geth --datadir data account import $key
 expect "Passphrase:"
 send "123456\r"
-expect "Repeat Passphrase:"
+expect "Repeat passphrase:"
 send "123456\r"
 interact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Zhang YaNing
@@ -9,22 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ethereum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: serpent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +71,7 @@ files:
 - lib/teth/erbs/Gemfile
 - lib/teth/erbs/contract.sol
 - lib/teth/erbs/contract_test.rb
+- lib/teth/erbs/migration
 - lib/teth/minitest.rb
 - lib/teth/templates/bin/attach.sh
 - lib/teth/templates/bin/build.sh
@@ -67,6 +82,7 @@ files:
 - lib/teth/templates/bin/solc_helper.rb
 - lib/teth/templates/bin/test.sh
 - lib/teth/templates/genesis.json
+- lib/teth/templates/gitignore
 - lib/teth/templates/private_keys/import.sh
 - lib/teth/templates/rakefile
 homepage: https://github.com/cryptape/teth