WA-238 Blockchain requirements

.travis.yml

@@ -5,15 +5,16 @@ os:
   - linux
 before_script:
   - yarn global add surge
+  - export NODE_ENV=testing
 after_success:
-  - yarn build-storybook
-  - yarn build
   - |
     if [ ${TRAVIS_BRANCH} = "master" ]; then
       export NODE_ENV=production;
     else
       export NODE_ENV=development;
     fi
+  - yarn build-storybook
+  - yarn build
   - cd build_webpack/ && cp index.html 200.html && cd ..
   - chmod ugo+x ./config/deploy/deploy.sh
   - ./config/deploy/deploy.sh

package.json

@@ -9,7 +9,7 @@
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
     "test": "run-with-testrpc -l 40000000 'node scripts/test.js --env=jsdom'",
-    "test-local": "node scripts/test.js --env=jsdom",
+    "test-local": "NODE_ENV=test && node scripts/test.js --env=jsdom",
     "precommit": "./precommit.sh",
     "flow": "flow",
     "storybook": "start-storybook -p 6006",
@@ -50,6 +50,7 @@
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-transform-es3-member-expression-literals": "^6.22.0",
     "babel-plugin-transform-es3-property-literals": "^6.22.0",
+    "bignumber.js": "^7.2.1",
     "classnames": "^2.2.5",
     "css-loader": "^0.28.10",
     "detect-port": "^1.2.2",

safe-contracts/build/contracts/CreateAndAddModules.json

@@ -1262,10 +1262,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0x251be274c3a4580fc02223ee33edfa9a2dc386e5",
-      "transactionHash": "0x7e0d20efecc34a31abf9e22cedf9e709811549a444d77d4889739930ad68ffb3"
+      "address": "0x18449f1e7a7397fcc0efb8021e55766f5874d6bb",
+      "transactionHash": "0x288775644c087eed5e41b96fecebdb23be4e6d40bef5b6fb9a2876c2a3145157"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0x4541a795062934411e9aa7debc9cd288d1ca3c3d",
+      "transactionHash": "0x1de7d532cd599c2eeb5bd5eed12038de0f6556b5d22a0a4f4f8cc15a68ef552c"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0x5fd674bc2873513f8e5a19d69637d0211e476380",
+      "transactionHash": "0x288775644c087eed5e41b96fecebdb23be4e6d40bef5b6fb9a2876c2a3145157"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.822Z"
+  "updatedAt": "2018-06-04T10:56:37.138Z"
 }

safe-contracts/build/contracts/DailyLimitModule.json

@@ -6685,10 +6685,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0x904a781310cc19b414bafa5499628cd10173cbad",
-      "transactionHash": "0x2ec83a0174a651dec98e783aa4e23d0b97e8487f788329f82789da4d5067c614"
+      "address": "0x7318910138c97bec533269843cac7cc32e30d627",
+      "transactionHash": "0xf501438a4ec967e2928d922e4af568a2a5365002f8b3f9e32117bbacfaa49331"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0xb3a1d7348482ad2556b7cc56d84e8650e9288cd2",
+      "transactionHash": "0xd6ea4f9e92e49e53ee69faafc7c7ab1c54d811fd1552351f8ec5cdc6f1795843"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0x3bdceb07fddd50d259a059ca9a75ecda561d4afc",
+      "transactionHash": "0xf501438a4ec967e2928d922e4af568a2a5365002f8b3f9e32117bbacfaa49331"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.821Z"
+  "updatedAt": "2018-06-04T10:56:37.129Z"
 }

safe-contracts/build/contracts/GnosisSafePersonalEdition.json

@@ -9850,10 +9850,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0x5aba3ebfac41cb9be55a7ab67b506c960982e427",
-      "transactionHash": "0x370c8b71ac770f90d44d7bc1f447930a01806b3d8d7b218b21e4020865c45321"
+      "address": "0x177c7d89d62a0d8bdab4a0a8a5e7225370fd1486",
+      "transactionHash": "0x67117c1452ee2f4b904621b6f30790ff998d1f1a72f11c6b71ef47e3dd254724"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0x4dbf7fe3ee192b4ea00005c0a7219e4ca19971d6",
+      "transactionHash": "0xbbf11bb9369aeb027629ec2279e2be554fee6c522da76160a6b535d25d966b1e"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0x8c55b458a53e8c6e9efa7f54e7be9ca76b43dd9b",
+      "transactionHash": "0x67117c1452ee2f4b904621b6f30790ff998d1f1a72f11c6b71ef47e3dd254724"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.830Z"
+  "updatedAt": "2018-06-04T10:56:37.124Z"
 }

