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

merge staging to master (1.0 release) #168

Merged
merged 143 commits into from
Jan 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
a4bd506
fix roundedDiv method
treerz Jul 19, 2018
09d3ba9
use mul to protect from overflow in roundedDiv
treerz Jul 19, 2018
f980b4c
add test wrapper for SafeMath, add tests for roundedDiv
treerz Jul 20, 2018
968f0e9
proper roundedDiv without possible overflow, simplify div operations
treerz Jul 20, 2018
a9987a5
add test case for division by zero
treerz Jul 20, 2018
94bbc7b
fix typo in require in Locker.transferNotification
treerz Jul 20, 2018
a46a9e9
remove unused return value from Locker._createLock
treerz Jul 20, 2018
ab181f2
fix misleading comment
treerz Jul 23, 2018
2adcd2d
remove redundant check for lockProductId
treerz Jul 23, 2018
70daaa0
make types consistent in chunksize and related loops
treerz Jul 23, 2018
72cdf39
remove dummy return values from increase/decrease-approval, merge _in…
treerz Jul 23, 2018
669d366
Merge pull request #130 from Augmint/audit-safemath
treerz Jul 23, 2018
8a80c63
Merge branch 'staging' into audit-locker
treerz Jul 23, 2018
589ea2b
Merge branch 'staging' into audit-token
treerz Jul 23, 2018
81db961
Merge pull request #131 from Augmint/audit-locker
treerz Jul 23, 2018
5f87598
Merge branch 'staging' into audit-token
treerz Jul 23, 2018
a36e5cf
use abi.encodeWithSignature for delegatecall
treerz Jul 26, 2018
cfcf761
limit gas amount passed to delegatecall
treerz Jul 26, 2018
8dde264
set gas amount to be retained from delegatecall
treerz Jul 27, 2018
7c96313
remove unnecessary parts (no need to set status preemptively, as we n…
treerz Jul 27, 2018
42bf9f9
chore(package): update truffle-hdwallet-provider to version 0.0.6
greenkeeper[bot] Jul 30, 2018
f61fb91
chore(package): update lockfile
greenkeeperio-bot Jul 30, 2018
9fbf3f0
optimize: avoid redundant lookups
treerz Jul 30, 2018
8a1bd05
add check for missing input parameter to increase/decrease approval m…
treerz Jul 30, 2018
4b17d88
chunkSize parameter in Locker
treerz Jul 31, 2018
3b7e94d
fix bug in setLoanProductActiveState
treerz Jul 31, 2018
02a2bbb
remove unused return variable names
treerz Jul 31, 2018
050cda1
fix require for valid loanId-s in collect()
treerz Jul 31, 2018
95ce068
chunkSize parameter in LoanManager
treerz Jul 31, 2018
46ef421
Merge pull request #134 from Augmint/greenkeeper/truffle-hdwallet-pro…
Aug 1, 2018
97ebafb
Merge branch 'staging' into audit-multisig
treerz Aug 2, 2018
cf2d0c1
Merge branch 'staging' into audit-token
treerz Aug 2, 2018
26f8bef
Merge pull request #132 from Augmint/audit-token
treerz Aug 2, 2018
93e6e1d
Merge branch 'staging' into audit-multisig
treerz Aug 2, 2018
a4f8b3d
Merge pull request #133 from Augmint/audit-multisig
treerz Aug 2, 2018
1ef02eb
remove unused method getLoanToDepositRatio
treerz Aug 2, 2018
1a52021
loanmanager implements TokenReceiver interface
treerz Aug 2, 2018
47fa947
extend test for setLoanProductActiveState (actually check the new sta…
treerz Aug 2, 2018
509d8b9
Merge branch 'staging' into audit-loanmanager
treerz Aug 2, 2018
29484f2
Merge pull request #135 from Augmint/audit-loanmanager
treerz Aug 2, 2018
52860ce
transferFrom deducts the fee from the allowed amount (fixes some fee …
treerz Aug 3, 2018
1c16e04
improve comment and message
treerz Aug 6, 2018
25530ea
Merge branch 'staging' into audit-token
treerz Aug 6, 2018
0282e40
fix lint warnings (whitespaces only)
treerz Aug 6, 2018
90fd296
fix lint warnings (method order, too long lines)
treerz Aug 6, 2018
6ea3fc7
change fallback method to external
treerz Aug 6, 2018
2afbe2f
change fallback method to external in FeeAccount
treerz Aug 6, 2018
a6bd9fd
Merge branch 'staging' into audit-monetarysupervisor
treerz Aug 6, 2018
5f2a2b2
Merge branch 'staging' into chunk-size
treerz Aug 6, 2018
3033671
chunkSize parameter in PreToken
treerz Aug 6, 2018
463e116
chunkSize parameter in MultiSig
treerz Aug 6, 2018
e5c2f1e
chunkSize parameter in Exchange
treerz Aug 6, 2018
9582a9c
fix some lint warnings (whitespaces, indentation, too long lines)
treerz Aug 6, 2018
30d16d8
Merge pull request #136 from Augmint/audit-token
treerz Aug 7, 2018
5137331
Merge branch 'staging' into audit-monetarysupervisor
treerz Aug 7, 2018
4958cc2
Merge pull request #137 from Augmint/audit-monetarysupervisor
treerz Aug 7, 2018
f78c51e
Merge branch 'staging' into audit-reserves
treerz Aug 7, 2018
9ab1c9f
Merge pull request #138 from Augmint/audit-reserves
treerz Aug 7, 2018
9d49cb4
Merge branch 'staging' into chunk-size
treerz Aug 7, 2018
f4c1ede
optimize chunking loops (iterate on the actual index, precompute limit)
treerz Aug 7, 2018
46caef6
use safe addition when calculating limit
treerz Aug 7, 2018
e48c2fe
chore(package): update solidity-coverage to version 0.5.7
greenkeeper[bot] Aug 8, 2018
52d3957
chore(package): update lockfile
greenkeeperio-bot Aug 8, 2018
cab1fb7
Merge pull request #139 from Augmint/chunk-size
treerz Aug 8, 2018
70dabb8
Merge branch 'staging' into greenkeeper/solidity-coverage-0.5.7
Aug 13, 2018
ff959c9
optimize chunked queries: initialize response array with real size (d…
treerz Aug 13, 2018
3021fab
Merge branch 'staging' into chunk-size
treerz Aug 13, 2018
d770b21
chore(package): update truffle to version 4.1.14
greenkeeper[bot] Aug 13, 2018
bae230a
chore(package): update lockfile
greenkeeperio-bot Aug 13, 2018
fa69721
Merge pull request #140 from Augmint/greenkeeper/solidity-coverage-0.5.7
treerz Aug 14, 2018
d4cf7c9
Merge branch 'staging' into chunk-size
treerz Aug 14, 2018
631d1d7
chore(package): update ganache-cli to version 6.1.8
greenkeeper[bot] Aug 15, 2018
79da730
Merge branch 'staging' into greenkeeper/truffle-4.1.14
Aug 16, 2018
60f537f
chore(package): update lockfile
greenkeeperio-bot Aug 17, 2018
c3eae24
Merge pull request #145 from Augmint/greenkeeper/ganache-cli-6.1.8
treerz Aug 17, 2018
ba5db96
Merge branch 'staging' into chunk-size
treerz Aug 17, 2018
5c822fa
Merge branch 'staging' into greenkeeper/truffle-4.1.14
treerz Aug 17, 2018
2708eaa
Merge pull request #142 from Augmint/greenkeeper/truffle-4.1.14
treerz Aug 17, 2018
bea3148
Merge branch 'staging' into chunk-size
treerz Aug 17, 2018
c3826ec
tests: issue test tokens directly instead of via reserve.withdraw
treerz Aug 21, 2018
f6bd567
AugmintReserves is no longer a SystemAccount, add simple migrate func…
treerz Aug 21, 2018
e304330
Merge pull request #141 from Augmint/chunk-size
treerz Aug 22, 2018
b7a26f3
Merge branch 'staging' into audit-withdraw
treerz Aug 22, 2018
fba7ba3
Merge pull request #146 from Augmint/audit-withdraw
treerz Aug 22, 2018
085db49
chore(package): update stringifier to version 1.4.0
greenkeeper[bot] Aug 23, 2018
25cfa1c
chore(package): update lockfile
greenkeeperio-bot Aug 23, 2018
2f293a2
Merge branch 'master' into merge-master-to-staging
treerz Aug 27, 2018
005eb5d
Merge pull request #152 from Augmint/merge-master-to-staging
treerz Aug 28, 2018
19c82e4
chore(package): update solidity-coverage to version 0.5.11
greenkeeper[bot] Aug 31, 2018
f84ccd3
chore(package): update lockfile
greenkeeperio-bot Aug 31, 2018
012e2fb
Merge branch 'staging' into greenkeeper/stringifier-1.4.0
Sep 3, 2018
09a0bf5
Merge pull request #148 from Augmint/greenkeeper/stringifier-1.4.0
Sep 11, 2018
466e0de
Merge branch 'staging' into greenkeeper/solidity-coverage-0.5.11
Sep 12, 2018
934f7de
Merge pull request #153 from Augmint/greenkeeper/solidity-coverage-0.…
Sep 12, 2018
96092f4
Merge branch 'master' into merge-master-to-staging
treerz Sep 20, 2018
4bd14f9
remove temporary methods (chunkSize backward compatibility in test he…
treerz Sep 20, 2018
4052c9f
Merge pull request #155 from Augmint/merge-master-to-staging
treerz Sep 21, 2018
e8c3895
separate issued and burned amount counters in monetarysupervisor
treerz Oct 12, 2018
07db402
test fixes and improvements
treerz Oct 12, 2018
9c3d2b5
Merge pull request #158 from Augmint/issued_and_burned_amount
treerz Oct 16, 2018
41f6df0
delete old abiniser deployment descriptors (rinkeby)
treerz Oct 17, 2018
c21d6f6
delete old migration scripts (rinkeby)
treerz Oct 17, 2018
df3355e
rinkeby script: deploy all contracts
treerz Oct 18, 2018
040add9
delete old sb scripts (rinkeby)
treerz Oct 18, 2018
bee2b4b
abiniser files (new abis, rinkeby deploments)
treerz Oct 18, 2018
eb0993e
rinkeby script: init all contracts
treerz Oct 18, 2018
50d9436
abiniser files (local deployments)
treerz Oct 18, 2018
824dc7a
rinkeby script: redeploy all contracts
treerz Oct 19, 2018
b69b096
abiniser deployment descriptors for second rinkeby deploy
treerz Oct 29, 2018
6156d81
remove duplicate entry from local abiniser deployment descriptor
treerz Oct 29, 2018
4ab380b
clean up local abiniser deployment descriptor for AugmintReserves
treerz Oct 29, 2018
430cccc
rinkeby redeploy init scripts
treerz Oct 30, 2018
b3895ca
deploy script for redeploy init scripts
treerz Oct 30, 2018
7a41f6b
rinkeby redeploy legacy setup script
treerz Oct 30, 2018
c7787da
rinkeby scripts: disable old products in legacy contracts
treerz Oct 30, 2018
858c7b3
rinkeby scripts: setup SB signers
treerz Oct 30, 2018
9776cb8
rinkeby scripts: post deploy setup
treerz Oct 30, 2018
0b6bbc3
add comment about misplaced step in rinkeby init scripts
treerz Nov 7, 2018
66dafbc
Merge pull request #159 from Augmint/rinkeby_new_deploy
Nov 7, 2018
9f54465
mainnet deploy and init scripts
treerz Nov 9, 2018
3d1754b
mainnet init script changes: add pretoken signers, move stabiproxy si…
treerz Nov 13, 2018
6f46761
abiniser deployment descriptors for mainnet
treerz Nov 14, 2018
bc140b0
add new contract addresses to init scripts
treerz Nov 14, 2018
48d3069
fix legacy setup script
treerz Nov 14, 2018
5e74903
replace addresses with funny camelcase versions (to avoid compiler wa…
treerz Nov 14, 2018
8a001f0
remove adding pretoken signers from init script
treerz Nov 14, 2018
c622194
move adding pretoken signers to separate script, fix typo
treerz Nov 14, 2018
8f4b203
add pretoken signer script to script deploy script
treerz Nov 14, 2018
4026f3f
chore(package): update stringifier to version 2.0.0
greenkeeper[bot] Nov 23, 2018
21a05ea
chore(package): update lockfile yarn.lock
greenkeeper[bot] Nov 23, 2018
56b6207
chore(package): update dotenv to version 6.2.0
greenkeeper[bot] Dec 5, 2018
6751c84
chore(package): update lockfile
greenkeeperio-bot Dec 5, 2018
71c86c5
Merge pull request #162 from Augmint/greenkeeper/stringifier-2.0.0
Dec 7, 2018
33d5df0
Merge branch 'staging' into greenkeeper/dotenv-6.2.0
Dec 7, 2018
c4c2e34
Merge pull request #164 from Augmint/greenkeeper/dotenv-6.2.0
Dec 7, 2018
c977c87
update to node 8.14.0
szerintedmi Dec 7, 2018
d1faf93
script to eliminate transfer fees (mainnet)
treerz Jan 2, 2019
ed47368
script to remove deployer account from signers (mainnet)
treerz Jan 2, 2019
8b1a054
script to deploy scripts (mainnet)
treerz Jan 2, 2019
8f33a15
Merge branch 'staging' into mainnet_deploy
Jan 3, 2019
1cac513
Merge pull request #160 from Augmint/mainnet_deploy
treerz Jan 3, 2019
d9b4863
Merge branch 'staging' into node_upgrade
treerz Jan 3, 2019
a89a1d1
Merge pull request #165 from Augmint/node_upgrade
treerz Jan 3, 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 .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.9.4
v8.14.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
{
"contractName": "AugmintReserves",
"abiHash": "024b81d1a1f75241167a8a0f6e62326f",
"generatedAt": "2018-10-18T13:35:02.346Z",
"abi": [
{
"constant": true,
"inputs": [
{
"name": "",
"type": "address"
},
{
"name": "",
"type": "bytes32"
}
],
"name": "permissions",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "agent",
"type": "address"
},
{
"name": "requiredPermission",
"type": "bytes32"
}
],
"name": "revokePermission",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "agent",
"type": "address"
},
{
"name": "requiredPermissions",
"type": "bytes32[]"
}
],
"name": "revokeMultiplePermissions",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "agent",
"type": "address"
},
{
"name": "requiredPermissions",
"type": "bytes32[]"
}
],
"name": "grantMultiplePermissions",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "agent",
"type": "address"
},
{
"name": "requiredPermission",
"type": "bytes32"
}
],
"name": "grantPermission",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"name": "permissionGranterContract",
"type": "address"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"payable": true,
"stateMutability": "payable",
"type": "fallback"
},
{
"anonymous": false,
"inputs": [
{
"indexed": false,
"name": "to",
"type": "address"
},
{
"indexed": false,
"name": "weiAmount",
"type": "uint256"
}
],
"name": "ReserveMigration",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "agent",
"type": "address"
},
{
"indexed": false,
"name": "grantedPermission",
"type": "bytes32"
}
],
"name": "PermissionGranted",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "agent",
"type": "address"
},
{
"indexed": false,
"name": "revokedPermission",
"type": "bytes32"
}
],
"name": "PermissionRevoked",
"type": "event"
},
{
"constant": false,
"inputs": [
{
"name": "augmintToken",
"type": "address"
},
{
"name": "amount",
"type": "uint256"
}
],
"name": "burn",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "to",
"type": "address"
},
{
"name": "weiAmount",
"type": "uint256"
}
],
"name": "migrate",
"outputs": [],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
}
]
}
Loading