Merge pull request #124 from ethereum-alarm-clock/feature/updagre-to-…

…0.4.21 Upgrade to 0.4.21
ethereum-alarm-clock · Mar 31, 2018 · 2ebd650 · 2ebd650
2 parents 59f900e + 26eb4f1
commit 2ebd650
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 44 deletions.
diff --git a/contracts/Interface/RequestFactoryInterface.sol b/contracts/Interface/RequestFactoryInterface.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 contract RequestFactoryInterface {
 

diff --git a/contracts/Interface/RequestTrackerInterface.sol b/contracts/Interface/RequestTrackerInterface.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 contract RequestTrackerInterface {
 

diff --git a/contracts/Interface/SchedulerInterface.sol b/contracts/Interface/SchedulerInterface.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Library/RequestScheduleLib.sol";
 import "contracts/Library/SchedulerLib.sol";

diff --git a/contracts/Interface/TransactionRequestInterface.sol b/contracts/Interface/TransactionRequestInterface.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 contract TransactionRequestInterface {
 

diff --git a/contracts/IterTools.sol b/contracts/IterTools.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 /**
  * @title IterTools

diff --git a/contracts/Library/ClaimLib.sol b/contracts/Library/ClaimLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import 'contracts/zeppelin/SafeMath.sol';
 

diff --git a/contracts/Library/ExecutionLib.sol b/contracts/Library/ExecutionLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 /**
  * @title ExecutionLib

diff --git a/contracts/Library/GroveLib.sol b/contracts/Library/GroveLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 /// @title GroveLib - Library for queriable indexed ordered data.
 /// @author PiperMerriam - <pipermerriam@gmail.com>

diff --git a/contracts/Library/MathLib.sol b/contracts/Library/MathLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 library MathLib {
     uint constant INT_MAX = 57896044618658097711785492504343953926634992332820282019728792003956564819967;  // 2**255 - 1

diff --git a/contracts/Library/PaymentLib.sol b/contracts/Library/PaymentLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Library/ExecutionLib.sol";
 import "contracts/Library/MathLib.sol";

diff --git a/contracts/Library/RequestLib.sol b/contracts/Library/RequestLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Library/ClaimLib.sol";
 import "contracts/Library/ExecutionLib.sol";
@@ -313,7 +313,7 @@ library RequestLib {
          *     else:
          *         - throw (should be impossible)
          *  
-         *  6. msg.gas == callGas
+         *  6. gasleft() == callGas
          *
          *  +--------------------+
          *  | Phase 2: Execution |
@@ -335,34 +335,34 @@ library RequestLib {
 
         // Record the gas at the beginning of the transaction so we can
         // calculate how much has been used later.
-        uint startGas = msg.gas;
+        uint startGas = gasleft();
 
         // +----------------------+
         // | Begin: Authorization |
         // +----------------------+
 
-        if (msg.gas < requiredExecutionGas(self).sub(_PRE_EXECUTION_GAS)) {
-            Aborted(uint8(AbortReason.InsufficientGas));
+        if (gasleft() < requiredExecutionGas(self).sub(_PRE_EXECUTION_GAS)) {
+            emit Aborted(uint8(AbortReason.InsufficientGas));
             return false;
         } else if (self.meta.wasCalled) {
-            Aborted(uint8(AbortReason.AlreadyCalled));
+            emit Aborted(uint8(AbortReason.AlreadyCalled));
             return false;
         } else if (self.meta.isCancelled) {
-            Aborted(uint8(AbortReason.WasCancelled));
+            emit Aborted(uint8(AbortReason.WasCancelled));
             return false;
         } else if (self.schedule.isBeforeWindow()) {
-            Aborted(uint8(AbortReason.BeforeCallWindow));
+            emit Aborted(uint8(AbortReason.BeforeCallWindow));
             return false;
         } else if (self.schedule.isAfterWindow()) {
-            Aborted(uint8(AbortReason.AfterCallWindow));
+            emit Aborted(uint8(AbortReason.AfterCallWindow));
             return false;
         } else if (self.claimData.isClaimed() &&
                    msg.sender != self.claimData.claimedBy &&
                    self.schedule.inReservedWindow()) {
-            Aborted(uint8(AbortReason.ReservedForClaimer));
+            emit Aborted(uint8(AbortReason.ReservedForClaimer));
             return false;
         } else if (self.txnData.gasPrice != tx.gasprice) {
-            Aborted(uint8(AbortReason.MismatchGasPrice));
+            emit Aborted(uint8(AbortReason.MismatchGasPrice));
             return false;
         }
 
@@ -424,7 +424,7 @@ library RequestLib {
 
         // Take down the amount of gas used so far in execution to compensate the executing agent.
         uint measuredGasConsumption = startGas
-                                      .sub(msg.gas)
+                                      .sub(gasleft())
                                       .add(_EXECUTE_EXTRA_GAS);
 
         // // +----------------------------------------------------------------------+
@@ -438,7 +438,7 @@ library RequestLib {
 
         // Log the bounty and fee. Otherwise it is non-trivial to figure
         // out how much was payed.
-        Executed(self.paymentData.bountyOwed, totalFeePayment, measuredGasConsumption);
+        emit Executed(self.paymentData.bountyOwed, totalFeePayment, measuredGasConsumption);
 
         // Attempt to send the bounty. as with `.sendFee()` it may fail and need to be caled after execution.
         self.paymentData.sendBounty();
@@ -544,7 +544,7 @@ library RequestLib {
     function cancel(Request storage self) 
         public returns (bool)
     {
-        uint startGas = msg.gas;
+        uint startGas = gasleft();
         uint rewardPayment;
         uint measuredGasConsumption;
 
@@ -571,7 +571,7 @@ library RequestLib {
 
             // Calculate the amount of gas cancelling agent used in this transaction.
             measuredGasConsumption = startGas
-                                     .sub(msg.gas)
+                                     .sub(gasleft())
                                      .add(_CANCEL_EXTRA_GAS);
             // Add their gas fees to the reward.
             rewardOwed = measuredGasConsumption
@@ -589,7 +589,7 @@ library RequestLib {
         }
 
         // Log it!
-        Cancelled(rewardPayment, measuredGasConsumption);
+        emit Cancelled(rewardPayment, measuredGasConsumption);
 
         // Send the remaining ether to the owner.
         return sendOwnerEther(self);
@@ -623,7 +623,7 @@ library RequestLib {
         require( isClaimable(self) );
 
         self.claimData.claim(self.schedule.computePaymentModifier());
-        Claimed();
+        emit Claimed();
         claimed = true;
     }
 
@@ -682,7 +682,7 @@ library RequestLib {
     {
         // Note! This does not do any checks since it is used in the execute function.
         // The public version of the function should be used for checks and in the cancel function.
-        uint ownerRefund = this.balance
+        uint ownerRefund = address(this).balance
                            .sub(self.claimData.claimDeposit)
                            .sub(self.paymentData.bountyOwed)
                            .sub(self.paymentData.feeOwed);

diff --git a/contracts/Library/RequestMetaLib.sol b/contracts/Library/RequestMetaLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 /**
  * @title RequestMetaLib

diff --git a/contracts/Library/RequestScheduleLib.sol b/contracts/Library/RequestScheduleLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/zeppelin/SafeMath.sol";
 

diff --git a/contracts/Library/SchedulerLib.sol b/contracts/Library/SchedulerLib.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Interface/RequestFactoryInterface.sol";
 

diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 /// Truffle-specific contract (Not a part of the EAC)
 

diff --git a/contracts/RequestFactory.sol b/contracts/RequestFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Interface/RequestFactoryInterface.sol";
 import "contracts/Interface/RequestTrackerInterface.sol";

diff --git a/contracts/RequestTracker.sol b/contracts/RequestTracker.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Interface/RequestTrackerInterface.sol";
 import "contracts/Library/GroveLib.sol";

diff --git a/contracts/Scheduler/BaseScheduler.sol b/contracts/Scheduler/BaseScheduler.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Interface/SchedulerInterface.sol";
 import "contracts/Library/RequestScheduleLib.sol";

diff --git a/contracts/Scheduler/BlockScheduler.sol b/contracts/Scheduler/BlockScheduler.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Library/RequestScheduleLib.sol";
 import "contracts/Scheduler/BaseScheduler.sol";

diff --git a/contracts/Scheduler/TimestampScheduler.sol b/contracts/Scheduler/TimestampScheduler.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Library/RequestScheduleLib.sol";
 import "contracts/Scheduler/BaseScheduler.sol";

diff --git a/contracts/TransactionRequestCore.sol b/contracts/TransactionRequestCore.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import "contracts/Library/RequestLib.sol";
 import "contracts/Library/RequestScheduleLib.sol";

diff --git a/contracts/_examples/DelayedPayment.sol b/contracts/_examples/DelayedPayment.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 import 'contracts/Interface/SchedulerInterface.sol';
 

diff --git a/contracts/_test/SimpleToken.sol b/contracts/_test/SimpleToken.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 /// Super simple token contract that moves funds into the owner account on creation and
 /// only exposes an API to be used for `test/proxy.js`

diff --git a/contracts/_test/TransactionRecorder.sol b/contracts/_test/TransactionRecorder.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 contract TransactionRecorder {
     address owner;
@@ -14,7 +14,7 @@ contract TransactionRecorder {
     }
 
     function() payable {
-        lastCallGas = msg.gas;
+        lastCallGas = gasleft();
         lastCallData = msg.data;
         lastCaller = msg.sender;
         lastCallValue = msg.value;

diff --git a/contracts/zeppelin/SafeMath.sol b/contracts/zeppelin/SafeMath.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.19;
+pragma solidity ^0.4.21;
 
 
 /**

diff --git a/test/transaction-request/proxy.js b/test/transaction-request/proxy.js
@@ -76,7 +76,7 @@ contract("TransactionRequestCore proxy function", (accounts) => {
 
     // This is allowed since it is from scheduling accounts
     const tx = await txRequest.proxy(accounts[7], testData32)
-    expect(tx.receipt.status).to.equal(1)
+    expect(tx.receipt.status).to.equal('0x01')
   })
 
   it("does some fancy stuff with proxy", async () => {