safe-contracts/build/contracts/GnosisSafeTeamEdition.json

@@ -6862,10 +6862,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0xb25140d7a0383c103745ce78d394f13ba4cf05ce",
-      "transactionHash": "0x6443dda4014bb6968582b264cb829cade880976d4c08e3f3c038cbc7d180f619"
+      "address": "0xb8d09a68423900f75635ae045562a8338060c9aa",
+      "transactionHash": "0xa71d3b0b3752acc18733fa881f70c256d63562f28ccca9af910fad3beee9181a"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0x8bec74b923b0d2ac349b920ab7566f9c2de06ed1",
+      "transactionHash": "0x846890db3c85ef38bf8ee86c789f20fbdf1c6339e44f897e15e80ba166b50de3"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0xd4edae2f2d5718d1798deb48c062b939d6e9d4f4",
+      "transactionHash": "0xa71d3b0b3752acc18733fa881f70c256d63562f28ccca9af910fad3beee9181a"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.817Z"
+  "updatedAt": "2018-06-04T10:56:37.114Z"
 }

safe-contracts/build/contracts/Migrations.json

@@ -1384,10 +1384,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0x3058a32c81f9e74ace6fa808b1906af0252c7638",
-      "transactionHash": "0x025b6461e9bfe4546ffada7cbf308b8eb4c12287d93fd6079297fb9c847de4df"
+      "address": "0x954fe52de6d6d18bef1da4972b7bd26dfae4b90c",
+      "transactionHash": "0xb6a19a7a679a1474c09c651e4151421f210afa3f47effed019d4c0206144ee5f"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0xad40476dc43dbb9546709731e1112be5817db3d2",
+      "transactionHash": "0xb329d36a169f7dae30b168e57ae72496354fde3b36d9c285a92da9ff012a6399"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0x2ebea54cbbd4f5491deba7a37605f8f0be3e3c9b",
+      "transactionHash": "0xb6a19a7a679a1474c09c651e4151421f210afa3f47effed019d4c0206144ee5f"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.833Z"
+  "updatedAt": "2018-06-04T10:56:37.139Z"
 }

safe-contracts/build/contracts/MultiSend.json

@@ -346,10 +346,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0xe423b2291101fb206218ce4eeb03150e94446086",
-      "transactionHash": "0xa78e4749df5af5dff57145c85a9c9ca882d3b61e6125da675388fdda421622a2"
+      "address": "0x8e9d29708810d650d0b43058b41687ea02c0baee",
+      "transactionHash": "0xd044f1662e339061a8cabf2b06ac94a9f86fcccf3f5d80ebd1bea2a7542d4021"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0x6655c7792ebda0b1dbea3607591995ea391c8a9e",
+      "transactionHash": "0x70aa0d9af1bc4978d61d3f0c67523717246c4a588a4c1808d45609e0adb04a05"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0x3946fcaaa0ba21aaffc5e06a3cc45debc9e07f7f",
+      "transactionHash": "0xd044f1662e339061a8cabf2b06ac94a9f86fcccf3f5d80ebd1bea2a7542d4021"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.823Z"
+  "updatedAt": "2018-06-04T10:56:37.139Z"
 }

safe-contracts/build/contracts/ProxyFactory.json

@@ -997,10 +997,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0x1f7aea763a0714a857aa537a630aa9c1489a9e8d",
-      "transactionHash": "0xe6856fb57fd2c5da970b640fe9a5f8ee38444b5dbc381bb11bef2bb9cb80d648"
+      "address": "0xa16e2ea106b09506111fcd01eb82c9864afa4315",
+      "transactionHash": "0x75ad1066b44cd801ac66a316dbe4c09e72636d72b70fd62eb647295a0fc5e285"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0xf2bf237dc75c3a466b457a5eff498061dac4c341",
+      "transactionHash": "0x0a1bf7e8030e9d4d24dd7002f35ece3848830cd266ab089664fd1d44ea95d506"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0xbefd9f4a40b1bec8ec730969a3508d1739fb2742",
+      "transactionHash": "0x75ad1066b44cd801ac66a316dbe4c09e72636d72b70fd62eb647295a0fc5e285"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.811Z"
+  "updatedAt": "2018-06-04T10:56:37.112Z"
 }

