disable calculate price for non crowdsale accounts

Author: Stavros

contracts/GetPrePricingStrategy.sol

@@ -8,15 +8,14 @@ pragma solidity ^0.4.15;
 
 import "../token_market_net/FlatPricing.sol";
 import "./GetWhitelist.sol";
-
+import "zeppelin-solidity/contracts/ownership/Ownable.sol";
 
 /// @dev Tranche based pricing with special support for pre-ico deals.
 ///      Implementing "first price" tranches, meaning, that if byers order is
 ///      covering more than one tranche, the price of the lowest tranche will apply
 ///      to the whole order.
-contract GetPrePricingStrategy is FlatPricing {
-    address presaleCrowdsale;
-    address saleCrowdsale;
+contract GetPrePricingStrategy is FlatPricing, Ownable {
+    address precrowdsale;
     GetWhitelist public whitelist;
     uint public presalePrice;
 
@@ -25,15 +24,24 @@ contract GetPrePricingStrategy is FlatPricing {
         whitelist = _whitelist;
     }
 
-    
-
     function isPresalePurchase(address purchaser) public constant returns (bool) {
         // we log sales in presale contract as normal sales.
         return false;
     }
 
+    function setPrecrowdsale(address _precrowdsale) onlyOwner {
+        require(_precrowdsale != 0);
+        precrowdsale = _precrowdsale;
+    }
+
+    function isSane(address crowdsale) public constant returns (bool) {
+        return precrowdsale != 0;
+    }
+
     /// @dev Calculate the current price for buy in amount.
     function calculatePrice(uint value, uint weiRaised, uint tokensSold, address msgSender, uint decimals) public constant returns (uint) {
+        // only precrowdsale can call this
+        require(msg.sender == precrowdsale);
         // 0 is the presale tier.
         whitelist.subtractAmount(msgSender, 0, value);
         return super.calculatePrice(value, weiRaised, tokensSold, msgSender, decimals);

contracts/GetPricingStrategy.sol

@@ -16,6 +16,7 @@ import "./GetWhitelist.sol";
 ///      to the whole order.
 contract GetPricingStrategy is EthTranchePricing {
     GetWhitelist public whitelist;
+    address crowdsale;
 
     function GetPricingStrategy(GetWhitelist _whitelist, uint[] _tranches) EthTranchePricing(_tranches) {
         assert(_whitelist.isGetWhiteList());
@@ -26,6 +27,15 @@ contract GetPricingStrategy is EthTranchePricing {
         return false;
     }
 
+    function setCrowdsale(address _crowdsale) onlyOwner {
+        require(_crowdsale != 0);
+        crowdsale = _crowdsale;
+    }
+
+    function isSane(address _crowdsale) public constant returns (bool) {
+        return crowdsale == _crowdsale;
+    }
+
     // needed to update the correct tier in whitelist
     function getCurrentTrancheIndex(uint weiRaised) public constant returns (uint) {
         uint i;
@@ -40,6 +50,7 @@ contract GetPricingStrategy is EthTranchePricing {
 
     /// @dev Calculate the current price for buy in amount.
     function calculatePrice(uint value, uint weiRaised, uint tokensSold, address msgSender, uint decimals) public constant returns (uint) {
+        require(msg.sender == crowdsale);
         uint amount;
         bool isEarly;
         bool isWhitelisted;

migrations/4_deploy_precrowdsale.js

@@ -23,6 +23,10 @@ module.exports = function(deployer) {
             constants.precrowdsale.END,
             constants.precrowdsale.PRESALE_TOKEN_CAP
         );
+    }).then(() => {
+        return GetPrePricingStrategy.deployed();
+    }).then((pricingStrategy) => {
+        return pricingStrategy.setPrecrowdsale(GetPreCrowdsale.address);
     }).then(() => {
         return deployer.deploy(
             GetPreFinalizeAgent,

migrations/5_deploy_crowdsale.js

@@ -36,6 +36,10 @@ module.exports = function(deployer) {
             constants.multisig.STABILITYADDRESS,
             constants.multisig.BOUNTYADDRESS
         );
+    }).then(() => {
+        return GetPricingStrategy.deployed();
+    }).then((pricingStrategy) => {
+        return pricingStrategy.setCrowdsale(GetCrowdsale.address);
     }).then(() => {
         return GetCrowdsale.deployed();
     }).then((crowdsale) => {

test/1_pricingstrategy.js

@@ -0,0 +1,44 @@
+const GetPricingStrategy = artifacts.require("./GetPricingStrategy.sol");
+const GetPrePricingStrategy = artifacts.require("./GetPrePricingStrategy.sol");
+const GetWhitelist = artifacts.require("./GetWhitelist.sol");
+const constants = require('../constants.js');
+
+
+
+contract('GetPricingStrategy', function(accounts) {
+    it("non crowdsale cannot call calculateprice", async function() {
+        const pricingstrategy = await GetPricingStrategy.deployed();
+        const whitelist = await GetWhitelist.deployed();
+        await whitelist.setWhitelister(accounts[0], true)
+        await whitelist.accept(accounts[0], true);
+        
+        try{
+            await pricingstrategy.calculatePrice(
+               100, 0, 0, accounts[0], 18
+            );
+        }catch (error){
+            assert(error.message.indexOf("invalid opcode") != -1, "Incorrect throw");
+            return;
+        }
+        throw new Error("Could call calculate price");
+    });
+})
+
+contract('GetPrePricingStrategy', function(accounts) {
+    it("non crowdsale cannot call calculateprice", async function() {
+        const pricingstrategy = await GetPrePricingStrategy.deployed();
+        const whitelist = await GetWhitelist.deployed();
+        await whitelist.setWhitelister(accounts[0], true)
+        await whitelist.accept(accounts[0], true);
+        
+        try{
+            await pricingstrategy.calculatePrice(
+               100, 0, 0, accounts[0], 18
+            );
+        }catch (error){
+            assert(error.message.indexOf("invalid opcode") != -1, "Incorrect throw");
+            return;
+        }
+        throw new Error("bought more than cap");
+    });
+})