Skip to content

Commit

Permalink
PricerRule payment integration test and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
abhayks1 committed Feb 21, 2019
1 parent 1b8c677 commit e38690b
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 27 deletions.
1 change: 1 addition & 0 deletions contracts/abi/PricerRule.abi
Original file line number Diff line number Diff line change
@@ -0,0 +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 change: 1 addition & 0 deletions contracts/abi/ProxyFactory.abi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"anonymous":false,"inputs":[{"indexed":false,"name":"_proxy","type":"address"}],"name":"ProxyCreated","type":"event"},{"constant":false,"inputs":[{"name":"_masterCopy","type":"address"},{"name":"_data","type":"bytes"}],"name":"createProxy","outputs":[{"name":"proxy_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]
1 change: 1 addition & 0 deletions contracts/abi/TokenHolder.abi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"constant":true,"inputs":[],"name":"EXECUTE_RULE_CALLPREFIX","outputs":[{"name":"","type":"bytes4"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"sessionWindow","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"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":"EXECUTE_REDEMPTION_CALLPREFIX","outputs":[{"name":"","type":"bytes4"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"sessionKeys","outputs":[{"name":"spendingLimit","type":"uint256"},{"name":"expirationHeight","type":"uint256"},{"name":"nonce","type":"uint256"},{"name":"session","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"token","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_sessionKey","type":"address"}],"name":"SessionAuthorized","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_sessionKey","type":"address"}],"name":"SessionRevoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_sessionWindow","type":"uint256"}],"name":"SessionsLoggedOut","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_messageHash","type":"bytes32"},{"indexed":false,"name":"_status","type":"bool"}],"name":"RuleExecuted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_messageHash","type":"bytes32"},{"indexed":false,"name":"_status","type":"bool"}],"name":"RedemptionExecuted","type":"event"},{"constant":false,"inputs":[{"name":"_token","type":"address"},{"name":"_tokenRules","type":"address"},{"name":"_owner","type":"address"},{"name":"_sessionKeys","type":"address[]"},{"name":"_sessionKeysSpendingLimits","type":"uint256[]"},{"name":"_sessionKeysExpirationHeights","type":"uint256[]"}],"name":"setup","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_sessionKey","type":"address"},{"name":"_spendingLimit","type":"uint256"},{"name":"_expirationHeight","type":"uint256"}],"name":"authorizeSession","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_sessionKey","type":"address"}],"name":"revokeSession","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"logout","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_data","type":"bytes"},{"name":"_nonce","type":"uint256"},{"name":"_r","type":"bytes32"},{"name":"_s","type":"bytes32"},{"name":"_v","type":"uint8"}],"name":"executeRule","outputs":[{"name":"executionStatus_","type":"bool"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_data","type":"bytes"},{"name":"_nonce","type":"uint256"},{"name":"_r","type":"bytes32"},{"name":"_s","type":"bytes32"},{"name":"_v","type":"uint8"}],"name":"executeRedemption","outputs":[{"name":"executionStatus_","type":"bool"}],"payable":true,"stateMutability":"payable","type":"function"}]
1 change: 1 addition & 0 deletions contracts/abi/TokenRules.abi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"rules","outputs":[{"name":"ruleName","type":"string"},{"name":"ruleAddress","type":"address"},{"name":"ruleAbi","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"rulesByNameHash","outputs":[{"name":"index","type":"uint256"},{"name":"exists","type":"bool"}],"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":"","type":"address"}],"name":"allowedTransfers","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"areDirectTransfersEnabled","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"rulesByAddress","outputs":[{"name":"index","type":"uint256"},{"name":"exists","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"token","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_organization","type":"address"},{"name":"_token","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_ruleName","type":"string"},{"indexed":false,"name":"_ruleAddress","type":"address"}],"name":"RuleRegistered","type":"event"},{"constant":false,"inputs":[{"name":"_ruleName","type":"string"},{"name":"_ruleAddress","type":"address"},{"name":"_ruleAbi","type":"string"}],"name":"registerRule","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"allowTransfers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"disallowTransfers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_transfersTo","type":"address[]"},{"name":"_transfersAmount","type":"uint256[]"}],"name":"executeTransfers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"enableDirectTransfers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"disableDirectTransfers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_transfersTo","type":"address[]"},{"name":"_transfersAmount","type":"uint256[]"}],"name":"directTransfers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]
1 change: 1 addition & 0 deletions contracts/abi/UserWalletFactory.abi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"constant":true,"inputs":[],"name":"TOKENHOLDER_SETUP_CALLPREFIX","outputs":[{"name":"","type":"bytes4"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_gnosisSafeProxy","type":"address"},{"indexed":false,"name":"_tokenHolderProxy","type":"address"}],"name":"UserWalletCreated","type":"event"},{"constant":false,"inputs":[{"name":"_gnosisSafeMasterCopy","type":"address"},{"name":"_gnosisSafeData","type":"bytes"},{"name":"_tokenHolderMasterCopy","type":"address"},{"name":"_token","type":"address"},{"name":"_tokenRules","type":"address"},{"name":"_sessionKeys","type":"address[]"},{"name":"_sessionKeysSpendingLimits","type":"uint256[]"},{"name":"_sessionKeysExpirationHeights","type":"uint256[]"}],"name":"createUserWallet","outputs":[{"name":"gnosisSafeProxy_","type":"address"},{"name":"tokenHolderProxy_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]
Loading

0 comments on commit e38690b

Please sign in to comment.