safe-contracts/build/contracts/SocialRecoveryModule.json

@@ -7296,10 +7296,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0xaba91d2c011e7cc4e8a7b89c7731fc355f5733f4",
-      "transactionHash": "0x274449b108fc18df74c77e6dcd670fa9c486c1dd6ad7aece13cbedea6a77f75d"
+      "address": "0x72c57fd020ba5c1e42d7e9a7757dd40d5febc594",
+      "transactionHash": "0xf0cd95843453bdac02ad8018ef507479ea62989e56d69ad0ac1aad9d3a8515d2"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0xeda62e0821a48445ae6f6f80106e216c6a7f01ef",
+      "transactionHash": "0x36c8dd7c6308c6c439014348fa486a003b509f6740a3fbb01b00d57958c4eca7"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0xfb1771240bb7edf209c70bd520a5d5424d23b084",
+      "transactionHash": "0xf0cd95843453bdac02ad8018ef507479ea62989e56d69ad0ac1aad9d3a8515d2"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.837Z"
+  "updatedAt": "2018-06-04T10:56:37.135Z"
 }

safe-contracts/build/contracts/StateChannelModule.json

@@ -5867,10 +5867,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0x54385cc32f3e1cf1167a00d1031713005b58810d",
-      "transactionHash": "0x5f41f6fd32694378659292b40446fc88ab574830bb99b43380355fd9b2454ca4"
+      "address": "0xa3944632cf9b50c805788da58443efdf323e69bd",
+      "transactionHash": "0x0396e1c9da4fa7bd313286e6033446dbb6e491f267956f8cf13202ce534fd0e6"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0x5b0e6b22a1d89e20256ec666ad2acab10d506258",
+      "transactionHash": "0x6d60cded3abc0298631da9e4402c536e9c10604d213f4fb215f83795722ccda9"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0x589fd9eea7cca488a80e17a5105befff9616f11d",
+      "transactionHash": "0x0396e1c9da4fa7bd313286e6033446dbb6e491f267956f8cf13202ce534fd0e6"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.813Z"
+  "updatedAt": "2018-06-04T10:56:37.118Z"
 }

safe-contracts/build/contracts/WhitelistModule.json

@@ -4340,10 +4340,22 @@
     "1527420696956": {
       "events": {},
       "links": {},
-      "address": "0x68493ac3f7b340768f44d3924cbf6f303a104107",
-      "transactionHash": "0x45669293d5726d8b49af10473522b1c3d6232f5cbded6b626e24d366214501c8"
+      "address": "0x0f2908be3c687fe9fecdfcd3f87cd7464c229723",
+      "transactionHash": "0x463374c2fbc7eaff5b87e65c6a8fdc1177ef82c66084df6e7b88b506f99b193c"
+    },
+    "1527678155804": {
+      "events": {},
+      "links": {},
+      "address": "0xe6986286e71b3cf130edfecefd140c7b0ef7bdc0",
+      "transactionHash": "0xf135f6e2d525ab0b8889f2860a2ff124ca2c3b8660bf5352cc05206a71be9a9a"
+    },
+    "1528109761438": {
+      "events": {},
+      "links": {},
+      "address": "0xca574a31a4cf1eeabeecaffc555bdc7f91c5caf9",
+      "transactionHash": "0x463374c2fbc7eaff5b87e65c6a8fdc1177ef82c66084df6e7b88b506f99b193c"
     }
   },
   "schemaVersion": "2.0.0",
-  "updatedAt": "2018-05-28T13:58:28.834Z"
+  "updatedAt": "2018-06-04T10:56:37.132Z"
 }

src/routes/open/components/Layout.test.js

@@ -65,10 +65,10 @@ describe('React DOM TESTS > Create Safe form', () => {
     const deployed = TestUtils.findRenderedDOMComponentWithClass(open, DEPLOYED_COMPONENT_ID)
 
     if (deployed) {
-      const transactionHash = JSON.parse(deployed.getElementsByTagName('pre')[0].innerHTML)
-      delete transactionHash.logsBloom
+      const transaction = JSON.parse(deployed.getElementsByTagName('pre')[0].innerHTML)
+      delete transaction.receipt.logsBloom
       // eslint-disable-next-line
-      console.log(transactionHash)
+      // console.log(transaction)
     }
   })
 })

