From a986092a22e11cabd38af67f2b8cdd3e2c28277b Mon Sep 17 00:00:00 2001 From: Vitaliy Vlasov Date: Mon, 5 Mar 2018 13:05:33 +0200 Subject: [PATCH] Update web3j and solc versions; remove obsolete fn --- README.md | 13 ++----------- project.clj | 2 +- src/clj/commiteth/eth/token_registry.clj | 10 ---------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index de5fd30..9129032 100644 --- a/README.md +++ b/README.md @@ -38,23 +38,14 @@ psql postgres -c "CREATE DATABASE commiteth;" ### solc -Solidity compiler [0.4.15](https://github.com/ethereum/solidity/releases/tag/v0.4.15) is required and needs to be in $PATH. +Solidity compiler (latest version, currently [0.4.20](https://github.com/ethereum/solidity/releases/tag/v0.4.20)) is required and needs to be in $PATH. Detailed [installation instructions for various platforms](https://solidity.readthedocs.io/en/develop/installing-solidity.html) can be found in the official Solidity documentation. -``` -brew install https://raw.githubusercontent.com/ethereum/homebrew-ethereum/de1da16f7972a899fc8dd1f3f04299eced6f4312/solidity.rb -brew pin solidity -``` - ### web3j -Web3j [2.3.0](https://github.com/web3j/web3j/releases/tag/v2.3.0) is required and the command line tools need to be in $PATH. +Web3j (latest version, currently [3.3.1](https://github.com/web3j/web3j/releases/tag/v3.3.1)) is required and the command line tools need to be in $PATH. Installation instructions for the command line tools can be found in the [Web3j Command Line Tools documentation](https://docs.web3j.io/command_line.html). -``` -brew install https://raw.githubusercontent.com/web3j/homebrew-web3j/881cf369b551a5f2557bd8fb02fa8b7b970256ca/web3j.rb -brew pin web3j -``` ## Application config diff --git a/project.clj b/project.clj index 094f2f9..f4b1064 100644 --- a/project.clj +++ b/project.clj @@ -48,7 +48,7 @@ [com.andrewmcveigh/cljs-time "0.5.1"] [akiroz.re-frame/storage "0.1.2"] [cljsjs/chartjs "2.6.0-0"] - [org.web3j/core "2.3.1"] + [org.web3j/core "3.3.1"] [cljs-web3 "0.19.0-0-7"]] :min-lein-version "2.0.0" diff --git a/src/clj/commiteth/eth/token_registry.clj b/src/clj/commiteth/eth/token_registry.clj index 2d60cc9..14f0f75 100644 --- a/src/clj/commiteth/eth/token_registry.clj +++ b/src/clj/commiteth/eth/token_registry.clj @@ -55,13 +55,3 @@ .get))) ;; ignore empty records (filter (fn [[tla _]] (not= ":" (str tla)))))))))) - -(defn deploy-parity-tokenreg - "Deploy an instance of parity token-registry to current network" - [] - (let [web3j (create-web3j)] - (TokenReg/deploy web3j - (creds) - (eth/gas-price) - (BigInteger/valueOf 4000000) ;; gas limit - BigInteger/ZERO)))