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

Jump to bottom

Loan token enhancements v1.20.0 #436

Merged
merged 58 commits into from
May 6, 2022
Merged

Loan token enhancements v1.20.0 #436

merged 58 commits into from
May 6, 2022

Conversation

tjcloa
Copy link
Contributor

@tjcloa tjcloa commented May 6, 2022 •
edited
Loading

smbsp and others added 30 commits December 14, 2021 21:52
@smbsp
Modified marginTrade()
955601c
@smbsp
Ran Prettier
d551c2f
@smbsp
Modified the logic to check position size
51f2d08
@smbsp
Ran Prettier
90afb73
@smbsp
Modified the legacy 'minReturn' parameter
b6e0701
@smbsp
Merge branch 'development' of https://github.com/DistributedCollectiv…
fc5e448 
…e/Sovryn-smart-contracts into margintrading-using-limitorder
@smbsp
Ran Prettier
5ac2d54
@smbsp
Fixed failing test
9bb0ca2
@smbsp
Merge branch 'development' of https://github.com/DistributedCollectiv…
d0f432b 
…e/Sovryn-smart-contracts into margintrading-using-limitorder
@smbsp
Fixed Typo
f3e4d75
@smbsp
Fixed script and updated addresses
9231303
@smbsp
Ran prettier
d226c8c
@smbsp
Merge branch 'development' of https://github.com/DistributedCollectiv…
a4b17a9 
…e/Sovryn-smart-contracts into margintrading-using-limitorder
@smbsp
Merge branch 'development' of https://github.com/DistributedCollectiv…
f5682fd 
…e/Sovryn-smart-contracts into margintrading-using-limitorder
@smbsp
Ran prettier
d7ff47e
@smbsp
Incorporating review comments
fd84c97
@smbsp
Ran prettier
29f5194
@smbsp
Updated addresses
2d69e9d
@smbsp
Ran prettier
371b63b
@smbsp
Merge branch 'development' of https://github.com/DistributedCollectiv…
20ca32d 
…e/Sovryn-smart-contracts into margintrading-using-limitorder
@smbsp
Ran prettier
6286c57
@smbsp
Changed variable name
897b8b0
@smbsp
Merge branch 'development' of https://github.com/DistributedCollectiv…
8a431e0 
…e/Sovryn-smart-contracts into margintrading-using-limitorder
@smbsp
Ran Prettier
3c67fbd
@cwsnt
fix: money lost on extendLoanDuration
5ccb8bb 
when used collateral to extend the loan duration, will use the whole converted loan token
@ororopickpocket
added fastbtc max transfer to scripts
131c0d4
@ororopickpocket
mend
e9fb385
@ororopickpocket
Merge branch 'development' of https://github.com/DistributedCollectiv…
f3beff4 
…e/Sovryn-smart-contracts into development
@tjcloa
cleanup protocol.py
f338c12
@tjcloa
SIP44 script & set new logic to testnet_contracts
ef68838
tjcloa and others added 28 commits April 8, 2022 13:24
@tjcloa
add testnet-dev to config.py
0dda0f9
@cwsnt
Update V1 Converter address in testnet.json
a1412ce
@tjcloa
add loan tokens proxies to testnet_contracts.json
9380379
@tjcloa
WeightedStakingTest.js prettier formatting
3d202fe
@tjcloa
LM py script fix a bug & small enhancements
676cc35
@tjcloa
Merge branch 'sip-0044' into sip-0044-voting
67a6d5c
@tjcloa
sip-0044 new StakingLogic addresses
d5cb065
@tjcloa
Merge pull request #429 from DistributedCollective/sip-0044
54cdea3 
Sip 0044
@tjcloa
SIP-0044 deployment
272af2a
@tjcloa
Merge remote-tracking branch 'origin/development' into sip-0044-voting
45695e2
@tjcloa
.prettier formatting testnet_contracts.json
a80ae7f
@cwsnt
Merge pull request #425 from DistributedCollective/fix_moneylost_exte…
fd43df8 
…nd_duration

fix: money lost on extendLoanDuration
@tjcloa
Merge remote-tracking branch 'origin/development' into sip-0044-voting
4b7c76c
@tjcloa
Merge pull request #430 from DistributedCollective/sip-0044-voting
d4494f1 
Sip-0044-voting
@tjcloa
Merge remote-tracking branch 'origin/master' into development
e5355d5
@tjcloa
Revert "Temporarily revert commits that should not go into master yet"
8f8d2d9 
This reverts commit 778e41b.
@tjcloa
.prettier update useTabs = false, printWidth: 99
8d4e95c
@tjcloa
Merge pull request #432 from DistributedCollective/development-fix-id…
bd9d959 
…entation-pep8

.prettier update useTabs: false, printWidth: 99
@smbsp
Modified Prettier
0a000da
@smbsp
Merge branch 'development' of https://github.com/DistributedCollectiv…
29a104c 
…e/Sovryn-smart-contracts into margintrading-using-limitorder
@smbsp
Ran prettier
6fbef0f
@smbsp
Merge pull request #404 from DistributedCollective/margintrading-usin…
41115d7 
…g-limitorder

Margintrading using limitorder
@tjcloa
upd ignore for prettier, git, eslint
b3734f7
@tjcloa
add amm converters and registry data and py scripts
181d156
@tjcloa
revert contract_interaction.py
c50c875
@tjcloa
upd GenericTokenSender mainnet address
1b5fd54
@smbsp
Addresses updated - Loan Tokens deployment - 03/05
d4934d1
@smbsp
Ran prettier
6b09a19
@tjcloa tjcloa merged commit 068ce8a into master May 6, 2022
@smbsp smbsp deleted the merge-dev-to-master branch May 8, 2022 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tjcloa @smbsp @cwsnt @ororopickpocket