bug fix

Hash-Rare · Apr 21, 2019 · 20cdfa8 · 20cdfa8
1 parent f740e40
commit 20cdfa8
Show file tree

Hide file tree

Showing 8 changed files with 46,305 additions and 13,183 deletions.
diff --git a/build/contracts/MasterContract.json b/build/contracts/MasterContract.json
diff --git a/build/contracts/MasterMultiSig.json b/build/contracts/MasterMultiSig.json
diff --git a/build/contracts/NiftyStaticCalls.json b/build/contracts/NiftyStaticCalls.json
diff --git a/build/contracts/NiftyWallet.json b/build/contracts/NiftyWallet.json
diff --git a/build/contracts/NiftyWalletContract.json b/build/contracts/NiftyWalletContract.json
diff --git a/build/contracts/TestContractCalls.json b/build/contracts/TestContractCalls.json
diff --git a/contracts/MasterMultiSig.sol b/contracts/MasterMultiSig.sol
@@ -221,21 +221,22 @@ contract MasterMultiSig {
    * @dev Stored here to reduce deployment costs of a Nifty Wallet instance
    */
 
-      struct mStruct {
-        address this_add;
-        address des_add;
-        uint value;
-        uint interalTxCount;
-        bytes txData;
-    }
+   struct mStruct {
+     address this_add;
+     address des_add;
+     uint value;
+     uint internalTxCount;
+     bytes txData;
+ }
+
+ function returnTxMessageToSign(bytes memory txData,
+                             address des_add,
+                             uint value,
+                             uint tx_count) public view returns(bytes32) {
+     mStruct memory message = mStruct(msg.sender, des_add, value, tx_count, txData);
+     return keccak256(abi.encodePacked(message.this_add, message.internalTxCount, message.des_add, message.value, message.txData));
+ }
 
-    function returnTxMessageToSign(bytes memory txData,
-                                address des_add,
-                                uint value,
-                                uint tx_count) public view returns(bytes32) {
-        mStruct memory message = mStruct(msg.sender, des_add, value, tx_count, txData);
-        return keccak256(abi.encode(message.this_add, message.txData));
-    }
 
   /**
    * Multisig transacitons from https://github.com/gnosis/MultiSigWallet/blob/master/contracts/MultiSigWallet.sol

diff --git a/contracts/NiftyWallet.sol b/contracts/NiftyWallet.sol
@@ -4,7 +4,7 @@ contract NiftyWallet {
 
     /**
      * The Nifty Wallet - the niftiest wallet around!
-     * Author - Duncan Cock Foster. [email protected]
+     * Author - Duncan Cock Foster - [email protected]
      */
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ contract NiftyWallet { @@
         /**
          * The Nifty Wallet - the niftiest wallet around!
-         * Author - Duncan Cock Foster. [email protected]
+         * Author - Duncan Cock Foster - [email protected]
          */
         /**
@@ Expand Down @@