Andrea Franz
|
0a5292bdbc
|
check bucket type before loading ERC20 or NFT bucket
|
2020-04-30 12:16:02 +02:00 |
Michele Balistreri
|
60133de7d1
|
Merge branch 'master' of github.com:status-im/keycard-redeem
|
2020-04-30 08:34:41 +03:00 |
|
Michele Balistreri
|
3062b69502
|
correct assert
|
2020-04-30 08:34:24 +03:00 |
|
Andrea Franz
|
c2251bd20d
|
inline contract functions to save gas for buckets
ERC20Bucket from 47,372 to 46,971
NFTBucket from 53,056 to 52,225
|
2020-04-30 01:06:18 +02:00 |
|
Andrea Franz
|
ce4df7d040
|
update app to be a create-react-app
|
2020-04-30 00:53:10 +02:00 |
|
Michele Balistreri
|
1e5c35c8e9
|
closes #24
|
2020-04-29 13:50:25 +03:00 |
|
Michele Balistreri
|
6a243df6e1
|
close #13
|
2020-04-29 13:33:14 +03:00 |
|
Andrea Franz
|
e118c153f9
|
add error action
|
2020-04-28 16:09:34 +02:00 |
Bitgamma
|
a7e86d8652
|
Merge pull request #22 from status-im/gift-to-erc20-redeemable
remove gift terminology
|
2020-04-28 13:16:54 +03:00 |
|
Michele Balistreri
|
d942033969
|
remove gift terminology
|
2020-04-28 12:36:34 +03:00 |
|
Andrea Franz
|
835173b70b
|
Merge pull request #21 from status-im/base-bucket
add base Bucket contract
|
2020-04-27 16:14:33 +02:00 |
|
Andrea Franz
|
008ab8e881
|
remove comments and blank lines
|
2020-04-24 19:08:23 +02:00 |
|
Andrea Franz
|
16579768d3
|
remove duplicated test
|
2020-04-24 19:06:06 +02:00 |
|
Andrea Franz
|
b4e923c0a3
|
fix test
|
2020-04-24 19:00:39 +02:00 |
|
Andrea Franz
|
3189f42e31
|
remove RedeemUtil
|
2020-04-24 19:00:20 +02:00 |
|
Andrea Franz
|
a4dff0868c
|
add base Bucket contract
|
2020-04-24 18:59:08 +02:00 |
|
Michele Balistreri
|
726df43f41
|
closes #18
|
2020-04-23 15:51:05 +03:00 |
|
Bitgamma
|
4f9c711678
|
Merge pull request #20 from status-im/fix-tests
minAt NOW to avoid failing in next test files
|
2020-04-23 14:51:28 +03:00 |
|
Michele Balistreri
|
01ca6aaf01
|
closes #9
|
2020-04-23 14:44:04 +03:00 |
|
Andrea Franz
|
d9b4ff8584
|
minAt NOW to avoid failing in next test files
|
2020-04-23 13:42:36 +02:00 |
|
Bitgamma
|
aec3c4d77e
|
Merge pull request #19 from status-im/redeem-library
extracted redeem validation utils
|
2020-04-23 12:05:39 +03:00 |
|
Michele Balistreri
|
e34f1a8e99
|
extracted redeem validation utils
|
2020-04-21 13:39:40 +03:00 |
|
Andrea Franz
|
3dfa0a7fb7
|
Merge pull request #6 from status-im/nft-support
NFT support
|
2020-04-16 12:27:16 +02:00 |
|
Michele Balistreri
|
c4b7027a56
|
use constant for ERC721 callback
|
2020-04-14 09:31:53 +03:00 |
|
Michele Balistreri
|
0a10824c6a
|
adapt create-gift tool
|
2020-04-13 12:08:37 +03:00 |
|
Michele Balistreri
|
8e7ab9ebc9
|
onERC721Received must be called by the NFT only
|
2020-04-13 11:46:09 +03:00 |
|
Michele Balistreri
|
f3a07496fa
|
add NFT tests
|
2020-04-10 13:14:50 +03:00 |
|
Michele Balistreri
|
bef186115e
|
Add NFTBucketFactory
|
2020-04-09 13:05:00 +03:00 |
|
Michele Balistreri
|
af787e1ecd
|
Add NFTBucketFactory
|
2020-04-09 12:59:43 +03:00 |
|
Michele Balistreri
|
97e1f60329
|
NFT support
|
2020-04-09 11:13:16 +03:00 |
|
Michele Balistreri
|
84850e0270
|
use recipient to test existance
|
2020-04-08 14:00:16 +03:00 |
|
Michele Balistreri
|
456f699f67
|
Merge branch 'master' of github.com:status-im/keycard-redeem
|
2020-04-06 11:18:21 +03:00 |
|
Michele Balistreri
|
ebd69a4ee6
|
update minimist
|
2020-04-06 11:17:05 +03:00 |
|
Andrea Franz
|
f2971e659c
|
re-organize contracts
|
2020-04-03 14:19:40 +02:00 |
|
Andrea Franz
|
3da8c8c43c
|
move block info to Message interface
|
2020-04-03 12:49:22 +02:00 |
|
Bitgamma
|
46ee4862b4
|
Merge pull request #3 from status-im/add-block-num
add block number and hash
|
2020-04-03 08:57:48 +03:00 |
|
Michele Balistreri
|
a9574f14ca
|
small improvements
|
2020-04-03 08:56:24 +03:00 |
|
Michele Balistreri
|
cd909d6adc
|
add block number and hash
|
2020-04-02 14:28:41 +03:00 |
|
Michele Balistreri
|
8a5c979115
|
make sender a string
|
2020-04-02 12:34:38 +03:00 |
|
Michele Balistreri
|
827965e8eb
|
avoid parallel tx execution
|
2020-04-02 11:06:53 +03:00 |
|
Andrea Franz
|
5d9e3bcb6c
|
add redeem actions
|
2020-04-01 18:30:01 +02:00 |
|
Andrea Franz
|
3fbbffca65
|
fix web3/config error
|
2020-04-01 18:29:09 +02:00 |
|
Michele Balistreri
|
5c51dcc1d8
|
Merge branch 'master' of github.com:status-im/gift-keycard
merge
|
2020-04-01 13:50:41 +03:00 |
|
Michele Balistreri
|
1bb13358d5
|
set destination field
|
2020-04-01 13:50:22 +03:00 |
|
Michele Balistreri
|
4fd3162439
|
add gift creation tool
|
2020-04-01 13:18:28 +03:00 |
|
Andrea Franz
|
003c875590
|
add utils
|
2020-03-30 17:40:45 +02:00 |
|
Andrea Franz
|
fa1f796695
|
add Home and update config
|
2020-03-30 16:23:01 +02:00 |
|
Andrea Franz
|
0937a83f93
|
convert to TypeScript and add bucket actions
|
2020-03-30 15:54:59 +02:00 |
|
Andrea Franz
|
88f019e6c6
|
add IERC20Detailed contract and update TestToken constructor
|
2020-03-30 15:43:39 +02:00 |
|
Andrea Franz
|
35903220cc
|
update contracts
|
2020-03-25 10:03:27 +01:00 |