Merge branch 'main' into zkbesu

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>

datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountOverride.java

@@ -0,0 +1,197 @@
+/*
+ * Copyright contributors to Besu.
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Account Override parameter class */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonDeserialize(builder = AccountOverride.Builder.class)
+public class AccountOverride {
+  private static final Logger LOG = LoggerFactory.getLogger(AccountOverride.class);
+
+  private final Optional<Wei> balance;
+  private final Optional<Long> nonce;
+  private final Optional<String> code;
+  private final Optional<Map<String, String>> stateDiff;
+
+  private AccountOverride(
+      final Optional<Wei> balance,
+      final Optional<Long> nonce,
+      final Optional<String> code,
+      final Optional<Map<String, String>> stateDiff) {
+    this.balance = balance;
+    this.nonce = nonce;
+    this.code = code;
+    this.stateDiff = stateDiff;
+  }
+
+  /**
+   * Gets the balance override
+   *
+   * @return the balance if present
+   */
+  public Optional<Wei> getBalance() {
+    return balance;
+  }
+
+  /**
+   * Gets the nonce override
+   *
+   * @return the nonce if present
+   */
+  public Optional<Long> getNonce() {
+    return nonce;
+  }
+
+  /**
+   * Gets the code override
+   *
+   * @return the code if present
+   */
+  public Optional<String> getCode() {
+    return code;
+  }
+
+  /**
+   * Gets the state override map
+   *
+   * @return the state override map if present
+   */
+  public Optional<Map<String, String>> getStateDiff() {
+    return stateDiff;
+  }
+
+  /** Builder class for Account overrides */
+  public static class Builder {
+    private Optional<Wei> balance = Optional.empty();
+    private Optional<Long> nonce = Optional.empty();
+    private Optional<String> code = Optional.empty();
+    private Optional<Map<String, String>> stateDiff = Optional.empty();
+
+    /** Default constructor. */
+    public Builder() {}
+
+    /**
+     * Sets the balance override
+     *
+     * @param balance the balance override
+     * @return the builder
+     */
+    public Builder withBalance(final Wei balance) {
+      this.balance = Optional.ofNullable(balance);
+      return this;
+    }
+
+    /**
+     * Sets the nonce override
+     *
+     * @param nonce the nonce override
+     * @return the builder
+     */
+    public Builder withNonce(final Long nonce) {
+      this.nonce = Optional.ofNullable(nonce);
+      return this;
+    }
+
+    /**
+     * Sets the code override
+     *
+     * @param code the code override
+     * @return the builder
+     */
+    public Builder withCode(final String code) {
+      this.code = Optional.ofNullable(code);
+      return this;
+    }
+
+    /**
+     * Sets the state diff override
+     *
+     * @param stateDiff the map of state overrides
+     * @return the builder
+     */
+    public Builder withStateDiff(final Map<String, String> stateDiff) {
+      this.stateDiff = Optional.ofNullable(stateDiff);
+      return this;
+    }
+
+    /**
+     * build the account override from the builder
+     *
+     * @return account override
+     */
+    public AccountOverride build() {
+      return new AccountOverride(balance, nonce, code, stateDiff);
+    }
+  }
+
+  /**
+   * utility method to log unknown properties
+   *
+   * @param key key for the unrecognized value
+   * @param value the unrecognized value
+   */
+  @JsonAnySetter
+  public void withUnknownProperties(final String key, final Object value) {
+    LOG.debug(
+        "unknown property - {} with value - {} and type - {} caught during serialization",
+        key,
+        value,
+        value != null ? value.getClass() : "NULL");
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final AccountOverride accountOverride = (AccountOverride) o;
+    return balance.equals(accountOverride.balance)
+        && nonce.equals(accountOverride.nonce)
+        && code.equals(accountOverride.code)
+        && stateDiff.equals(accountOverride.stateDiff);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(balance, nonce, code, stateDiff);
+  }
+
+  @Override
+  public String toString() {
+    return "AccountOverride{"
+        + "balance="
+        + balance
+        + ", nonce="
+        + nonce
+        + ", code="
+        + code
+        + ", stateDiff="
+        + stateDiff
+        + '}';
+  }
+}

datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountOverrideMap.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright contributors to Besu.
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import java.util.HashMap;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/** Map of account overrides, indexed by address */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AccountOverrideMap extends HashMap<Address, AccountOverride> {
+
+  /** Default constructor */
+  public AccountOverrideMap() {}
+}