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.

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

Loan token enhancements v1.20.0 #436

Merged
merged 58 commits into from
May 6, 2022
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
955601c
Modified marginTrade()
smbsp Dec 14, 2021
d551c2f
Ran Prettier
smbsp Dec 14, 2021
51f2d08
Modified the logic to check position size
smbsp Dec 16, 2021
90afb73
Ran Prettier
smbsp Dec 16, 2021
b6e0701
Modified the legacy 'minReturn' parameter
smbsp Dec 16, 2021
fc5e448
Merge branch 'development' of https://github.com/DistributedCollectiv…
smbsp Jan 19, 2022
5ac2d54
Ran Prettier
smbsp Jan 19, 2022
9bb0ca2
Fixed failing test
smbsp Jan 19, 2022
d0f432b
Merge branch 'development' of https://github.com/DistributedCollectiv…
smbsp Jan 21, 2022
f3e4d75
Fixed Typo
smbsp Jan 21, 2022
9231303
Fixed script and updated addresses
smbsp Jan 21, 2022
d226c8c
Ran prettier
smbsp Jan 21, 2022
a4b17a9
Merge branch 'development' of https://github.com/DistributedCollectiv…
smbsp Jan 21, 2022
f5682fd
Merge branch 'development' of https://github.com/DistributedCollectiv…
smbsp Feb 2, 2022
d7ff47e
Ran prettier
smbsp Feb 2, 2022
fd84c97
Incorporating review comments
smbsp Feb 2, 2022
29f5194
Ran prettier
smbsp Feb 2, 2022
2d69e9d
Updated addresses
smbsp Feb 2, 2022
371b63b
Ran prettier
smbsp Feb 2, 2022
20ca32d
Merge branch 'development' of https://github.com/DistributedCollectiv…
smbsp Feb 3, 2022
6286c57
Ran prettier
smbsp Feb 3, 2022
897b8b0
Changed variable name
smbsp Feb 16, 2022
8a431e0
Merge branch 'development' of https://github.com/DistributedCollectiv…
smbsp Feb 16, 2022
3c67fbd
Ran Prettier
smbsp Feb 16, 2022
5ccb8bb
fix: money lost on extendLoanDuration
cwsnt Mar 25, 2022
131c0d4
added fastbtc max transfer to scripts
ororopickpocket Apr 7, 2022
e9fb385
mend
ororopickpocket Apr 7, 2022
f3beff4
Merge branch 'development' of https://github.com/DistributedCollectiv…
ororopickpocket Apr 7, 2022
f338c12
cleanup protocol.py
tjcloa Apr 7, 2022
ef68838
SIP44 script & set new logic to testnet_contracts
tjcloa Apr 7, 2022
0dda0f9
add testnet-dev to config.py
tjcloa Apr 8, 2022
a1412ce
Update V1 Converter address in testnet.json
cwsnt Apr 8, 2022
9380379
add loan tokens proxies to testnet_contracts.json
tjcloa Apr 11, 2022
3d202fe
WeightedStakingTest.js prettier formatting
tjcloa Apr 11, 2022
676cc35
LM py script fix a bug & small enhancements
tjcloa Apr 11, 2022
67a6d5c
Merge branch 'sip-0044' into sip-0044-voting
tjcloa Apr 11, 2022
d5cb065
sip-0044 new StakingLogic addresses
tjcloa Apr 11, 2022
54cdea3
Merge pull request #429 from DistributedCollective/sip-0044
tjcloa Apr 12, 2022
272af2a
SIP-0044 deployment
tjcloa Apr 12, 2022
45695e2
Merge remote-tracking branch 'origin/development' into sip-0044-voting
tjcloa Apr 12, 2022
a80ae7f
.prettier formatting testnet_contracts.json
tjcloa Apr 12, 2022
fd43df8
Merge pull request #425 from DistributedCollective/fix_moneylost_exte…
cwsnt Apr 12, 2022
4b7c76c
Merge remote-tracking branch 'origin/development' into sip-0044-voting
tjcloa Apr 13, 2022
d4494f1
Merge pull request #430 from DistributedCollective/sip-0044-voting
tjcloa Apr 13, 2022
e5355d5
Merge remote-tracking branch 'origin/master' into development
tjcloa Apr 16, 2022
8f8d2d9
Revert "Temporarily revert commits that should not go into master yet"
tjcloa Apr 16, 2022
8d4e95c
.prettier update useTabs = false, printWidth: 99
tjcloa Apr 16, 2022
bd9d959
Merge pull request #432 from DistributedCollective/development-fix-id…
tjcloa Apr 16, 2022
0a000da
Modified Prettier
smbsp Apr 20, 2022
29a104c
Merge branch 'development' of https://github.com/DistributedCollectiv…
smbsp Apr 20, 2022
6fbef0f
Ran prettier
smbsp Apr 20, 2022
41115d7
Merge pull request #404 from DistributedCollective/margintrading-usin…
smbsp Apr 20, 2022
b3734f7
upd ignore for prettier, git, eslint
tjcloa Apr 25, 2022
181d156
add amm converters and registry data and py scripts
tjcloa Apr 28, 2022
c50c875
revert contract_interaction.py
tjcloa Apr 28, 2022
1b5fd54
upd GenericTokenSender mainnet address
tjcloa May 3, 2022
d4934d1
Addresses updated - Loan Tokens deployment - 03/05
smbsp May 6, 2022
6b09a19
Ran prettier
smbsp May 6, 2022
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
upd ignore for prettier, git, eslint
tjcloa committed Apr 25, 2022
commit b3734f7957fc260c386e558201a74b83f5fb4fa1
8 changes: 8 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node_modules
artifacts
build
cache
coverage
types
reports
tmp
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ ignore/
!.gitattributes
!.solhint.json
!.solhintignore
!.eslintignore
ignore
*.txt
*.log
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -18,4 +18,5 @@ hardhat-ganache-tests.config.js
cache
brownie-config.yaml
.vscode
abi
abi
types/