Commit Graph

364 Commits

Author SHA1 Message Date
杨新刚
199ea5f1d5 upload VDODO 2021-01-29 16:27:05 +08:00
owen05
a5b29dd35c callee fix 2021-01-22 15:32:36 +08:00
owen05
4095ebbb2f wait to test 2021-01-21 21:48:40 +08:00
owen05
1c8d393ae1 freeze 2021-01-21 19:22:56 +08:00
owen05
13bd041af7 fix incentive 2021-01-21 17:56:59 +08:00
owen05
6ecf34e1e1 fix proxy 2021-01-21 17:56:59 +08:00
owen05
b0a0ecd190 proxy fix 2021-01-20 11:18:20 +08:00
owen05
2c9446c94b change factory name 2021-01-19 18:08:27 +08:00
owen05
8b683af08f add twap switch 2021-01-19 17:10:46 +08:00
owen05
059778b27b add cp event && smartroute helper fix 2021-01-18 22:32:34 +08:00
mingda
211b5e0172 fix _SolveQuadraticFunctionForTrade sub error 2021-01-15 22:45:33 +08:00
mingda
70c0df01d5 Merge branch 'feature/V2' of github.com:DODOEX/contractV2 into feature/V2 2021-01-15 15:02:54 +08:00
mingda
827d14eddc emit transfer event in ERC20 template 2021-01-15 15:02:43 +08:00
owen05
3f707f5604 add crowdpooling pmmstate 2021-01-15 13:24:48 +08:00
owen05
450069ec1b trade incentive fix && test 2021-01-14 19:36:29 +08:00
owen05
a9ab9e981c refactor mixSwap && add trade adapter 2021-01-14 18:33:18 +08:00
mingda
6e126ba6ae remove startblock from dodo incentive 2021-01-14 16:24:48 +08:00
owen05
74a12f54c6 fix dodomath 2021-01-13 20:40:02 +08:00
owen05
847d0bf895 fix mixSwap weth to eth 2021-01-13 20:40:02 +08:00
owen05
ab4b5b7c03 update deployv1.5 && fix 2021-01-13 20:40:02 +08:00
杨新刚
3afca0f7a0 update event 2021-01-12 21:20:04 +08:00
杨新刚
fa5180bcd8 update feeratemodel & test case 2021-01-12 18:12:42 +08:00
mingda
b283a1c1f9 Merge branch 'feature/V2' of github.com:DODOEX/contractV2 into feature/V2 2021-01-11 09:44:41 +08:00
mingda
0659364e11 fix DODO math comment 2021-01-11 09:43:25 +08:00
owen05
dc28166194 V1Proxy02 - more protection 2021-01-10 15:48:54 +08:00
owen05
34d9ccf668 annotation && v2proxy add gasreturn and trade incentive && proxyV2 incentive test 2021-01-08 19:09:12 +08:00
owen05
267ad24edc fix 2021-01-08 19:09:12 +08:00
牛涛涛
051dc73eb3 add bid claim weth 2 eth support 2021-01-08 17:41:36 +08:00
牛涛涛
86a8f303a4 add weth 2 eth support in crowdpooling 2021-01-08 01:59:35 +08:00
牛涛涛
784c443834 code review modifyupdate 2021-01-07 21:36:27 +08:00
owen05
9d45b310bb update cpfactory 2021-01-07 14:21:57 +08:00
owen05
6e8c5d6f91 factory add template update && proxy fix 2021-01-07 12:52:42 +08:00
owen05
66ab633d41 trade incentive && dodov1proxy02 2021-01-06 18:02:54 +08:00
owen05
f380356893 fix incentive 2021-01-06 00:27:11 +08:00
牛涛涛
a7aa20c5d5 Merge branch 'feature/V2' of https://github.com/DODOEX/contractV2 into feature/V2 2021-01-05 23:43:42 +08:00
牛涛涛
5a81c6a404 add events from user bid/cancel in crowdpooling 2021-01-05 23:43:27 +08:00
owen05
6fdd53e7eb fix incentive switch 2021-01-05 18:11:50 +08:00
owen05
b249d44b16 fix 2021-01-05 18:08:20 +08:00
owen05
cfe9ae67db trade incentive contract && deployV2 script fix 2021-01-05 18:01:51 +08:00
owen05
1bc41f9a61 dodomath fix && proxy test 2021-01-04 22:23:08 +08:00
owen05
c42f7e590e simplify cpfacotry && fix proxy-dvm test 2020-12-31 11:53:54 +08:00
owen05
f81e5481f8 math overflow fix 2020-12-30 23:23:20 +08:00
owen05
c717e5fb9b simplify dpp 2020-12-30 18:41:13 +08:00
owen05
9d2b0f06f5 cp add settle fund 2020-12-30 17:05:31 +08:00
owen05
4e5accd62d simplify dvm 2020-12-30 12:23:52 +08:00
owen05
7df13cbbcb update factory && kovan deploy 2020-12-24 11:51:55 +08:00
owen05
4e5a95cf6f cpfactory fix and test 2020-12-22 16:42:53 +08:00
owen05
2b3ffc31e8 add routev2 predata helper 2020-12-22 13:18:36 +08:00
牛涛涛
e9dc5c9be9 fix base value cacl 2020-12-22 02:26:15 +08:00
牛涛涛
f964814af2 fix base value cacl 2020-12-22 02:21:21 +08:00