[WIP] Feature/killswitch (#159)

* make requestFactory pausable * add test * fix test * fix package-lock
ethereum-alarm-clock · Aug 16, 2018 · aa05494 · aa05494
1 parent 51b4161
commit aa05494
Show file tree

Hide file tree

Showing 5 changed files with 340 additions and 337 deletions.
diff --git a/contracts/RequestFactory.sol b/contracts/RequestFactory.sol
@@ -7,11 +7,13 @@ import "contracts/IterTools.sol";
 import "contracts/CloneFactory.sol";
 import "contracts/Library/RequestScheduleLib.sol";
 
+import "openzeppelin-solidity/contracts/lifecycle/Pausable.sol";
+
 /**
  * @title RequestFactory
  * @dev Contract which will produce new TransactionRequests.
  */
-contract RequestFactory is RequestFactoryInterface, CloneFactory {
+contract RequestFactory is RequestFactoryInterface, CloneFactory, Pausable {
     using IterTools for bool[6];
 
     TransactionRequestCore public transactionRequestCore;
@@ -54,6 +56,7 @@ contract RequestFactory is RequestFactoryInterface, CloneFactory {
         uint[12]    _uintArgs,
         bytes       _callData
     )
+        whenNotPaused
         public payable returns (address)
     {
         // Create a new transaction request clone from transactionRequestCore.

diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js
@@ -75,7 +75,7 @@ NOW DEPLOYING THE ETHEREUM ALARM CLOCK CONTRACTS...\n`)
       deployer.link(PaymentLib, RequestFactory)
       deployer.link(RequestLib, RequestFactory)
       deployer.link(SafeMath, RequestFactory)
-      return deployer.deploy(RequestFactory, TransactionRequestCore.address, { gas: 1500000 })
+      return deployer.deploy(RequestFactory, TransactionRequestCore.address, { gas: 1900000 })
     })
     .then(() => {
       deployer.link(RequestScheduleLib, BaseScheduler)