Updated to handle cmdline logging and default gas (Consensys#5)

Errorific · Mar 12, 2019 · 7bdfa5d · 7bdfa5d
1 parent 33ef337
commit 7bdfa5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ethfirewall/src/main/java/tech/pegasys/ethfirewall/EthFirewallCommand.java b/ethfirewall/src/main/java/tech/pegasys/ethfirewall/EthFirewallCommand.java
@@ -109,6 +109,7 @@ public void parse(
 
     commandLine = new CommandLine(this);
     commandLine.setCaseInsensitiveEnumValuesAllowed(true);
+    commandLine.registerConverter(Level.class, Level::valueOf);
 
     // Must manually show the usage/version info, as per the design of picocli
     // (https://picocli.info/#_printing_help_automatically)

diff --git a/ethfirewall/src/main/java/tech/pegasys/ethfirewall/jsonrpcproxy/TransactionSigner.java b/ethfirewall/src/main/java/tech/pegasys/ethfirewall/jsonrpcproxy/TransactionSigner.java
@@ -52,10 +52,17 @@ public static RawTransaction fromTransactionJson(final JsonObject transaction) {
     if (txnParams.getString("data") != null) {
       dataString = txnParams.getString("data");
     }
+
+    // TODO(tmm): This should be configurable, but currently matches Geth.
+    String gasValue = "90000";
+    if (txnParams.getString("gas") != null) {
+      gasValue = txnParams.getString("gas").substring(2);
+    }
+
     return RawTransaction.createTransaction(
         new BigInteger(txnParams.getString("nonce").substring(2), 16),
         new BigInteger(txnParams.getString("gasPrice").substring(2), 16),
-        new BigInteger(txnParams.getString("gas").substring(2), 16),
+        new BigInteger(gasValue, 16),
         txnParams.getString("to"),
         new BigInteger(txnParams.getString("value").substring(2), 16),
         dataString);