Skip to content

Commit 62b995d

Browse files
benjaminbollenbenjaminbollen
authored
Merge pull request #128 from OpenSTFoundation/develop
Merge develop to release-0.10
2 parents 232ca04 + 0ec8f1d commit 62b995d

7 files changed

Lines changed: 14 additions & 8 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Version 0.10.0
44

5+
* Update PricerRule ABI/BIN with PricerRule:convertPayCurrencyToToken fix ([126](https://github.com/OpenSTFoundation/openst.js/pull/126))
56
* PricerRule integration test and cleanup ([#114](https://github.com/OpenSTFoundation/openst.js/pull/114))
67
* ProxyFactory address refactoring from createCompanyWallet method ([#113](https://github.com/OpenSTFoundation/openst.js/pull/113)
78
* Integration with mosaic.js npm ([#109](https://github.com/OpenSTFoundation/openst.js/pull/109))

‎contracts/abi/PricerRule.abi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"constant":true,"inputs":[{"name":"","type":"bytes3"}],"name":"baseCurrencyPriceAcceptanceMargins","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"organization","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"eip20Token","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes3"}],"name":"baseCurrencyPriceOracles","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"conversionRateFromBaseCurrencyToToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"tokenRules","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"requiredPriceOracleDecimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"conversionRateDecimalsFromBaseCurrencyToToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"baseCurrencyCode","outputs":[{"name":"","type":"bytes3"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_organization","type":"address"},{"name":"_eip20Token","type":"address"},{"name":"_baseCurrencyCode","type":"bytes3"},{"name":"_conversionRate","type":"uint256"},{"name":"_conversionRateDecimals","type":"uint8"},{"name":"_requiredPriceOracleDecimals","type":"uint8"},{"name":"_tokenRules","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_priceOracle","type":"address"}],"name":"PriceOracleAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_priceOracle","type":"address"}],"name":"PriceOracleRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_quoteCurrencyCode","type":"bytes3"},{"indexed":false,"name":"_acceptanceMargin","type":"uint256"}],"name":"AcceptanceMarginSet","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_quoteCurrencyCode","type":"bytes3"}],"name":"AcceptanceMarginRemoved","type":"event"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_toList","type":"address[]"},{"name":"_amountList","type":"uint256[]"},{"name":"_payCurrencyCode","type":"bytes3"},{"name":"_baseCurrencyIntendedPrice","type":"uint256"}],"name":"pay","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_priceOracle","type":"address"}],"name":"addPriceOracle","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_payCurrencyCode","type":"bytes3"}],"name":"removePriceOracle","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_payCurrencyCode","type":"bytes3"},{"name":"_acceptanceMargin","type":"uint256"}],"name":"setAcceptanceMargin","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_payCurrencyCode","type":"bytes3"}],"name":"removeAcceptanceMargin","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]
1+
[{"constant":true,"inputs":[{"name":"","type":"bytes3"}],"name":"baseCurrencyPriceAcceptanceMargins","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"organization","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"tokenDecimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"eip20Token","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes3"}],"name":"baseCurrencyPriceOracles","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"conversionRateFromBaseCurrencyToToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"tokenRules","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"requiredPriceOracleDecimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"conversionRateDecimalsFromBaseCurrencyToToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"baseCurrencyCode","outputs":[{"name":"","type":"bytes3"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_organization","type":"address"},{"name":"_eip20Token","type":"address"},{"name":"_baseCurrencyCode","type":"bytes3"},{"name":"_conversionRate","type":"uint256"},{"name":"_conversionRateDecimals","type":"uint8"},{"name":"_requiredPriceOracleDecimals","type":"uint8"},{"name":"_tokenRules","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_priceOracle","type":"address"}],"name":"PriceOracleAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_priceOracle","type":"address"}],"name":"PriceOracleRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_quoteCurrencyCode","type":"bytes3"},{"indexed":false,"name":"_acceptanceMargin","type":"uint256"}],"name":"AcceptanceMarginSet","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_quoteCurrencyCode","type":"bytes3"}],"name":"AcceptanceMarginRemoved","type":"event"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_toList","type":"address[]"},{"name":"_amountList","type":"uint256[]"},{"name":"_payCurrencyCode","type":"bytes3"},{"name":"_baseCurrencyIntendedPrice","type":"uint256"}],"name":"pay","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_priceOracle","type":"address"}],"name":"addPriceOracle","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_payCurrencyCode","type":"bytes3"}],"name":"removePriceOracle","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_payCurrencyCode","type":"bytes3"},{"name":"_acceptanceMargin","type":"uint256"}],"name":"setAcceptanceMargin","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_payCurrencyCode","type":"bytes3"}],"name":"removeAcceptanceMargin","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]

0 commit comments

Comments
 (0)