WIP - Eip1559 support for private txs

acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/Account.java

@@ -12,9 +12,12 @@
  */
 package tech.pegasys.web3signer.dsl;
 
+import java.math.BigInteger;
+
 public class Account {
 
   private final String address;
+  private BigInteger nonce = BigInteger.ZERO;
 
   public Account(final String address) {
     this.address = address;
@@ -23,4 +26,16 @@ public Account(final String address) {
   public String address() {
     return address;
   }
+
+  public BigInteger nextNonce() {
+    return nonce;
+  }
+
+  public BigInteger nextNonceAndIncrement() {
+
+    final BigInteger next = nonce;
+    nonce = nonce.add(BigInteger.ONE);
+
+    return next;
+  }
 }

acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/Accounts.java

@@ -19,10 +19,26 @@
 
 public class Accounts {
 
+  /** Private key: 8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63 */
+  private static final String GENESIS_ACCOUNT_ONE_PUBLIC_KEY =
+      "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73";
+
+  public static final String GENESIS_ACCOUNT_ONE_PASSWORD = "pass";
+
+  private final Account benefactor;
   private final Eth eth;
 
   public Accounts(final Eth eth) {
     this.eth = eth;
+    this.benefactor = new Account(GENESIS_ACCOUNT_ONE_PUBLIC_KEY);
+  }
+
+  public Account richBenefactor() {
+    return benefactor;
+  }
+
+  public BigInteger balance(final Account account) {
+    return balance(account.address());
   }
 
   public BigInteger balance(final String address) {

acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/Contracts.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.web3signer.dsl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static tech.pegasys.web3signer.dsl.utils.ExceptionUtils.failOnIOException;
+import static tech.pegasys.web3signer.dsl.utils.WaitUtils.waitFor;
+
+import tech.pegasys.web3signer.core.service.jsonrpc.response.JsonRpcErrorResponse;
+import tech.pegasys.web3signer.dsl.signer.SignerResponse;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.awaitility.core.ConditionTimeoutException;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+
+public abstract class Contracts<T> {
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  public static final BigInteger GAS_PRICE = BigInteger.valueOf(1000);
+  public static final BigInteger GAS_LIMIT = BigInteger.valueOf(3000000);
+
+  public abstract String sendTransaction(T smartContract) throws IOException;
+
+  public abstract SignerResponse<JsonRpcErrorResponse> sendTransactionExpectsError(T smartContract)
+      throws IOException;
+
+  public abstract Optional<? extends TransactionReceipt> getTransactionReceipt(final String hash)
+      throws IOException;
+
+  public String submit(final T smartContract) {
+    return failOnIOException(() -> sendTransaction(smartContract));
+  }
+
+  public void awaitBlockContaining(final String hash) {
+    try {
+      waitFor(() -> assertThat(getTransactionReceipt(hash).isPresent()).isTrue());
+    } catch (final ConditionTimeoutException e) {
+      LOG.error("Timed out waiting for a block containing the transaction receipt hash: " + hash);
+    }
+  }
+
+  public String address(final String hash) {
+    return failOnIOException(
+        () -> {
+          final TransactionReceipt receipt =
+              getTransactionReceipt(hash)
+                  .orElseThrow(() -> new RuntimeException("No receipt found for hash: " + hash));
+          assertThat(receipt.getContractAddress()).isNotEmpty();
+          return receipt.getContractAddress();
+        });
+  }
+}

acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/Eth.java

@@ -12,12 +12,21 @@
  */
 package tech.pegasys.web3signer.dsl;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import tech.pegasys.web3signer.core.service.jsonrpc.response.JsonRpcErrorResponse;
+import tech.pegasys.web3signer.dsl.signer.SignerResponse;
+
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
+import java.util.Optional;
 
 import org.web3j.protocol.Web3j;
 import org.web3j.protocol.core.DefaultBlockParameterName;
+import org.web3j.protocol.core.methods.request.Transaction;
+import org.web3j.protocol.core.methods.response.EthSendTransaction;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
 
 public class Eth {
 
@@ -27,11 +36,49 @@ public Eth(final Web3j jsonRpc) {
     this.jsonRpc = jsonRpc;
   }
 
+  public String sendTransaction(final Transaction transaction) throws IOException {
+    final EthSendTransaction response = jsonRpc.ethSendTransaction(transaction).send();
+
+    assertThat(response.getTransactionHash()).isNotEmpty();
+    assertThat(response.getError()).isNull();
+
+    return response.getTransactionHash();
+  }
+
+  public SignerResponse<JsonRpcErrorResponse> sendTransactionExpectsError(
+      final Transaction transaction) throws IOException {
+    final EthSendTransaction response = jsonRpc.ethSendTransaction(transaction).send();
+    assertThat(response.hasError()).isTrue();
+    return SignerResponse.fromWeb3jErrorResponse(response);
+  }
+
+  public BigInteger getTransactionCount(final String address) throws IOException {
+    return jsonRpc
+        .ethGetTransactionCount(address, DefaultBlockParameterName.LATEST)
+        .send()
+        .getTransactionCount();
+  }
+
+  public Optional<TransactionReceipt> getTransactionReceipt(final String hash) throws IOException {
+    return jsonRpc.ethGetTransactionReceipt(hash).send().getTransactionReceipt();
+  }
+
   public List<String> getAccounts() throws IOException {
     return jsonRpc.ethAccounts().send().getAccounts();
   }
 
+  public String getCode(final String address) throws IOException {
+    return jsonRpc.ethGetCode(address, DefaultBlockParameterName.LATEST).send().getResult();
+  }
+
   public BigInteger getBalance(final String account) throws IOException {
     return jsonRpc.ethGetBalance(account, DefaultBlockParameterName.LATEST).send().getBalance();
   }
+
+  public String call(final Transaction contractViewOperation) throws IOException {
+    return jsonRpc
+        .ethCall(contractViewOperation, DefaultBlockParameterName.LATEST)
+        .send()
+        .getValue();
+  }
 }

acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/PublicContracts.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.web3signer.dsl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static tech.pegasys.web3signer.dsl.utils.ExceptionUtils.failOnIOException;
+
+import tech.pegasys.web3signer.core.service.jsonrpc.response.JsonRpcErrorResponse;
+import tech.pegasys.web3signer.dsl.signer.SignerResponse;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.web3j.protocol.core.methods.request.Transaction;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+
+public class PublicContracts extends Contracts<Transaction> {
+
+  private final Eth eth;
+
+  public PublicContracts(final Eth eth) {
+    this.eth = eth;
+  }
+
+  @Override
+  public String sendTransaction(final Transaction smartContract) throws IOException {
+    return eth.sendTransaction(smartContract);
+  }
+
+  @Override
+  public SignerResponse<JsonRpcErrorResponse> sendTransactionExpectsError(
+      final Transaction smartContract) throws IOException {
+    return eth.sendTransactionExpectsError(smartContract);
+  }
+
+  @Override
+  public Optional<TransactionReceipt> getTransactionReceipt(final String hash) throws IOException {
+    return eth.getTransactionReceipt(hash);
+  }
+
+  public String code(final String address) {
+    return failOnIOException(
+        () -> {
+          final String code = eth.getCode(address);
+          assertThat(code).isNotEmpty();
+          return code;
+        });
+  }
+
+  public String call(final Transaction contractViewOperation) {
+    return failOnIOException(() -> eth.call(contractViewOperation));
+  }
+}

acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/Transactions.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package tech.pegasys.web3signer.dsl;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static tech.pegasys.web3signer.dsl.utils.ExceptionUtils.failOnIOException;
+import static tech.pegasys.web3signer.dsl.utils.WaitUtils.waitFor;
+
+import tech.pegasys.web3signer.core.service.jsonrpc.response.JsonRpcErrorResponse;
+import tech.pegasys.web3signer.dsl.signer.SignerResponse;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.awaitility.core.ConditionTimeoutException;
+import org.web3j.protocol.core.methods.request.Transaction;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.protocol.exceptions.ClientConnectionException;
+
+public class Transactions {
+
+  private static final Logger LOG = LogManager.getLogger();
+
+  private final Eth eth;
+
+  public Transactions(final Eth eth) {
+    this.eth = eth;
+  }
+
+  public String submit(final Transaction transaction) {
+    return failOnIOException(() -> eth.sendTransaction(transaction));
+  }
+
+  public SignerResponse<JsonRpcErrorResponse> submitExceptional(final Transaction transaction) {
+    try {
+      return failOnIOException(() -> eth.sendTransactionExpectsError(transaction));
+    } catch (final ClientConnectionException e) {
+      LOG.info("ClientConnectionException with message: " + e.getMessage());
+      return SignerResponse.fromError(e);
+    }
+  }
+
+  public void awaitBlockContaining(final String hash) {
+    try {
+      waitFor(() -> assertThat(eth.getTransactionReceipt(hash).isPresent()).isTrue());
+    } catch (final ConditionTimeoutException e) {
+      LOG.error("Timed out waiting for a block containing the transaction receipt hash: " + hash);
+      throw new RuntimeException("No receipt found for hash: " + hash);
+    }
+  }
+
+  public Optional<TransactionReceipt> getTransactionReceipt(final String hash) {
+    try {
+      return eth.getTransactionReceipt(hash);
+    } catch (IOException e) {
+      LOG.error("IOException with message: " + e.getMessage());
+      throw new RuntimeException("No tx receipt found for hash: " + hash);
+    }
+  }
+}

acceptance-tests/src/test/java/tech/pegasys/web3signer/dsl/besu/BesuNode.java

@@ -17,6 +17,8 @@
 
 import tech.pegasys.web3signer.dsl.Accounts;
 import tech.pegasys.web3signer.dsl.Eth;
+import tech.pegasys.web3signer.dsl.PublicContracts;
+import tech.pegasys.web3signer.dsl.Transactions;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -52,12 +54,17 @@ public class BesuNode {
   private static final BigInteger SPURIOUS_DRAGON_HARD_FORK_BLOCK = BigInteger.valueOf(1);
 
   private final BesuNodeConfig besuNodeConfig;
+
+  @SuppressWarnings("unused")
   private final String[] args;
+
   private final Map<String, String> environment;
   private final Properties portsProperties = new Properties();
   private Accounts accounts;
   private Future<ProcessResult> besuProcess;
+  private Transactions transactions;
   private Web3j jsonRpc;
+  private PublicContracts publicContracts;
   private BesuNodePorts besuNodePorts;
 
   BesuNode(final BesuNodeConfig besuNodeConfig, String[] args, Map<String, String> environment) {
@@ -130,6 +137,8 @@ public void awaitStartupCompletion() {
     final Eth eth = new Eth(jsonRpc);
 
     accounts = new Accounts(eth);
+    publicContracts = new PublicContracts(eth);
+    transactions = new Transactions(eth);
   }
 
   public BesuNodePorts ports() {
@@ -159,4 +168,12 @@ private void loadPortsFile() {
       throw new RuntimeException("Error reading Besu ports file", e);
     }
   }
+
+  public PublicContracts publicContracts() {
+    return publicContracts;
+  }
+
+  public Transactions transactions() {
+    return transactions;
+  }
 }