hashgraph · agadzhalov · Jul 5, 2023 · May 25, 2023 · May 25, 2023 · May 29, 2023
@@ -19,15 +19,18 @@
 import org.hyperledger.besu.datatypes.Address;
 
 /**
- * When an account's balance is changed by an EVM call, it is necessary to ensure that any Hedera system contract running
- * within the same frame can immediately see the change. This means that waiting for commit() to be called on a WorldUpdater
- * is not an option; instead, the "parallel" Hedera world state must be updated immediately.
+ * When an account's balance is changed by an EVM call, it is necessary to ensure that any Hedera system contract
+ * running within the same frame can immediately see the change. This means that waiting for commit() to be called on a
+ * WorldUpdater is not an option; instead, the "parallel" Hedera world state must be updated immediately.
  *
  * <p>This class defines the callback mechanism that a mutated account uses to report its balance changes to the Hedera
- * world state when executing an EVM transaction on a consensus node. Accounts that are "mutated" during an eth_estimateGas
- * call running on a mirror node do not actually change, so a null implementation of the callback can be provided in such cases.
- * */
+ * world state when executing an EVM transaction on a consensus node. Accounts that are "mutated" during an
+ * eth_estimateGas call running on a mirror node do not actually change, so a null implementation of the callback can be
+ * provided in such cases.
+ */
 public interface UpdateAccountTracker {
 
     void setBalance(final Address accountAddess, final long balance);
+
+    void setNonce(Address address, long nonce);
 }
