Merge pull request #53 from gnosis/feature/fixed-gas-limit

Feature/fixed gas limit
gnosis · Jan 23, 2018 · fefb811 · fefb811
2 parents e3f691c + 9e87e7d
commit fefb811
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/dapp/abi.js b/dapp/abi.js
diff --git a/dapp/config.js b/dapp/config.js
@@ -158,7 +158,7 @@ var txDefault = {
     },
     'kovan': {
       name: 'Kovan',
-      address: '0x6C4c60F01999408CfD872Fdcf739912509A15da5'
+      address: '0x2c992817e0152a65937527b774c7a99a84603045'
     },
     'privatenet': {
       name: 'Privatenet',

diff --git a/dapp/partials/settings.html b/dapp/partials/settings.html
@@ -26,7 +26,7 @@ <h4>
           </provider-list>
         </div>
       </div>
-      <div class="row">
+      <div class="row" show-hide-by-connectivity="offline">
         <div class="col-md-6 form-group">
           <label for="gas-limit">Gas limit</label>
           <input id="gas-limit" type="number" ng-model="config.gasLimit" class="form-control" />

diff --git a/dapp/services/Wallet.js b/dapp/services/Wallet.js
@@ -2,8 +2,7 @@
   function () {
     angular
     .module('multiSigWeb')
-    .service('Wallet', function ($window, $http, $q, $rootScope, $uibModal, Utils, ABI, Connection, Web3Service) {
-
+    .service('Wallet', function ($window, $http, $q, $rootScope, $uibModal, Utils, ABI, Connection, Web3Service) {      
       // Init wallet factory object
       var wallet = {
         wallets: JSON.parse(localStorage.getItem("wallets")) || {},
@@ -540,7 +539,8 @@
           requiredConfirmations,
           limit,
           wallet.txDefaults({
-            data: wallet.json.multiSigDailyLimit.binHex
+            data: wallet.json.multiSigDailyLimit.binHex,
+            gas: (2556980 + 42733 * owners.length) // Gas to create multisig with dynamic gas for owners
           }),
           cb
         );
@@ -554,7 +554,8 @@
           requiredConfirmations,
           limit,
           wallet.txDefaults({
-            data: wallet.json.multiSigDailyLimit.binHex
+            data: wallet.json.multiSigDailyLimit.binHex,
+            gas: (2002000 + 27820 * owners.length)
           }),
           cb
         );
@@ -670,7 +671,7 @@
                 "0x0",
                 data,
                 count,
-                wallet.txDefaults()
+                wallet.txDefaults({gas: 300000})
               ],
               options,
               cb
@@ -724,7 +725,7 @@
                 "0x0",
                 data,
                 count,
-                wallet.txDefaults()
+                wallet.txDefaults({gas: 300000})
               ],
               options,
               cb
@@ -779,7 +780,7 @@
                 "0x0",
                 data,
                 count,
-                wallet.txDefaults()
+                wallet.txDefaults({gas: 300000})
               ],
               options,
               cb
@@ -838,7 +839,7 @@
                 "0x0",
                 data,
                 count,
-                wallet.txDefaults()
+                wallet.txDefaults({gas: 300000})
               ],
               options,
               cb
@@ -983,7 +984,7 @@
                 "0x0",
                 data,
                 count,
-                wallet.txDefaults()
+                wallet.txDefaults({gas: 300000})
               ],
               options,
               cb

diff --git a/dapp/services/Web3Service.js b/dapp/services/Web3Service.js
@@ -4,7 +4,7 @@
     .module('multiSigWeb')
     .service("Web3Service", function ($window, $q, Utils, $uibModal, Connection, Config, $http) {
 
-      factory = {};
+      var factory = {};
 
       factory.webInitialized = $q(function (resolve, reject) {
         window.addEventListener('load', function () {
@@ -78,23 +78,24 @@
             cb(e);
           }
           else {
-            if (result) {
+            if (result) {                            
               method.sendTransaction.apply(method.sendTransaction, params.concat(cb));
             }
             else {
               cb("Simulated transaction failed");
             }
           }
         }
-
+
+        var args;
         if ( options && options.onlySimulate) {
-          var args = params.concat(cb);
+          args = params.concat(cb);
           method.call.apply(method.call, args);
         }
         else {
-          var args = params.concat(sendIfSuccess);
+          args = params.concat(sendIfSuccess);
           method.call.apply(method.call, args);
-        }
+        }        
       };
 
       /**