Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Smart token #9

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open

Smart token #9

Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
82682a2
Almost done with OneSplitSmartTokenView
krboktv Mar 30, 2020
66e7061
Merge pull request #1 from CryptoManiacsZone/master
krboktv Mar 30, 2020
08cba0b
Merge pull request #2 from krboktv/master
krboktv Mar 30, 2020
79074c3
fix
krboktv Mar 31, 2020
bea92a7
done with SmartTokenView contract
krboktv Mar 31, 2020
35cb84f
add _swapFromSmartToken function
krboktv Mar 31, 2020
3350e6e
add _swapToSmartToken function
krboktv Mar 31, 2020
dc2a84c
update full contract
krboktv Apr 1, 2020
323ef6b
fix msg.sender -> address(this)
krboktv Apr 1, 2020
536b05d
fix minReturnAmount
krboktv Apr 1, 2020
1488825
complete some <todo>
krboktv Apr 1, 2020
f728277
edit distribution
krboktv Apr 2, 2020
98a6368
reservers -> connectors + remove experimental encoder
krboktv Apr 2, 2020
dc408b5
get version -> staticcall
krboktv Apr 3, 2020
1bf38bd
fix leftover calculation
krboktv Apr 3, 2020
9b49195
safe fund swap
krboktv Apr 3, 2020
e79ff42
refactor
krboktv Apr 3, 2020
d113487
handle "lose funds" behavior
krboktv Apr 4, 2020
f5a24bd
some changes and safe calls
krboktv Apr 4, 2020
1cab6d3
disable flags -> 0
krboktv Apr 4, 2020
e3995a4
remove useless code
krboktv Apr 4, 2020
bf2d661
refactor
krboktv Apr 4, 2020
a975fb6
Some fixes
k06a Apr 4, 2020
04fc628
Safe Bancor swap added
k06a Apr 4, 2020
edec249
Fix Bancor safe swap
k06a Apr 4, 2020
c38acbe
fix shadowed naming
krboktv Apr 4, 2020
8f7038a
fix
krboktv Apr 4, 2020
f3cd14c
fixes
krboktv Apr 4, 2020
705a818
fix
krboktv Apr 5, 2020
25807f4
Fix bug
k06a Apr 5, 2020
014a5af
Revert abi and bin
k06a Apr 5, 2020
34d6e0a
Fix call
k06a Apr 5, 2020
959fc5f
Fix bug in view call
k06a Apr 5, 2020
d58fb9f
Fix
k06a Apr 5, 2020
978a652
Merge pull request #3 from CryptoManiacsZone/master
krboktv Apr 11, 2020
80743c2
unworkable uniswap pool token contract
krboktv Apr 11, 2020
e4849c9
modified formula and optimized
krboktv Apr 13, 2020
82e511b
add comment
krboktv Apr 13, 2020
c670567
done with view contract
krboktv Apr 21, 2020
ae2651a
almost done with swap
krboktv Apr 21, 2020
b50e5a1
almost done with curve susd pool token
krboktv Apr 26, 2020
0579ccd
rename vars
krboktv Apr 26, 2020
e888c9a
change snx curve address
krboktv Apr 27, 2020
125fc8c
some changes with weights
krboktv Apr 27, 2020
6bc1585
fix toToken split amount
krboktv Apr 27, 2020
61339c0
gas optimizations
krboktv Apr 27, 2020
8d0ed0f
fix curveSynthetix
krboktv Apr 27, 2020
af8a4df
optimize
krboktv Apr 27, 2020
f026063
Anton's refactoring
krboktv Apr 27, 2020
1dc5c72
fix
krboktv Apr 27, 2020
4cc1d3f
Merge pull request #4 from CryptoManiacsZone/master
krboktv May 2, 2020
36d126e
Merge branch 'master' into feature/curve-susd
krboktv May 2, 2020
8f54d0e
Merge branch 'feature/curve-susd' into smart-token
krboktv May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@krboktv
krboktv committed Mar 31, 2020
commit 79074c36e05b1ec64b8f2d7facc804479799686d
2 changes: 1 addition & 1 deletion contracts/OneSplitSmartToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ contract OneSplitSmartTokenView is OneSplitBaseView, OneSplitSmartTokenBase {
uint256 returnAmount = 0;
for (uint256 i = 0; i < tokens.tokens.length; i++) {
uint256 srcAmount = smartTokenFormula.calculateLiquidateReturn(
toToken.totalSupply(),
fromToken.totalSupply(),
tokens.tokens[i].balanceOf(address(converter)),
uint32(tokens.totalRatio),
amount
Expand Down