Commit Graph

94 Commits

Author SHA1 Message Date
Bitgamma 31392d373f
Merge pull request #13 from status-im/wallet-creation-script
Wallet creation script
2020-02-21 11:23:57 +03:00
Michele Balistreri 5bb43e32a0
wallet creation script 2020-02-21 11:08:04 +03:00
Michele Balistreri 2262499067
keycard argument 2020-02-20 16:33:39 +03:00
Michele Balistreri 4227eb181d
first draft 2020-02-20 16:16:56 +03:00
Michele Balistreri 9be4aca2d5
add currency field to tx 2020-02-12 15:37:48 +03:00
Andrea Franz 4baad4d4a7
Merge pull request #3 from status-im/pos-keycard-api
Pos keycard api
2020-02-12 13:30:16 +01:00
Andrea Franz 079d66d97f
update wallet app to work with the new tx format 2020-02-12 13:27:26 +01:00
Andrea Franz 996002ba0b
update pos app to work with the new tx type 2020-02-12 13:24:13 +01:00
Michele Balistreri d9af79fd8e
add ER20 support 2020-01-28 13:22:49 +03:00
Michele Balistreri 244624c207
add signer 2020-01-10 16:19:49 +03:00
Michele Balistreri 3de6a65045
finish signing method 2020-01-10 16:17:40 +03:00
Michele Balistreri 386ea7fb8c
use block number instead of noncne 2020-01-10 15:07:50 +03:00
Bitgamma 61c1d25e8f
Update contracts 2020-01-10 14:53:31 +03:00
Michele Balistreri 9291db471e
restore symlink 2020-01-10 14:52:10 +03:00
Michele Balistreri 3564631b83
Merge branch 'master' into pos-keycard-api
update
2020-01-10 14:39:02 +03:00
Bitgamma d6d8dfd4ef
Merge pull request #9 from status-im/registry-as-interface
Registry as interface
2020-01-09 13:21:20 +03:00
Bitgamma f4d43e5950
Merge pull request #8 from status-im/multiple-wallets-per-owner
add multiple wallets per owner
2020-01-09 13:20:47 +03:00
Michele Balistreri 2d782d8852
make the registry an interface 2019-12-20 15:07:41 +01:00
Michele Balistreri 38a6c17c01
adjust test 2019-12-20 14:52:53 +01:00
Michele Balistreri bc968e7019
add multiple wallets per owner 2019-12-20 14:22:19 +01:00
Bitgamma f57e3169ea
Merge pull request #4 from status-im/nonce-to-block-hash
make owner and keycard changeable from factory
2019-12-19 16:36:53 +01:00
Bitgamma 807ec4cd52
Merge branch 'master' into nonce-to-block-hash 2019-12-19 16:06:42 +01:00
Michele Balistreri 3b943ecd63
invert factory/wallet roles when changing wallet ownership 2019-12-19 16:02:27 +01:00
Andrea Franz a385a71d60
Merge pull request #6 from status-im/setting-struct
use Settings structure everywhere
2019-12-18 16:37:33 +01:00
Andrea Franz 13e808f7aa
set settings directly instead of setting each attribute 2019-12-18 16:36:50 +01:00
Andrea Franz 4ff81bbe90
Merge pull request #5 from status-im/only-nonce-to-block-hash
use block hash instead of nonce
2019-12-18 16:24:14 +01:00
Andrea Franz 1e0d303c1b
improve web3 initialization 2019-12-17 16:16:19 +01:00
Andrea Franz 64805df8ac
add spinner to transactions list 2019-12-17 16:07:31 +01:00
Andrea Franz f706e0d413
add MerchantsRegistry 2019-12-16 15:57:17 +01:00
Michele Balistreri ea408a58ce
make owner and keycard changeable from factory 2019-12-13 18:19:58 +01:00
Michele Balistreri 17867471ad
use Settings structure everywhere 2019-12-13 14:17:12 +01:00
Michele Balistreri 111a3c4dff
use block hash instead of nonce 2019-12-13 13:09:59 +01:00
Michele Balistreri e963308cf6
remove duplicates 2019-12-13 10:34:17 +01:00
Andrea Franz a282bc9d13
validate keycard address 2019-12-12 14:20:57 +01:00
Michele Balistreri a9b955fe7a
Merge branch 'master' into pos-keycard-api 2019-12-12 11:57:08 +01:00
Andrea Franz 363947a3cf
test pending withdrawal 2019-12-11 16:13:09 +01:00
Andrea Franz 60362e6f17
Merge pull request #2 from status-im/eip-712
use EIP-712 data and signatures
2019-12-11 16:08:52 +01:00
Andrea Franz 5323b29151
WIP 2019-12-11 15:50:02 +01:00
Michele Balistreri 57d251ceb8
add amount field 2019-12-10 15:20:49 +01:00
Michele Balistreri ca8e952ec3
use EIP-712 data and signatures 2019-12-05 14:13:59 +03:00
Andrea Franz 4a1b836f23
fix initial loading 2019-12-04 16:59:14 +01:00
Andrea Franz 5d52326725
remove old actions 2019-12-04 16:58:54 +01:00
Bitgamma 464c7811cc
Merge pull request #1 from status-im/no-double-spending
fix balance check
2019-12-04 15:50:46 +03:00
Andrea Franz 72df77f927
update gitignore 2019-12-04 12:32:21 +01:00
Andrea Franz 813323fa4d
reload balance after txs are confirmed 2019-12-04 12:17:57 +01:00
Andrea Franz ea434dd846
watch for tx confirmation 2019-12-04 11:59:24 +01:00
Andrea Franz 4f6744ed1f
simple-wallet: add pending txs 2019-12-04 11:15:10 +01:00
Andrea Franz 61f4bf9ebd
update heroku-postbuild 2019-12-04 09:41:03 +01:00
Andrea Franz d69c83e4c4
simple-wallet: add server 2019-12-04 09:33:07 +01:00
Andrea Franz 709a7df4e6
update package name 2019-12-04 09:32:23 +01:00