Commit Graph

837 Commits

Author SHA1 Message Date
Richard Ramos d81ab596ca
fix: removing warnings (pt. 1) (#341) 2019-07-02 15:14:46 -04:00
Richard Ramos ac289bf0b0
refactors: createAndFund, removing tradeAmount from fund() and displaying SNT offers when user does not have enough ETH (#338)
* removed unneeded contracts
* added createAndFund back, and removed tradeAmount from fund()
* feat: small refactors
* updated tests
* ropsten contracts update
* displaying SNT offers, and removing references to tradeAmount
2019-07-02 15:12:48 -04:00
Richard Ramos 3fec461ec8
fix: remove extra transfer to reduce gas costs (#339)
* fix: remove extra transfer to reduce gas costs
* fix: moved value verification inside _payFee
2019-07-02 15:02:40 -04:00
Jonathan Rainville bf1a0dd444
Merge pull request #335 from status-im/fix/trade-token-refresh
fix(network-reducer): fix updating the balance and not override
2019-07-02 10:09:14 -04:00
Richard Ramos 13ec57df46
feat: make the escrow contract upgradable (#332)
* feat: updating contracts with learnings from multiple instances experiment
* feat: update tests
* fix: contract configuration and function name
* feat: adding upgradability
* feat: adding upgrade tests, splitting arbitration tests from escrow_spec.js
* feat: update fund signature in approve and call
* feat: prefix internal functions, add management functions and rename license var
* feat: add approveAndCall test
* fix: merge error
* feat: UI changes for upgradable escrow (#336)
* feat: updating contracts with learnings from multiple instances experiment
* fix: limit use of init function
* fix: updated tests and ropsten config
* feat:  update provider and escrow to use proxy and relay
* feat: removing leftover from rebase
* fix: code review
2019-06-28 15:54:50 -04:00
Jonathan Rainville 35d2f3528c
Merge pull request #333 from status-im/fix/token-diff
fix(escrow-detail): use only two decimals to calculate the diff
2019-06-28 13:48:17 -04:00
Jonathan Rainville af778d5469
Merge pull request #334 from status-im/fix/open-trade-fail-reset
fix(open-trade): reset state when exiting an open trade failure
2019-06-28 13:33:01 -04:00
Jonathan Rainville 648452da5f
fix(network-reducer): fix updating the balance and not override 2019-06-28 13:32:30 -04:00
Jonathan Rainville f03d406290
fix(open-trade): reset state when exiting an open trade failure 2019-06-28 12:56:28 -04:00
Jonathan Rainville 2aafa659d2
fix(escrow-detail): use only two decimals to calculate the diff 2019-06-28 10:58:35 -04:00
Jonathan Rainville 3bad7c57c8
update chains with new escrow address 2019-06-27 10:24:33 -04:00
Jonathan Rainville 512cb7f5ec
Merge pull request #326 from status-im/feat/send-fees
Send fees to the arbiter and /or the Staking pool
2019-06-27 10:18:07 -04:00
Richard Ramos 6288322129
fix: various (#330)
* fix: various
* Update index.jsx
2019-06-27 10:17:44 -04:00
Jonathan Rainville 5f9047cc3a
feat: send fees to the arbiter and or the staking pool at then end 2019-06-27 08:27:41 -04:00
Jonathan Rainville ec3fa9ceda Implement 1 percent fees (#323)
* fund escrow
* fund escrow for token escrows
* fix almost all tests
* wip pr
* fix withdraw
* small stuff
* make SNT approval work
* fix margin selector using the fee
* make SNT trade 100% work 🙌
* make ETH work too 💃
* make funding_escrows tests pass
* unbug license test
* remove feeAmount from function call + review comments
2019-06-24 09:05:40 -04:00
Richard Ramos 807d195d34
fix: transfer to burn address and remove withdraw function (#322) 2019-06-23 14:40:34 -04:00
Richard Ramos 2db3ff4bed
fix: comments MetadataStore contract and removes unused function (#321)
* fix: documents metadata store contract and removes unneeded functions
* reorder events and rename attribute
2019-06-23 14:40:12 -04:00
Iuri Matias 1f302ac2a5
Merge pull request #320 from status-im/add_staking_contract
add staking pool contract
2019-06-19 09:23:32 -04:00
Iuri Matias 54c9368965 add burnAddress to license; update tests 2019-06-19 09:08:04 -04:00
Iuri Matias f7af5554d2 add staking pool contract 2019-06-19 09:04:57 -04:00
Iuri Matias 8c5aa9cb19
Merge pull request #319 from status-im/fix/docs
fix: improve contract documentation and removed unneeded allowance check due to already verifying if transfer was successful
2019-06-19 09:04:33 -04:00
Richard Ramos 5c28dde717 fix: improve contract documentation and removed unneeded allowance check due to already verifying if transfer was successful 2019-06-18 16:24:37 -04:00
Richard Ramos 0b660eec7f
fix: calculate percentages taking in account margin (#318) 2019-06-18 14:15:09 -04:00
Richard Ramos 6904e015f0
feat: delete offers on user profile (#317)
* refactor: adding nonce to signatures
* feat: UI changes to ask for signature
* refactor: removing owner from metadata
* add redux code for deleting offer
* feat: added delete offer confirmation dialog
* fix: code review
2019-06-18 14:14:50 -04:00
The Gitter Badger 30c3e9cdd4 Add Gitter badge (#315) 2019-06-17 17:37:07 -04:00
Richard Ramos 8985b29aac
feat: offers can be marked as deleted in the contract, and make the UI filter these (#316)
* refactor: adding nonce to signatures
* feat: UI changes to ask for signature
* refactor: removing owner from metadata
* feat: offers can be marked as deleted in the contract, and UI filters these
* fix: code-review - disable escrow creation if the offer has been deleted
2019-06-17 17:35:35 -04:00
Richard Ramos b97fb21f9b
feat: decouple metadata from escrow, and ask for signatures in escrow creation (#314)
* refactor: adding nonce to signatures
* feat: UI changes to ask for signature
* refactor: removing owner from metadata
2019-06-17 16:22:41 -04:00
Richard Ramos c964fe6df0
fix: check if arbitrator is valid when creating offers (#313) 2019-06-17 16:14:57 -04:00
Iuri Matias 9faf9d955c
Merge pull request #312 from status-im/refactor/arbitration-licenses
refactor: decouple arbitration licenses from escrow
2019-06-14 09:43:37 -04:00
Iuri Matias 9dd239068e
Merge pull request #311 from status-im/feat/all-fiat
feat: add fiat currencies handled by status app
2019-06-14 09:43:31 -04:00
Richard Ramos 5aeb0079cd fix: tests 2019-06-13 18:33:32 -04:00
Richard Ramos dd2acd5540 refactor: decouple arbitration licenses from disputes 2019-06-13 18:30:49 -04:00
Richard Ramos 9c5cd1b267 moved currencies to constants folder 2019-06-13 14:09:42 -04:00
Richard Ramos ccc14b5d45 feat: adds fiat currencies handled by status app 2019-06-13 13:47:15 -04:00
Richard Ramos 551c0bc67c
fix: more gas cost reduction (#310) 2019-06-11 14:38:37 -04:00
Richard Ramos b3749922f3
fix: reducing gas costs and changing solidity version (#309)
* fix: reducing gas costs and changing solidity version
* fix: change solc version
2019-06-11 13:52:33 -04:00
Iuri Matias 09f8dc0885
Merge pull request #306 from status-im/feat/add-events-on-new-offers
feat: watch new offers created
2019-06-11 09:19:25 -04:00
Jonathan Rainville b60bc3f0e8 Fix using the custom provider in local (#308)
* fix: fix local provider set by just extending the provider
* Adapting sendAsync
2019-06-11 08:42:42 -04:00
Richard Ramos 5bf6efebd5
fix: lint messages for contracts (#307)
* fix: test using error messages
* fix: lint
2019-06-11 08:42:24 -04:00
Jonathan Rainville 87d3501c24
fix lint 2019-06-06 14:10:15 -04:00
Richard Ramos fd1bd385dc
fix: test using error messages (#305) 2019-06-06 14:01:47 -04:00
Jonathan Rainville 1d9dff24d6
feat: watch new offers created 2019-06-06 13:45:55 -04:00
Jonathan Rainville f71fd05965
Merge pull request #296 from status-im/feat/warn-seller-of-discrenpancy
feat: show a message when the trade asset price is 10% lower
2019-06-06 12:44:30 -04:00
Jonathan Rainville f39fad84b6
only show warning if escrow is waiting 2019-06-06 11:56:19 -04:00
Jonathan Rainville 5c0cc5e127
feat: show a message when the trade asset price is 10% lower 2019-06-06 10:23:48 -04:00
Richard Ramos 389139bffc
Update README.md 2019-06-06 08:55:58 -04:00
Richard Ramos 90c2da9afd
fix: reset status (#304) 2019-06-06 08:54:52 -04:00
Richard Ramos c1916bcf9b
feat: disable escrow creation if it's going to be via relay and last activity < 15min (#302)
* feat: get last activity
* feat: disable cancel button under relay conditions
* feat: disable creation depending on last activity
* fix: tests
2019-06-06 08:54:36 -04:00
Richard Ramos 6521ce50db
feat: disable cancel button when balance is not enough for transaction and last activity is < 15min (#301)
* feat: get last activity

* feat: disable cancel button under relay conditions
2019-06-05 14:41:06 -04:00
Richard Ramos 173db39623
feat: custom provider that only acts as relayer on low balance and calling specific functions (#300)
* feat: hide token offers if you don't have ETH in your wallet
* fix: code review
* feat: hidde other assets from profile
* fix: code review
* feat: custom provider
* fix: code review
* fix: code revew / reversing condition
2019-06-05 11:30:13 -04:00