fix(): use SafeMath in Storage for key add

AraBlocks · Jul 12, 2018 · 0cb75fc · 0cb75fc
1 parent 83c04b4
commit 0cb75fc
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/constants.js b/constants.js
@@ -10,8 +10,8 @@ module.exports = {
   kTreeFile: 'tree',
   kSignaturesFile: 'signatures',
   kStagingFile: './staged.json',
-  kStorageAddress: '0x4679b5245525c26bf0199021e84f5fa79fecc5bc',
-  kPriceAddress: '0x9fd09dd609430da75bbbaf301b5a8a15442caac6',
+  kStorageAddress: '0x82d50ad3c1091866e258fd0f1a7cc9674609d254',
+  kPriceAddress: '0xdda6327139485221633a1fcd65f4ac932e60a2e1',
 
   kFileMappings: {
     kContentTree: {

diff --git a/contracts/Storage.sol b/contracts/Storage.sol
@@ -1,7 +1,11 @@
 pragma solidity ^0.4.24;
 
+import 'openzeppelin-solidity/contracts/math/SafeMath.sol';
+
 contract Storage {
 
+  using SafeMath for uint256;
+
   address public owner;
 
   // 0 - content/tree file
@@ -52,7 +56,7 @@ contract Storage {
     if (largest_key == 0) {
       return 0;
     } else {
-      return largest_key + buffer_mappings[identity][file].buffers[largest_key].length;
+      return largest_key.add(buffer_mappings[identity][file].buffers[largest_key].length);
     }
   }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
     "mirror-folder": "^3.0.0",
     "mkdirp": "^0.5.1",
     "multidrive": "^5.2.0",
+    "openzeppelin-solidity": "1.10.0",
     "pify": "^3.0.0",
     "pretty-bytes": "^4.0.2",
     "progress": "^2.0.0",
@@ -72,5 +73,9 @@
     "eslint": "^4.19.1",
     "eslint-config-ara": "github:arablocks/eslint-config-ara",
     "eslint-plugin-import": "^2.12.0"
+  },
+  "directories": {
+    "lib": "lib",
+    "test": "test"
   }
 }