Merge branch 'master' into guanyu-datasource-hp

bandprotocol · Aug 10, 2020 · cb95b17 · cb95b17
2 parents 6a8f1a6 + 9f68c14
commit cb95b17
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md
@@ -21,6 +21,7 @@
 
 ### Scan
 
+- (impv) [\#2449](https://github.com/bandprotocol/bandchain/pull/2449) Adjusted gas limit as msg
 - (impv) [\#2448](https://github.com/bandprotocol/bandchain/pull/2448) Implemented All Datasources page with the new grid system.
 - (impv) [\#2416](https://github.com/bandprotocol/bandchain/pull/2416) Added more HD Path index for ledger
 - (impv) [\#2394](https://github.com/bandprotocol/bandchain/pull/2394) Implemented the msg on TxMobileTable for GUANYU

diff --git a/scan/src/components/modal/submitTx/SubmitTxModal.re b/scan/src/components/modal/submitTx/SubmitTxModal.re
@@ -87,7 +87,7 @@ module SubmitTxStep = {
   let make = (~account: AccountContext.t, ~setRawTx, ~isActive, ~msg) => {
     let (msgsOpt, setMsgsOpt) = React.useState(_ => None);
 
-    let gas = 500000;
+    let gas = SubmitMsg.gasLimit(msg);
     let fee = 5000.;
     let (memo, setMemo) = React.useState(_ => EnhanceTxInput.{text: "", value: Some("")});
 

diff --git a/scan/src/utils/SubmitMsg.re b/scan/src/utils/SubmitMsg.re
@@ -12,3 +12,11 @@ let toString =
   | Undelegate(_) => "Undelegate"
   | Redelegate(_) => "Redelegate"
   | WithdrawReward(_) => "Withdraw Reward";
+
+let gasLimit =
+  fun
+  | Send(_)
+  | Delegate(_)
+  | Undelegate(_)
+  | WithdrawReward(_) => 200000
+  | Redelegate(_) => 300000;