WA-238 Added contracts after migrated to Kovan and Rinkeby

.flowconfig

@@ -17,7 +17,7 @@ module.file_ext=.css
 module.file_ext=.scss
 
 module.name_mapper='^~' ->'<PROJECT_ROOT>/src'
-module.name_mapper='^#' ->'<PROJECT_ROOT>/gnosis-safe-contracts/build/contracts'
+module.name_mapper='^#' ->'<PROJECT_ROOT>/safe-contracts/build/contracts'
 module.name_mapper='.*\(.s?css\)' -> '{}'
 
 [strict]

.gitignore

@@ -1,8 +1,4 @@
 node_modules/
-build/
 build_webpack/
 build_storybook/
-build/contracts/
-truffle-config.js
-gnosis-safe-contracts/
 .DS_Store

.travis.yml

@@ -4,12 +4,7 @@ node_js:
 os:
   - linux
 before_script:
-  - yarn global add truffle@4.1.5
   - yarn global add surge
-  - git clone https://github.com/gnosis/gnosis-safe-contracts.git
-  - cd gnosis-safe-contracts
-  - git fetch && git checkout feature/optimize_personal_edition
-  - truffle compile && cd ..
 after_success:
   - yarn build-storybook
   - yarn build

config/paths.js

@@ -38,7 +38,7 @@ module.exports = {
   appIndexJs: resolveApp('src/index.js'),
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
-  appContracts: resolveApp('gnosis-safe-contracts/build/contracts'),
+  appContracts: resolveApp('safe-contracts/build/contracts'),
   yarnLockFile: resolveApp('yarn.lock'),
   testsSetup: resolveApp('src/setupTests.js'),
   appNodeModules: resolveApp('node_modules'),

jsconfig.json

@@ -5,7 +5,7 @@
     "baseUrl": "./",
     "paths": {
       "~/*":["src/*"],
-      "@/*":["gnosis-safe-contracts/build/contracts"]
+      "@/*":["safe-contracts/build/contracts"]
     }
   },
   "exclude": [

package.json

@@ -136,7 +136,7 @@
     ],
     "moduleNameMapper": {
       "~(.*)$": "<rootDir>/src/$1",
-      "#(.*)$": "<rootDir>/gnosis-safe-contracts/build/contracts/$1",
+      "#(.*)$": "<rootDir>/safe-contracts/build/contracts/$1",
       "^react-native$": "react-native-web"
     }
   }

readme.md

@@ -14,7 +14,7 @@ What things you need to install the software and how to install them
 npm install truffle // recommended usage of -g flag
 npm install ganache-cli // recommended usage of -g flag
 npm install flow-type // recommended usage of -g flag
-git clone https://github.com/gnosis/gnosis-safe-contracts.git
+git clone https://github.com/gnosis/safe-contracts.git
 ```
 
 ### Installing
@@ -28,7 +28,7 @@ ganache-cli -b 3
 
 Start the project in the other one
 ```
-cd gnosis-safe-contracts && truffle compile && truffle migrate && cd ..
+cd safe-contracts && truffle compile && truffle migrate && cd ..
 npm install
 npm start
 ```

safe-contracts

@@ -0,0 +1 @@
+Subproject commit 299e972345691a25f91dc25ae6caeea765aa53c3

src/wallets/safeContracts.js

@@ -72,8 +72,7 @@ const createMasterCopies = async () => {
   try {
     safeMaster = await GnosisSafe.deployed()
   } catch (err) {
-    safeMaster = await GnosisSafe.new({ from: userAccount, gas: '5000000' })
+    safeMaster = await GnosisSafe.new([userAccount], 1, 0, 0, { from: userAccount, gas: '5000000' })
-    safeMaster.setup([userAccount], 1, 0, 0, { from: userAccount, gas: '5000000' })
   }
 
   // Initialize extension master copy
@@ -81,8 +80,7 @@ const createMasterCopies = async () => {
   try {
     dailyLimitMaster = await DailyLimitExtension.deployed()
   } catch (err) {
-    dailyLimitMaster = await DailyLimitExtension.new({ from: userAccount, gas: '5000000' })
+    dailyLimitMaster = await DailyLimitExtension.new([], [], { from: userAccount, gas: '5000000' })
-    dailyLimitMaster.setup([], [], { from: userAccount, gas: '5000000' })
   }
 }