@@ -26,6 +26,10 @@ public interface HederaEvmEntityAccess {
 
     long getBalance(Address address);
 
+    default long getNonce(Address address) {
+        return 0;
+    }
+
     boolean isTokenAccount(Address address);
 
     ByteString alias(Address address);
@@ -35,8 +39,8 @@ public interface HederaEvmEntityAccess {
     Bytes getStorage(Address address, Bytes key);
 
     /**
-     * Returns the bytecode for the contract with the given account id; or null if there is no byte
-     * present for this contract.
+     * Returns the bytecode for the contract with the given account id; or null if there is no byte present for this
+     * contract.
      *
      * @param address the account's address of the target contract
      * @return the target contract's bytecode, or null if it is not present

@@ -59,7 +59,7 @@ public Hash getAddressHash() {
 
     @Override
     public long getNonce() {
-        return 0;
+        return entityAccess.getNonce(address);
     }
 
     @Override

@@ -38,28 +38,29 @@
 import org.hyperledger.besu.evm.account.MutableAccount;
 
 /**
- * A mutable and updatable implementation of the {@link MutableAccount} interface, that tracks account updates
- * since the creation of the updated it's linked to.
- *
- * Contains {@code updateAccountTracker} for immediate set of balance in the world state.
- * Note that in practice this only track the modified account values, but doesn't remind if they were modified or not.
+ * A mutable and updatable implementation of the {@link MutableAccount} interface, that tracks account updates since the
+ * creation of the updated it's linked to.
+ * <p>
+ * Contains {@code updateAccountTracker} for immediate set of balance in the world state. Note that in practice this
+ * only track the modified account values, but doesn't remind if they were modified or not.
  */
 public class UpdateTrackingAccount<A extends Account> implements MutableAccount, EvmAccount {
+    @Nullable
+    protected final A account;
+
     private final Address address;
     private final Hash addressHash;
-    private long nonce;
-    private Wei balance;
-    private HederaEvmEntityAccess hederaEvmEntityAccess;
-    private boolean storageWasCleared = false;
     private final UpdateAccountTracker updateAccountTracker;
     private final NavigableMap<UInt256, UInt256> updatedStorage;
 
-    @Nullable
-    protected final A account;
-
     @Nullable
     protected Bytes updatedCode;
 
+    private long nonce;
+    private Wei balance;
+    private HederaEvmEntityAccess hederaEvmEntityAccess;
+    private boolean storageWasCleared = false;
+
     @Nullable
     private Hash updatedCodeHash;
 
@@ -92,8 +93,7 @@ public UpdateTrackingAccount(final A account, @Nullable final UpdateAccountTrack
     /**
      * The original account over which this tracks updates.
      *
-     * @return The original account over which this tracks updates, or {@code null} if this is a
-     *     newly created account.
+     * @return The original account over which this tracks updates, or {@code null} if this is a newly created account.
      */
     public A getWrappedAccount() {
         return account;
@@ -115,8 +115,8 @@ public boolean wrappedAccountIsTokenProxy() {
     /**
      * A map of the storage entries that were modified.
      *
-     * @return a map containing all entries that have been modified. This <b>may</b> contain entries
-     *     with a value of 0 to signify deletion.
+     * @return a map containing all entries that have been modified. This <b>may</b> contain entries with a value of 0
+     * to signify deletion.
      */
     @Override
     public Map<UInt256, UInt256> getUpdatedStorage() {
@@ -141,6 +141,9 @@ public long getNonce() {
     @Override
     public void setNonce(final long nonce) {
         this.nonce = nonce;
+        if (updateAccountTracker != null) {
+            updateAccountTracker.setNonce(address, nonce);
+        }
     }
 
     @Override
@@ -166,6 +169,12 @@ public Bytes getCode() {
         return updatedCode == null ? account.getCode() : updatedCode;
     }
 
+    @Override
+    public void setCode(Bytes code) {
+        this.updatedCode = code;
+        this.updatedCodeHash = null;
+    }
+
     @Override
     public Hash getCodeHash() {
         if (updatedCode == null) {
@@ -187,12 +196,6 @@ public boolean hasCode() {
         return updatedCode == null ? account.hasCode() : !updatedCode.isEmpty();
     }
 
-    @Override
-    public void setCode(Bytes code) {
-        this.updatedCode = code;
-        this.updatedCodeHash = null;
-    }
-
     @Override
     public UInt256 getStorageValue(final UInt256 key) {
         final UInt256 value = updatedStorage.get(key);

@@ -22,7 +22,9 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
 
+import com.hedera.node.app.service.evm.store.UpdateAccountTracker;
 import com.hedera.node.app.service.evm.store.contracts.AbstractCodeCache;
 import com.hedera.node.app.service.evm.store.contracts.HederaEvmEntityAccess;
 import com.hedera.node.app.service.evm.store.contracts.HederaEvmWorldStateTokenAccount;
@@ -42,12 +44,16 @@
 @ExtendWith(MockitoExtension.class)
 class UpdateTrackingAccountTest {
     private static final long newBalance = 200_000L;
+    private static final long newNonce = 2L;
     private static final long initialBalance = 100_000L;
     private static final Address targetAddress = Address.fromHexString("0x000000000000000000000000000000000000066e");
 
     @Mock
     private HederaEvmEntityAccess entityAccess;
 
+    @Mock
+    private UpdateAccountTracker updateAccountTracker;
+
     private AbstractCodeCache codeCache;
 
     @BeforeEach
@@ -85,6 +91,18 @@ void justPropagatesBalanceChangeWithNullTrackingAccounts() {
         assertFalse(subject.wrappedAccountIsTokenProxy());
     }
 
+    @Test
+    void justPropagatesNonceChangeWithTrackingAccounts() {
+        final var account = new WorldStateAccount(targetAddress, Wei.of(initialBalance), codeCache, entityAccess);
+
+        final var subject = new UpdateTrackingAccount<>(account, updateAccountTracker);
+
+        subject.setNonce(newNonce);
+
+        assertEquals(newNonce, subject.getNonce());
+        verify(updateAccountTracker).setNonce(targetAddress, newNonce);
+    }
+
     @Test
     void reusesAddressHashWhenConstructedWithTracker() {
         final var account = new WorldStateAccount(targetAddress, Wei.of(initialBalance), codeCache, entityAccess);

@@ -54,6 +54,7 @@
 import static com.hedera.node.app.service.mono.context.properties.PropertyNames.CONTRACTS_MAX_NUM;
 import static com.hedera.node.app.service.mono.context.properties.PropertyNames.CONTRACTS_MAX_NUM_WITH_HAPI_SIGS_ACCESS;
 import static com.hedera.node.app.service.mono.context.properties.PropertyNames.CONTRACTS_MAX_REFUND_PERCENT_OF_GAS_LIMIT;
+import static com.hedera.node.app.service.mono.context.properties.PropertyNames.CONTRACTS_NONCES_EXTERNALIZATION_ENABLED;
 import static com.hedera.node.app.service.mono.context.properties.PropertyNames.CONTRACTS_PERMITTED_DELEGATE_CALLERS;
 import static com.hedera.node.app.service.mono.context.properties.PropertyNames.CONTRACTS_PRECOMPILE_ATOMIC_CRYPTO_TRANSFER_ENABLED;
 import static com.hedera.node.app.service.mono.context.properties.PropertyNames.CONTRACTS_PRECOMPILE_EXCHANGE_RATE_GAS_COST;
@@ -256,6 +257,7 @@ public class GlobalDynamicProperties implements EvmProperties {
     private Set<CustomFeeType> htsUnsupportedCustomFeeReceiverDebits;
     private boolean atomicCryptoTransferEnabled;
     private boolean enableHRCAssociate;
+    private boolean enableContractsNoncesExternalization;
     private KnownBlockValues knownBlockValues;
     private long exchangeRateGasReq;
     private long stakingRewardRate;
@@ -407,6 +409,7 @@ public void reload() {
         atomicCryptoTransferEnabled =
                 properties.getBooleanProperty(CONTRACTS_PRECOMPILE_ATOMIC_CRYPTO_TRANSFER_ENABLED);
         enableHRCAssociate = properties.getBooleanProperty(CONTRACTS_PRECOMPILE_HRC_FACADE_ASSOCIATE_ENABLED);
+        enableContractsNoncesExternalization = properties.getBooleanProperty(CONTRACTS_NONCES_EXTERNALIZATION_ENABLED);
         knownBlockValues = properties.getBlockValuesProperty(CONTRACTS_KNOWN_BLOCK_HASH);
         exchangeRateGasReq = properties.getLongProperty(CONTRACTS_PRECOMPILE_EXCHANGE_RATE_GAS_COST);
         stakingMaxStakeRewarded = properties.getLongProperty(STAKING_MAX_STAKE_REWARDED);
@@ -788,6 +791,10 @@ public boolean isHRCAssociateEnabled() {
         return enableHRCAssociate;
     }
 
+    public boolean isContractsNoncesExternalizationEnabled() {
+        return enableContractsNoncesExternalization;
+    }
+
     public KnownBlockValues knownBlockValues() {
         return knownBlockValues;
     }

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tuweni.bytes.Bytes;
 import org.hyperledger.besu.datatypes.Address;
@@ -41,6 +42,7 @@ public class TransactionProcessingResult extends HederaEvmTransactionProcessingR
     private List<SolidityAction> actions;
 
     private List<ContractID> createdContracts = Collections.emptyList();
+    private Map<ContractID, Long> contractNonces = new TreeMap<>();
 
     public static TransactionProcessingResult failed(
             final long gasUsed,
@@ -113,10 +115,18 @@ public void setCreatedContracts(List<ContractID> createdContracts) {
         this.createdContracts = createdContracts;
     }
 
+    public void setContractNonces(Map<ContractID, Long> contractNonces) {
+        this.contractNonces = contractNonces;
+    }
+
     public List<ContractID> getCreatedContracts() {
         return createdContracts;
     }
 
+    public Map<ContractID, Long> getContractNonces() {
+        return contractNonces;
+    }
+
     public Map<Address, Map<Bytes, Pair<Bytes, Bytes>>> getStateChanges() {
         return stateChanges;
     }

@@ -19,6 +19,7 @@
 import static com.hedera.node.app.service.mono.ledger.properties.AccountProperty.ALIAS;
 import static com.hedera.node.app.service.mono.ledger.properties.AccountProperty.AUTO_RENEW_PERIOD;
 import static com.hedera.node.app.service.mono.ledger.properties.AccountProperty.BALANCE;
+import static com.hedera.node.app.service.mono.ledger.properties.AccountProperty.ETHEREUM_NONCE;
 import static com.hedera.node.app.service.mono.ledger.properties.AccountProperty.EXPIRY;
 import static com.hedera.node.app.service.mono.ledger.properties.AccountProperty.IS_DELETED;
 import static com.hedera.node.app.service.mono.ledger.properties.AccountProperty.IS_RECEIVER_SIG_REQUIRED;
@@ -73,21 +74,19 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 /**
- * Provides a ledger for Hedera Services crypto and smart contract accounts with transactional
- * semantics. Changes to the ledger are <b>only</b> allowed in the scope of a transaction.
+ * Provides a ledger for Hedera Services crypto and smart contract accounts with transactional semantics. Changes to the
+ * ledger are <b>only</b> allowed in the scope of a transaction.
  *
  * <p>All changes that are made during a transaction are summarized as per-account changesets. These
- * changesets are committed to a wrapped {@link TransactionalLedger}; or dropped entirely in case of
- * a rollback.
+ * changesets are committed to a wrapped {@link TransactionalLedger}; or dropped entirely in case of a rollback.
  *
  * <p>The ledger delegates history of each transaction to an injected {@link RecordsHistorian} by
- * invoking its {@code addNewRecords} immediately before the final {@link
- * TransactionalLedger#commit()}.
+ * invoking its {@code addNewRecords} immediately before the final {@link TransactionalLedger#commit()}.
  *
  * <p>We should think of the ledger as using double-booked accounting, (e.g., via the {@link
- * HederaLedger#doTransfer(AccountID, AccountID, long)} method); but it is necessary to provide
- * "unsafe" single-booked methods like {@link HederaLedger#adjustBalance(AccountID, long)} in order
- * to match transfer semantics the EVM expects.
+ * HederaLedger#doTransfer(AccountID, AccountID, long)} method); but it is necessary to provide "unsafe" single-booked
+ * methods like {@link HederaLedger#adjustBalance(AccountID, long)} in order to match transfer semantics the EVM
+ * expects.
  */
 public class HederaLedger {
     public static final String NO_ACTIVE_TXN_CHANGE_SET = "{*NO ACTIVE TXN*}";
@@ -111,13 +110,11 @@ public class HederaLedger {
     private final RecordsHistorian historian;
     private final TransactionalLedger<TokenID, TokenProperty, MerkleToken> tokensLedger;
     private final TransactionalLedger<AccountID, AccountProperty, HederaAccount> accountsLedger;
-
+    private final AutoCreationLogic autoCreationLogic;
     private MutableEntityAccess mutableEntityAccess;
     private TransactionalLedger<NftId, NftProperty, UniqueTokenAdapter> nftsLedger = null;
     private TransactionalLedger<Pair<AccountID, TokenID>, TokenRelProperty, HederaTokenRel> tokenRelsLedger = null;
 
-    private final AutoCreationLogic autoCreationLogic;
-
     public HederaLedger(
             final TokenStore tokenStore,
             final EntityIdSource ids,
@@ -149,15 +146,6 @@ public void setMutableEntityAccess(final MutableEntityAccess mutableEntityAccess
         this.mutableEntityAccess = mutableEntityAccess;
     }
 
-    public void setNftsLedger(final TransactionalLedger<NftId, NftProperty, UniqueTokenAdapter> nftsLedger) {
-        this.nftsLedger = nftsLedger;
-    }
-
-    public void setTokenRelsLedger(
-            final TransactionalLedger<Pair<AccountID, TokenID>, TokenRelProperty, HederaTokenRel> tokenRelsLedger) {
-        this.tokenRelsLedger = tokenRelsLedger;
-    }
-
     public TransactionalLedger<AccountID, AccountProperty, HederaAccount> getAccountsLedger() {
         return accountsLedger;
     }
@@ -166,10 +154,19 @@ public TransactionalLedger<NftId, NftProperty, UniqueTokenAdapter> getNftsLedger
         return nftsLedger;
     }
 
+    public void setNftsLedger(final TransactionalLedger<NftId, NftProperty, UniqueTokenAdapter> nftsLedger) {
+        this.nftsLedger = nftsLedger;
+    }
+
     public TransactionalLedger<Pair<AccountID, TokenID>, TokenRelProperty, HederaTokenRel> getTokenRelsLedger() {
         return tokenRelsLedger;
     }
 
+    public void setTokenRelsLedger(
+            final TransactionalLedger<Pair<AccountID, TokenID>, TokenRelProperty, HederaTokenRel> tokenRelsLedger) {
+        this.tokenRelsLedger = tokenRelsLedger;
+    }
+
     /* -- TRANSACTIONAL SEMANTICS -- */
     public void begin() {
         autoCreationLogic.reset();
@@ -230,6 +227,10 @@ public String currentChangeSet() {
         }
     }
 
+    public long getNonce(final AccountID id) {
+        return (long) accountsLedger.get(id, ETHEREUM_NONCE);
+    }
+
     /* -- CURRENCY MANIPULATION -- */
     public long getBalance(final AccountID id) {
         return (long) accountsLedger.get(id, BALANCE);
@@ -349,10 +350,10 @@ public void customize(final AccountID id, final HederaAccountCustomizer customiz
     }
 
     /**
-     * Updates the provided {@link AccountID} with the {@link HederaAccountCustomizer}. All
-     * properties from the customizer are applied to the {@link MerkleAccount} provisionally
+     * Updates the provided {@link AccountID} with the {@link HederaAccountCustomizer}. All properties from the
+     * customizer are applied to the {@link MerkleAccount} provisionally
      *
-     * @param id target account
+     * @param id         target account
      * @param customizer properties to update
      */
     public void customizePotentiallyDeleted(final AccountID id, final HederaAccountCustomizer customizer) {