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

mainnet deploy #160

Merged
merged 13 commits into from
Jan 3, 2019
Merged
20 changes: 19 additions & 1 deletion abiniser/deployments/1/AugmintReserves_DEPLOYS.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contractName": "AugmintReserves",
"latestAbiHash": "fe74b7986dafb00f221486e790fc70ec",
"latestAbiHash": "024b81d1a1f75241167a8a0f6e62326f",
"deployedAbis": {
"fe74b7986dafb00f221486e790fc70ec": {
"latestDeployedAddress": "0x633cb544b2ef1bd9269b2111fd2b66fc05cd3477",
Expand All @@ -19,6 +19,24 @@
"source": "/* Contract to hold Augmint reserves (ETH & Token)\n - ETH as regular ETH balance of the contract\n - ERC20 token reserve (stored as regular Token balance under the contract address)\n\nNB: reserves are held under the contract address, therefore any transaction on the reserve is limited to the\n tx-s defined here (i.e. transfer is not allowed even by the contract owner or StabilityBoard or MonetarySupervisor)\n\n */\n\npragma solidity 0.4.24;\nimport \"./generic/SystemAccount.sol\";\nimport \"./interfaces/AugmintTokenInterface.sol\";\n\n\ncontract AugmintReserves is SystemAccount {\n\n function () public payable { // solhint-disable-line no-empty-blocks\n // to accept ETH sent into reserve (from defaulted loan's collateral )\n }\n\n constructor(address permissionGranterContract) public SystemAccount(permissionGranterContract) {} // solhint-disable-line no-empty-blocks\n\n function burn(AugmintTokenInterface augmintToken, uint amount) external restrict(\"MonetarySupervisor\") {\n augmintToken.burn(amount);\n }\n\n}\n"
}
}
},
"024b81d1a1f75241167a8a0f6e62326f": {
"latestDeployedAddress": "0x65f30f8dd20c707c1938ccad7416c7381e6eb9c8",
"deployments": {
"0x65f30f8dd20c707c1938ccad7416c7381e6eb9c8": {
"generatedAt": "2018-11-14T12:52:13.027Z",
"truffleContractFileUpdatedAt": "2018-11-13T16:34:24.469Z",
"deployTransactionHash": "0x3f6f0c7e6d357fe0e8d195ad850ed5c787c01c99e03a8f64a7c064d429a1b666",
"compiler": {
"name": "solc",
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
},
"bytecodeHash": "5bf4ede2aaad5b0b112f7b1ebf420fd2",
"deployedBytecodeHash": "3720667df6506876043fba53c540acb6",
"sourceHash": "b9d84f5f6153164ba581845190291c88",
"source": "/* Contract to hold Augmint reserves (ETH & Token)\n - ETH as regular ETH balance of the contract\n - ERC20 token reserve (stored as regular Token balance under the contract address)\n\nNB: reserves are held under the contract address, therefore any transaction on the reserve is limited to the\n tx-s defined here (i.e. transfer is not allowed even by the contract owner or StabilityBoard or MonetarySupervisor)\n\n */\n\npragma solidity 0.4.24;\nimport \"./generic/SystemAccount.sol\";\nimport \"./interfaces/AugmintTokenInterface.sol\";\n\n\ncontract AugmintReserves is Restricted {\n\n event ReserveMigration(address to, uint weiAmount);\n\n constructor(address permissionGranterContract)\n public Restricted(permissionGranterContract) {} // solhint-disable-line no-empty-blocks\n\n function () external payable { // solhint-disable-line no-empty-blocks\n // to accept ETH sent into reserve (from defaulted loan's collateral )\n }\n\n function burn(AugmintTokenInterface augmintToken, uint amount)\n external restrict(\"MonetarySupervisor\") {\n augmintToken.burn(amount);\n }\n\n function migrate(address to, uint weiAmount)\n external restrict(\"StabilityBoard\") {\n if (weiAmount > 0) {\n to.transfer(weiAmount);\n }\n emit ReserveMigration(to, weiAmount);\n }\n}\n"
}
}
}
}
}
20 changes: 19 additions & 1 deletion abiniser/deployments/1/Exchange_DEPLOYS.json

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion abiniser/deployments/1/FeeAccount_DEPLOYS.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"latestAbiHash": "67db260db12738df3cced3511d34c65c",
"deployedAbis": {
"67db260db12738df3cced3511d34c65c": {
"latestDeployedAddress": "0xf6b541e1b5e001dcc11827c1a16232759aea730a",
"latestDeployedAddress": "0xe3ed84a163b9eeaf4f69b4890ae45cc52171aa7e",
"deployments": {
"0xf6b541e1b5e001dcc11827c1a16232759aea730a": {
"generatedAt": "2018-06-11T13:29:06.622Z",
Expand All @@ -17,6 +17,19 @@
"deployedBytecodeHash": "1a57c03530d204909d1075b452099e77",
"sourceHash": "653a2a034144713dc046880dafd503c9",
"source": "/* Contract to collect fees from system\n TODO: calculateExchangeFee + Exchange params and setters\n*/\n\npragma solidity 0.4.24;\nimport \"./generic/SafeMath.sol\";\nimport \"./generic/SystemAccount.sol\";\nimport \"./interfaces/TransferFeeInterface.sol\";\n\n\ncontract FeeAccount is SystemAccount, TransferFeeInterface {\n\n using SafeMath for uint256;\n\n struct TransferFee {\n uint pt; // in parts per million (ppm) , ie. 2,000 = 0.2%\n uint min; // with base unit of augmint token, eg. 2 decimals for token, eg. 310 = 3.1 ACE\n uint max; // with base unit of augmint token, eg. 2 decimals for token, eg. 310 = 3.1 ACE\n }\n\n TransferFee public transferFee;\n\n event TransferFeesChanged(uint transferFeePt, uint transferFeeMin, uint transferFeeMax);\n\n constructor(address permissionGranterContract, uint transferFeePt, uint transferFeeMin, uint transferFeeMax)\n public SystemAccount(permissionGranterContract) {\n transferFee = TransferFee(transferFeePt, transferFeeMin, transferFeeMax);\n }\n\n function () public payable { // solhint-disable-line no-empty-blocks\n // to accept ETH sent into feeAccount (defaulting fee in ETH )\n }\n\n function setTransferFees(uint transferFeePt, uint transferFeeMin, uint transferFeeMax)\n external restrict(\"StabilityBoard\") {\n transferFee = TransferFee(transferFeePt, transferFeeMin, transferFeeMax);\n emit TransferFeesChanged(transferFeePt, transferFeeMin, transferFeeMax);\n }\n\n function calculateTransferFee(address from, address to, uint amount) external view returns (uint256 fee) {\n if (!permissions[from][\"NoTransferFee\"] && !permissions[to][\"NoTransferFee\"]) {\n fee = amount.mul(transferFee.pt).div(1000000);\n if (fee > transferFee.max) {\n fee = transferFee.max;\n } else if (fee < transferFee.min) {\n fee = transferFee.min;\n }\n }\n return fee;\n }\n\n function calculateExchangeFee(uint weiAmount) external view returns (uint256 weiFee) {\n /* TODO: to be implemented and use in Exchange.sol. always revert for now */\n require(weiAmount != weiAmount, \"not yet implemented\");\n weiFee = transferFee.max; // to silence compiler warnings until it's implemented\n }\n\n}\n"
},
"0xe3ed84a163b9eeaf4f69b4890ae45cc52171aa7e": {
"generatedAt": "2018-11-14T12:52:13.033Z",
"truffleContractFileUpdatedAt": "2018-11-13T16:34:24.474Z",
"deployTransactionHash": "0x5ab749f0dda1932da74e9055eba69e4fbda32f1a26176ae89241f809c1b6526c",
"compiler": {
"name": "solc",
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
},
"bytecodeHash": "7f27e332912911a33f3a5831a478a40e",
"deployedBytecodeHash": "62169a6a5b1bc79360f85c7d6b7cbadf",
"sourceHash": "d8975a5e1941ad79313f4b7bb0be9f95",
"source": "/* Contract to collect fees from system\n TODO: calculateExchangeFee + Exchange params and setters\n*/\n\npragma solidity 0.4.24;\nimport \"./generic/SafeMath.sol\";\nimport \"./generic/SystemAccount.sol\";\nimport \"./interfaces/TransferFeeInterface.sol\";\n\n\ncontract FeeAccount is SystemAccount, TransferFeeInterface {\n\n using SafeMath for uint256;\n\n struct TransferFee {\n uint pt; // in parts per million (ppm) , ie. 2,000 = 0.2%\n uint min; // with base unit of augmint token, eg. 2 decimals for token, eg. 310 = 3.1 ACE\n uint max; // with base unit of augmint token, eg. 2 decimals for token, eg. 310 = 3.1 ACE\n }\n\n TransferFee public transferFee;\n\n event TransferFeesChanged(uint transferFeePt, uint transferFeeMin, uint transferFeeMax);\n\n constructor(address permissionGranterContract, uint transferFeePt, uint transferFeeMin, uint transferFeeMax)\n public SystemAccount(permissionGranterContract) {\n transferFee = TransferFee(transferFeePt, transferFeeMin, transferFeeMax);\n }\n\n function () external payable { // solhint-disable-line no-empty-blocks\n // to accept ETH sent into feeAccount (defaulting fee in ETH )\n }\n\n function setTransferFees(uint transferFeePt, uint transferFeeMin, uint transferFeeMax)\n external restrict(\"StabilityBoard\") {\n transferFee = TransferFee(transferFeePt, transferFeeMin, transferFeeMax);\n emit TransferFeesChanged(transferFeePt, transferFeeMin, transferFeeMax);\n }\n\n function calculateTransferFee(address from, address to, uint amount) external view returns (uint256 fee) {\n if (!permissions[from][\"NoTransferFee\"] && !permissions[to][\"NoTransferFee\"]) {\n fee = amount.mul(transferFee.pt).div(1000000);\n if (fee > transferFee.max) {\n fee = transferFee.max;\n } else if (fee < transferFee.min) {\n fee = transferFee.min;\n }\n }\n return fee;\n }\n\n function calculateExchangeFee(uint weiAmount) external view returns (uint256 weiFee) {\n /* TODO: to be implemented and use in Exchange.sol. always revert for now */\n require(weiAmount != weiAmount, \"not yet implemented\");\n weiFee = transferFee.max; // to silence compiler warnings until it's implemented\n }\n\n}\n"
}
}
}
Expand Down
15 changes: 14 additions & 1 deletion abiniser/deployments/1/InterestEarnedAccount_DEPLOYS.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"latestAbiHash": "11b039ce783db308e1a9b5f46f05824f",
"deployedAbis": {
"11b039ce783db308e1a9b5f46f05824f": {
"latestDeployedAddress": "0x5c1a44e07541203474d92bdd03f803ea74f6947c",
"latestDeployedAddress": "0xf23e0af0e41341127bb4e7b203aebca0185f9ebd",
"deployments": {
"0x5c1a44e07541203474d92bdd03f803ea74f6947c": {
"generatedAt": "2018-06-11T13:54:29.127Z",
Expand All @@ -17,6 +17,19 @@
"deployedBytecodeHash": "62cba71783fcbe9a394e7ef9880058da",
"sourceHash": "3ae3310cda808efba999807e54bf8c9b",
"source": "/* Contract to hold earned interest from loans repaid\n premiums for locks are being accrued (i.e. transferred) to Locker */\n\npragma solidity 0.4.24;\nimport \"./generic/SystemAccount.sol\";\nimport \"./interfaces/AugmintTokenInterface.sol\";\n\n\ncontract InterestEarnedAccount is SystemAccount {\n\n constructor(address permissionGranterContract) public SystemAccount(permissionGranterContract) {} // solhint-disable-line no-empty-blocks\n\n function transferInterest(AugmintTokenInterface augmintToken, address locker, uint interestAmount)\n external restrict(\"MonetarySupervisor\") {\n augmintToken.transfer(locker, interestAmount);\n }\n\n}\n"
},
"0xf23e0af0e41341127bb4e7b203aebca0185f9ebd": {
"generatedAt": "2018-11-14T12:52:13.038Z",
"truffleContractFileUpdatedAt": "2018-11-13T16:34:24.475Z",
"deployTransactionHash": "0x93d43a44973d67d2fd0709b277c7580ab74b1888998b6766fa6c75901720d724",
"compiler": {
"name": "solc",
"version": "0.4.24+commit.e67f0147.Emscripten.clang"
},
"bytecodeHash": "3994e47ec4faf784d97e783d6e3de64d",
"deployedBytecodeHash": "9b8b05d9a455663e6bc0b4aa953ef26e",
"sourceHash": "3ae3310cda808efba999807e54bf8c9b",
"source": "/* Contract to hold earned interest from loans repaid\n premiums for locks are being accrued (i.e. transferred) to Locker */\n\npragma solidity 0.4.24;\nimport \"./generic/SystemAccount.sol\";\nimport \"./interfaces/AugmintTokenInterface.sol\";\n\n\ncontract InterestEarnedAccount is SystemAccount {\n\n constructor(address permissionGranterContract) public SystemAccount(permissionGranterContract) {} // solhint-disable-line no-empty-blocks\n\n function transferInterest(AugmintTokenInterface augmintToken, address locker, uint interestAmount)\n external restrict(\"MonetarySupervisor\") {\n augmintToken.transfer(locker, interestAmount);\n }\n\n}\n"
}
}
}
Expand Down
Loading