Hebao small fixes (#1752)

* [hebao] a small fix in ForwarderModule.sol

* small fixes in migrations/9_modules.js

Author: kongliangzhong

packages/hebao_v1/contracts/modules/core/ForwarderModule.sol

@@ -221,7 +221,7 @@ abstract contract ForwarderModule is BaseModule
 
         // Check the wallet has enough meta tx gas
         if (metaTx.gasPrice > 0) {
-            uint gasCost = gasLimit.mul(metaTx.gasPrice);
+            uint gasCost = metaTx.gasLimit.mul(metaTx.gasPrice);
 
             if (metaTx.gasToken == address(0)) {
                 require(

packages/hebao_v1/migrations/9_modules.js

@@ -35,27 +35,32 @@ module.exports = function(deployer, network, accounts) {
 
     const dest = [FinalCoreModule, FinalSecurityModule, FinalTransferModule];
     await deployer.link(SignedRequest, dest);
-    await deployer.deploy(FinalCoreModule, ControllerImpl.address);
+    await deployer.deploy(FinalCoreModule, ControllerImpl.address, {
+      gas: 6700000
+    });
     await deployer.deploy(
       FinalSecurityModule,
       ControllerImpl.address,
       FinalCoreModule.address,
       guardianPendingPeriod,
       inheritanceWaitingPeriod,
-      whitelistDelayPeriod
+      whitelistDelayPeriod,
+      { gas: 6700000 }
     );
     await deployer.deploy(
       FinalTransferModule,
       ControllerImpl.address,
       FinalCoreModule.address,
-      quotaDelayPeriod
+      quotaDelayPeriod,
+      { gas: 6700000 }
     );
 
     await deployer.deploy(
       AddOfficialGuardianModule,
       ControllerImpl.address,
       OfficialGuardian.address,
-      11
+      11,
+      { gas: 6700000 }
     );
 
     const moduleRegistry = await ModuleRegistryImpl.deployed();