Commit Graph

25 Commits

Author SHA1 Message Date
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 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 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 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 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
Andrea Franz 363947a3cf
test pending withdrawal 2019-12-11 16:13:09 +01:00
Andrea Franz 5323b29151
WIP 2019-12-11 15:50:02 +01:00
Michele Balistreri ca8e952ec3
use EIP-712 data and signatures 2019-12-05 14:13:59 +03:00
Bitgamma 464c7811cc
Merge pull request #1 from status-im/no-double-spending
fix balance check
2019-12-04 15:50:46 +03:00
Michele Balistreri f5a30e828c
fix balance check 2019-12-03 14:03:34 +03:00
Andrea Franz 8cd4872ac8
add transactions list to simple wallet 2019-12-03 10:33:39 +01:00
Andrea Franz 72b1c0a19f
update contracts configs 2019-11-18 10:48:34 +01:00
Andrea Franz 69ca2ba965
remove empty test file 2019-10-28 15:25:07 +01:00
Andrea Franz 5730b177b5
remove app files 2019-10-25 14:21:54 +02:00
Andrea Franz 9d7774c00e
add network-contracts app 2019-10-25 14:19:13 +02:00