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 manager improvements #236

Merged
merged 31 commits into from
Aug 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c8b1be4
add currentRate to LoanManager events (NewLoan, LoanRepayed, LoanColl…
treerz Jun 6, 2019
e19d540
fix inverted collateralRatio, rename to initialCollateralRatio
treerz Jun 7, 2019
259e3a5
add minRate to newEthBackedLoan
treerz Jun 7, 2019
21b7890
Merge branch 'staging' into loan_manager_improvements
treerz Jun 7, 2019
2fc612a
emit LoanChanged event on addExtraCollateral
treerz Jun 7, 2019
444fccc
Merge branch 'staging' into loan_manager_improvements
treerz Jun 7, 2019
5cb3061
rename event LoanRepayed to LoanRepaid
treerz Jun 13, 2019
d7550a8
regenerate abiniser files
treerz Jul 2, 2019
e5677e9
contract deployer script (rinkeby)
treerz Jul 2, 2019
435cbbb
abiniser: new deployments for rinkeby
treerz Jul 2, 2019
f9a8d7b
rinkeby sb script: migrate contracts to new sb proxy
treerz Jul 2, 2019
fc572fd
rinkeby deploy script
treerz Jul 2, 2019
1d6e08b
rinkeby sb script: configure new loanmanager
treerz Jul 2, 2019
e42a37d
rinkeby sb script: configure new loanmanager
treerz Jul 2, 2019
8ebebea
rinkeby sb script: add signers to new proxy
treerz Jul 2, 2019
52ef766
Merge branch 'staging' into loan_manager_improvements
szerintedmi Jul 4, 2019
9257892
disable transfer fee on rinkeby test network
treerz Jul 10, 2019
f3b031f
Merge branch 'loan_manager_improvements' of github.com:Augmint/augmin…
treerz Jul 10, 2019
44b97bd
abiniser: local network deployments cleanup
treerz Jul 15, 2019
460b8dc
abiniser: remove safemath from abiniser config
treerz Jul 15, 2019
c2f8fe9
add legacy (1.0.12) loanmanager, for augmint-js cross version contrac…
treerz Jul 16, 2019
eb0fd2b
travis config: improve version number regexp, to match suffixes (for …
treerz Jul 16, 2019
2fa246f
version number: 1.1.0-pre5
treerz Jul 16, 2019
10ce8fb
add script to run ganache in compatibility mode (slow, but compatible…
treerz Jul 17, 2019
2a6ccee
abiniser: properly upper+lowercase addresses (loanmanager deployments)
treerz Jul 17, 2019
0c5c97a
version number: 1.1.0-pre6
treerz Jul 17, 2019
3d710cb
improve ganache test loanproducts for tests (nicer numbers for collat…
treerz Jul 25, 2019
667d8e1
ganache: do not get a 1 hour loan in the legacy loanmanager on test g…
treerz Jul 25, 2019
c9c287a
bump version number (1.1.0-pre8)
treerz Jul 25, 2019
d80a68c
ganache: migrations scripts to manually set the rate for testing
treerz Jul 29, 2019
7971271
version number: 1.1.0
treerz Aug 9, 2019
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ after_success:
- echo after_success TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST TRAVIS_TAG=$TRAVIS_TAG TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER TRAVIS_COMMIT=$TRAVIS_COMMIT ;
- |
if [ $TRAVIS_PULL_REQUEST == "false" ]; then
if [ $TRAVIS_BRANCH == "master" ] || [[ $TRAVIS_TAG =~ v([0-9]+)\.([0-9]+)\.([0-9]+) ]]; then
if [ $TRAVIS_BRANCH == "master" ] || [[ $TRAVIS_TAG =~ v([0-9]+)\.([0-9]+)\.([0-9]+)((-|_)\S*)? ]]; then
echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ;
yarn docker:tag:build ;
if [ ! -z $TRAVIS_TAG ]; then
Expand Down
1 change: 0 additions & 1 deletion abiniser.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"truffleContractFiles": [
"SafeMath.json",
"Migrations.json",
"Rates.json",
"AugmintReserves.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"contractName": "LoanManager",
"abiHash": "1a18d349e2ea55585c57e2125d99dad9",
"generatedAt": "2019-06-06T11:06:21.107Z",
"abiHash": "753a73f4b2140507197a8f80bff47b40",
"generatedAt": "2019-07-02T09:59:47.884Z",
"abi": [
{
"constant": true,
Expand Down Expand Up @@ -118,7 +118,7 @@
"type": "uint32"
},
{
"name": "collateralRatio",
"name": "initialCollateralRatio",
"type": "uint32"
},
{
Expand Down Expand Up @@ -305,11 +305,48 @@
"indexed": false,
"name": "maturity",
"type": "uint40"
},
{
"indexed": false,
"name": "currentRate",
"type": "uint256"
}
],
"name": "NewLoan",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"name": "loanId",
"type": "uint256"
},
{
"indexed": true,
"name": "borrower",
"type": "address"
},
{
"indexed": false,
"name": "collateralAmount",
"type": "uint256"
},
{
"indexed": false,
"name": "repaymentAmount",
"type": "uint256"
},
{
"indexed": false,
"name": "currentRate",
"type": "uint256"
}
],
"name": "LoanChanged",
"type": "event"
},
{
"anonymous": false,
"inputs": [
Expand Down Expand Up @@ -348,12 +385,17 @@
"type": "uint256"
},
{
"indexed": false,
"indexed": true,
"name": "borrower",
"type": "address"
},
{
"indexed": false,
"name": "currentRate",
"type": "uint256"
}
],
"name": "LoanRepayed",
"name": "LoanRepaid",
"type": "event"
},
{
Expand Down Expand Up @@ -383,6 +425,11 @@
"indexed": false,
"name": "defaultingFee",
"type": "uint256"
},
{
"indexed": false,
"name": "currentRate",
"type": "uint256"
}
],
"name": "LoanCollected",
Expand Down Expand Up @@ -451,7 +498,7 @@
"type": "uint32"
},
{
"name": "collateralRatio",
"name": "initialCollateralRatio",
"type": "uint32"
},
{
Expand Down Expand Up @@ -501,6 +548,10 @@
{
"name": "productId",
"type": "uint32"
},
{
"name": "minRate",
"type": "uint256"
}
],
"name": "newEthBackedLoan",
Expand Down
Loading