Commit Graph

432 Commits

Author SHA1 Message Date
Teemu Patja 270dd3e277 Merge pull request #89 from 3esmit/test-token
add test token
2017-08-20 21:48:02 +03:00
Teemu Patja b00d30e370
ERC20 related smart contract call clj functions
* functions for querying ERC20 token balance from bounty contract and
  from token contract
* fix several bugs
* web3j related shared code to own module
2017-08-20 21:40:34 +03:00
Teemu Patja 97c0314ec2 Merge pull request #88 from 3esmit/cleanup
cleanup contracts
2017-08-20 21:35:15 +03:00
Ricardo Guilherme Schmidt 0d25d2823a add test token 2017-08-20 15:33:28 -03:00
Ricardo Guilherme Schmidt 3cc0c36186 cleanup 2017-08-20 15:29:37 -03:00
Teemu Patja b3fe5072a1 Merge pull request #87 from status-im/token-reg
Add token-reg.sol to be used in web3j
2017-08-20 17:06:27 +03:00
Ricardo Guilherme Schmidt 7143d3b0c4 Add token-reg.sol to be used in web3j 2017-08-20 11:05:35 -03:00
Teemu Patja 3f5a79c223
Build contracts with leiningen
* compile .sol files and generate java with web3j as part of
  uberjar build

Related to #80
2017-08-20 13:51:10 +03:00
Teemu Patja 6acc1bfb96
Mount component for holding tokenreg data 2017-08-20 12:22:08 +03:00
Teemu Patja 9c71e37e2a
Make factory contract address configurable 2017-08-20 11:54:11 +03:00
Teemu Patja c52c10e555
Function for finding created multisig address from tx receipt 2017-08-20 11:48:01 +03:00
Teemu Patja abb36770c6
Add less build to :prep-tasks, update build instructions 2017-08-20 11:46:57 +03:00
Teemu Patja 1744810c8a
Allow contract build script to overwrite old files 2017-08-20 11:45:43 +03:00
Teemu Patja aa89ed11d0 Merge pull request #84 from 3esmit/web3js-abifix
Web3js abifix
2017-08-20 10:21:51 +03:00
Ricardo Guilherme Schmidt e83f7f1583 new factory address 2017-08-20 00:48:24 -03:00
Ricardo Guilherme Schmidt cd7056608d added functions to fix ABI access 2017-08-19 22:05:58 -03:00
Teemu Patja b2cd1886f6
DB changes for bounty USD value + token support
* rename balance -> balance_eth
* add tokens jsonb column
* add value_usd column
* update existing SQL
2017-08-19 22:41:41 +03:00
Teemu Patja 43ea9b91e0
Fix bug in send-transaction 2017-08-19 21:27:01 +03:00
Teemu Patja 67ca49b816
Fix uberjar build
* include all needed tasks in uberjar profile's :prep-tasks
2017-08-19 14:36:58 +03:00
Teemu Patja 7c39d6940e
Build script for solidity contracts
* added simple script that compiles .sol contracts and generates java
  code for them
2017-08-19 14:11:46 +03:00
Teemu Patja 4d6d925772
Update build instructions in README 2017-08-19 12:53:12 +03:00
Teemu Patja 87effb5f6c
eth.core improvements
* add conversion func for (big)int -> hex string
* use integer instead of hex string for gas-price
2017-08-19 12:52:27 +03:00
Teemu Patja c647e4afd4
Read data from parity token registry + fix build
* read data from parity's mainnet token registry contract to a clojure
  map
2017-08-19 12:52:27 +03:00
Teemu Patja ec2e49601d
Add web3j 2017-08-18 21:28:51 +03:00
Teemu Patja 815544ec12
Fix compile error 2017-08-18 15:13:28 +03:00
Teemu Patja 350657a488
Remove duplication
* refactor duplication out of map values
2017-08-17 18:30:24 +03:00
Teemu Patja 7dde94ef65
Fix compile errors
* fix cyclic dependency issue
* fix several compile errors
2017-08-17 17:38:57 +03:00
Teemu Patja 6d7f47df4b
Replace hard-coded hex strings with util fn calls, refactoring
* replace hard-coded hex-strings with
* refactor some clojure code
2017-08-17 16:37:04 +03:00
Teemu Patja af4588dd9b Merge pull request #83 from 3esmit/erc20-multisig
wallet factory, and more organizated contracts
2017-08-17 16:09:49 +03:00
Ricardo Guilherme Schmidt ee5823a120 owners array getter, better custom tokenlist, interface to new contract 2017-08-17 10:06:14 -03:00
Ricardo Guilherme Schmidt cc4e742d03 cleanup and smaller stub 2017-08-17 09:49:22 -03:00
Ricardo Guilherme Schmidt 9c2775d87f multisig separated files and better stub contract 2017-08-17 09:49:22 -03:00
Teemu Patja 902129d639
Utility function for computing topic-id
* added utility function for computing topic ID hex-string from event signature
2017-08-17 14:52:38 +03:00
Teemu Patja 074f510aa5
Un-hardcode another hex method ID 2017-08-17 13:32:59 +03:00
Teemu Patja c0fa786225
Remove unused function 2017-08-17 13:19:01 +03:00
Teemu Patja 8599b67dd9
Eliminate need for hard-coded hex method IDs
* utility function for computing method-id hex string from method
  signature
* use util function in most places (TODO: find out missing hex
  method-id signatures)
2017-08-17 13:11:17 +03:00
Teemu Patja cc36b5bb02
Update dependencies + minor refactoring
* update all dependency libraries to latest
* use ring.util.http-response instead of ring.util.response everywhere
2017-08-17 11:42:08 +03:00
Teemu Patja 2bb7790768
Github comment improvements
* add missing "ETH" to github comment
* use 6 decimals instead of 8 for github comment + image
2017-08-14 13:18:33 +03:00
Teemu Patja 209698c170
Get USD value for token-value map
* get current USD value for an arbirary size token-value map
2017-08-04 12:16:13 +03:00
Teemu Patja f379da4924
Support for getting token USD value
* utility function for getting current USD value of a crypto token
  from cryptonator API
2017-08-04 11:50:51 +03:00
Teemu Patja 153c3dc7cb Merge pull request #81 from 3esmit/erc20-multisig
consensys Erc20 enhanced multisig
2017-08-03 14:43:08 +03:00
Ricardo Guilherme Schmidt 24e3ae84f1 added to clj 2017-08-03 04:50:22 -03:00
Ricardo Guilherme Schmidt a5a4bec9ef changed function signatures in commiteth 2017-08-02 00:11:12 -03:00
Ricardo Guilherme Schmidt a0e5d2b5dd contract cleanup 2017-08-02 00:10:54 -03:00
Ricardo Guilherme Schmidt fd3269aa4d updated to consensys multisig 2017-08-01 05:37:25 -03:00
Ricardo Guilherme Schmidt a24170baed erc20-enhanced-wallet 2017-07-31 17:34:17 -03:00
Ricardo Guilherme Schmidt 80e92aeeb3
Update enhanced-wallet.sol 2017-07-31 22:09:43 +03:00
Ricardo Guilherme Schmidt e45f9eb8da
Update to new multisig bytecode 2017-07-31 22:09:43 +03:00
Julien Eluard 021d1c2880 Merge pull request #76 from jeluard/develop
Improved README
2017-07-28 10:42:21 +02:00
Julien Eluard d7e4843c82
Fixed wrong arity 2017-07-26 23:51:45 +02:00