src/routes/safe/component/AddTransaction/createTransactions.js

@@ -8,6 +8,7 @@ import { getGnosisSafeContract } from '~/wallets/safeContracts'
 import { getWeb3 } from '~/wallets/getWeb3'
 import { type Safe } from '~/routes/safe/store/model/safe'
 import { sameAddress } from '~/wallets/ethAddresses'
+import executeTransaction from '~/wallets/ethTransactions'
 
 export const TX_NAME_PARAM = 'txName'
 export const TX_DESTINATION_PARAM = 'txDestination'
@@ -96,13 +97,15 @@ export const createTransaction = async (
 
   const thresholdIsOne = safe.get('confirmations') === 1
   if (hasOneOwner(safe) || thresholdIsOne) {
-    const txReceipt = await gnosisSafe.execTransactionIfApproved(txDestination, valueInWei, '0x', CALL, nonce, { from: user, gas: '5000000' })
+    const txConfirmationData = gnosisSafe.contract.execTransactionIfApproved.getData(txDestination, valueInWei, '0x', CALL, nonce)
+    const txReceipt = await executeTransaction(txConfirmationData, user, safeAddress)
     const executedConfirmations: List<Confirmation> = buildExecutedConfirmationFrom(safe.get('owners'), user)
-    return storeTransaction(txName, nonce, txDestination, txValue, user, executedConfirmations, txReceipt.tx, safeAddress, safe.get('confirmations'))
+    return storeTransaction(txName, nonce, txDestination, txValue, user, executedConfirmations, txReceipt, safeAddress, safe.get('confirmations'))
   }
 
-  const txConfirmationHash = await gnosisSafe.approveTransactionWithParameters(txDestination, valueInWei, '0x', CALL, nonce, { from: user, gas: '5000000' })
-  const confirmations: List<Confirmation> = buildConfirmationsFrom(safe.get('owners'), user, txConfirmationHash.tx)
+  const txConfirmationData = gnosisSafe.contract.approveTransactionWithParameters.getData(txDestination, valueInWei, '0x', CALL, nonce)
+  const txConfirmationReceipt = await executeTransaction(txConfirmationData, user, safeAddress)
+  const confirmations: List<Confirmation> = buildConfirmationsFrom(safe.get('owners'), user, txConfirmationReceipt)
 
   return storeTransaction(txName, nonce, txDestination, txValue, user, confirmations, '', safeAddress, safe.get('confirmations'))
 }

src/routes/safe/component/Safe/DailyLimit.jsx

@@ -10,14 +10,16 @@ import { type DailyLimit } from '~/routes/safe/store/model/dailyLimit'
 type Props = {
   dailyLimit: DailyLimit,
   onWithdrawn: () => void,
+  balance: string,
 }
 
 export const WITHDRAWN_BUTTON_TEXT = 'Withdrawn'
 
-const DailyLimitComponent = ({ dailyLimit, onWithdrawn }: Props) => {
+const DailyLimitComponent = ({ dailyLimit, balance, onWithdrawn }: Props) => {
   const limit = dailyLimit.get('value')
   const spentToday = dailyLimit.get('spentToday')
-  const disabled = spentToday >= limit
+
+  const disabled = spentToday >= limit || Number(balance) === 0
   const text = `${limit} ETH (spent today: ${spentToday} ETH)`
 
   return (

src/routes/safe/component/Safe/index.jsx

@@ -71,7 +71,7 @@ class GnoSafe extends React.PureComponent<SafeProps, State> {
             <Owners owners={safe.owners} />
             <Confirmations confirmations={safe.get('confirmations')} />
             <Address address={safe.get('address')} />
-            <DailyLimit dailyLimit={safe.get('dailyLimit')} onWithdrawn={this.onWithdrawn} />
+            <DailyLimit balance={balance} dailyLimit={safe.get('dailyLimit')} onWithdrawn={this.onWithdrawn} />
             <MultisigTx balance={balance} onAddTx={this.onAddTx} onSeeTxs={this.onListTransactions} />
           </List>
         </Col>