From 5834afd44e2a5334b3e4e87012f7276c1d193d3e Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Thu, 16 Jan 2025 12:12:25 +1000 Subject: [PATCH 1/9] [CHANGELOG] list deprecated bonsai CLI options (#8126) * upcoming breaking changes for various deprecated bonsai CLI options Signed-off-by: Sally MacFarlane * order Signed-off-by: Sally MacFarlane --------- Signed-off-by: Sally MacFarlane --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c46fee3a5..ff0185dac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ ### Upcoming Breaking Changes - `MetricSystem::createLabelledGauge` is deprecated and will be removed in a future release, replace it with `MetricSystem::createLabelledSuppliedGauge` - k8s (KUBERNETES) Nat method is now deprecated and will be removed in a future release. Use docker or none instead. +- `--Xsnapsync-synchronizer-flat-db-healing-enabled` is deprecated, use `--Xbonsai-full-flat-db-enabled` instead. +- `--Xbonsai-limit-trie-logs-enabled` is deprecated, use `--bonsai-limit-trie-logs-enabled` instead. +- `--Xbonsai-trie-log-pruning-enabled` is deprecated, use `--bonsai-limit-trie-logs-enabled` instead. +- `--Xbonsai-trie-logs-pruning-window-size` is deprecated, use `--bonsai-trie-logs-pruning-window-size` instead. - Sunsetting features - for more context on the reasoning behind the deprecation of these features, including alternative options, read [this blog post](https://www.lfdecentralizedtrust.org/blog/sunsetting-tessera-and-simplifying-hyperledger-besu) - Tessera privacy - Smart-contract-based (onchain) permissioning From 479bec031077f647d33b22344761dde91057d312 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 15 Jan 2025 22:47:50 -0700 Subject: [PATCH 2/9] Update EXTCALL creation detection (#8038) Update the EXTCALL account creation detection to match legacy call detection. Signed-off-by: Danno Ferrin --- .../besu/evm/operation/AbstractExtCallOperation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java index 5f6c70eb6..2c80007c7 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java @@ -136,7 +136,7 @@ public abstract class AbstractExtCallOperation extends AbstractCallOperation { } } - boolean accountCreation = contract == null && !zeroValue; + boolean accountCreation = (contract == null || contract.isEmpty()) && !zeroValue; long cost = clampedAdd( clampedAdd( From b5fdcc096ffbb970641125f0453fd594ca22bc4d Mon Sep 17 00:00:00 2001 From: daniellehrner Date: Thu, 16 Jan 2025 07:20:20 +0100 Subject: [PATCH 3/9] Pectra devnet 5: 7702 changes (#8118) * first draft for 7702 changes for pectra-devnet5 Signed-off-by: Daniel Lehrner * spotless, javadoc Signed-off-by: Daniel Lehrner * fixed get code in call operations Signed-off-by: Daniel Lehrner * allow code delegation chain id to be up to 2^256-1 Signed-off-by: Daniel Lehrner * set code for delegated accounts correctly in the initialFrame of the tx processing Signed-off-by: Daniel Lehrner * delegated accounts return empty bytes for the code if the target does not exist Signed-off-by: Daniel Lehrner --------- Signed-off-by: Daniel Lehrner Co-authored-by: Simon Dudley --- .../mainnet/MainnetTransactionProcessor.java | 11 +++- .../mainnet/MainnetTransactionValidator.java | 11 ++-- ...java => AbstractDelegatedCodeAccount.java} | 50 +++++++--------- .../hyperledger/besu/evm/account/Account.java | 11 ---- .../besu/evm/account/AccountState.java | 19 ++++++ .../evm/account/DelegatedCodeAccount.java | 16 +---- .../account/MutableDelegatedCodeAccount.java | 16 +---- .../evm/operation/AbstractCallOperation.java | 48 +++++++++++---- .../operation/AbstractExtCallOperation.java | 30 ++++++---- .../evm/operation/ExtCodeCopyOperation.java | 24 ++++---- .../evm/operation/ExtCodeHashOperation.java | 23 ++++---- .../evm/operation/ExtCodeSizeOperation.java | 25 ++++---- .../evm/worldstate/DelegateCodeHelper.java | 59 +++++++++++++++++++ .../DelegatedCodeGasCostHelper.java | 32 ++-------- .../evm/worldstate/DelegatedCodeService.java | 19 ++---- 15 files changed, 215 insertions(+), 179 deletions(-) rename evm/src/main/java/org/hyperledger/besu/evm/account/{BaseDelegatedCodeAccount.java => AbstractDelegatedCodeAccount.java} (65%) create mode 100644 evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegateCodeHelper.java diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java index 708dd33a2..46c71b435 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java @@ -438,7 +438,16 @@ public class MainnetTransactionProcessor { .inputData(transaction.getPayload()) .code( maybeContract - .map(c -> messageCallProcessor.getCodeFromEVM(c.getCodeHash(), c.getCode())) + .map( + c -> { + if (c.hasDelegatedCode()) { + return messageCallProcessor.getCodeFromEVM( + c.getDelegatedCodeHash().get(), c.getDelegatedCode().get()); + } + + return messageCallProcessor.getCodeFromEVM( + c.getCodeHash(), c.getCode()); + }) .orElse(CodeV0.EMPTY_CODE)) .accessListWarmAddresses(warmAddressList) .build(); diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java index 2b9fea0f3..200fd167c 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.ethereum.mainnet; import static org.hyperledger.besu.evm.account.Account.MAX_NONCE; +import static org.hyperledger.besu.evm.worldstate.DelegateCodeHelper.hasDelegatedCode; import org.hyperledger.besu.crypto.SECPSignature; import org.hyperledger.besu.crypto.SignatureAlgorithmFactory; @@ -32,7 +33,6 @@ import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason; import org.hyperledger.besu.evm.account.Account; import org.hyperledger.besu.evm.gascalculator.GasCalculator; -import org.hyperledger.besu.evm.worldstate.DelegatedCodeService; import java.math.BigInteger; import java.util.List; @@ -52,8 +52,6 @@ import org.bouncycastle.crypto.digests.SHA256Digest; */ public class MainnetTransactionValidator implements TransactionValidator { - public static final BigInteger TWO_POW_8 = BigInteger.TWO.pow(8); - public static final BigInteger TWO_POW_64 = BigInteger.TWO.pow(64); public static final BigInteger TWO_POW_256 = BigInteger.TWO.pow(256); private final GasCalculator gasCalculator; @@ -166,9 +164,9 @@ public class MainnetTransactionValidator implements TransactionValidator { .map( codeDelegations -> { for (CodeDelegation codeDelegation : codeDelegations) { - if (codeDelegation.chainId().compareTo(TWO_POW_64) >= 0) { + if (codeDelegation.chainId().compareTo(TWO_POW_256) >= 0) { throw new IllegalArgumentException( - "Invalid 'chainId' value, should be < 2^64 but got " + "Invalid 'chainId' value, should be < 2^256 but got " + codeDelegation.chainId()); } @@ -329,8 +327,7 @@ public class MainnetTransactionValidator implements TransactionValidator { } private static boolean canSendTransaction(final Account sender, final Hash codeHash) { - return codeHash.equals(Hash.EMPTY) - || DelegatedCodeService.hasDelegatedCode(sender.getUnprocessedCode()); + return codeHash.equals(Hash.EMPTY) || hasDelegatedCode(sender.getCode()); } private ValidationResult validateTransactionSignature( diff --git a/evm/src/main/java/org/hyperledger/besu/evm/account/BaseDelegatedCodeAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/account/AbstractDelegatedCodeAccount.java similarity index 65% rename from evm/src/main/java/org/hyperledger/besu/evm/account/BaseDelegatedCodeAccount.java rename to evm/src/main/java/org/hyperledger/besu/evm/account/AbstractDelegatedCodeAccount.java index 4ee28145d..2318d4865 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/account/BaseDelegatedCodeAccount.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/account/AbstractDelegatedCodeAccount.java @@ -16,7 +16,6 @@ package org.hyperledger.besu.evm.account; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Hash; -import org.hyperledger.besu.datatypes.Wei; import org.hyperledger.besu.evm.gascalculator.GasCalculator; import org.hyperledger.besu.evm.worldstate.WorldUpdater; @@ -24,14 +23,14 @@ import java.util.Optional; import org.apache.tuweni.bytes.Bytes; -class BaseDelegatedCodeAccount { +abstract class AbstractDelegatedCodeAccount implements Account { private final WorldUpdater worldUpdater; private final GasCalculator gasCalculator; /** The address of the account that has delegated code to be loaded into it. */ protected final Address delegatedCodeAddress; - protected BaseDelegatedCodeAccount( + protected AbstractDelegatedCodeAccount( final WorldUpdater worldUpdater, final Address delegatedCodeAddress, final GasCalculator gasCalculator) { @@ -45,7 +44,8 @@ class BaseDelegatedCodeAccount { * * @return the delegated code. */ - protected Bytes getCode() { + @Override + public Optional getDelegatedCode() { return resolveDelegatedCode(); } @@ -54,27 +54,9 @@ class BaseDelegatedCodeAccount { * * @return the hash of the delegated code. */ - protected Hash getCodeHash() { - final Bytes code = getCode(); - return (code == null || code.isEmpty()) ? Hash.EMPTY : Hash.hash(code); - } - - /** - * Returns the balance of the delegated account. - * - * @return the balance of the delegated account. - */ - protected Wei getDelegatedBalance() { - return getDelegatedAccount().map(Account::getBalance).orElse(Wei.ZERO); - } - - /** - * Returns the nonce of the delegated account. - * - * @return the nonce of the delegated account. - */ - protected long getDelegatedNonce() { - return getDelegatedAccount().map(Account::getNonce).orElse(Account.DEFAULT_NONCE); + @Override + public Optional getDelegatedCodeHash() { + return getDelegatedCode().map(Hash::hash); } /** @@ -82,19 +64,27 @@ class BaseDelegatedCodeAccount { * * @return the address of the delegated code. */ - protected Optional
delegatedCodeAddress() { + @Override + public Optional
delegatedCodeAddress() { return Optional.of(delegatedCodeAddress); } + @Override + public boolean hasDelegatedCode() { + return true; + } + private Optional getDelegatedAccount() { return Optional.ofNullable(worldUpdater.getAccount(delegatedCodeAddress)); } - private Bytes resolveDelegatedCode() { - if (gasCalculator.isPrecompile(delegatedCodeAddress)) { - return Bytes.EMPTY; + private Optional resolveDelegatedCode() { + final Optional maybeDelegatedAccount = getDelegatedAccount(); + + if (gasCalculator.isPrecompile(delegatedCodeAddress) || maybeDelegatedAccount.isEmpty()) { + return Optional.of(Bytes.EMPTY); } - return getDelegatedAccount().map(Account::getUnprocessedCode).orElse(Bytes.EMPTY); + return Optional.of(maybeDelegatedAccount.get().getCode()); } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/account/Account.java b/evm/src/main/java/org/hyperledger/besu/evm/account/Account.java index 8a65adf61..f0196c827 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/account/Account.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/account/Account.java @@ -19,8 +19,6 @@ import org.hyperledger.besu.datatypes.Wei; import java.util.Optional; -import org.apache.tuweni.bytes.Bytes; - /** * A world state account. * @@ -71,13 +69,4 @@ public interface Account extends AccountState { default boolean hasDelegatedCode() { return false; } - - /** - * Returns the code as it is stored in the trie even if it's a delegated code account. - * - * @return the code as it is stored in the trie. - */ - default Bytes getUnprocessedCode() { - return getCode(); - } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/account/AccountState.java b/evm/src/main/java/org/hyperledger/besu/evm/account/AccountState.java index a1bd0da18..235f61fbe 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/account/AccountState.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/account/AccountState.java @@ -18,6 +18,7 @@ import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.datatypes.Wei; import java.util.NavigableMap; +import java.util.Optional; import org.apache.tuweni.bytes.Bytes; import org.apache.tuweni.bytes.Bytes32; @@ -74,6 +75,15 @@ public interface AccountState { */ Bytes getCode(); + /** + * The optional EVM bytecode if the account has set a 7702 code delegation. + * + * @return the delegated code (which may be empty). + */ + default Optional getDelegatedCode() { + return Optional.empty(); + } + /** * The hash of the EVM bytecode associated with this account. * @@ -81,6 +91,15 @@ public interface AccountState { */ Hash getCodeHash(); + /** + * The optional hash of the delegated EVM bytecode if the account has set a 7702 code delegation. + * + * @return the hash of the delegated code (which may be empty). + */ + default Optional getDelegatedCodeHash() { + return Optional.empty(); + } + /** * Whether the account has (non empty) EVM bytecode associated to it. * diff --git a/evm/src/main/java/org/hyperledger/besu/evm/account/DelegatedCodeAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/account/DelegatedCodeAccount.java index 0ac969aba..3252dab9c 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/account/DelegatedCodeAccount.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/account/DelegatedCodeAccount.java @@ -28,7 +28,7 @@ import org.apache.tuweni.bytes.Bytes32; import org.apache.tuweni.units.bigints.UInt256; /** Wraps an EOA account and includes delegated code to be run on behalf of it. */ -public class DelegatedCodeAccount extends BaseDelegatedCodeAccount implements Account { +public class DelegatedCodeAccount extends AbstractDelegatedCodeAccount implements Account { private final Account wrappedAccount; @@ -81,17 +81,12 @@ public class DelegatedCodeAccount extends BaseDelegatedCodeAccount implements Ac @Override public Bytes getCode() { - return super.getCode(); - } - - @Override - public Bytes getUnprocessedCode() { return wrappedAccount.getCode(); } @Override public Hash getCodeHash() { - return super.getCodeHash(); + return wrappedAccount.getCodeHash(); } @Override @@ -106,7 +101,7 @@ public class DelegatedCodeAccount extends BaseDelegatedCodeAccount implements Ac @Override public boolean isEmpty() { - return getDelegatedNonce() == 0 && getDelegatedBalance().isZero() && !hasCode(); + return wrappedAccount.isEmpty(); } @Override @@ -119,9 +114,4 @@ public class DelegatedCodeAccount extends BaseDelegatedCodeAccount implements Ac final Bytes32 startKeyHash, final int limit) { return wrappedAccount.storageEntriesFrom(startKeyHash, limit); } - - @Override - public boolean hasDelegatedCode() { - return true; - } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/account/MutableDelegatedCodeAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/account/MutableDelegatedCodeAccount.java index 20894b4f2..9b98d5964 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/account/MutableDelegatedCodeAccount.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/account/MutableDelegatedCodeAccount.java @@ -29,7 +29,7 @@ import org.apache.tuweni.bytes.Bytes32; import org.apache.tuweni.units.bigints.UInt256; /** Wraps an EOA account and includes delegated code to be run on behalf of it. */ -public class MutableDelegatedCodeAccount extends BaseDelegatedCodeAccount +public class MutableDelegatedCodeAccount extends AbstractDelegatedCodeAccount implements MutableAccount { private final MutableAccount wrappedAccount; @@ -83,17 +83,12 @@ public class MutableDelegatedCodeAccount extends BaseDelegatedCodeAccount @Override public Bytes getCode() { - return super.getCode(); - } - - @Override - public Bytes getUnprocessedCode() { return wrappedAccount.getCode(); } @Override public Hash getCodeHash() { - return super.getCodeHash(); + return wrappedAccount.getCodeHash(); } @Override @@ -108,7 +103,7 @@ public class MutableDelegatedCodeAccount extends BaseDelegatedCodeAccount @Override public boolean isEmpty() { - return getDelegatedNonce() == 0 && getDelegatedBalance().isZero() && !hasCode(); + return wrappedAccount.isEmpty(); } @Override @@ -156,9 +151,4 @@ public class MutableDelegatedCodeAccount extends BaseDelegatedCodeAccount public void becomeImmutable() { wrappedAccount.becomeImmutable(); } - - @Override - public boolean hasDelegatedCode() { - return true; - } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java index 932bb4c39..d2cde85a6 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java @@ -15,7 +15,6 @@ package org.hyperledger.besu.evm.operation; import static org.hyperledger.besu.evm.internal.Words.clampedToLong; -import static org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper.deductDelegatedCodeGasCost; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Wei; @@ -192,13 +191,24 @@ public abstract class AbstractCallOperation extends AbstractOperation { final Account contract = frame.getWorldUpdater().get(to); - if (contract != null) { - final DelegatedCodeGasCostHelper.Result result = - deductDelegatedCodeGasCost(frame, gasCalculator(), contract); - if (result.status() != DelegatedCodeGasCostHelper.Status.SUCCESS) { - return new Operation.OperationResult( - result.gasCost(), ExceptionalHaltReason.INSUFFICIENT_GAS); + if (contract != null && contract.hasDelegatedCode()) { + if (contract.getDelegatedCode().isEmpty()) { + throw new RuntimeException("A delegated code account must have delegated code"); } + + if (contract.getDelegatedCodeHash().isEmpty()) { + throw new RuntimeException("A delegated code account must have a delegated code hash"); + } + + final long delegatedCodeResolutionGas = + DelegatedCodeGasCostHelper.delegatedCodeGasCost(frame, gasCalculator(), contract); + + if (frame.getRemainingGas() < delegatedCodeResolutionGas) { + return new Operation.OperationResult( + delegatedCodeResolutionGas, ExceptionalHaltReason.INSUFFICIENT_GAS); + } + + frame.decrementRemainingGas(delegatedCodeResolutionGas); } final Account account = frame.getWorldUpdater().get(frame.getRecipientAddress()); @@ -218,10 +228,7 @@ public abstract class AbstractCallOperation extends AbstractOperation { final Bytes inputData = frame.readMutableMemory(inputDataOffset(frame), inputDataLength(frame)); - final Code code = - contract == null - ? CodeV0.EMPTY_CODE - : evm.getCode(contract.getCodeHash(), contract.getCode()); + final Code code = getCode(evm, contract); // invalid code results in a quick exit if (!code.isValid()) { @@ -337,4 +344,23 @@ public abstract class AbstractCallOperation extends AbstractOperation { return LEGACY_FAILURE_STACK_ITEM; } } + + /** + * Gets the code from the contract or EOA with delegated code. + * + * @param evm the evm + * @param account the account which needs to be retrieved + * @return the code + */ + protected static Code getCode(final EVM evm, final Account account) { + if (account == null) { + return CodeV0.EMPTY_CODE; + } + + if (account.hasDelegatedCode()) { + return evm.getCode(account.getDelegatedCodeHash().get(), account.getDelegatedCode().get()); + } + + return evm.getCode(account.getCodeHash(), account.getCode()); + } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java index 2c80007c7..1040cb1a8 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractExtCallOperation.java @@ -15,14 +15,12 @@ package org.hyperledger.besu.evm.operation; import static org.hyperledger.besu.evm.internal.Words.clampedAdd; -import static org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper.deductDelegatedCodeGasCost; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Wei; import org.hyperledger.besu.evm.Code; import org.hyperledger.besu.evm.EVM; import org.hyperledger.besu.evm.account.Account; -import org.hyperledger.besu.evm.code.CodeV0; import org.hyperledger.besu.evm.frame.ExceptionalHaltReason; import org.hyperledger.besu.evm.frame.MessageFrame; import org.hyperledger.besu.evm.gascalculator.GasCalculator; @@ -127,13 +125,24 @@ public abstract class AbstractExtCallOperation extends AbstractCallOperation { Address to = Words.toAddress(toBytes); final Account contract = frame.getWorldUpdater().get(to); - if (contract != null) { - final DelegatedCodeGasCostHelper.Result result = - deductDelegatedCodeGasCost(frame, gasCalculator, contract); - if (result.status() != DelegatedCodeGasCostHelper.Status.SUCCESS) { - return new Operation.OperationResult( - result.gasCost(), ExceptionalHaltReason.INSUFFICIENT_GAS); + if (contract != null && contract.hasDelegatedCode()) { + if (contract.getDelegatedCode().isEmpty()) { + throw new RuntimeException("A delegated code account must have delegated code"); } + + if (contract.getDelegatedCodeHash().isEmpty()) { + throw new RuntimeException("A delegated code account must have a delegated code hash"); + } + + final long delegatedCodeResolutionGas = + DelegatedCodeGasCostHelper.delegatedCodeGasCost(frame, gasCalculator(), contract); + + if (frame.getRemainingGas() < delegatedCodeResolutionGas) { + return new Operation.OperationResult( + delegatedCodeResolutionGas, ExceptionalHaltReason.INSUFFICIENT_GAS); + } + + frame.decrementRemainingGas(delegatedCodeResolutionGas); } boolean accountCreation = (contract == null || contract.isEmpty()) && !zeroValue; @@ -154,10 +163,7 @@ public abstract class AbstractExtCallOperation extends AbstractCallOperation { currentGas -= cost; frame.expandMemory(inputOffset, inputLength); - final Code code = - contract == null - ? CodeV0.EMPTY_CODE - : evm.getCode(contract.getCodeHash(), contract.getCode()); + final Code code = getCode(evm, contract); // invalid code results in a quick exit if (!code.isValid()) { diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java index ed1e46977..848cfaaea 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java @@ -16,7 +16,6 @@ package org.hyperledger.besu.evm.operation; import static org.hyperledger.besu.evm.internal.Words.clampedAdd; import static org.hyperledger.besu.evm.internal.Words.clampedToLong; -import static org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper.deductDelegatedCodeGasCost; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.evm.EVM; @@ -26,7 +25,7 @@ import org.hyperledger.besu.evm.frame.ExceptionalHaltReason; import org.hyperledger.besu.evm.frame.MessageFrame; import org.hyperledger.besu.evm.gascalculator.GasCalculator; import org.hyperledger.besu.evm.internal.Words; -import org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper; +import org.hyperledger.besu.evm.worldstate.DelegateCodeHelper; import org.apache.tuweni.bytes.Bytes; @@ -96,16 +95,7 @@ public class ExtCodeCopyOperation extends AbstractOperation { final Account account = frame.getWorldUpdater().get(address); - if (account != null) { - final DelegatedCodeGasCostHelper.Result result = - deductDelegatedCodeGasCost(frame, gasCalculator(), account); - if (result.status() != DelegatedCodeGasCostHelper.Status.SUCCESS) { - return new Operation.OperationResult( - result.gasCost(), ExceptionalHaltReason.INSUFFICIENT_GAS); - } - } - - final Bytes code = account != null ? account.getCode() : Bytes.EMPTY; + final Bytes code = getCode(account); if (enableEIP3540 && code.size() >= 2 @@ -118,4 +108,14 @@ public class ExtCodeCopyOperation extends AbstractOperation { return new OperationResult(cost, null); } + + private static Bytes getCode(final Account account) { + if (account == null) { + return Bytes.EMPTY; + } + + return account.hasDelegatedCode() + ? DelegateCodeHelper.getDelegatedCodeForRead() + : account.getCode(); + } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java index 9a8cfe838..9157c55aa 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java @@ -14,8 +14,6 @@ */ package org.hyperledger.besu.evm.operation; -import static org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper.deductDelegatedCodeGasCost; - import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.evm.EVM; @@ -27,7 +25,7 @@ import org.hyperledger.besu.evm.gascalculator.GasCalculator; import org.hyperledger.besu.evm.internal.OverflowException; import org.hyperledger.besu.evm.internal.UnderflowException; import org.hyperledger.besu.evm.internal.Words; -import org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper; +import org.hyperledger.besu.evm.worldstate.DelegateCodeHelper; import org.apache.tuweni.bytes.Bytes; @@ -85,19 +83,10 @@ public class ExtCodeHashOperation extends AbstractOperation { final Account account = frame.getWorldUpdater().get(address); - if (account != null) { - final DelegatedCodeGasCostHelper.Result result = - deductDelegatedCodeGasCost(frame, gasCalculator(), account); - if (result.status() != DelegatedCodeGasCostHelper.Status.SUCCESS) { - return new Operation.OperationResult( - result.gasCost(), ExceptionalHaltReason.INSUFFICIENT_GAS); - } - } - if (account == null || account.isEmpty()) { frame.pushStackItem(Bytes.EMPTY); } else { - final Bytes code = account.getCode(); + final Bytes code = getCode(account); if (enableEIP3540 && code.size() >= 2 && code.get(0) == EOFLayout.EOF_PREFIX_BYTE @@ -115,4 +104,12 @@ public class ExtCodeHashOperation extends AbstractOperation { return new OperationResult(cost(true), ExceptionalHaltReason.TOO_MANY_STACK_ITEMS); } } + + private static Bytes getCode(final Account account) { + if (!account.hasDelegatedCode()) { + return account.getCode(); + } + + return DelegateCodeHelper.getDelegatedCodeForRead(); + } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java index c2795f364..8b8ff1725 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java @@ -14,8 +14,6 @@ */ package org.hyperledger.besu.evm.operation; -import static org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper.deductDelegatedCodeGasCost; - import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.evm.EVM; import org.hyperledger.besu.evm.account.Account; @@ -26,7 +24,7 @@ import org.hyperledger.besu.evm.gascalculator.GasCalculator; import org.hyperledger.besu.evm.internal.OverflowException; import org.hyperledger.besu.evm.internal.UnderflowException; import org.hyperledger.besu.evm.internal.Words; -import org.hyperledger.besu.evm.worldstate.DelegatedCodeGasCostHelper; +import org.hyperledger.besu.evm.worldstate.DelegateCodeHelper; import org.apache.tuweni.bytes.Bytes; @@ -82,20 +80,11 @@ public class ExtCodeSizeOperation extends AbstractOperation { } else { final Account account = frame.getWorldUpdater().get(address); - if (account != null) { - final DelegatedCodeGasCostHelper.Result result = - deductDelegatedCodeGasCost(frame, gasCalculator(), account); - if (result.status() != DelegatedCodeGasCostHelper.Status.SUCCESS) { - return new Operation.OperationResult( - result.gasCost(), ExceptionalHaltReason.INSUFFICIENT_GAS); - } - } - Bytes codeSize; if (account == null) { codeSize = Bytes.EMPTY; } else { - final Bytes code = account.getCode(); + final Bytes code = getCode(account); if (enableEIP3540 && code.size() >= 2 && code.get(0) == EOFLayout.EOF_PREFIX_BYTE @@ -114,4 +103,14 @@ public class ExtCodeSizeOperation extends AbstractOperation { return new OperationResult(cost(true), ExceptionalHaltReason.TOO_MANY_STACK_ITEMS); } } + + private static Bytes getCode(final Account account) { + if (account == null) { + return Bytes.EMPTY; + } + + return account.hasDelegatedCode() + ? DelegateCodeHelper.getDelegatedCodeForRead() + : account.getCode(); + } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegateCodeHelper.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegateCodeHelper.java new file mode 100644 index 000000000..5331bdd27 --- /dev/null +++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegateCodeHelper.java @@ -0,0 +1,59 @@ +/* + * Copyright contributors to Hyperledger 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.evm.worldstate; + +import org.hyperledger.besu.datatypes.Address; + +import org.apache.tuweni.bytes.Bytes; + +/** Helper class for 7702 delegated code interactions */ +public class DelegateCodeHelper { + /** + * The designator that is returned when a ExtCode* operation calls a contract with delegated code + */ + public static final Bytes DELEGATED_CODE_DESIGNATOR = Bytes.fromHexString("ef01"); + + /** The prefix that is used to identify delegated code */ + public static final Bytes DELEGATED_CODE_PREFIX = Bytes.fromHexString("ef0100"); + + /** The size of the delegated code */ + public static final int DELEGATED_CODE_SIZE = DELEGATED_CODE_PREFIX.size() + Address.SIZE; + + /** create a new DelegateCodeHelper */ + public DelegateCodeHelper() { + // empty + } + + /** + * Returns if the provided code is delegated code. + * + * @param code the code to check. + * @return {@code true} if the code is delegated code, {@code false} otherwise. + */ + public static boolean hasDelegatedCode(final Bytes code) { + return code != null + && code.size() == DELEGATED_CODE_SIZE + && code.slice(0, DELEGATED_CODE_PREFIX.size()).equals(DELEGATED_CODE_PREFIX); + } + + /** + * Returns the delegated code designator + * + * @return the hardcoded designator for delegated code: ef01 + */ + public static Bytes getDelegatedCodeForRead() { + return DELEGATED_CODE_DESIGNATOR; + } +} diff --git a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeGasCostHelper.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeGasCostHelper.java index 3cdd2dc20..480dc8fcb 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeGasCostHelper.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeGasCostHelper.java @@ -33,22 +33,6 @@ public class DelegatedCodeGasCostHelper { // empty constructor } - /** The status of the operation. */ - public enum Status { - /** The operation failed due to insufficient gas. */ - INSUFFICIENT_GAS, - /** The operation was successful. */ - SUCCESS - } - - /** - * The result of the operation. - * - * @param gasCost the gas cost - * @param status of the operation - */ - public record Result(long gasCost, Status status) {} - /** * Deducts the gas cost for delegated code resolution. * @@ -57,26 +41,18 @@ public class DelegatedCodeGasCostHelper { * @param account the account * @return the gas cost and result of the operation */ - public static Result deductDelegatedCodeGasCost( + public static long delegatedCodeGasCost( final MessageFrame frame, final GasCalculator gasCalculator, final Account account) { if (!account.hasDelegatedCode()) { - return new Result(0, Status.SUCCESS); + return 0; } if (account.delegatedCodeAddress().isEmpty()) { throw new RuntimeException("A delegated code account must have a delegated code address"); } - final long delegatedCodeResolutionGas = - calculateDelegatedCodeResolutionGas( - frame, gasCalculator, account.delegatedCodeAddress().get()); - - if (frame.getRemainingGas() < delegatedCodeResolutionGas) { - return new Result(delegatedCodeResolutionGas, Status.INSUFFICIENT_GAS); - } - - frame.decrementRemainingGas(delegatedCodeResolutionGas); - return new Result(delegatedCodeResolutionGas, Status.SUCCESS); + return calculateDelegatedCodeResolutionGas( + frame, gasCalculator, account.delegatedCodeAddress().get()); } private static long calculateDelegatedCodeResolutionGas( diff --git a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeService.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeService.java index 770d0b79d..d919b9dc6 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeService.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/DelegatedCodeService.java @@ -14,6 +14,9 @@ */ package org.hyperledger.besu.evm.worldstate; +import static org.hyperledger.besu.evm.worldstate.DelegateCodeHelper.DELEGATED_CODE_PREFIX; +import static org.hyperledger.besu.evm.worldstate.DelegateCodeHelper.hasDelegatedCode; + import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.evm.account.Account; import org.hyperledger.besu.evm.account.DelegatedCodeAccount; @@ -25,8 +28,6 @@ import org.apache.tuweni.bytes.Bytes; /** A service that manages the code injection of delegated code. */ public class DelegatedCodeService { - private static final Bytes DELEGATED_CODE_PREFIX = Bytes.fromHexString("ef0100"); - private static final int DELEGATED_CODE_SIZE = DELEGATED_CODE_PREFIX.size() + Address.SIZE; private final GasCalculator gasCalculator; @@ -64,7 +65,7 @@ public class DelegatedCodeService { * @return {@code true} if the account can set delegated code, {@code false} otherwise. */ public boolean canSetDelegatedCode(final Account account) { - return account.getCode().isEmpty() || hasDelegatedCode(account.getUnprocessedCode()); + return account.getCode().isEmpty() || hasDelegatedCode(account.getCode()); } /** @@ -102,18 +103,6 @@ public class DelegatedCodeService { worldUpdater, account, resolveDelegatedAddress(account.getCode()), gasCalculator); } - /** - * Returns if the provided code is delegated code. - * - * @param code the code to check. - * @return {@code true} if the code is delegated code, {@code false} otherwise. - */ - public static boolean hasDelegatedCode(final Bytes code) { - return code != null - && code.size() == DELEGATED_CODE_SIZE - && code.slice(0, DELEGATED_CODE_PREFIX.size()).equals(DELEGATED_CODE_PREFIX); - } - private Address resolveDelegatedAddress(final Bytes code) { return Address.wrap(code.slice(DELEGATED_CODE_PREFIX.size())); } From 1e7f6f6bf3e05be961422427110a3e9f7c2fde94 Mon Sep 17 00:00:00 2001 From: daniellehrner Date: Thu, 16 Jan 2025 11:09:04 +0100 Subject: [PATCH 4/9] EIP-7623 (#8093) Implements EIP-7623 (increase calldata cost) Signed-off-by: Daniel Lehrner Signed-off-by: Simon Dudley Co-authored-by: Simon Dudley --- CHANGELOG.md | 1 + .../eea/PluginEeaSendRawTransaction.java | 2 +- .../mainnet/MainnetTransactionProcessor.java | 19 +-- .../mainnet/MainnetTransactionValidator.java | 20 ++- .../ethereum/mainnet/IntrinsicGasTest.java | 51 ++++++- .../MainnetTransactionValidatorTest.java | 28 +++- .../besu/evmtool/EvmToolCommand.java | 16 ++- .../hyperledger/besu/evmtool/T8nExecutor.java | 2 +- .../besu/evmtool/t8n/prague-deposit.json | 6 +- .../besu/ethereum/core/TransactionTest.java | 11 +- .../gascalculator/FrontierGasCalculator.java | 112 ++++++++++++--- .../besu/evm/gascalculator/GasCalculator.java | 24 ++-- .../gascalculator/IstanbulGasCalculator.java | 25 +--- .../gascalculator/PragueGasCalculator.java | 50 +++++++ .../gascalculator/ShanghaiGasCalculator.java | 12 +- .../FrontierGasCalculatorTest.java | 26 +++- .../PragueGasCalculatorTest.java | 135 ++++++++++++++++++ 17 files changed, 433 insertions(+), 107 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff0185dac..ec39f72e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Improve debug_traceBlock calls performance and reduce output size [#8076](https://github.com/hyperledger/besu/pull/8076) - Add support for EIP-7702 transaction in the txpool [#8018](https://github.com/hyperledger/besu/pull/8018) [#7984](https://github.com/hyperledger/besu/pull/7984) - Add support for `movePrecompileToAddress` in `StateOverrides` (`eth_call`)[8115](https://github.com/hyperledger/besu/pull/8115) +- Add EIP-7623 - Increase calldata cost [#8093](https://github.com/hyperledger/besu/pull/8093) ### Bug fixes - Fix serialization of state overrides when `movePrecompileToAddress` is present [#8204](https://github.com/hyperledger/besu/pull/8024) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java index 146ef2c72..2d6af314f 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java @@ -84,6 +84,6 @@ public class PluginEeaSendRawTransaction extends AbstractEeaSendRawTransaction { // choose the highest of the two options return Math.max( privateTransaction.getGasLimit(), - gasCalculator.transactionIntrinsicGasCost(Bytes.fromBase64String(pmtPayload), false)); + gasCalculator.transactionIntrinsicGasCost(Bytes.fromBase64String(pmtPayload), false, 0)); } } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java index 46c71b435..a25267079 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java @@ -18,6 +18,7 @@ import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PER import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER; import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION; import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION_HASH; +import static org.hyperledger.besu.evm.internal.Words.clampedAdd; import org.hyperledger.besu.collections.trie.BytesTrieSet; import org.hyperledger.besu.datatypes.AccessListEntry; @@ -351,22 +352,22 @@ public class MainnetTransactionProcessor { warmAddressList.add(miningBeneficiary); } - final long intrinsicGas = - gasCalculator.transactionIntrinsicGasCost( - transaction.getPayload(), transaction.isContractCreation()); final long accessListGas = gasCalculator.accessListGasCost(accessListEntries.size(), accessListStorageCount); final long codeDelegationGas = gasCalculator.delegateCodeGasCost(transaction.codeDelegationListSize()); - final long gasAvailable = - transaction.getGasLimit() - intrinsicGas - accessListGas - codeDelegationGas; + final long intrinsicGas = + gasCalculator.transactionIntrinsicGasCost( + transaction.getPayload(), + transaction.isContractCreation(), + clampedAdd(accessListGas, codeDelegationGas)); + + final long gasAvailable = transaction.getGasLimit() - intrinsicGas; LOG.trace( - "Gas available for execution {} = {} - {} - {} - {} (limit - intrinsic - accessList - codeDelegation)", + "Gas available for execution {} = {} - {} (limit - intrinsic)", gasAvailable, transaction.getGasLimit(), - intrinsicGas, - accessListGas, - codeDelegationGas); + intrinsicGas); final WorldUpdater worldUpdater = evmWorldUpdater.updater(); final ImmutableMap.Builder contextVariablesBuilder = diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java index 200fd167c..0bef4d569 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.ethereum.mainnet; import static org.hyperledger.besu.evm.account.Account.MAX_NONCE; +import static org.hyperledger.besu.evm.internal.Words.clampedAdd; import static org.hyperledger.besu.evm.worldstate.DelegateCodeHelper.hasDelegatedCode; import org.hyperledger.besu.crypto.SECPSignature; @@ -250,17 +251,22 @@ public class MainnetTransactionValidator implements TransactionValidator { } } - final long intrinsicGasCost = - gasCalculator.transactionIntrinsicGasCost( - transaction.getPayload(), transaction.isContractCreation()) - + (transaction.getAccessList().map(gasCalculator::accessListGasCost).orElse(0L)) - + gasCalculator.delegateCodeGasCost(transaction.codeDelegationListSize()); - if (Long.compareUnsigned(intrinsicGasCost, transaction.getGasLimit()) > 0) { + final long baselineGas = + clampedAdd( + transaction.getAccessList().map(gasCalculator::accessListGasCost).orElse(0L), + gasCalculator.delegateCodeGasCost(transaction.codeDelegationListSize())); + final long intrinsicGasCostOrFloor = + Math.max( + gasCalculator.transactionIntrinsicGasCost( + transaction.getPayload(), transaction.isContractCreation(), baselineGas), + gasCalculator.transactionFloorCost(transaction.getPayload())); + + if (Long.compareUnsigned(intrinsicGasCostOrFloor, transaction.getGasLimit()) > 0) { return ValidationResult.invalid( TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT, String.format( "intrinsic gas cost %s exceeds gas limit %s", - intrinsicGasCost, transaction.getGasLimit())); + intrinsicGasCostOrFloor, transaction.getGasLimit())); } if (transaction.calculateUpfrontGasCost(transaction.getMaxGasPrice(), Wei.ZERO, 0).bitLength() diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java index bb9ce2b49..84af8547b 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java @@ -16,15 +16,21 @@ package org.hyperledger.besu.ethereum.mainnet; import static org.assertj.core.api.Assertions.assertThat; +import org.hyperledger.besu.datatypes.AccessListEntry; import org.hyperledger.besu.ethereum.core.Transaction; +import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput; import org.hyperledger.besu.ethereum.rlp.RLP; import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator; import org.hyperledger.besu.evm.gascalculator.GasCalculator; import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator; +import org.hyperledger.besu.evm.gascalculator.PragueGasCalculator; +import org.hyperledger.besu.evm.gascalculator.ShanghaiGasCalculator; +import java.util.List; import java.util.stream.Stream; import org.apache.tuweni.bytes.Bytes; +import org.apache.tuweni.bytes.Bytes32; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -36,6 +42,8 @@ public class IntrinsicGasTest { public static Stream data() { final GasCalculator frontier = new FrontierGasCalculator(); final GasCalculator istanbul = new IstanbulGasCalculator(); + final GasCalculator shanghai = new ShanghaiGasCalculator(); + final GasCalculator prague = new PragueGasCalculator(); return Stream.of( // EnoughGAS Arguments.of( @@ -81,16 +89,36 @@ public class IntrinsicGasTest { Arguments.of( istanbul, 21116L, - "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804")); + "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"), + // CallData Gas Increase + Arguments.of( + prague, + 21116L, + "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"), + // AccessList + Arguments.of( + shanghai, + 25300L, + "0x01f89a018001826a4094095e7baea6a6c7c4c2dfeb977efac326af552d878080f838f794a95e7baea6a6c7c4c2dfeb977efac326af552d87e1a0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80a05cbd172231fc0735e0fb994dd5b1a4939170a260b36f0427a8a80866b063b948a07c230f7f578dd61785c93361b9871c0706ebfa6d06e3f4491dc9558c5202ed36")); } @ParameterizedTest @MethodSource("data") public void validateGasCost( final GasCalculator gasCalculator, final long expectedGas, final String txRlp) { - Transaction t = Transaction.readFrom(RLP.input(Bytes.fromHexString(txRlp))); + Bytes rlp = Bytes.fromHexString(txRlp); + + // non-frontier transactions need to be opaque for parsing to work + if (rlp.get(0) > 0) { + final BytesValueRLPOutput output = new BytesValueRLPOutput(); + output.writeBytes(rlp); + rlp = output.encoded(); + } + + Transaction t = Transaction.readFrom(RLP.input(rlp)); Assertions.assertThat( - gasCalculator.transactionIntrinsicGasCost(t.getPayload(), t.isContractCreation())) + gasCalculator.transactionIntrinsicGasCost( + t.getPayload(), t.isContractCreation(), baselineGas(gasCalculator, t))) .isEqualTo(expectedGas); } @@ -100,4 +128,21 @@ public class IntrinsicGasTest { .withFailMessage("This test is here so gradle --dry-run executes this class") .isTrue(); } + + long baselineGas(final GasCalculator gasCalculator, final Transaction transaction) { + final List accessListEntries = transaction.getAccessList().orElse(List.of()); + + int accessListStorageCount = 0; + for (final var entry : accessListEntries) { + final List storageKeys = entry.storageKeys(); + accessListStorageCount += storageKeys.size(); + } + final long accessListGas = + gasCalculator.accessListGasCost(accessListEntries.size(), accessListStorageCount); + + final long codeDelegationGas = + gasCalculator.delegateCodeGasCost(transaction.codeDelegationListSize()); + + return accessListGas + codeDelegationGas; + } } diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java index c673bf08f..86dcc2ff6 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java @@ -128,7 +128,27 @@ public class MainnetTransactionValidatorTest { .gasLimit(10) .chainId(Optional.empty()) .createTransaction(senderKeys); - when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(50L); + when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean(), anyLong())).thenReturn(50L); + + assertThat( + validator.validate( + transaction, Optional.empty(), Optional.empty(), transactionValidationParams)) + .isEqualTo( + ValidationResult.invalid(TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT)); + } + + @Test + public void shouldRejectTransactionIfFloorExceedsGasLimit_EIP_7623() { + final TransactionValidator validator = + createTransactionValidator( + gasCalculator, GasLimitCalculator.constant(), false, Optional.empty()); + final Transaction transaction = + new TransactionTestFixture() + .gasLimit(10) + .chainId(Optional.empty()) + .createTransaction(senderKeys); + when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean(), anyLong())).thenReturn(5L); + when(gasCalculator.transactionFloorCost(any())).thenReturn(51L); assertThat( validator.validate( @@ -398,7 +418,7 @@ public class MainnetTransactionValidatorTest { transaction, Optional.empty(), Optional.empty(), transactionValidationParams)) .isEqualTo(ValidationResult.invalid(INVALID_TRANSACTION_FORMAT)); - when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(0L); + when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean(), anyLong())).thenReturn(0L); assertThat( eip1559Validator.validate( @@ -475,7 +495,7 @@ public class MainnetTransactionValidatorTest { .chainId(Optional.of(BigInteger.ONE)) .createTransaction(senderKeys); final Optional basefee = Optional.of(Wei.of(150000L)); - when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(50L); + when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean(), anyLong())).thenReturn(50L); assertThat( validator.validate(transaction, basefee, Optional.empty(), transactionValidationParams)) @@ -500,7 +520,7 @@ public class MainnetTransactionValidatorTest { .type(TransactionType.EIP1559) .chainId(Optional.of(BigInteger.ONE)) .createTransaction(senderKeys); - when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(50L); + when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean(), anyLong())).thenReturn(50L); assertThat( validator.validate( diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java index 0ff6a21da..7dde74946 100644 --- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java +++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java @@ -402,16 +402,20 @@ public class EvmToolCommand implements Runnable { long txGas = gas; if (chargeIntrinsicGas) { - final long intrinsicGasCost = - protocolSpec - .getGasCalculator() - .transactionIntrinsicGasCost(tx.getPayload(), tx.isContractCreation()); - txGas -= intrinsicGasCost; final long accessListCost = tx.getAccessList() .map(list -> protocolSpec.getGasCalculator().accessListGasCost(list)) .orElse(0L); - txGas -= accessListCost; + + final long delegateCodeCost = + protocolSpec.getGasCalculator().delegateCodeGasCost(tx.codeDelegationListSize()); + + final long intrinsicGasCost = + protocolSpec + .getGasCalculator() + .transactionIntrinsicGasCost( + tx.getPayload(), tx.isContractCreation(), accessListCost + delegateCodeCost); + txGas -= intrinsicGasCost; } final EVM evm = protocolSpec.getEvm(); diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java index 15c400bc0..7053961a1 100644 --- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java +++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java @@ -437,7 +437,7 @@ public class T8nExecutor { gasUsed += transactionGasUsed; long intrinsicGas = gasCalculator.transactionIntrinsicGasCost( - transaction.getPayload(), transaction.getTo().isEmpty()); + transaction.getPayload(), transaction.getTo().isEmpty(), 0); TransactionReceipt receipt = protocolSpec .getTransactionReceiptFactory() diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-deposit.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-deposit.json index 6c704e0e2..58f845f5c 100644 --- a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-deposit.json +++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/prague-deposit.json @@ -70,7 +70,7 @@ }, "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": { "nonce": "0x00", - "balance": "0xad78ebc5ac62000000", + "balance": "0xaa00be18c288efd690", "code": "0x", "storage": {} } @@ -194,7 +194,7 @@ "nonce": "0x1" }, "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": { - "balance": "0xaa00be18c288efd690", + "balance": "0xa688906bd8afdfad20", "nonce": "0x2" } }, @@ -204,7 +204,7 @@ "requests": [ "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000" ], - "stateRoot": "0x6471f6d90b87f759176a0ad62a7096f69d0d24fd873bdb6b6ced57d04a71e274", + "stateRoot": "0xc769f83dbad9b87a209216d18c4b19cb12b61838594a2e8270898438f4e147af", "txRoot": "0x2b790bf82ef7259a0e4513d1b89a77d81e99672ba68758ef2ba3fde32851d023", "receiptsRoot": "0x9c8d7a917ecb3ff2566f264abbf39131e51b08b07eb2b69cb46989d79d985593", "logsHash": "0x43e31613bfefc1f55d8b3ca2b61f933f3838d523dc11cb5d7ffdd2ecf0ab5d49", diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java index 9aa04bd0f..a3758422c 100644 --- a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java +++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java @@ -192,10 +192,13 @@ public class TransactionTest { assertThat(transaction.getSender()).isEqualTo(expected.getSender()); assertThat(transaction.getHash()).isEqualTo(expected.getHash()); - final long intrinsicGasCost = - gasCalculator.transactionIntrinsicGasCost( - transaction.getPayload(), transaction.isContractCreation()) - + (transaction.getAccessList().map(gasCalculator::accessListGasCost).orElse(0L)); + final long baselineGas = + transaction.getAccessList().map(gasCalculator::accessListGasCost).orElse(0L) + + gasCalculator.delegateCodeGasCost(transaction.codeDelegationListSize()); + final long intrinsicGasCost = gasCalculator.transactionIntrinsicGasCost( + transaction.getPayload(), + transaction.isContractCreation(), + baselineGas); assertThat(intrinsicGasCost).isEqualTo(expected.getIntrinsicGas()); } catch (final Exception e) { if (expected.isSucceeds()) { diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculator.java index 8db00c3dd..efa33ceea 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculator.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculator.java @@ -39,7 +39,8 @@ public class FrontierGasCalculator implements GasCalculator { private static final long TX_DATA_NON_ZERO_COST = 68L; - private static final long TX_BASE_COST = 21_000L; + /** Minimum base cost that every transaction needs to pay */ + protected static final long TX_BASE_COST = 21_000L; private static final long TX_CREATE_EXTRA_COST = 0L; @@ -129,18 +130,82 @@ public class FrontierGasCalculator implements GasCalculator { } @Override - public long transactionIntrinsicGasCost(final Bytes payload, final boolean isContractCreate) { + public long transactionIntrinsicGasCost( + final Bytes payload, final boolean isContractCreation, final long baselineGas) { + final long dynamicIntrinsicGasCost = + dynamicIntrinsicGasCost(payload, isContractCreation, baselineGas); + + if (dynamicIntrinsicGasCost == Long.MIN_VALUE || dynamicIntrinsicGasCost == Long.MAX_VALUE) { + return dynamicIntrinsicGasCost; + } + return clampedAdd(getMinimumTransactionCost(), dynamicIntrinsicGasCost); + } + + /** + * Calculates the dynamic part of the intrinsic gas cost + * + * @param payload the call data payload + * @param isContractCreation whether the transaction is a contract creation + * @param baselineGas how much gas is used by access lists and code delegations + * @return the dynamic part of the intrinsic gas cost + */ + protected long dynamicIntrinsicGasCost( + final Bytes payload, final boolean isContractCreation, final long baselineGas) { + final int payloadSize = payload.size(); + final long zeroBytes = zeroBytes(payload); + long cost = clampedAdd(callDataCost(payloadSize, zeroBytes), baselineGas); + + if (cost == Long.MIN_VALUE || cost == Long.MAX_VALUE) { + return cost; + } + + if (isContractCreation) { + cost = clampedAdd(cost, contractCreationCost(payloadSize)); + + if (cost == Long.MIN_VALUE || cost == Long.MAX_VALUE) { + return cost; + } + } + + return cost; + } + + /** + * Calculates the cost of the call data + * + * @param payloadSize the total size of the payload + * @param zeroBytes the number of zero bytes in the payload + * @return the cost of the call data + */ + protected long callDataCost(final long payloadSize, final long zeroBytes) { + return clampedAdd( + TX_DATA_NON_ZERO_COST * (payloadSize - zeroBytes), TX_DATA_ZERO_COST * zeroBytes); + } + + /** + * Counts the zero bytes in the payload + * + * @param payload the payload + * @return the number of zero bytes in the payload + */ + protected static long zeroBytes(final Bytes payload) { int zeros = 0; for (int i = 0; i < payload.size(); i++) { if (payload.get(i) == 0) { - ++zeros; + zeros += 1; } } - final int nonZeros = payload.size() - zeros; + return zeros; + } - final long cost = TX_BASE_COST + TX_DATA_ZERO_COST * zeros + TX_DATA_NON_ZERO_COST * nonZeros; - - return isContractCreate ? (cost + txCreateExtraGasCost()) : cost; + /** + * Returns the gas cost for contract creation transactions + * + * @param ignored the size of the contract creation code (ignored in Frontier) + * @return the gas cost for contract creation transactions + */ + protected long contractCreationCost(final int ignored) { + return txCreateExtraGasCost(); } /** @@ -152,6 +217,11 @@ public class FrontierGasCalculator implements GasCalculator { return TX_CREATE_EXTRA_COST; } + @Override + public long transactionFloorCost(final Bytes payload) { + return 0L; + } + @Override public long codeDepositGasCost(final int codeSize) { return CODE_DEPOSIT_BYTE_COST * codeSize; @@ -558,11 +628,6 @@ public class FrontierGasCalculator implements GasCalculator { return clampedAdd(clampedMultiply(MEMORY_WORD_GAS_COST, length), base); } - @Override - public long getMaximumTransactionCost(final int size) { - return TX_BASE_COST + TX_DATA_NON_ZERO_COST * size; - } - @Override public long getMinimumTransactionCost() { return TX_BASE_COST; @@ -572,20 +637,21 @@ public class FrontierGasCalculator implements GasCalculator { public long calculateGasRefund( final Transaction transaction, final MessageFrame initialFrame, - final long codeDelegationRefund) { - final long selfDestructRefund = - getSelfDestructRefundAmount() * initialFrame.getSelfDestructs().size(); - final long baseRefundGas = - initialFrame.getGasRefund() + selfDestructRefund + codeDelegationRefund; - return refunded(transaction, initialFrame.getRemainingGas(), baseRefundGas); + final long ignoredCodeDelegationRefund) { + + final long refundAllowance = calculateRefundAllowance(transaction, initialFrame); + + return initialFrame.getRemainingGas() + refundAllowance; } - private long refunded( - final Transaction transaction, final long gasRemaining, final long gasRefund) { + private long calculateRefundAllowance( + final Transaction transaction, final MessageFrame initialFrame) { + final long selfDestructRefund = + getSelfDestructRefundAmount() * initialFrame.getSelfDestructs().size(); + final long executionRefund = initialFrame.getGasRefund() + selfDestructRefund; // Integer truncation takes care of the floor calculation needed after the divide. final long maxRefundAllowance = - (transaction.getGasLimit() - gasRemaining) / getMaxRefundQuotient(); - final long refundAllowance = Math.min(maxRefundAllowance, gasRefund); - return gasRemaining + refundAllowance; + (transaction.getGasLimit() - initialFrame.getRemainingGas()) / getMaxRefundQuotient(); + return Math.min(executionRefund, maxRefundAllowance); } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java index ec8537cf9..9462a6f31 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java @@ -543,10 +543,21 @@ public interface GasCalculator { * encoded binary representation when stored on-chain. * * @param transactionPayload The encoded transaction, as bytes - * @param isContractCreate Is this transaction a contract creation transaction? + * @param isContractCreation Is this transaction a contract creation transaction? + * @param baselineGas The gas used by access lists and code delegation authorizations * @return the transaction's intrinsic gas cost */ - long transactionIntrinsicGasCost(Bytes transactionPayload, boolean isContractCreate); + long transactionIntrinsicGasCost( + Bytes transactionPayload, boolean isContractCreation, long baselineGas); + + /** + * Returns the floor gas cost of a transaction payload, i.e. the minimum gas cost that a + * transaction will be charged based on its calldata. Introduced in EIP-7623 in Prague. + * + * @param transactionPayload The encoded transaction, as bytes + * @return the transaction's floor gas cost + */ + long transactionFloorCost(final Bytes transactionPayload); /** * Returns the gas cost of the explicitly declared access list. @@ -580,15 +591,6 @@ public interface GasCalculator { return 2; } - /** - * Maximum Cost of a Transaction of a certain length. - * - * @param size the length of the transaction, in bytes - * @return the maximum gas cost - */ - // what would be the gas for a PMT with hash of all non-zeros - long getMaximumTransactionCost(int size); - /** * Minimum gas cost of a transaction. * diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/IstanbulGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/IstanbulGasCalculator.java index a997f7fe1..5df0c168b 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/IstanbulGasCalculator.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/IstanbulGasCalculator.java @@ -14,9 +14,10 @@ */ package org.hyperledger.besu.evm.gascalculator; +import static org.hyperledger.besu.evm.internal.Words.clampedAdd; + import java.util.function.Supplier; -import org.apache.tuweni.bytes.Bytes; import org.apache.tuweni.units.bigints.UInt256; /** The Istanbul gas calculator. */ @@ -24,7 +25,6 @@ public class IstanbulGasCalculator extends PetersburgGasCalculator { private static final long TX_DATA_ZERO_COST = 4L; private static final long ISTANBUL_TX_DATA_NON_ZERO_COST = 16L; - private static final long TX_BASE_COST = 21_000L; private static final long SLOAD_GAS = 800L; private static final long BALANCE_OPERATION_GAS_COST = 700L; @@ -42,19 +42,9 @@ public class IstanbulGasCalculator extends PetersburgGasCalculator { public IstanbulGasCalculator() {} @Override - public long transactionIntrinsicGasCost(final Bytes payload, final boolean isContractCreation) { - int zeros = 0; - for (int i = 0; i < payload.size(); i++) { - if (payload.get(i) == 0) { - ++zeros; - } - } - final int nonZeros = payload.size() - zeros; - - final long cost = - TX_BASE_COST + (TX_DATA_ZERO_COST * zeros) + (ISTANBUL_TX_DATA_NON_ZERO_COST * nonZeros); - - return isContractCreation ? (cost + txCreateExtraGasCost()) : cost; + protected long callDataCost(final long payloadSize, final long zeroBytes) { + return clampedAdd( + ISTANBUL_TX_DATA_NON_ZERO_COST * (payloadSize - zeroBytes), TX_DATA_ZERO_COST * zeroBytes); } @Override @@ -136,9 +126,4 @@ public class IstanbulGasCalculator extends PetersburgGasCalculator { public long extCodeHashOperationGasCost() { return EXTCODE_HASH_COST; } - - @Override - public long getMaximumTransactionCost(final int size) { - return TX_BASE_COST + (ISTANBUL_TX_DATA_NON_ZERO_COST * size); - } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculator.java index 268a58061..60f2b8493 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculator.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculator.java @@ -15,8 +15,13 @@ package org.hyperledger.besu.evm.gascalculator; import static org.hyperledger.besu.datatypes.Address.BLS12_MAP_FP2_TO_G2; +import static org.hyperledger.besu.evm.internal.Words.clampedAdd; import org.hyperledger.besu.datatypes.CodeDelegation; +import org.hyperledger.besu.datatypes.Transaction; +import org.hyperledger.besu.evm.frame.MessageFrame; + +import org.apache.tuweni.bytes.Bytes; /** * Gas Calculator for Prague @@ -26,6 +31,8 @@ import org.hyperledger.besu.datatypes.CodeDelegation; * */ public class PragueGasCalculator extends CancunGasCalculator { + private static final long TOTAL_COST_FLOOR_PER_TOKEN = 10L; + final long existingAccountGasRefund; /** @@ -68,4 +75,47 @@ public class PragueGasCalculator extends CancunGasCalculator { public long calculateDelegateCodeGasRefund(final long alreadyExistingAccounts) { return existingAccountGasRefund * alreadyExistingAccounts; } + + @Override + public long calculateGasRefund( + final Transaction transaction, + final MessageFrame initialFrame, + final long codeDelegationRefund) { + + final long refundAllowance = + calculateRefundAllowance(transaction, initialFrame, codeDelegationRefund); + + final long executionGasUsed = + transaction.getGasLimit() - initialFrame.getRemainingGas() - refundAllowance; + final long transactionFloorCost = transactionFloorCost(transaction.getPayload()); + final long totalGasUsed = Math.max(executionGasUsed, transactionFloorCost); + return transaction.getGasLimit() - totalGasUsed; + } + + private long calculateRefundAllowance( + final Transaction transaction, + final MessageFrame initialFrame, + final long codeDelegationRefund) { + final long selfDestructRefund = + getSelfDestructRefundAmount() * initialFrame.getSelfDestructs().size(); + final long executionRefund = + initialFrame.getGasRefund() + selfDestructRefund + codeDelegationRefund; + // Integer truncation takes care of the floor calculation needed after the divide. + final long maxRefundAllowance = + (transaction.getGasLimit() - initialFrame.getRemainingGas()) / getMaxRefundQuotient(); + return Math.min(executionRefund, maxRefundAllowance); + } + + @Override + public long transactionFloorCost(final Bytes transactionPayload) { + return clampedAdd( + getMinimumTransactionCost(), + tokensInCallData(transactionPayload.size(), zeroBytes(transactionPayload)) + * TOTAL_COST_FLOOR_PER_TOKEN); + } + + private long tokensInCallData(final long payloadSize, final long zeroBytes) { + // as defined in https://eips.ethereum.org/EIPS/eip-7623#specification + return clampedAdd(zeroBytes, (payloadSize - zeroBytes) * 4); + } } diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.java index a44300f06..aa0dd080d 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.java @@ -14,11 +14,8 @@ */ package org.hyperledger.besu.evm.gascalculator; -import static org.hyperledger.besu.evm.internal.Words.clampedAdd; import static org.hyperledger.besu.evm.internal.Words.numWords; -import org.apache.tuweni.bytes.Bytes; - /** The Shanghai gas calculator. */ public class ShanghaiGasCalculator extends LondonGasCalculator { @@ -39,13 +36,8 @@ public class ShanghaiGasCalculator extends LondonGasCalculator { } @Override - public long transactionIntrinsicGasCost(final Bytes payload, final boolean isContractCreation) { - long intrinsicGasCost = super.transactionIntrinsicGasCost(payload, isContractCreation); - if (isContractCreation) { - return clampedAdd(intrinsicGasCost, initcodeCost(payload.size())); - } else { - return intrinsicGasCost; - } + protected long contractCreationCost(final int initCodeLength) { + return txCreateExtraGasCost() + initcodeCost(initCodeLength); } @Override diff --git a/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculatorTest.java b/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculatorTest.java index a657776b8..b0b949d38 100644 --- a/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculatorTest.java +++ b/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculatorTest.java @@ -51,11 +51,11 @@ public class FrontierGasCalculatorTest { // Assert assertThat(refund) - .isEqualTo(6500L); // 5000 (remaining) + min(1500 (total refund), 19000 (max allowance)) + .isEqualTo(6000L); // 5000 (remaining) + min(1000 (execution refund), 47500 (max allowance)) } @Test - void shouldCalculateRefundWithMultipleSelfDestructs() { + void shouldCalculateRefundWithMultipleSelfDestructsAndIgnoreCodeDelegation() { // Arrange Set
selfDestructs = new HashSet<>(); selfDestructs.add(Address.wrap(Bytes.random(20))); @@ -71,7 +71,8 @@ public class FrontierGasCalculatorTest { // Assert assertThat(refund) - .isEqualTo(52500L); // 5000 (remaining) + min(47500 (total refund), 49500 (max allowance)) + .isEqualTo( + 52500L); // 5000 (remaining) + min(49500 (execution refund), 47500 (max allowance)) } @Test @@ -87,7 +88,8 @@ public class FrontierGasCalculatorTest { // Assert assertThat(refund) - .isEqualTo(60000L); // 20000 (remaining) + min(101000 (total refund), 40000 (max allowance)) + .isEqualTo( + 60000L); // 20000 (remaining) + min(101000 (execution refund), 40000 (max allowance)) } @Test @@ -99,9 +101,23 @@ public class FrontierGasCalculatorTest { when(transaction.getGasLimit()).thenReturn(100000L); // Act - long refund = gasCalculator.calculateGasRefund(transaction, messageFrame, 0L); + long refund = + gasCalculator.calculateGasRefund( + transaction, + messageFrame, + 0L); // 0 (remaining) + min(0 (execution refund), 50000 (max allowance)) // Assert assertThat(refund).isEqualTo(0L); } + + @Test + void transactionFloorCostShouldAlwaysBeZero() { + assertThat(gasCalculator.transactionFloorCost(Bytes.EMPTY)).isEqualTo(0L); + assertThat(gasCalculator.transactionFloorCost(Bytes.random(256))).isEqualTo(0L); + assertThat(gasCalculator.transactionFloorCost(Bytes.repeat((byte) 0x0, Integer.MAX_VALUE))) + .isEqualTo(0L); + assertThat(gasCalculator.transactionFloorCost(Bytes.repeat((byte) 0x1, Integer.MAX_VALUE))) + .isEqualTo(0L); + } } diff --git a/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculatorTest.java b/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculatorTest.java index fdacad0e8..e8ded7458 100644 --- a/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculatorTest.java +++ b/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/PragueGasCalculatorTest.java @@ -15,22 +15,36 @@ package org.hyperledger.besu.evm.gascalculator; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; import org.hyperledger.besu.datatypes.Address; +import org.hyperledger.besu.datatypes.Transaction; +import org.hyperledger.besu.evm.frame.MessageFrame; +import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import org.apache.tuweni.bytes.Bytes; +import org.assertj.core.api.AssertionsForClassTypes; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; @TestInstance(TestInstance.Lifecycle.PER_CLASS) +@ExtendWith(MockitoExtension.class) class PragueGasCalculatorTest { private static final long TARGET_BLOB_GAS_PER_BLOCK_PRAGUE = 0xC0000; private final PragueGasCalculator pragueGasCalculator = new PragueGasCalculator(); + @Mock private Transaction transaction; + @Mock private MessageFrame messageFrame; @Test void testPrecompileSize() { @@ -66,4 +80,125 @@ class PragueGasCalculatorTest { pragueGasCalculator.getBlobGasPerBlob()), Arguments.of(sixBlobTargetGas, newTargetCount, sixBlobTargetGas)); } + + @Test + void shouldCalculateRefundWithCodeDelegationAndNoSelfDestructs() { + // Arrange + when(messageFrame.getSelfDestructs()).thenReturn(Collections.emptySet()); + when(messageFrame.getGasRefund()).thenReturn(1000L); + when(messageFrame.getRemainingGas()).thenReturn(5000L); + when(transaction.getGasLimit()).thenReturn(100000L); + when(transaction.getPayload()).thenReturn(Bytes.EMPTY); + + // Act + long refund = pragueGasCalculator.calculateGasRefund(transaction, messageFrame, 500L); + + // Assert + // execution refund = 1000 + 0 (self destructs) + 500 (code delegation) = 1500 + AssertionsForClassTypes.assertThat(refund) + .isEqualTo(6500L); // 5000 (remaining) + min(1500 (execution refund), 19000 (max allowance)) + } + + @Test + void shouldCalculateRefundWithMultipleSelfDestructs() { + // Arrange + Set
selfDestructs = new HashSet<>(); + selfDestructs.add(Address.wrap(Bytes.random(20))); + selfDestructs.add(Address.wrap(Bytes.random(20))); + + when(messageFrame.getSelfDestructs()).thenReturn(selfDestructs); + when(messageFrame.getGasRefund()).thenReturn(1000L); + when(messageFrame.getRemainingGas()).thenReturn(5000L); + when(transaction.getGasLimit()).thenReturn(100000L); + when(transaction.getPayload()).thenReturn(Bytes.EMPTY); + + // Act + long refund = pragueGasCalculator.calculateGasRefund(transaction, messageFrame, 1000L); + + // Assert + // execution refund = 1000 + 0 (self destructs EIP-3529) + 1000 (code delegation) = 2000 + AssertionsForClassTypes.assertThat(refund) + .isEqualTo(7000L); // 5000 (remaining) + min(2000 (execution refund), 1900 (max allowance)) + } + + @Test + void shouldRespectMaxRefundAllowance() { + // Arrange + when(messageFrame.getSelfDestructs()).thenReturn(Collections.emptySet()); + when(messageFrame.getGasRefund()).thenReturn(100000L); + when(messageFrame.getRemainingGas()).thenReturn(20000L); + when(transaction.getGasLimit()).thenReturn(100000L); + when(transaction.getPayload()).thenReturn(Bytes.EMPTY); + + // Act + long refund = pragueGasCalculator.calculateGasRefund(transaction, messageFrame, 1000L); + + // Assert + // execution refund = 100000 + 1000 (code delegation) = 101000 + AssertionsForClassTypes.assertThat(refund) + .isEqualTo( + 36000L); // 20000 (remaining) + min(101000 (execution refund), 16000 (max allowance)) + } + + @Test + void shouldHandleZeroValuesCorrectly() { + // Arrange + when(messageFrame.getSelfDestructs()).thenReturn(Collections.emptySet()); + when(messageFrame.getGasRefund()).thenReturn(0L); + when(messageFrame.getRemainingGas()).thenReturn(0L); + when(transaction.getGasLimit()).thenReturn(100000L); + when(transaction.getPayload()).thenReturn(Bytes.EMPTY); + + // Act + long refund = + pragueGasCalculator.calculateGasRefund( + transaction, + messageFrame, + 0L); // 0 (remaining) + min(0 (execution refund), 20000 (max allowance)) + + // Assert + AssertionsForClassTypes.assertThat(refund).isEqualTo(0L); + } + + @Test + void shouldRespectTransactionFloorCost() { + // Arrange + when(messageFrame.getSelfDestructs()).thenReturn(Collections.emptySet()); + when(messageFrame.getGasRefund()).thenReturn(100000L); + when(messageFrame.getRemainingGas()).thenReturn(90000L); + when(transaction.getGasLimit()).thenReturn(100000L); + when(transaction.getPayload()).thenReturn(Bytes.EMPTY); + + // Act + long refund = pragueGasCalculator.calculateGasRefund(transaction, messageFrame, 1000L); + + // Assert + // refund allowance = 16000 + // execution gas used = 100000 (gas limit) - 20000 (remaining gas) - 16000 (refund allowance) = + // 64000 + // floor cost = 21000 (base cost) + 0 (tokensInCallData * floor cost per token) = 21000 + AssertionsForClassTypes.assertThat(refund) + .isEqualTo( + 79000L); // 100000 (gas limit) - max(8000 (execution gas used), 21000 (floor cost)) + } + + @Test + void transactionFloorCostShouldBeAtLeastTransactionBaseCost() { + // floor cost = 21000 (base cost) + 0 + AssertionsForClassTypes.assertThat(pragueGasCalculator.transactionFloorCost(Bytes.EMPTY)) + .isEqualTo(21000); + // floor cost = 21000 (base cost) + 256 (tokensInCallData) * 10 (cost per token) + AssertionsForClassTypes.assertThat( + pragueGasCalculator.transactionFloorCost(Bytes.repeat((byte) 0x0, 256))) + .isEqualTo(23560L); + // floor cost = 21000 (base cost) + 256 * 4 (tokensInCallData) * 10 (cost per token) + AssertionsForClassTypes.assertThat( + pragueGasCalculator.transactionFloorCost(Bytes.repeat((byte) 0x1, 256))) + .isEqualTo(31240L); + // floor cost = 21000 (base cost) + 5 + (6 * 4) (tokensInCallData) * 10 (cost per token) + AssertionsForClassTypes.assertThat( + pragueGasCalculator.transactionFloorCost( + Bytes.fromHexString("0x0001000100010001000101"))) + .isEqualTo(21290L); + } } From 870f3b7857eb748bfa699f30e2ca8a45a6e35dfe Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Fri, 17 Jan 2025 05:55:29 +1000 Subject: [PATCH 5/9] default target gas limit for holesky (#8125) * default target gas limit for holesky --------- Signed-off-by: Sally MacFarlane Signed-off-by: Justin Florentine Co-authored-by: Justin Florentine --- CHANGELOG.md | 1 + .../org/hyperledger/besu/cli/BesuCommand.java | 7 +++ .../hyperledger/besu/cli/BesuCommandTest.java | 52 +++++++++++++++++++ .../ethereum/core/MiningConfiguration.java | 1 + 4 files changed, 61 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec39f72e0..fe2d341a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Improve debug_traceBlock calls performance and reduce output size [#8076](https://github.com/hyperledger/besu/pull/8076) - Add support for EIP-7702 transaction in the txpool [#8018](https://github.com/hyperledger/besu/pull/8018) [#7984](https://github.com/hyperledger/besu/pull/7984) - Add support for `movePrecompileToAddress` in `StateOverrides` (`eth_call`)[8115](https://github.com/hyperledger/besu/pull/8115) +- Default target-gas-limit to 36M for holesky [#8125](https://github.com/hyperledger/besu/pull/8125) - Add EIP-7623 - Increase calldata cost [#8093](https://github.com/hyperledger/besu/pull/8093) ### Bug fixes diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java index edcc248ab..8ee35458b 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java @@ -2132,6 +2132,13 @@ public class BesuCommand implements DefaultCommandValues, Runnable { getGenesisBlockPeriodSeconds(genesisConfigOptionsSupplier.get()) .ifPresent(miningParameters::setBlockPeriodSeconds); initMiningParametersMetrics(miningParameters); + // if network = holesky, set targetGasLimit to 36,000,000 unless otherwise specified + if (miningParameters.getTargetGasLimit().isEmpty() && NetworkName.HOLESKY.equals(network)) { + logger.info( + "Setting target gas limit for holesky: {}", + MiningConfiguration.DEFAULT_TARGET_GAS_LIMIT_HOLESKY); + miningParameters.setTargetGasLimit(MiningConfiguration.DEFAULT_TARGET_GAS_LIMIT_HOLESKY); + } return miningParameters; } diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java index a8bcde0e2..70cb4d507 100644 --- a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java @@ -1911,6 +1911,58 @@ public class BesuCommandTest extends CommandTestAbstract { verify(mockLogger, never()).warn(contains("Holesky is deprecated and will be shutdown")); } + @Test + public void holeskyTargetGasLimitIsSetToHoleskyDefaultWhenNoValueSpecified() { + parseCommand("--network", "holesky"); + + final ArgumentCaptor networkArg = + ArgumentCaptor.forClass(EthNetworkConfig.class); + + final ArgumentCaptor miningArg = + ArgumentCaptor.forClass(MiningConfiguration.class); + + verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any()); + verify(mockControllerBuilder).miningParameters(miningArg.capture()); + verify(mockControllerBuilder).build(); + + assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(HOLESKY)); + + assertThat(miningArg.getValue().getCoinbase()).isEqualTo(Optional.empty()); + assertThat(miningArg.getValue().getMinTransactionGasPrice()).isEqualTo(Wei.of(1000)); + assertThat(miningArg.getValue().getExtraData()).isEqualTo(Bytes.EMPTY); + assertThat(miningArg.getValue().getTargetGasLimit().getAsLong()) + .isEqualTo(MiningConfiguration.DEFAULT_TARGET_GAS_LIMIT_HOLESKY); + + assertThat(commandOutput.toString(UTF_8)).isEmpty(); + assertThat(commandErrorOutput.toString(UTF_8)).isEmpty(); + } + + @Test + public void holeskyTargetGasLimitIsSetToSpecifiedValueWhenValueSpecified() { + long customGasLimit = 99000000; + parseCommand("--network", "holesky", "--target-gas-limit", String.valueOf(customGasLimit)); + + final ArgumentCaptor networkArg = + ArgumentCaptor.forClass(EthNetworkConfig.class); + + final ArgumentCaptor miningArg = + ArgumentCaptor.forClass(MiningConfiguration.class); + + verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any()); + verify(mockControllerBuilder).miningParameters(miningArg.capture()); + verify(mockControllerBuilder).build(); + + assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(HOLESKY)); + + assertThat(miningArg.getValue().getCoinbase()).isEqualTo(Optional.empty()); + assertThat(miningArg.getValue().getMinTransactionGasPrice()).isEqualTo(Wei.of(1000)); + assertThat(miningArg.getValue().getExtraData()).isEqualTo(Bytes.EMPTY); + assertThat(miningArg.getValue().getTargetGasLimit().getAsLong()).isEqualTo(customGasLimit); + + assertThat(commandOutput.toString(UTF_8)).isEmpty(); + assertThat(commandErrorOutput.toString(UTF_8)).isEmpty(); + } + @Test public void luksoValuesAreUsed() { parseCommand("--network", "lukso"); diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningConfiguration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningConfiguration.java index fb39d164b..55ffd5ba7 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningConfiguration.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningConfiguration.java @@ -35,6 +35,7 @@ import org.immutables.value.Value; @Value.Immutable @Value.Enclosing public abstract class MiningConfiguration { + public static final long DEFAULT_TARGET_GAS_LIMIT_HOLESKY = 36_000_000L; public static final PositiveNumber DEFAULT_NON_POA_BLOCK_TXS_SELECTION_MAX_TIME = PositiveNumber.fromInt((int) Duration.ofSeconds(5).toMillis()); public static final PositiveNumber DEFAULT_POA_BLOCK_TXS_SELECTION_MAX_TIME = From 89632d774352f91d61023d1414ade77a83e1b6a2 Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Fri, 17 Jan 2025 16:16:48 +1000 Subject: [PATCH 6/9] Unignore Prague ref tests and remove osakaTime from Prague (#8133) Signed-off-by: Simon Dudley --- .../referencetests/ReferenceTestProtocolSchedules.java | 9 +-------- .../besu/ethereum/vm/BlockchainReferenceTestTools.java | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java index 153f56d63..7509f04c1 100644 --- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java +++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java @@ -106,14 +106,7 @@ public class ReferenceTestProtocolSchedules { Map.entry( "CancunToPragueAtTime15k", createSchedule(genesisStub.clone().cancunTime(0).pragueTime(15000))), - Map.entry( - "Prague", - createSchedule( - genesisStub - .clone() - .pragueTime(0) - .osakaTime(0) // TODO remove this once osaka_devnet_0 ships - )), + Map.entry("Prague", createSchedule(genesisStub.clone().pragueTime(0))), Map.entry("Osaka", createSchedule(genesisStub.clone().osakaTime(0))), Map.entry("Amsterdam", createSchedule(genesisStub.clone().futureEipsTime(0))), Map.entry("Bogota", createSchedule(genesisStub.clone().futureEipsTime(0))), diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java index 1af785b02..f4cb3dc67 100644 --- a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java +++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java @@ -91,9 +91,6 @@ public class BlockchainReferenceTestTools { // EOF tests don't have Prague stuff like deposits right now params.ignore("/stEOF/"); - // None of the Prague tests have withdrawals and deposits handling - params.ignore("\\[Prague\\]"); - // TODO: remove once updated EIP-2537 gas cost artifacts exist params.ignore("/eip2537_bls_12_381_precompiles/"); params.ignore("/stEIP2537/"); From a98e950eac005532a1134f6bb6301a2c4f9668b7 Mon Sep 17 00:00:00 2001 From: daniellehrner Date: Fri, 17 Jan 2025 13:09:39 +0100 Subject: [PATCH 7/9] Add baseFeeUpdateFraction to blobSchedule genesis config (#8128) * Add baseFeeUpdateFraction to blobSchedule genesis config Signed-off-by: Daniel Lehrner * added genesis file for CodeDelegationTransactionAcceptanceTest Signed-off-by: Daniel Lehrner * remove hard coded baseFeeUpdateFraction from CancunFeeMarket & PragueFeeMarket Signed-off-by: Daniel Lehrner * make FeeMarket constructors package private Signed-off-by: Daniel Lehrner --------- Signed-off-by: Daniel Lehrner --- .../src/test/resources/dev/dev_prague.json | 9 ++++--- .../MergeBesuControllerBuilderTest.java | 4 +-- .../besu/config/BlobScheduleOptions.java | 23 ++++++++++++---- config/src/main/resources/holesky.json | 12 +++++++++ config/src/main/resources/mainnet.json | 6 +++-- config/src/main/resources/sepolia.json | 12 +++++++++ .../besu/config/BlobScheduleOptionsTest.java | 3 +++ .../besu/config/GenesisConfigOptionsTest.java | 25 ++++++++++-------- .../resources/mainnet_with_blob_schedule.json | 9 ++++--- .../blockcreation/MergeCoordinatorTest.java | 4 +-- .../merge/blockcreation/MergeReorgTest.java | 4 +-- .../internal/methods/EthGasPriceTest.java | 9 +++---- .../methods/EthGetTransactionReceiptTest.java | 3 +-- .../methods/EthMaxPriorityFeePerGasTest.java | 4 +-- .../mainnet/MainnetProtocolSpecs.java | 23 ++++++++++------ .../mainnet/feemarket/CancunFeeMarket.java | 26 +++++++++++++++---- .../ethereum/mainnet/feemarket/FeeMarket.java | 14 ++++++++++ .../mainnet/feemarket/FixedBaseFeeMarket.java | 2 +- .../mainnet/feemarket/LegacyFeeMarket.java | 2 +- .../mainnet/feemarket/LondonFeeMarket.java | 7 +++-- .../mainnet/feemarket/PragueFeeMarket.java | 23 +++++++++------- .../mainnet/feemarket/ZeroBaseFeeMarket.java | 2 +- .../feemarket/CancunFeeMarketTest.java | 2 +- .../feemarket/LondonFeeMarketTest.java | 6 ++--- ...BlockHeaderGasPriceValidationRuleTest.java | 3 +-- ...yValidationRuleFixedBaseFeeMarketTest.java | 4 +-- .../GasLimitElasticityValidationRuleTest.java | 4 +-- ...tyValidationRuleZeroBaseFeeMarketTest.java | 4 +-- 28 files changed, 168 insertions(+), 81 deletions(-) diff --git a/acceptance-tests/tests/src/test/resources/dev/dev_prague.json b/acceptance-tests/tests/src/test/resources/dev/dev_prague.json index 7a7b56d95..b5d087342 100644 --- a/acceptance-tests/tests/src/test/resources/dev/dev_prague.json +++ b/acceptance-tests/tests/src/test/resources/dev/dev_prague.json @@ -18,15 +18,18 @@ "blobSchedule": { "cancun": { "target": 3, - "max": 6 + "max": 6, + "baseFeeUpdateFraction": 3338477 }, "prague": { "target": 6, - "max": 9 + "max": 9, + "baseFeeUpdateFraction": 5007716 }, "osaka": { "target": 9, - "max": 12 + "max": 12, + "baseFeeUpdateFraction": 5007716 } }, "clique": { diff --git a/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java index ce2dab822..4fe0735b0 100644 --- a/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java +++ b/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java @@ -49,7 +49,7 @@ import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket; +import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; import org.hyperledger.besu.ethereum.storage.StorageProvider; import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; @@ -106,7 +106,7 @@ public class MergeBesuControllerBuilderTest { BigInteger networkId = BigInteger.ONE; private final BlockHeaderTestFixture headerGenerator = new BlockHeaderTestFixture(); - private final BaseFeeMarket feeMarket = new LondonFeeMarket(0, Optional.of(Wei.of(42))); + private final BaseFeeMarket feeMarket = FeeMarket.london(0, Optional.of(Wei.of(42))); private final TransactionPoolConfiguration poolConfiguration = TransactionPoolConfiguration.DEFAULT; private final ObservableMetricsSystem observableMetricsSystem = new NoOpMetricsSystem(); diff --git a/config/src/main/java/org/hyperledger/besu/config/BlobScheduleOptions.java b/config/src/main/java/org/hyperledger/besu/config/BlobScheduleOptions.java index 1ad458fa3..289ed904b 100644 --- a/config/src/main/java/org/hyperledger/besu/config/BlobScheduleOptions.java +++ b/config/src/main/java/org/hyperledger/besu/config/BlobScheduleOptions.java @@ -82,15 +82,16 @@ public class BlobScheduleOptions { public static class BlobSchedule { private final int target; private final int max; + private final int baseFeeUpdateFraction; /** The constant CANCUN_DEFAULT. */ - public static final BlobSchedule CANCUN_DEFAULT = new BlobSchedule(3, 6); + public static final BlobSchedule CANCUN_DEFAULT = new BlobSchedule(3, 6, 3338477); /** The constant PRAGUE_DEFAULT. */ - public static final BlobSchedule PRAGUE_DEFAULT = new BlobSchedule(6, 9); + public static final BlobSchedule PRAGUE_DEFAULT = new BlobSchedule(6, 9, 5007716); /** The constant OSAKA_DEFAULT. */ - public static final BlobSchedule OSAKA_DEFAULT = new BlobSchedule(9, 12); + public static final BlobSchedule OSAKA_DEFAULT = new BlobSchedule(9, 12, 5007716); /** * Instantiates a new Blob schedule. @@ -100,11 +101,14 @@ public class BlobScheduleOptions { public BlobSchedule(final ObjectNode blobScheduleConfigRoot) { this.target = JsonUtil.getInt(blobScheduleConfigRoot, "target").orElseThrow(); this.max = JsonUtil.getInt(blobScheduleConfigRoot, "max").orElseThrow(); + this.baseFeeUpdateFraction = + JsonUtil.getInt(blobScheduleConfigRoot, "basefeeupdatefraction").orElseThrow(); } - private BlobSchedule(final int target, final int max) { + private BlobSchedule(final int target, final int max, final int baseFeeUpdateFraction) { this.target = target; this.max = max; + this.baseFeeUpdateFraction = baseFeeUpdateFraction; } /** @@ -125,13 +129,22 @@ public class BlobScheduleOptions { return max; } + /** + * Gets base fee update fraction. + * + * @return the base fee update fraction + */ + public int getBaseFeeUpdateFraction() { + return baseFeeUpdateFraction; + } + /** * As map. * * @return the map */ Map asMap() { - return Map.of("target", target, "max", max); + return Map.of("target", target, "max", max, "baseFeeUpdateFraction", baseFeeUpdateFraction); } } } diff --git a/config/src/main/resources/holesky.json b/config/src/main/resources/holesky.json index ea8327995..e1cc51a85 100644 --- a/config/src/main/resources/holesky.json +++ b/config/src/main/resources/holesky.json @@ -15,6 +15,18 @@ "terminalTotalDifficulty": 0, "shanghaiTime": 1696000704, "cancunTime": 1707305664, + "blobSchedule": { + "cancun": { + "target": 3, + "max": 6, + "baseFeeUpdateFraction": 3338477 + }, + "prague": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + } + }, "ethash": {}, "discovery": { "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.holesky.ethdisco.net", diff --git a/config/src/main/resources/mainnet.json b/config/src/main/resources/mainnet.json index 5a0fd8d72..a90e620f1 100644 --- a/config/src/main/resources/mainnet.json +++ b/config/src/main/resources/mainnet.json @@ -19,11 +19,13 @@ "blobSchedule": { "cancun": { "target": 3, - "max": 6 + "max": 6, + "baseFeeUpdateFraction": 3338477 }, "prague": { "target": 6, - "max": 9 + "max": 9, + "baseFeeUpdateFraction": 5007716 } }, "ethash": { diff --git a/config/src/main/resources/sepolia.json b/config/src/main/resources/sepolia.json index 713e46ff6..606038939 100644 --- a/config/src/main/resources/sepolia.json +++ b/config/src/main/resources/sepolia.json @@ -15,6 +15,18 @@ "terminalTotalDifficulty": 17000000000000000, "shanghaiTime": 1677557088, "cancunTime": 1706655072, + "blobSchedule": { + "cancun": { + "target": 3, + "max": 6, + "baseFeeUpdateFraction": 3338477 + }, + "prague": { + "target": 6, + "max": 9, + "baseFeeUpdateFraction": 5007716 + } + }, "ethash":{}, "discovery": { "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.sepolia.ethdisco.net", diff --git a/config/src/test/java/org/hyperledger/besu/config/BlobScheduleOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/BlobScheduleOptionsTest.java index fc7463629..608fd5ddd 100644 --- a/config/src/test/java/org/hyperledger/besu/config/BlobScheduleOptionsTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/BlobScheduleOptionsTest.java @@ -31,11 +31,14 @@ public class BlobScheduleOptionsTest { assertThat(blobScheduleOptions.getCancun()).isNotEmpty(); assertThat(blobScheduleOptions.getCancun().get().getTarget()).isEqualTo(4); assertThat(blobScheduleOptions.getCancun().get().getMax()).isEqualTo(7); + assertThat(blobScheduleOptions.getCancun().get().getBaseFeeUpdateFraction()).isEqualTo(3338477); assertThat(blobScheduleOptions.getPrague()).isNotEmpty(); assertThat(blobScheduleOptions.getPrague().get().getTarget()).isEqualTo(7); assertThat(blobScheduleOptions.getPrague().get().getMax()).isEqualTo(10); + assertThat(blobScheduleOptions.getPrague().get().getBaseFeeUpdateFraction()).isEqualTo(5007716); assertThat(blobScheduleOptions.getOsaka()).isNotEmpty(); assertThat(blobScheduleOptions.getOsaka().get().getTarget()).isEqualTo(10); assertThat(blobScheduleOptions.getOsaka().get().getMax()).isEqualTo(13); + assertThat(blobScheduleOptions.getOsaka().get().getBaseFeeUpdateFraction()).isEqualTo(5007716); } } diff --git a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java index 16622f35c..d30146249 100644 --- a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java +++ b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java @@ -418,15 +418,18 @@ class GenesisConfigOptionsTest { + " \"blobSchedule\": {\n" + " \"cancun\": {\n" + " \"target\": 1,\n" - + " \"max\": 2\n" + + " \"max\": 2,\n" + + " \"baseFeeUpdateFraction\": 3\n" + " },\n" + " \"prague\": {\n" - + " \"target\": 3,\n" - + " \"max\": 4\n" + + " \"target\": 4,\n" + + " \"max\": 5,\n" + + " \"baseFeeUpdateFraction\": 6\n" + " },\n" + " \"osaka\": {\n" - + " \"target\": 4,\n" - + " \"max\": 5\n" + + " \"target\": 7,\n" + + " \"max\": 8,\n" + + " \"baseFeeUpdateFraction\": 9\n" + " }\n" + " }\n" + " }\n" @@ -438,14 +441,14 @@ class GenesisConfigOptionsTest { final Map blobSchedule = (Map) map.get("blobSchedule"); assertThat(blobSchedule).containsOnlyKeys("cancun", "prague", "osaka"); assertThat((Map) blobSchedule.get("cancun")) - .containsOnlyKeys("target", "max") - .containsValues(1, 2); + .containsOnlyKeys("target", "max", "baseFeeUpdateFraction") + .containsValues(1, 2, 3); assertThat((Map) blobSchedule.get("prague")) - .containsOnlyKeys("target", "max") - .containsValues(3, 4); + .containsOnlyKeys("target", "max", "baseFeeUpdateFraction") + .containsValues(4, 5, 6); assertThat((Map) blobSchedule.get("osaka")) - .containsOnlyKeys("target", "max") - .containsValues(4, 5); + .containsOnlyKeys("target", "max", "baseFeeUpdateFraction") + .containsValues(7, 8, 9); } private GenesisConfigOptions fromConfigOptions(final Map configOptions) { diff --git a/config/src/test/resources/mainnet_with_blob_schedule.json b/config/src/test/resources/mainnet_with_blob_schedule.json index b313a7dba..617bccd96 100644 --- a/config/src/test/resources/mainnet_with_blob_schedule.json +++ b/config/src/test/resources/mainnet_with_blob_schedule.json @@ -19,15 +19,18 @@ "blobSchedule": { "cancun": { "target": 4, - "max": 7 + "max": 7, + "baseFeeUpdateFraction": 3338477 }, "prague": { "target": 7, - "max": 10 + "max": 10, + "baseFeeUpdateFraction": 5007716 }, "osaka": { "target": 10, - "max": 13 + "max": 13, + "baseFeeUpdateFraction": 5007716 } }, "depositContractAddress": "0x4242424242424242424242424242424242424242", diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java index ea1fa73ea..3cfdd70f5 100644 --- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java +++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java @@ -73,7 +73,7 @@ import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics; import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter; import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket; +import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import org.hyperledger.besu.ethereum.trie.MerkleTrieException; import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import org.hyperledger.besu.metrics.StubMetricsSystem; @@ -158,7 +158,7 @@ public class MergeCoordinatorTest implements MergeGenesisConfigHelper { private final Address suggestedFeeRecipient = Address.ZERO; private final BlockHeaderTestFixture headerGenerator = new BlockHeaderTestFixture(); private final BaseFeeMarket feeMarket = - new LondonFeeMarket(0, genesisState.getBlock().getHeader().getBaseFee()); + FeeMarket.london(0, genesisState.getBlock().getHeader().getBaseFee()); private final org.hyperledger.besu.metrics.StubMetricsSystem metricsSystem = new StubMetricsSystem(); diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java index 7ec2df35f..cb8b3977a 100644 --- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java +++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java @@ -42,7 +42,7 @@ import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket; +import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import org.hyperledger.besu.testutil.DeterministicEthScheduler; import org.hyperledger.besu.util.LogConfigurator; @@ -81,7 +81,7 @@ public class MergeReorgTest implements MergeGenesisConfigHelper { private final Address coinbase = genesisAllocations(getPowGenesisConfig()).findFirst().get(); private final BlockHeaderTestFixture headerGenerator = new BlockHeaderTestFixture(); private final BaseFeeMarket feeMarket = - new LondonFeeMarket(0, genesisState.getBlock().getHeader().getBaseFee()); + FeeMarket.london(0, genesisState.getBlock().getHeader().getBaseFee()); @BeforeEach public void setUp() { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java index 6f3360821..dcb07af6f 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java @@ -43,10 +43,7 @@ import org.hyperledger.besu.ethereum.core.MiningConfiguration; import org.hyperledger.besu.ethereum.core.Transaction; import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; -import org.hyperledger.besu.ethereum.mainnet.feemarket.CancunFeeMarket; import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.LegacyFeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket; import org.hyperledger.besu.evm.log.LogsBloomFilter; import java.util.HashMap; @@ -289,11 +286,11 @@ public class EthGasPriceTest { } private void mockBaseFeeMarket() { - mockFeeMarket(new LondonFeeMarket(0)); + mockFeeMarket(FeeMarket.london(0)); } private void mockGasPriceMarket() { - mockFeeMarket(new LegacyFeeMarket()); + mockFeeMarket(FeeMarket.legacy()); } private void mockFeeMarket(final FeeMarket feeMarket) { @@ -313,7 +310,7 @@ public class EthGasPriceTest { final var genesisBlock = createFakeBlock(0, 0, genesisBaseFee); blocksByNumber.put(0L, genesisBlock); - final var baseFeeMarket = new CancunFeeMarket(0, Optional.empty()); + final var baseFeeMarket = FeeMarket.cancun(0, Optional.empty()); var baseFee = genesisBaseFee; for (long i = 1; i <= chainHeadBlockNumber; i++) { diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java index 702f06c7a..9ec194c8b 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java @@ -48,7 +48,6 @@ import org.hyperledger.besu.ethereum.mainnet.PoWHasher; import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; import org.hyperledger.besu.ethereum.mainnet.blockhash.FrontierBlockHashProcessor; -import org.hyperledger.besu.ethereum.mainnet.feemarket.CancunFeeMarket; import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator; @@ -322,7 +321,7 @@ public class EthGetTransactionReceiptTest { } private void mockProtocolSpec(final BlockHeader blockHeader) { - FeeMarket feeMarket = new CancunFeeMarket(0, Optional.empty()); + FeeMarket feeMarket = FeeMarket.cancun(0, Optional.empty()); ProtocolSpec spec = mock(ProtocolSpec.class); when(spec.getFeeMarket()).thenReturn(feeMarket); when(spec.getGasCalculator()).thenReturn(new CancunGasCalculator()); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMaxPriorityFeePerGasTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMaxPriorityFeePerGasTest.java index 066f97c0d..b8ac2fa9c 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMaxPriorityFeePerGasTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMaxPriorityFeePerGasTest.java @@ -38,7 +38,7 @@ import org.hyperledger.besu.ethereum.core.Difficulty; import org.hyperledger.besu.ethereum.core.MiningConfiguration; import org.hyperledger.besu.ethereum.core.Transaction; import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; -import org.hyperledger.besu.ethereum.mainnet.feemarket.CancunFeeMarket; +import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import org.hyperledger.besu.evm.log.LogsBloomFilter; import java.math.BigInteger; @@ -148,7 +148,7 @@ public class EthMaxPriorityFeePerGasTest { final var genesisBlock = createFakeBlock(0, 0, genesisBaseFee); blocksByNumber.put(0L, genesisBlock); - final var baseFeeMarket = new CancunFeeMarket(0, Optional.empty()); + final var baseFeeMarket = FeeMarket.cancun(0, Optional.empty()); var baseFee = genesisBaseFee; for (long i = 1; i <= chainHeadBlockNumber; i++) { diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java index e366eaee0..686bed1dd 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java @@ -677,6 +677,13 @@ public abstract class MainnetProtocolSpecs { final boolean isParallelTxProcessingEnabled, final MetricsSystem metricsSystem) { final long londonForkBlockNumber = genesisConfigOptions.getLondonBlockNumber().orElse(0L); + + final var cancunBlobSchedule = + genesisConfigOptions + .getBlobScheduleOptions() + .flatMap(BlobScheduleOptions::getCancun) + .orElse(BlobScheduleOptions.BlobSchedule.CANCUN_DEFAULT); + final BaseFeeMarket cancunFeeMarket; if (genesisConfigOptions.isZeroBaseFee()) { cancunFeeMarket = FeeMarket.zeroBaseFee(londonForkBlockNumber); @@ -686,15 +693,12 @@ public abstract class MainnetProtocolSpecs { londonForkBlockNumber, miningConfiguration.getMinTransactionGasPrice()); } else { cancunFeeMarket = - FeeMarket.cancun(londonForkBlockNumber, genesisConfigOptions.getBaseFeePerGas()); + FeeMarket.cancun( + londonForkBlockNumber, + genesisConfigOptions.getBaseFeePerGas(), + cancunBlobSchedule.getBaseFeeUpdateFraction()); } - final var cancunBlobSchedule = - genesisConfigOptions - .getBlobScheduleOptions() - .flatMap(BlobScheduleOptions::getCancun) - .orElse(BlobScheduleOptions.BlobSchedule.CANCUN_DEFAULT); - final java.util.function.Supplier cancunGasCalcSupplier = () -> new CancunGasCalculator(cancunBlobSchedule.getTarget()); @@ -830,7 +834,10 @@ public abstract class MainnetProtocolSpecs { londonForkBlockNumber, miningConfiguration.getMinTransactionGasPrice()); } else { pragueFeeMarket = - FeeMarket.prague(londonForkBlockNumber, genesisConfigOptions.getBaseFeePerGas()); + FeeMarket.prague( + londonForkBlockNumber, + genesisConfigOptions.getBaseFeePerGas(), + pragueBlobSchedule.getBaseFeeUpdateFraction()); } return cancunDefinition( diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java index e8642aef9..293a68f78 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java @@ -14,6 +14,7 @@ */ package org.hyperledger.besu.ethereum.mainnet.feemarket; +import org.hyperledger.besu.config.BlobScheduleOptions; import org.hyperledger.besu.datatypes.BlobGas; import org.hyperledger.besu.datatypes.Wei; @@ -26,11 +27,23 @@ import org.slf4j.LoggerFactory; public class CancunFeeMarket extends LondonFeeMarket { private static final Logger LOG = LoggerFactory.getLogger(CancunFeeMarket.class); protected static final BigInteger BLOB_GAS_PRICE = BigInteger.ONE; - private static final BigInteger BLOB_GAS_PRICE_UPDATE_FRACTION = BigInteger.valueOf(3338477); - public CancunFeeMarket( - final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { + private final BigInteger baseFeeUpdateFraction; + + CancunFeeMarket( + final long londonForkBlockNumber, + final Optional baseFeePerGasOverride, + final long baseFeeUpdateFraction) { super(londonForkBlockNumber, baseFeePerGasOverride); + + this.baseFeeUpdateFraction = BigInteger.valueOf(baseFeeUpdateFraction); + } + + CancunFeeMarket(final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { + this( + londonForkBlockNumber, + baseFeePerGasOverride, + BlobScheduleOptions.BlobSchedule.CANCUN_DEFAULT.getBaseFeeUpdateFraction()); } @Override @@ -42,8 +55,7 @@ public class CancunFeeMarket extends LondonFeeMarket { public Wei blobGasPricePerGas(final BlobGas excessBlobGas) { final var blobGasPrice = Wei.of( - fakeExponential( - BLOB_GAS_PRICE, excessBlobGas.toBigInteger(), BLOB_GAS_PRICE_UPDATE_FRACTION)); + fakeExponential(BLOB_GAS_PRICE, excessBlobGas.toBigInteger(), baseFeeUpdateFraction)); LOG.atTrace() .setMessage("parentExcessBlobGas: {} blobGasPrice: {}") .addArgument(excessBlobGas::toShortHexString) @@ -67,4 +79,8 @@ public class CancunFeeMarket extends LondonFeeMarket { } return output.divide(denominator); } + + protected BigInteger getBaseFeeUpdateFraction() { + return baseFeeUpdateFraction; + } } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FeeMarket.java index 05f97647b..72562c0b3 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FeeMarket.java @@ -49,11 +49,25 @@ public interface FeeMarket { return new CancunFeeMarket(londonForkBlockNumber, baseFeePerGasOverride); } + static BaseFeeMarket cancun( + final long londonForkBlockNumber, + final Optional baseFeePerGasOverride, + final long baseFeeUpdateFraction) { + return new CancunFeeMarket(londonForkBlockNumber, baseFeePerGasOverride, baseFeeUpdateFraction); + } + static BaseFeeMarket prague( final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { return new PragueFeeMarket(londonForkBlockNumber, baseFeePerGasOverride); } + static BaseFeeMarket prague( + final long londonForkBlockNumber, + final Optional baseFeePerGasOverride, + final long baseFeeUpdateFraction) { + return new PragueFeeMarket(londonForkBlockNumber, baseFeePerGasOverride, baseFeeUpdateFraction); + } + static BaseFeeMarket zeroBaseFee(final long londonForkBlockNumber) { return new ZeroBaseFeeMarket(londonForkBlockNumber); } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FixedBaseFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FixedBaseFeeMarket.java index e3155a743..6b31d5453 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FixedBaseFeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FixedBaseFeeMarket.java @@ -20,7 +20,7 @@ import java.util.Optional; public class FixedBaseFeeMarket extends LondonFeeMarket { - public FixedBaseFeeMarket(final long londonForkBlockNumber, final Wei fixedBaseFee) { + FixedBaseFeeMarket(final long londonForkBlockNumber, final Wei fixedBaseFee) { super(londonForkBlockNumber, Optional.of(fixedBaseFee)); } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LegacyFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LegacyFeeMarket.java index 8e73ec294..3fcb3b079 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LegacyFeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LegacyFeeMarket.java @@ -21,7 +21,7 @@ public class LegacyFeeMarket implements FeeMarket { private final TransactionPriceCalculator txPriceCalculator; - public LegacyFeeMarket() { + LegacyFeeMarket() { this.txPriceCalculator = TransactionPriceCalculator.frontier(); } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java index 5ba94a78a..7830f0b7e 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java @@ -39,16 +39,15 @@ public class LondonFeeMarket implements BaseFeeMarket { private final TransactionPriceCalculator txPriceCalculator; private final Wei baseFeeFloor; - public LondonFeeMarket(final long londonForkBlockNumber) { + LondonFeeMarket(final long londonForkBlockNumber) { this(londonForkBlockNumber, Optional.empty()); } - public LondonFeeMarket( - final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { + LondonFeeMarket(final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { this(TransactionPriceCalculator.eip1559(), londonForkBlockNumber, baseFeePerGasOverride); } - protected LondonFeeMarket( + LondonFeeMarket( final TransactionPriceCalculator txPriceCalculator, final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java index cff7cde00..b33d92b33 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/PragueFeeMarket.java @@ -14,23 +14,30 @@ */ package org.hyperledger.besu.ethereum.mainnet.feemarket; +import org.hyperledger.besu.config.BlobScheduleOptions; import org.hyperledger.besu.datatypes.BlobGas; import org.hyperledger.besu.datatypes.Wei; -import java.math.BigInteger; import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PragueFeeMarket extends CancunFeeMarket { - private static final BigInteger BLOB_BASE_FEE_UPDATE_FRACTION_ELECTRA = - BigInteger.valueOf(5007716); private static final Logger LOG = LoggerFactory.getLogger(PragueFeeMarket.class); - public PragueFeeMarket( - final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { - super(londonForkBlockNumber, baseFeePerGasOverride); + PragueFeeMarket( + final long londonForkBlockNumber, + final Optional baseFeePerGasOverride, + final long baseFeeUpdateFraction) { + super(londonForkBlockNumber, baseFeePerGasOverride, baseFeeUpdateFraction); + } + + PragueFeeMarket(final long londonForkBlockNumber, final Optional baseFeePerGasOverride) { + this( + londonForkBlockNumber, + baseFeePerGasOverride, + BlobScheduleOptions.BlobSchedule.PRAGUE_DEFAULT.getBaseFeeUpdateFraction()); } @Override @@ -38,9 +45,7 @@ public class PragueFeeMarket extends CancunFeeMarket { final var blobGasPrice = Wei.of( fakeExponential( - BLOB_GAS_PRICE, - excessBlobGas.toBigInteger(), - BLOB_BASE_FEE_UPDATE_FRACTION_ELECTRA)); + BLOB_GAS_PRICE, excessBlobGas.toBigInteger(), getBaseFeeUpdateFraction())); LOG.atTrace() .setMessage("parentExcessBlobGas: {} blobGasPrice: {}") .addArgument(excessBlobGas::toShortHexString) diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarket.java index 156d1d992..517385bde 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarket.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarket.java @@ -18,7 +18,7 @@ import org.hyperledger.besu.datatypes.Wei; public class ZeroBaseFeeMarket extends FixedBaseFeeMarket { - public ZeroBaseFeeMarket(final long londonForkBlockNumber) { + ZeroBaseFeeMarket(final long londonForkBlockNumber) { super(londonForkBlockNumber, Wei.ZERO); } diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarketTest.java index 06fe62de5..8edd2a9f9 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarketTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarketTest.java @@ -30,7 +30,7 @@ class CancunFeeMarketTest { @Test void dataPricePerGas() { - CancunFeeMarket cancunFeeMarket = new CancunFeeMarket(0, Optional.empty()); + final BaseFeeMarket cancunFeeMarket = FeeMarket.cancun(0, Optional.empty()); // when no excess blob gas, data price per gas is 1 assertEquals(1, cancunFeeMarket.blobGasPricePerGas(BlobGas.ZERO).getAsBigInteger().intValue()); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarketTest.java index 032ede3a8..4aecb021e 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarketTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarketTest.java @@ -40,7 +40,7 @@ public class LondonFeeMarketTest { .gasPrice(Wei.of(7)) .createTransaction(KEY_PAIR1); - final LondonFeeMarket londonFeeMarket = new LondonFeeMarket(0); + final BaseFeeMarket londonFeeMarket = FeeMarket.london(0); assertThat(londonFeeMarket.satisfiesFloorTxFee(transaction)).isTrue(); } @@ -54,7 +54,7 @@ public class LondonFeeMarketTest { .gasPrice(null) .createTransaction(KEY_PAIR1); - final LondonFeeMarket londonFeeMarket = new LondonFeeMarket(0); + final BaseFeeMarket londonFeeMarket = FeeMarket.london(0); assertThat(londonFeeMarket.satisfiesFloorTxFee(transaction)).isFalse(); } @@ -68,7 +68,7 @@ public class LondonFeeMarketTest { .gasPrice(null) .createTransaction(KEY_PAIR1); - final LondonFeeMarket londonFeeMarket = new LondonFeeMarket(0, Optional.of(Wei.ZERO)); + final BaseFeeMarket londonFeeMarket = FeeMarket.london(0, Optional.of(Wei.ZERO)); assertThat(londonFeeMarket.satisfiesFloorTxFee(transaction)).isTrue(); } } diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRuleTest.java index 2cd1936b3..384bcff50 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRuleTest.java @@ -20,7 +20,6 @@ import static org.hyperledger.besu.ethereum.mainnet.headervalidationrules.EIP155 import org.hyperledger.besu.datatypes.Wei; import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket; import java.util.Optional; @@ -30,7 +29,7 @@ import org.junit.jupiter.api.Test; public class BaseFeeMarketBlockHeaderGasPriceValidationRuleTest { private static final long FORK_BLOCK = 800L; - private final BaseFeeMarket baseFeeMarket = new LondonFeeMarket(FORK_BLOCK); + private final BaseFeeMarket baseFeeMarket = FeeMarket.london(FORK_BLOCK); private BaseFeeMarketBlockHeaderGasPriceValidationRule validationRule; private final BaseFeeMarket feeMarket = FeeMarket.london(FORK_BLOCK); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleFixedBaseFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleFixedBaseFeeMarketTest.java index 94b58fa69..effa3d4d1 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleFixedBaseFeeMarketTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleFixedBaseFeeMarketTest.java @@ -21,7 +21,7 @@ import org.hyperledger.besu.datatypes.Wei; import org.hyperledger.besu.ethereum.core.BlockHeader; import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.FixedBaseFeeMarket; +import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import java.util.Optional; @@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.CsvSource; public class GasLimitElasticityValidationRuleFixedBaseFeeMarketTest { private static final Optional fixedBaseFeeMarket = - Optional.of(new FixedBaseFeeMarket(10, Wei.ONE)); + Optional.of(FeeMarket.fixedBaseFee(10, Wei.ONE)); public GasLimitRangeAndDeltaValidationRule uut = new GasLimitRangeAndDeltaValidationRule(5000, MAX_VALUE, fixedBaseFeeMarket); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleTest.java index 1f7423344..12b3d6926 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.hyperledger.besu.ethereum.core.BlockHeader; import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket; +import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import java.util.Optional; @@ -30,7 +30,7 @@ import org.junit.jupiter.params.provider.CsvSource; public class GasLimitElasticityValidationRuleTest { - private static final Optional baseFeeMarket = Optional.of(new LondonFeeMarket(10)); + private static final Optional baseFeeMarket = Optional.of(FeeMarket.london(10)); public GasLimitRangeAndDeltaValidationRule uut = new GasLimitRangeAndDeltaValidationRule(5000, MAX_VALUE, baseFeeMarket); diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleZeroBaseFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleZeroBaseFeeMarketTest.java index 39462a22c..54278b47d 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleZeroBaseFeeMarketTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleZeroBaseFeeMarketTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.hyperledger.besu.ethereum.core.BlockHeader; import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket; -import org.hyperledger.besu.ethereum.mainnet.feemarket.ZeroBaseFeeMarket; +import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket; import java.util.Optional; @@ -31,7 +31,7 @@ import org.junit.jupiter.params.provider.CsvSource; public class GasLimitElasticityValidationRuleZeroBaseFeeMarketTest { private static final Optional zeroBaseFeeMarket = - Optional.of(new ZeroBaseFeeMarket(10)); + Optional.of(FeeMarket.zeroBaseFee(10)); public GasLimitRangeAndDeltaValidationRule uut = new GasLimitRangeAndDeltaValidationRule(5000, MAX_VALUE, zeroBaseFeeMarket); From 74d22a082b6f01aa49f578c5d38be67c46862b24 Mon Sep 17 00:00:00 2001 From: Luis Pinto Date: Sat, 18 Jan 2025 01:25:00 +0000 Subject: [PATCH 8/9] Revert "Add back deprecated traceStartBlock methods to the tracer API (#8112)" (#8137) This reverts commit 1f67cb511ccf5c23e17dbca2598122804ffaca8d. Signed-off-by: Luis Pinto --- plugin-api/build.gradle | 2 +- .../tracer/BlockAwareOperationTracer.java | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle index 77d918b24..0ae3e9424 100644 --- a/plugin-api/build.gradle +++ b/plugin-api/build.gradle @@ -71,7 +71,7 @@ Calculated : ${currentHash} tasks.register('checkAPIChanges', FileStateChecker) { description = "Checks that the API for the Plugin-API project does not change without deliberate thought" files = sourceSets.main.allJava.files - knownHash = '2b6i9SVzINvYv2E4yHk10d6ad+pzA12xsMltKghnW+U=' + knownHash = 'V3YwoXiJjbbrtpr7DmbebhJwAcj40J/3gb6VZcoFlF8=' } check.dependsOn('checkAPIChanges') diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/tracer/BlockAwareOperationTracer.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/tracer/BlockAwareOperationTracer.java index 134147386..9185d1143 100644 --- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/tracer/BlockAwareOperationTracer.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/tracer/BlockAwareOperationTracer.java @@ -33,17 +33,6 @@ public interface BlockAwareOperationTracer extends OperationTracer { */ BlockAwareOperationTracer NO_TRACING = new BlockAwareOperationTracer() {}; - /** - * Trace the start of a block. Notice: This method has been marked for removal and will be removed - * in a future version. Avoid using it and use {@link #traceStartBlock(BlockHeader, BlockBody, - * Address)} instead. - * - * @param blockHeader the header of the block which is traced - * @param blockBody the body of the block which is traced - */ - @Deprecated - default void traceStartBlock(final BlockHeader blockHeader, final BlockBody blockBody) {} - /** * Trace the start of a block. * @@ -62,16 +51,6 @@ public interface BlockAwareOperationTracer extends OperationTracer { */ default void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBody) {} - /** - * When building a block this API is called at the start of the process. Notice: This method has - * been marked for removal and will be removed in a future version. Avoid using it and use {@link - * #traceStartBlock(ProcessableBlockHeader, Address)} instead. - * - * @param processableBlockHeader the processable header - */ - @Deprecated - default void traceStartBlock(final ProcessableBlockHeader processableBlockHeader) {} - /** * When building a block this API is called at the start of the process * From 702ce74c3d6dc95efb77c8c112adc46521663bfa Mon Sep 17 00:00:00 2001 From: Gabriel-Trintinalia Date: Mon, 20 Jan 2025 12:31:52 +0800 Subject: [PATCH 9/9] Simulation: Add nonce to call parameter (#8139) Signed-off-by: Gabriel-Trintinalia --- CHANGELOG.md | 1 + .../eth/EthEstimateGasTransaction.java | 6 +- .../pojoadapter/BlockAdapterBase.java | 1 + .../internal/methods/AbstractEstimateGas.java | 3 +- .../internal/methods/EthCreateAccessList.java | 3 +- .../parameters/JsonCallParameter.java | 24 +- .../internal/methods/EthEstimateGasTest.java | 2 + .../debug/trace-call/debug_traceCall_all.json | 2 +- .../trace-call/debug_traceCall_default.json | 2 +- .../debug_traceCall_disableMemory.json | 2 +- .../debug_traceCall_disableStack.json | 2 +- .../debug_traceCall_disableStorage.json | 2 +- .../trace-call/trace_call_02_0_stateDiff.json | 3 +- .../trace-call/trace_call_02_0_trace.json | 3 +- .../trace-call/trace_call_02_0_vmTrace.json | 3 +- .../trace-call/trace_call_03_0_stateDiff.json | 3 +- .../trace-call/trace_call_03_0_trace.json | 3 +- .../trace-call/trace_call_03_0_vmTrace.json | 3 +- .../trace-call/trace_call_04_0_stateDiff.json | 3 +- .../trace-call/trace_call_04_0_trace.json | 3 +- .../trace-call/trace_call_04_0_vmTrace.json | 3 +- .../trace-call/trace_call_04_1_stateDiff.json | 3 +- .../trace-call/trace_call_04_1_trace.json | 3 +- .../trace-call/trace_call_04_1_vmTrace.json | 3 +- .../trace-call/trace_call_04_2_stateDiff.json | 3 +- .../trace-call/trace_call_04_2_trace.json | 3 +- .../trace-call/trace_call_04_2_vmTrace.json | 3 +- .../trace-call/trace_call_05_0_stateDiff.json | 3 +- .../trace-call/trace_call_05_0_trace.json | 3 +- .../trace-call/trace_call_05_0_vmTrace.json | 3 +- .../trace-call/trace_call_06_0_stateDiff.json | 3 +- .../trace-call/trace_call_06_0_trace.json | 3 +- .../trace-call/trace_call_06_0_vmTrace.json | 3 +- .../trace-call/trace_call_07_0_stateDiff.json | 3 +- .../trace-call/trace_call_07_0_trace.json | 3 +- .../trace-call/trace_call_07_0_vmTrace.json | 3 +- .../trace-call/trace_call_08_0_stateDiff.json | 3 +- .../trace-call/trace_call_08_0_trace.json | 3 +- .../trace-call/trace_call_08_0_vmTrace.json | 3 +- .../trace-call/trace_call_09_0_stateDiff.json | 3 +- .../trace-call/trace_call_09_0_trace.json | 3 +- .../trace-call/trace_call_09_0_vmTrace.json | 3 +- .../trace-call/trace_call_0a_0_stateDiff.json | 3 +- .../trace-call/trace_call_0a_0_trace.json | 3 +- .../trace-call/trace_call_0a_0_vmTrace.json | 3 +- .../trace-call/trace_call_0b_0_stateDiff.json | 3 +- .../trace-call/trace_call_0b_0_trace.json | 3 +- .../trace-call/trace_call_0b_0_vmTrace.json | 3 +- .../trace-call/trace_call_0c_0_stateDiff.json | 3 +- .../trace-call/trace_call_0c_0_trace.json | 3 +- .../trace-call/trace_call_0c_0_vmTrace.json | 3 +- .../trace-call/trace_call_0d_0_stateDiff.json | 3 +- .../trace-call/trace_call_0d_0_trace.json | 3 +- .../trace-call/trace_call_0d_0_vmTrace.json | 3 +- .../trace-call/trace_call_0e_0_stateDiff.json | 3 +- .../trace-call/trace_call_0e_0_trace.json | 3 +- .../trace-call/trace_call_0e_0_vmTrace.json | 3 +- .../trace-call/trace_call_0e_1_stateDiff.json | 3 +- .../trace-call/trace_call_0e_1_trace.json | 3 +- .../trace-call/trace_call_0e_1_vmTrace.json | 3 +- .../trace-call/trace_call_0e_2_stateDiff.json | 3 +- .../trace-call/trace_call_0e_2_trace.json | 3 +- .../trace-call/trace_call_0e_2_vmTrace.json | 3 +- .../trace-call/trace_call_0f_0_stateDiff.json | 3 +- .../trace-call/trace_call_0f_0_trace.json | 3 +- .../trace-call/trace_call_0f_0_vmTrace.json | 3 +- .../trace-call/trace_call_0f_1_stateDiff.json | 3 +- .../trace-call/trace_call_0f_1_trace.json | 3 +- .../trace-call/trace_call_0f_1_vmTrace.json | 3 +- .../trace-call/trace_call_10_0_stateDiff.json | 3 +- .../trace-call/trace_call_10_0_trace.json | 3 +- .../trace-call/trace_call_10_0_vmTrace.json | 3 +- .../trace-call/trace_call_10_1_stateDiff.json | 3 +- .../trace-call/trace_call_10_1_trace.json | 3 +- .../trace-call/trace_call_10_1_vmTrace.json | 3 +- .../trace-call/trace_call_10_2_stateDiff.json | 3 +- .../trace-call/trace_call_10_2_trace.json | 3 +- .../trace-call/trace_call_10_2_vmTrace.json | 3 +- .../trace-call/trace_call_11_0_stateDiff.json | 3 +- .../trace-call/trace_call_11_0_trace.json | 3 +- .../trace-call/trace_call_11_0_vmTrace.json | 3 +- .../trace-call/trace_call_12_0_stateDiff.json | 3 +- .../trace-call/trace_call_12_0_trace.json | 3 +- .../trace-call/trace_call_12_0_vmTrace.json | 3 +- .../trace-call/trace_call_12_1_stateDiff.json | 3 +- .../trace-call/trace_call_12_1_trace.json | 3 +- .../trace-call/trace_call_12_1_vmTrace.json | 3 +- .../trace-call/trace_call_13_0_stateDiff.json | 3 +- .../trace-call/trace_call_13_0_trace.json | 3 +- .../trace-call/trace_call_13_0_vmTrace.json | 3 +- .../trace-call/trace_call_13_1_stateDiff.json | 3 +- .../trace-call/trace_call_13_1_trace.json | 3 +- .../trace-call/trace_call_13_1_vmTrace.json | 3 +- .../trace-call/trace_call_13_2_stateDiff.json | 3 +- .../trace-call/trace_call_13_2_trace.json | 3 +- .../trace-call/trace_call_13_2_vmTrace.json | 3 +- .../trace-call/trace_call_13_3_stateDiff.json | 3 +- .../trace-call/trace_call_13_3_trace.json | 3 +- .../trace-call/trace_call_13_3_vmTrace.json | 3 +- .../trace-call/trace_call_13_4_stateDiff.json | 3 +- .../trace-call/trace_call_13_4_trace.json | 3 +- .../trace-call/trace_call_13_4_vmTrace.json | 3 +- .../trace-call/trace_call_13_5_stateDiff.json | 3 +- .../trace-call/trace_call_13_5_trace.json | 3 +- .../trace-call/trace_call_13_5_vmTrace.json | 3 +- .../trace-call/trace_call_14_0_stateDiff.json | 3 +- .../trace-call/trace_call_14_0_trace.json | 3 +- .../trace-call/trace_call_14_0_vmTrace.json | 3 +- .../trace-call/trace_call_14_1_stateDiff.json | 3 +- .../trace-call/trace_call_14_1_trace.json | 3 +- .../trace-call/trace_call_14_1_vmTrace.json | 3 +- .../trace-call/trace_call_15_0_stateDiff.json | 3 +- .../trace-call/trace_call_15_0_trace.json | 3 +- .../trace-call/trace_call_15_0_vmTrace.json | 3 +- .../trace-call/trace_call_15_1_stateDiff.json | 3 +- .../trace-call/trace_call_15_1_trace.json | 3 +- .../trace-call/trace_call_15_1_vmTrace.json | 3 +- .../trace-call/trace_call_15_2_stateDiff.json | 3 +- .../trace-call/trace_call_15_2_trace.json | 3 +- .../trace-call/trace_call_15_2_vmTrace.json | 3 +- .../trace-call/trace_call_15_3_stateDiff.json | 3 +- .../trace-call/trace_call_15_3_trace.json | 3 +- .../trace-call/trace_call_15_3_vmTrace.json | 3 +- .../trace-call/trace_call_16_0_stateDiff.json | 3 +- .../trace-call/trace_call_16_0_trace.json | 3 +- .../trace-call/trace_call_16_0_vmTrace.json | 3 +- .../trace-call/trace_call_16_1_stateDiff.json | 3 +- .../trace-call/trace_call_16_1_trace.json | 3 +- .../trace-call/trace_call_16_1_vmTrace.json | 3 +- .../trace-call/trace_call_16_2_stateDiff.json | 3 +- .../trace-call/trace_call_16_2_trace.json | 3 +- .../trace-call/trace_call_16_2_vmTrace.json | 3 +- .../trace-call/trace_call_16_3_stateDiff.json | 3 +- .../trace-call/trace_call_16_3_trace.json | 3 +- .../trace-call/trace_call_16_3_vmTrace.json | 3 +- .../trace-call/trace_call_17_0_stateDiff.json | 3 +- .../trace-call/trace_call_17_0_trace.json | 3 +- .../trace-call/trace_call_17_0_vmTrace.json | 3 +- .../trace-call/trace_call_18_0_stateDiff.json | 3 +- .../trace-call/trace_call_18_0_trace.json | 3 +- .../trace-call/trace_call_18_0_vmTrace.json | 3 +- .../trace-call/trace_call_19_0_stateDiff.json | 3 +- .../trace-call/trace_call_19_0_trace.json | 3 +- .../trace-call/trace_call_19_0_vmTrace.json | 3 +- .../trace-call/trace_call_19_1_stateDiff.json | 3 +- .../trace-call/trace_call_19_1_trace.json | 3 +- .../trace-call/trace_call_19_1_vmTrace.json | 3 +- .../trace-call/trace_call_1a_0_stateDiff.json | 3 +- .../trace-call/trace_call_1a_0_trace.json | 3 +- .../trace-call/trace_call_1a_0_vmTrace.json | 3 +- .../trace-call/trace_call_1b_0_stateDiff.json | 3 +- .../trace-call/trace_call_1b_0_trace.json | 3 +- .../trace-call/trace_call_1b_0_vmTrace.json | 3 +- .../trace-call/trace_call_1c_0_stateDiff.json | 3 +- .../trace-call/trace_call_1c_0_trace.json | 3 +- .../trace-call/trace_call_1c_0_vmTrace.json | 3 +- .../trace-call/trace_call_1d_0_stateDiff.json | 3 +- .../trace-call/trace_call_1d_0_trace.json | 3 +- .../trace-call/trace_call_1d_0_vmTrace.json | 3 +- .../trace-call/trace_call_1e_0_stateDiff.json | 3 +- .../trace-call/trace_call_1e_0_trace.json | 3 +- .../trace-call/trace_call_1e_0_vmTrace.json | 3 +- .../trace-call/trace_call_1f_0_stateDiff.json | 3 +- .../trace-call/trace_call_1f_0_trace.json | 3 +- .../trace-call/trace_call_1f_0_vmTrace.json | 3 +- .../trace-call/trace_call_20_0_stateDiff.json | 3 +- .../trace-call/trace_call_20_0_trace.json | 3 +- .../trace-call/trace_call_20_0_vmTrace.json | 3 +- .../trace-call/trace_call_21_0_stateDiff.json | 3 +- .../trace-call/trace_call_21_0_trace.json | 3 +- .../trace-call/trace_call_21_0_vmTrace.json | 3 +- .../trace_rawTransaction_02_0_stateDiff.json | 2 +- .../trace_rawTransaction_02_0_trace.json | 2 +- .../trace_rawTransaction_02_0_vmTrace.json | 2 +- .../trace_rawTransaction_03_0_stateDiff.json | 2 +- .../trace_rawTransaction_03_0_trace.json | 2 +- .../trace_rawTransaction_03_0_vmTrace.json | 2 +- .../trace_rawTransaction_04_0_stateDiff.json | 2 +- .../trace_rawTransaction_04_0_trace.json | 2 +- .../trace_rawTransaction_04_0_vmTrace.json | 2 +- .../trace_rawTransaction_04_1_stateDiff.json | 2 +- .../trace_rawTransaction_04_1_trace.json | 2 +- .../trace_rawTransaction_04_1_vmTrace.json | 2 +- .../trace_rawTransaction_04_2_stateDiff.json | 2 +- .../trace_rawTransaction_04_2_trace.json | 2 +- .../trace_rawTransaction_04_2_vmTrace.json | 2 +- .../trace_rawTransaction_05_0_stateDiff.json | 2 +- .../trace_rawTransaction_05_0_trace.json | 2 +- .../trace_rawTransaction_05_0_vmTrace.json | 2 +- .../trace_rawTransaction_06_0_stateDiff.json | 2 +- .../trace_rawTransaction_06_0_trace.json | 2 +- .../trace_rawTransaction_06_0_vmTrace.json | 2 +- .../trace_rawTransaction_07_0_stateDiff.json | 2 +- .../trace_rawTransaction_07_0_trace.json | 2 +- .../trace_rawTransaction_07_0_vmTrace.json | 2 +- .../trace_rawTransaction_08_0_stateDiff.json | 2 +- .../trace_rawTransaction_08_0_trace.json | 2 +- .../trace_rawTransaction_08_0_vmTrace.json | 2 +- .../trace_rawTransaction_09_0_stateDiff.json | 2 +- .../trace_rawTransaction_09_0_trace.json | 2 +- .../trace_rawTransaction_09_0_vmTrace.json | 2 +- .../trace_rawTransaction_0a_0_stateDiff.json | 2 +- .../trace_rawTransaction_0a_0_trace.json | 2 +- .../trace_rawTransaction_0a_0_vmTrace.json | 2 +- .../trace_rawTransaction_0b_0_stateDiff.json | 2 +- .../trace_rawTransaction_0b_0_trace.json | 2 +- .../trace_rawTransaction_0b_0_vmTrace.json | 2 +- .../trace_rawTransaction_0c_0_stateDiff.json | 2 +- .../trace_rawTransaction_0c_0_trace.json | 2 +- .../trace_rawTransaction_0c_0_vmTrace.json | 2 +- .../trace_rawTransaction_0d_0_stateDiff.json | 2 +- .../trace_rawTransaction_0d_0_trace.json | 2 +- .../trace_rawTransaction_0d_0_vmTrace.json | 2 +- .../trace_rawTransaction_0e_0_stateDiff.json | 2 +- .../trace_rawTransaction_0e_0_trace.json | 2 +- .../trace_rawTransaction_0e_0_vmTrace.json | 2 +- .../trace_rawTransaction_0e_1_stateDiff.json | 2 +- .../trace_rawTransaction_0e_1_trace.json | 2 +- .../trace_rawTransaction_0e_1_vmTrace.json | 2 +- .../trace_rawTransaction_0e_2_stateDiff.json | 2 +- .../trace_rawTransaction_0e_2_trace.json | 2 +- .../trace_rawTransaction_0e_2_vmTrace.json | 2 +- .../trace_rawTransaction_0f_0_stateDiff.json | 2 +- .../trace_rawTransaction_0f_0_trace.json | 2 +- .../trace_rawTransaction_0f_0_vmTrace.json | 2 +- .../trace_rawTransaction_0f_1_stateDiff.json | 2 +- .../trace_rawTransaction_0f_1_trace.json | 2 +- .../trace_rawTransaction_0f_1_vmTrace.json | 2 +- .../trace_rawTransaction_10_0_stateDiff.json | 2 +- .../trace_rawTransaction_10_0_trace.json | 2 +- .../trace_rawTransaction_10_0_vmTrace.json | 2 +- .../trace_rawTransaction_10_1_stateDiff.json | 2 +- .../trace_rawTransaction_10_1_trace.json | 2 +- .../trace_rawTransaction_10_1_vmTrace.json | 2 +- .../trace_rawTransaction_10_2_stateDiff.json | 2 +- .../trace_rawTransaction_10_2_trace.json | 2 +- .../trace_rawTransaction_10_2_vmTrace.json | 2 +- .../trace_rawTransaction_11_0_stateDiff.json | 2 +- .../trace_rawTransaction_11_0_trace.json | 2 +- .../trace_rawTransaction_11_0_vmTrace.json | 2 +- .../trace_rawTransaction_12_0_stateDiff.json | 2 +- .../trace_rawTransaction_12_0_trace.json | 2 +- .../trace_rawTransaction_12_0_vmTrace.json | 2 +- .../trace_rawTransaction_12_1_stateDiff.json | 2 +- .../trace_rawTransaction_12_1_trace.json | 2 +- .../trace_rawTransaction_12_1_vmTrace.json | 2 +- .../trace_rawTransaction_13_0_stateDiff.json | 2 +- .../trace_rawTransaction_13_0_trace.json | 2 +- .../trace_rawTransaction_13_0_vmTrace.json | 2 +- .../trace_rawTransaction_13_1_stateDiff.json | 2 +- .../trace_rawTransaction_13_1_trace.json | 2 +- .../trace_rawTransaction_13_1_vmTrace.json | 2 +- .../trace_rawTransaction_13_2_stateDiff.json | 2 +- .../trace_rawTransaction_13_2_trace.json | 2 +- .../trace_rawTransaction_13_2_vmTrace.json | 2 +- .../trace_rawTransaction_13_3_stateDiff.json | 2 +- .../trace_rawTransaction_13_3_trace.json | 2 +- .../trace_rawTransaction_13_3_vmTrace.json | 2 +- .../trace_rawTransaction_13_4_stateDiff.json | 2 +- .../trace_rawTransaction_13_4_trace.json | 2 +- .../trace_rawTransaction_13_4_vmTrace.json | 2 +- .../trace_rawTransaction_13_5_stateDiff.json | 2 +- .../trace_rawTransaction_13_5_trace.json | 2 +- .../trace_rawTransaction_13_5_vmTrace.json | 2 +- .../trace_rawTransaction_14_0_stateDiff.json | 2 +- .../trace_rawTransaction_14_0_trace.json | 2 +- .../trace_rawTransaction_14_0_vmTrace.json | 2 +- .../trace_rawTransaction_14_1_stateDiff.json | 2 +- .../trace_rawTransaction_14_1_trace.json | 2 +- .../trace_rawTransaction_14_1_vmTrace.json | 2 +- .../trace_rawTransaction_15_0_stateDiff.json | 2 +- .../trace_rawTransaction_15_0_trace.json | 2 +- .../trace_rawTransaction_15_0_vmTrace.json | 2 +- .../trace_rawTransaction_15_1_stateDiff.json | 2 +- .../trace_rawTransaction_15_1_trace.json | 2 +- .../trace_rawTransaction_15_1_vmTrace.json | 2 +- .../trace_rawTransaction_15_2_stateDiff.json | 2 +- .../trace_rawTransaction_15_2_trace.json | 2 +- .../trace_rawTransaction_15_2_vmTrace.json | 2 +- .../trace_rawTransaction_15_3_stateDiff.json | 2 +- .../trace_rawTransaction_15_3_trace.json | 2 +- .../trace_rawTransaction_15_3_vmTrace.json | 2 +- .../trace_rawTransaction_16_0_stateDiff.json | 2 +- .../trace_rawTransaction_16_0_trace.json | 2 +- .../trace_rawTransaction_16_0_vmTrace.json | 2 +- .../trace_rawTransaction_16_1_stateDiff.json | 2 +- .../trace_rawTransaction_16_1_trace.json | 2 +- .../trace_rawTransaction_16_1_vmTrace.json | 2 +- .../trace_rawTransaction_16_2_stateDiff.json | 2 +- .../trace_rawTransaction_16_2_trace.json | 2 +- .../trace_rawTransaction_16_2_vmTrace.json | 2 +- .../trace_rawTransaction_16_3_stateDiff.json | 2 +- .../trace_rawTransaction_16_3_trace.json | 2 +- .../trace_rawTransaction_16_3_vmTrace.json | 2 +- .../trace_rawTransaction_17_0_stateDiff.json | 2 +- .../trace_rawTransaction_17_0_trace.json | 2 +- .../trace_rawTransaction_17_0_vmTrace.json | 2 +- .../trace_rawTransaction_18_0_stateDiff.json | 2 +- .../trace_rawTransaction_18_0_trace.json | 2 +- .../trace_rawTransaction_18_0_vmTrace.json | 2 +- .../trace_rawTransaction_19_0_stateDiff.json | 2 +- .../trace_rawTransaction_19_0_trace.json | 2 +- .../trace_rawTransaction_19_0_vmTrace.json | 2 +- .../trace_rawTransaction_19_1_stateDiff.json | 2 +- .../trace_rawTransaction_19_1_trace.json | 2 +- .../trace_rawTransaction_19_1_vmTrace.json | 2 +- .../trace_rawTransaction_1a_0_stateDiff.json | 2 +- .../trace_rawTransaction_1a_0_trace.json | 2 +- .../trace_rawTransaction_1a_0_vmTrace.json | 2 +- .../trace_rawTransaction_1b_0_stateDiff.json | 2 +- .../trace_rawTransaction_1b_0_trace.json | 2 +- .../trace_rawTransaction_1b_0_vmTrace.json | 2 +- .../trace_rawTransaction_1c_0_stateDiff.json | 2 +- .../trace_rawTransaction_1c_0_trace.json | 2 +- .../trace_rawTransaction_1c_0_vmTrace.json | 2 +- .../trace_rawTransaction_1d_0_stateDiff.json | 2 +- .../trace_rawTransaction_1d_0_trace.json | 2 +- .../trace_rawTransaction_1d_0_vmTrace.json | 2 +- .../trace_rawTransaction_1e_0_stateDiff.json | 2 +- .../trace_rawTransaction_1e_0_trace.json | 2 +- .../trace_rawTransaction_1e_0_vmTrace.json | 2 +- .../trace_rawTransaction_1f_0_stateDiff.json | 2 +- .../trace_rawTransaction_1f_0_trace.json | 2 +- .../trace_rawTransaction_1f_0_vmTrace.json | 2 +- .../trace_rawTransaction_20_0_stateDiff.json | 2 +- .../trace_rawTransaction_20_0_trace.json | 2 +- .../trace_rawTransaction_20_0_vmTrace.json | 2 +- .../trace_rawTransaction_21_0_stateDiff.json | 2 +- .../trace_rawTransaction_21_0_trace.json | 2 +- .../trace_rawTransaction_21_0_vmTrace.json | 2 +- .../ethereum/transaction/CallParameter.java | 51 ++- .../transaction/TransactionSimulator.java | 11 +- .../transaction/TransactionSimulatorTest.java | 310 +++++++++--------- 333 files changed, 561 insertions(+), 656 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe2d341a3..8105305c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Add support for `movePrecompileToAddress` in `StateOverrides` (`eth_call`)[8115](https://github.com/hyperledger/besu/pull/8115) - Default target-gas-limit to 36M for holesky [#8125](https://github.com/hyperledger/besu/pull/8125) - Add EIP-7623 - Increase calldata cost [#8093](https://github.com/hyperledger/besu/pull/8093) +- Add nonce to transaction call object [#8139](https://github.com/hyperledger/besu/pull/8139) ### Bug fixes - Fix serialization of state overrides when `movePrecompileToAddress` is present [#8204](https://github.com/hyperledger/besu/pull/8024) diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthEstimateGasTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthEstimateGasTransaction.java index 31e0c5182..ba4b046aa 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthEstimateGasTransaction.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthEstimateGasTransaction.java @@ -14,6 +14,8 @@ */ package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth; +import static org.web3j.protocol.core.DefaultBlockParameterName.LATEST; + import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; @@ -36,11 +38,13 @@ public class EthEstimateGasTransaction implements Transaction { public EthEstimateGas execute(final NodeRequests node) { try { + var nonce = node.eth().ethGetTransactionCount(from, LATEST).send().getTransactionCount(); + return node.eth() .ethEstimateGas( new org.web3j.protocol.core.methods.request.Transaction( from, - BigInteger.ONE, + nonce, BigInteger.ZERO, BigInteger.ZERO, contractAddress, diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java index f49fa0a4c..dc3f00bdc 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java @@ -356,6 +356,7 @@ public class BlockAdapterBase extends AdapterBase { maxFeePerGas, valueParam, data, + Optional.empty(), Optional.empty()); return transactionSimulator.process( diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java index d839f2ed7..9e380a4c1 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java @@ -147,7 +147,8 @@ public abstract class AbstractEstimateGas extends AbstractBlockParameterMethod { callParams.getPayload(), callParams.getAccessList(), callParams.getMaxFeePerBlobGas(), - callParams.getBlobVersionedHashes()); + callParams.getBlobVersionedHashes(), + callParams.getNonce()); } /** diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java index 7d4ba313c..d9394417a 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java @@ -127,7 +127,8 @@ public class EthCreateAccessList extends AbstractEstimateGas { callParams.getMaxFeePerGas(), callParams.getValue(), callParams.getPayload(), - Optional.of(accessListEntries)); + Optional.of(accessListEntries), + callParams.getNonce()); } private record AccessListSimulatorResult( diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java index 85dabda57..dba20335a 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java @@ -18,6 +18,7 @@ import org.hyperledger.besu.datatypes.AccessListEntry; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.VersionedHash; import org.hyperledger.besu.datatypes.Wei; +import org.hyperledger.besu.datatypes.parameters.UnsignedLongParameter; import org.hyperledger.besu.ethereum.core.json.ChainIdDeserializer; import org.hyperledger.besu.ethereum.core.json.GasDeserializer; import org.hyperledger.besu.ethereum.core.json.HexStringDeserializer; @@ -56,6 +57,7 @@ import org.slf4j.LoggerFactory; * .withMaxPriorityFeePerGas(Wei.of(1)) // Optional * .withMaxFeePerBlobGas(Wei.of(3)) // Optional * .withBlobVersionedHashes(blobVersionedHashes) // Optional + * .withNonce(new UnsignedLongParameter(1L)) // Optional * .build(); * } * @@ -86,7 +88,8 @@ public class JsonCallParameter extends CallParameter { final Optional strict, final Optional> accessList, final Optional maxFeePerBlobGas, - final Optional> blobVersionedHashes) { + final Optional> blobVersionedHashes, + final Optional nonce) { super( chainId, @@ -100,7 +103,8 @@ public class JsonCallParameter extends CallParameter { payload, accessList, maxFeePerBlobGas, - blobVersionedHashes); + blobVersionedHashes, + nonce); this.strict = strict; } @@ -133,6 +137,7 @@ public class JsonCallParameter extends CallParameter { private Bytes input; private Optional> accessList = Optional.empty(); private Optional> blobVersionedHashes = Optional.empty(); + private Optional nonce = Optional.empty(); /** Default constructor. */ public JsonCallParameterBuilder() {} @@ -327,6 +332,18 @@ public class JsonCallParameter extends CallParameter { return this; } + /** + * Sets the nonce for the {@link JsonCallParameter}. It is an optional parameter, and if not + * specified, it defaults to an empty {@link Optional}. + * + * @param nonce the nonce, can be {@code null} to indicate no nonce is provided + * @return the {@link JsonCallParameterBuilder} instance for chaining + */ + public JsonCallParameterBuilder withNonce(final UnsignedLongParameter nonce) { + this.nonce = Optional.ofNullable(nonce).map(UnsignedLongParameter::getValue); + return this; + } + /** * Handles unknown JSON properties during deserialization. This method is invoked when an * unknown property is encountered in the JSON being deserialized into a {@link @@ -376,7 +393,8 @@ public class JsonCallParameter extends CallParameter { strict, accessList, maxFeePerBlobGas, - blobVersionedHashes); + blobVersionedHashes, + nonce); } } } diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java index 880ddb9a1..eea8f55b2 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java @@ -579,6 +579,7 @@ public class EthEstimateGasTest { Optional.empty(), Wei.ZERO, Bytes.EMPTY, + Optional.empty(), Optional.empty()); } @@ -613,6 +614,7 @@ public class EthEstimateGasTest { Optional.of(Wei.fromHexString("0x10")), Wei.ZERO, Bytes.EMPTY, + Optional.empty(), Optional.empty()); } diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_all.json index 34a3fecb9..3f6849d45 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_all.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_all.json @@ -9,7 +9,7 @@ "gasPrice" : "0xef", "value" : "0x0", "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "nonce" : "0x1E" }, "latest", { "disableMemory": true, "disableStack": true, "disableStorage": true diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_default.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_default.json index 286cd61d1..da6d2b780 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_default.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_default.json @@ -9,7 +9,7 @@ "gasPrice" : "0xef", "value" : "0x0", "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "nonce" : "0x1E" }, "latest" ], "id" : 1 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableMemory.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableMemory.json index d19605c5a..af3d29f84 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableMemory.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableMemory.json @@ -9,7 +9,7 @@ "gasPrice" : "0xef", "value" : "0x0", "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "nonce" : "0x1E" }, "latest", { "disableMemory":true diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStack.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStack.json index e1408198e..43ad0da8f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStack.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStack.json @@ -9,7 +9,7 @@ "gasPrice" : "0xef", "value" : "0x0", "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "nonce" : "0x1E" }, "latest", { "disableStack": true diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStorage.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStorage.json index 58e4f48c4..2c5bb7a5a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStorage.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_disableStorage.json @@ -9,7 +9,7 @@ "gasPrice" : "0xef", "value" : "0x0", "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "nonce" : "0x1E" }, "latest", { "disableStorage": true diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_stateDiff.json index ca3e29c9a..1705f2202 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0000000000000000000000000000000000000999", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x1", - "nonce" : "0x0" + "value" : "0x1" }, [ "stateDiff" ], "latest" ], "id" : 0 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_trace.json index 8ae4ad473..4cb890353 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x0000000000000000000000000000000000000999", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x1", - "nonce" : "0x0" + "value" : "0x1" }, [ "trace" ], "latest" ], "id" : 0 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_vmTrace.json index 52829b099..b3224b787 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0000000000000000000000000000000000000999", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x1", - "nonce" : "0x0" + "value" : "0x1" }, [ "vmTrace" ], "latest" ], "id" : 53 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_stateDiff.json index ce05e50bf..9f4d9c3fe 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "stateDiff" ], "latest" ], "id" : 1 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_trace.json index af6877868..c495f3924 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "trace" ], "latest" ], "id" : 1 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_vmTrace.json index f820d8b6f..1e24ec101 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "vmTrace" ], "latest" ], "id" : 54 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_stateDiff.json index 5c1b902d7..790b0b105 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "stateDiff" ], "latest" ], "id" : 2 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_trace.json index 7877787a1..e44078f56 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "trace" ], "latest" ], "id" : 2 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_vmTrace.json index dfd72ccda..bafd611ff 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "vmTrace" ], "latest" ], "id" : 55 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_stateDiff.json index e90913742..519539791 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "stateDiff" ], "latest" ], "id" : 3 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_trace.json index 26a61ae83..f0f53cb66 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "trace" ], "latest" ], "id" : 3 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_vmTrace.json index e97c9fdfa..59d3e512b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "vmTrace" ], "latest" ], "id" : 56 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_stateDiff.json index 19285a7a0..097fed2db 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 4 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_trace.json index 4a9458b7a..6b3251f24 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 4 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_vmTrace.json index 026c55e76..b1c3315d2 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 57 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_stateDiff.json index 38031ae56..d38dc33cf 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 5 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_trace.json index 829df25b7..8fb139b9d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 5 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_vmTrace.json index 5fdf107e9..fbecbcba5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 58 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_stateDiff.json index b3ff816a9..af7c68a9a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000999", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000999" }, [ "stateDiff" ], "latest" ], "id" : 6 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_trace.json index 2e29955cd..bee79fcd0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000999", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000999" }, [ "trace" ], "latest" ], "id" : 6 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_vmTrace.json index ec4eaacb6..293e28b9e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000999", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000999" }, [ "vmTrace" ], "latest" ], "id" : 59 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_stateDiff.json index 84be38b9c..23d14c776 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0xf000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0xf000000000000000000000000000000000000000000000000000000000000001" }, [ "stateDiff" ], "latest" ], "id" : 7 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_trace.json index c55b60491..435cc2768 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0xf000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0xf000000000000000000000000000000000000000000000000000000000000001" }, [ "trace" ], "latest" ], "id" : 7 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_vmTrace.json index 2452eef26..c32ad5f1a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0xf000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0xf000000000000000000000000000000000000000000000000000000000000001" }, [ "vmTrace" ], "latest" ], "id" : 60 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_stateDiff.json index ec720537d..9c90d89b9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "stateDiff" ], "latest" ], "id" : 8 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_trace.json index 5ffe2d6d5..7d8de7e88 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "trace" ], "latest" ], "id" : 8 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_vmTrace.json index 4a6f2bb02..a2ec7dc36 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "vmTrace" ], "latest" ], "id" : 61 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_stateDiff.json index 09d606d0f..08c476b11 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "stateDiff" ], "latest" ], "id" : 9 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_trace.json index 4a221bf10..95f69a9b1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "trace" ], "latest" ], "id" : 9 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_vmTrace.json index 89eb7ab33..0a36dc1d3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "vmTrace" ], "latest" ], "id" : 62 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_stateDiff.json index dd7d2e149..c8d0c3f16 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "stateDiff" ], "latest" ], "id" : 10 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_trace.json index 234d6da2c..50cd7225e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "trace" ], "latest" ], "id" : 10 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_vmTrace.json index 2d24eb0c1..4ebaba0dc 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "vmTrace" ], "latest" ], "id" : 63 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_stateDiff.json index de904bb16..52acea344 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "stateDiff" ], "latest" ], "id" : 11 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_trace.json index 7f03070d8..746af3714 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "trace" ], "latest" ], "id" : 11 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_vmTrace.json index 92039a7c6..d32c205e7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001" }, [ "vmTrace" ], "latest" ], "id" : 64 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_stateDiff.json index 9478082fa..f98fd14c7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0070000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 12 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_trace.json index 692598d53..2b728f2a0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x0070000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 12 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_vmTrace.json index 63c526557..314f59baf 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0070000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 65 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_stateDiff.json index cd22c7f61..7e31d46e5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0080000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 13 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_trace.json index c61215e1b..31093ea4a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x0080000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 13 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_vmTrace.json index 416265ca3..1a6a2fce5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0080000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 66 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_stateDiff.json index 32238466f..91372c145 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 14 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_trace.json index dcec20cb9..7dae370c9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 14 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_vmTrace.json index 963205ab0..945097b3a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 67 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_stateDiff.json index 7f7d1f659..8baa0a4d2 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 15 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_trace.json index 113661e4d..831547670 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_trace.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 15 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_vmTrace.json index 80e81ec8c..95c646137 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 68 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_stateDiff.json index 55aed682c..d455b91b9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 16 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_trace.json index efd93be5c..fa894d758 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_trace.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 16 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_vmTrace.json index e49f4e2a2..8dc06a04d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0090000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 69 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_stateDiff.json index f3e633725..5822a6c47 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x00A0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 17 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_trace.json index f5d268bcb..bbacf7dbb 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x00A0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 17 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_vmTrace.json index c7965af54..6424c10e7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x00A0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 70 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_stateDiff.json index 62710b516..ff9ce89db 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x00B0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 18 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_trace.json index 37d84a21d..61ba82a3d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_trace.json @@ -8,8 +8,7 @@ "to" : "0x00B0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 18 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_vmTrace.json index 93ae73598..cae5ae019 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x00B0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 71 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_stateDiff.json index a452e4357..453e786cb 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x00C0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 19 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_trace.json index 8c60b46f7..fa8cd5373 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x00C0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 19 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_vmTrace.json index d78e9136c..4f22d63a6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x00C0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 72 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_stateDiff.json index 7cc47b9c1..edfccc099 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x00D0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 20 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_trace.json index a51d6fa0d..e75593a33 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_trace.json @@ -8,8 +8,7 @@ "to" : "0x00D0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 20 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_vmTrace.json index 423337852..12acff0c9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x00D0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 73 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_stateDiff.json index a54bc17b6..8f9d7feb9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x00E0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 21 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_trace.json index 4e5fef4af..e102f8b55 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_trace.json @@ -8,8 +8,7 @@ "to" : "0x00E0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 21 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_vmTrace.json index c130f54f6..5ed0d8d8e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x00E0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 74 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_stateDiff.json index 7f3c6cdf3..cd83135f0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x00F0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 22 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_trace.json index 333e251aa..18de4ce54 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x00F0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 22 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_vmTrace.json index 90aaa45f7..9daebf228 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x00F0000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 75 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_stateDiff.json index 6adb95b22..fdd8864d5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0100000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 23 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_trace.json index 26a2fa528..03e17956a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x0100000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 23 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_vmTrace.json index 84acbe143..5abb8eb2f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0100000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 76 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_stateDiff.json index 810ab6a64..6ee19fa22 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0110000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 24 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_trace.json index af59f0bd4..ff463b98d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_trace.json @@ -8,8 +8,7 @@ "to" : "0x0110000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 24 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_vmTrace.json index d70f16ec9..88d916b06 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0110000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 77 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_stateDiff.json index ea459e7dc..04d43ff88 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "stateDiff" ], "latest" ], "id" : 25 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_trace.json index 612a44399..f5b0bf41d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "trace" ], "latest" ], "id" : 25 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_vmTrace.json index 826dc9a58..0a086c5ec 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "vmTrace" ], "latest" ], "id" : 78 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_stateDiff.json index 2a4561009..87f809115 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1", - "nonce" : "0x0" + "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1" }, [ "stateDiff" ], "latest" ], "id" : 26 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_trace.json index 0ba1ec1b7..339669655 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1", - "nonce" : "0x0" + "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1" }, [ "trace" ], "latest" ], "id" : 26 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_vmTrace.json index eaeea1e14..56ba9ed65 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1", - "nonce" : "0x0" + "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1" }, [ "vmTrace" ], "latest" ], "id" : 79 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_stateDiff.json index e07a0692f..2983a4e6a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "stateDiff" ], "latest" ], "id" : 27 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_trace.json index 5dfd1a562..7af7c9622 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "trace" ], "latest" ], "id" : 27 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_vmTrace.json index cc5cbb9bd..266613144 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "vmTrace" ], "latest" ], "id" : 80 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_stateDiff.json index c549380c3..c2256fe88 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2", - "nonce" : "0x0" + "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2" }, [ "stateDiff" ], "latest" ], "id" : 28 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_trace.json index b9672c598..0b908ec29 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2", - "nonce" : "0x0" + "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2" }, [ "trace" ], "latest" ], "id" : 28 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_vmTrace.json index c152ac74e..e7790191b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2", - "nonce" : "0x0" + "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2" }, [ "vmTrace" ], "latest" ], "id" : 81 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_stateDiff.json index 1d5b94288..3069b489e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "stateDiff" ], "latest" ], "id" : 29 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_trace.json index 4286e5ac1..1e060f9cd 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "trace" ], "latest" ], "id" : 29 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_vmTrace.json index f7820b133..fb2c73f8b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x6004600C60003960046000F3600035FF", - "nonce" : "0x0" + "data" : "0x6004600C60003960046000F3600035FF" }, [ "vmTrace" ], "latest" ], "id" : 82 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_stateDiff.json index 52c54477a..7712898ac 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4", - "nonce" : "0x0" + "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4" }, [ "stateDiff" ], "latest" ], "id" : 30 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_trace.json index 20fb4f89b..8ca6360c6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4", - "nonce" : "0x0" + "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4" }, [ "trace" ], "latest" ], "id" : 30 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_vmTrace.json index 5035f2665..6f7e55e30 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4", - "nonce" : "0x0" + "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4" }, [ "vmTrace" ], "latest" ], "id" : 83 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_stateDiff.json index 49a758cad..4fb2331f9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0130000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 31 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_trace.json index d70418c23..34eff0682 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x0130000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 31 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_vmTrace.json index d7ca2dcca..de7927698 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0130000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 84 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_stateDiff.json index f27ed09f0..007946bdf 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0140000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 32 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_trace.json index 935a13729..7d1236bff 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_trace.json @@ -8,8 +8,7 @@ "to" : "0x0140000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 32 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_vmTrace.json index ca8059e78..228fd1042 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0140000000000000000000000000000000000000", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 85 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_stateDiff.json index a500bfb1e..0e43f4e4e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "stateDiff" ], "latest" ], "id" : 33 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_trace.json index e10cb9e35..3e192bb6d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "trace" ], "latest" ], "id" : 33 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_vmTrace.json index 289665434..0ecfa9a50 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "vmTrace" ], "latest" ], "id" : 86 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_stateDiff.json index 6f27ad29a..04e32575b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "stateDiff" ], "latest" ], "id" : 34 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_trace.json index 48a609bbd..2a8cecb3a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "trace" ], "latest" ], "id" : 34 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_vmTrace.json index 0c81fb7f2..8dfa33dcb 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "vmTrace" ], "latest" ], "id" : 87 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_stateDiff.json index 9e976bccf..f5be210af 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 35 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_trace.json index d41ab126f..67e832578 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 35 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_vmTrace.json index b447dfda7..3dabfde22 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 88 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_stateDiff.json index 1beef0f8f..d23689444 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 36 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_trace.json index aac0f50f1..4f35e6922 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 36 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_vmTrace.json index 20487f970..b276f06bd 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 89 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_stateDiff.json index cec25b028..93bb41dc7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "stateDiff" ], "latest" ], "id" : 37 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_trace.json index 1905d6ba9..1691699ff 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "trace" ], "latest" ], "id" : 37 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_vmTrace.json index 802379206..b93ef1fcb 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" }, [ "vmTrace" ], "latest" ], "id" : 90 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_stateDiff.json index 879513901..d27945adc 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "stateDiff" ], "latest" ], "id" : 38 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_trace.json index 4bdaa9c2c..6d870f0fa 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "trace" ], "latest" ], "id" : 38 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_vmTrace.json index ef9a48493..4560ce6c4 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004" }, [ "vmTrace" ], "latest" ], "id" : 91 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_stateDiff.json index 3d6aa48d6..d86c364c0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 39 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_trace.json index 72bfa2e8a..f50acd972 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 39 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_vmTrace.json index 0fecdf9da..4a87e05a6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 92 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_stateDiff.json index 5fb01626f..dfe6b40a3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 40 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_trace.json index 0dddabcb6..41cf7b6a1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 40 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_vmTrace.json index 02bebced1..a85e879e3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 93 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_stateDiff.json index 7c7809360..635136979 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0x30d40", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d" }, [ "stateDiff" ], "latest" ], "id" : 41 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_trace.json index 5f86c4de7..0a56b0712 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0x30d40", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d" }, [ "trace" ], "latest" ], "id" : 41 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_vmTrace.json index 0c5c29816..913a8151e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0x30d40", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d" }, [ "vmTrace" ], "latest" ], "id" : 94 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_stateDiff.json index 4a4396a9a..53640d4e1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d", - "nonce" : "0x0" + "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d" }, [ "stateDiff" ], "latest" ], "id" : 42 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_trace.json index 2826d276b..06d2bbc7d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d", - "nonce" : "0x0" + "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d" }, [ "trace" ], "latest" ], "id" : 42 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_vmTrace.json index cc66c00d0..948e158be 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d", - "nonce" : "0x0" + "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d" }, [ "vmTrace" ], "latest" ], "id" : 95 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_stateDiff.json index 3f49ca84e..5c0978296 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 43 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_trace.json index c45c4fc25..b76d07e6f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 43 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_vmTrace.json index be92d2ab8..8bda9ae49 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 96 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_stateDiff.json index 4c3ac3a67..751146a2f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0x23c346000", "value" : "0x0", - "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000", - "nonce" : "0x0" + "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000" }, [ "stateDiff" ], "latest" ], "id" : 44 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_trace.json index 8c72641e1..53fea311c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0x23c346000", "value" : "0x0", - "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000", - "nonce" : "0x0" + "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000" }, [ "trace" ], "latest" ], "id" : 44 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_vmTrace.json index 19a101f72..75a19cb51 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0x23c346000", "value" : "0x0", - "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000", - "nonce" : "0x0" + "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000" }, [ "vmTrace" ], "latest" ], "id" : 97 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_stateDiff.json index dc0f32127..d641b028d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "stateDiff" ], "latest" ], "id" : 45 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_trace.json index 8e8f0f84d..3f99103fb 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "trace" ], "latest" ], "id" : 45 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_vmTrace.json index 7e81f92e7..9dbe558e5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" }, [ "vmTrace" ], "latest" ], "id" : 98 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_stateDiff.json index f1a22f0ea..2fc30b704 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000150000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000150000000000000" }, [ "stateDiff" ], "latest" ], "id" : 46 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_trace.json index 6996ebb82..2342f553c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000150000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000150000000000000" }, [ "trace" ], "latest" ], "id" : 46 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_vmTrace.json index 318a596c1..b1c6eaf8d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x0000000000000000000000000150000000000000", - "nonce" : "0x0" + "data" : "0x0000000000000000000000000150000000000000" }, [ "vmTrace" ], "latest" ], "id" : 99 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_stateDiff.json index 646da799a..923601074 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe", - "nonce" : "0x0" + "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe" }, [ "stateDiff" ], "latest" ], "id" : 47 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_trace.json index 75e38bec2..8906b9d01 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_trace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe", - "nonce" : "0x0" + "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe" }, [ "trace" ], "latest" ], "id" : 47 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_vmTrace.json index 72cbe018c..afc445de3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0xfffff2", "gasPrice" : "0xef", "value" : "0x0", - "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe", - "nonce" : "0x0" + "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe" }, [ "vmTrace" ], "latest" ], "id" : 100 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_stateDiff.json index fcee0ca0b..a4258ca08 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0x11940", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x6000f1", - "nonce" : "0x0" + "data" : "0x6000f1" }, [ "stateDiff" ], "latest" ], "id" : 48 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_trace.json index f594d61ff..0b8461314 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_trace.json @@ -8,8 +8,7 @@ "gas" : "0x11940", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x6000f1", - "nonce" : "0x0" + "data" : "0x6000f1" }, [ "trace" ], "latest" ], "id" : 48 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_vmTrace.json index b17d88b31..62b321477 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0x11940", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x6000f1", - "nonce" : "0x0" + "data" : "0x6000f1" }, [ "vmTrace" ], "latest" ], "id" : 101 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_stateDiff.json index c26b18372..a934bfcae 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0x989680", "gasPrice" : "0x1", "value" : "0xa", - "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4" }, [ "stateDiff" ], "latest" ], "id" : 49 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_trace.json index 5bf57379c..efe22a89f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0x989680", "gasPrice" : "0x1", "value" : "0xa", - "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4" }, [ "trace" ], "latest" ], "id" : 49 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_vmTrace.json index 607447006..d271e9e79 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0x989680", "gasPrice" : "0x1", "value" : "0xa", - "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4", - "nonce" : "0x0" + "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4" }, [ "vmTrace" ], "latest" ], "id" : 102 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_stateDiff.json index 63f7153ca..9dd6a1f01 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_stateDiff.json @@ -8,8 +8,7 @@ "to" : "0x0000000000000000000000000000000000000001", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "stateDiff" ], "latest" ], "id" : 50 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_trace.json index 8f53e66f1..9e2094345 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_trace.json @@ -8,8 +8,7 @@ "to" : "0x0000000000000000000000000000000000000001", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "trace" ], "latest" ], "id" : 50 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_vmTrace.json index 063a7e5a2..1010cbe38 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_vmTrace.json @@ -8,8 +8,7 @@ "to" : "0x0000000000000000000000000000000000000001", "gas" : "0xfffff2", "gasPrice" : "0xef", - "value" : "0x0", - "nonce" : "0x0" + "value" : "0x0" }, [ "vmTrace" ], "latest" ], "id" : 103 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_stateDiff.json index b3dda3b2c..46610a6c0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_stateDiff.json @@ -9,8 +9,7 @@ "gas" : "0x11fa1", "gasPrice" : "0x10", "value" : "0x0", - "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60", - "nonce" : "0x0" + "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60" }, [ "stateDiff" ], "latest" ], "id" : 51 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_trace.json index c77d5b300..8d2ef1569 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_trace.json @@ -9,8 +9,7 @@ "gas" : "0x11fa1", "gasPrice" : "0x10", "value" : "0x0", - "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60", - "nonce" : "0x0" + "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60" }, [ "trace" ], "latest" ], "id" : 51 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_vmTrace.json index cea9637b1..bc6df2d59 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_vmTrace.json @@ -9,8 +9,7 @@ "gas" : "0x11fa1", "gasPrice" : "0x10", "value" : "0x0", - "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60", - "nonce" : "0x0" + "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60" }, [ "vmTrace" ], "latest" ], "id" : 104 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_stateDiff.json index 3d8443155..fea438d22 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_stateDiff.json @@ -8,8 +8,7 @@ "gas" : "0x47b760", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x602af300", - "nonce" : "0x0" + "data" : "0x602af300" }, [ "stateDiff" ], "latest" ], "id" : 52 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_trace.json index c007c3cd7..f3a3419ff 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_trace.json @@ -8,8 +8,7 @@ "gas" : "0x47b760", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x602af300", - "nonce" : "0x0" + "data" : "0x602af300" }, [ "trace" ], "latest" ], "id" : 52 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_vmTrace.json index 7e35c861a..42609d49a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_vmTrace.json @@ -8,8 +8,7 @@ "gas" : "0x47b760", "gasPrice" : "0x1", "value" : "0x0", - "data" : "0x602af300", - "nonce" : "0x0" + "data" : "0x602af300" }, [ "vmTrace" ], "latest" ], "id" : 105 }, diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_stateDiff.json index 7d1599b1f..6cd3a33f6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000099901801ca06aeaaaac3375bb814d36f8c5fb941dae51b55dffc22a6fd3b5b3dd30a9a489d6a05a07dd9d31a1b78fed59812496306fd9e17446cbb456e4e68f1d15b186567302", [ "stateDiff" ] ], + "params" : [ "0xf8611781ef83fffff294000000000000000000000000000000000000099901801ca04ecb4fc65c930379a3688b9e34fb450141c141a6f8a651235ec4ddaaa62b0bd4a04d44121854a8747da882d3b66793bc3e8b0129cf6af18d43c4815ba2e3b097ef", [ "stateDiff" ] ], "id" : 0 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_trace.json index 329978d3c..26a12b59a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000099901801ca06aeaaaac3375bb814d36f8c5fb941dae51b55dffc22a6fd3b5b3dd30a9a489d6a05a07dd9d31a1b78fed59812496306fd9e17446cbb456e4e68f1d15b186567302", [ "trace" ] ], + "params" : [ "0xf8611781ef83fffff294000000000000000000000000000000000000099901801ca04ecb4fc65c930379a3688b9e34fb450141c141a6f8a651235ec4ddaaa62b0bd4a04d44121854a8747da882d3b66793bc3e8b0129cf6af18d43c4815ba2e3b097ef", [ "trace" ] ], "id" : 53 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_vmTrace.json index 9091ed9ab..a8ea19c7e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000099901801ca06aeaaaac3375bb814d36f8c5fb941dae51b55dffc22a6fd3b5b3dd30a9a489d6a05a07dd9d31a1b78fed59812496306fd9e17446cbb456e4e68f1d15b186567302", [ "vmTrace" ] ], + "params" : [ "0xf8611781ef83fffff294000000000000000000000000000000000000099901801ca04ecb4fc65c930379a3688b9e34fb450141c141a6f8a651235ec4ddaaa62b0bd4a04d44121854a8747da882d3b66793bc3e8b0129cf6af18d43c4815ba2e3b097ef", [ "vmTrace" ] ], "id" : 106 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_stateDiff.json index 4243204be..493220848 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "stateDiff" ] ], "id" : 1 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_trace.json index 2d3e31214..70ee151e6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "trace" ] ], "id" : 54 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_vmTrace.json index f74235847..cf7ba44cd 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "vmTrace" ] ], "id" : 107 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_stateDiff.json index d28f9d06c..5139af576 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba05da194e824c48667c3fffc005ce2308c4a507737e8f7a370f52be7b4de29fefda009802caf0afd343a87e043b1c28508da3e1688c441905457b9289571c789831e", [ "stateDiff" ] ], + "params" : [ "0xf8e21e81ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca01755bc8ad823bfe5921b6fd1be1103746d95a595036475a1e00fd324505d90e2a0592eebdf2a531e58df4a1aff8b844a1fe457256bc9b52a84e30b6e4ac8a18add", [ "stateDiff" ] ], "id" : 2 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_trace.json index 4759999c1..bdc8033ec 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba05da194e824c48667c3fffc005ce2308c4a507737e8f7a370f52be7b4de29fefda009802caf0afd343a87e043b1c28508da3e1688c441905457b9289571c789831e", [ "trace" ] ], + "params" : [ "0xf8e21e81ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca01755bc8ad823bfe5921b6fd1be1103746d95a595036475a1e00fd324505d90e2a0592eebdf2a531e58df4a1aff8b844a1fe457256bc9b52a84e30b6e4ac8a18add", [ "trace" ] ], "id" : 55 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_vmTrace.json index 960a0b5cc..06921ceeb 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba05da194e824c48667c3fffc005ce2308c4a507737e8f7a370f52be7b4de29fefda009802caf0afd343a87e043b1c28508da3e1688c441905457b9289571c789831e", [ "vmTrace" ] ], + "params" : [ "0xf8e21e81ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca01755bc8ad823bfe5921b6fd1be1103746d95a595036475a1e00fd324505d90e2a0592eebdf2a531e58df4a1aff8b844a1fe457256bc9b52a84e30b6e4ac8a18add", [ "vmTrace" ] ], "id" : 108 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_stateDiff.json index 9234f0079..beb5c0329 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca0966415c122a07c1862c8f5963aae24932b3621e386a9e65fb04b0b5dfcac7516a054518dd075127c40adfafa97b6243be762dd3f049ae6da2f1446b6067a4a98f8", [ "stateDiff" ] ], + "params" : [ "0xf8e21781ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba0ac6a6262a65077e17a0f61f9fe14f1a20d2c87131e978671039cfec8fdf388d4a078c5123b21217b491bb8729331a6bdfe711bc023bbd5044139cff47d61ad9285", [ "stateDiff" ] ], "id" : 3 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_trace.json index dde5f7402..b49f92593 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca0966415c122a07c1862c8f5963aae24932b3621e386a9e65fb04b0b5dfcac7516a054518dd075127c40adfafa97b6243be762dd3f049ae6da2f1446b6067a4a98f8", [ "trace" ] ], + "params" : [ "0xf8e21781ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba0ac6a6262a65077e17a0f61f9fe14f1a20d2c87131e978671039cfec8fdf388d4a078c5123b21217b491bb8729331a6bdfe711bc023bbd5044139cff47d61ad9285", [ "trace" ] ], "id" : 56 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_vmTrace.json index 15c042136..e6c0dc6ba 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca0966415c122a07c1862c8f5963aae24932b3621e386a9e65fb04b0b5dfcac7516a054518dd075127c40adfafa97b6243be762dd3f049ae6da2f1446b6067a4a98f8", [ "vmTrace" ] ], + "params" : [ "0xf8e21781ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba0ac6a6262a65077e17a0f61f9fe14f1a20d2c87131e978671039cfec8fdf388d4a078c5123b21217b491bb8729331a6bdfe711bc023bbd5044139cff47d61ad9285", [ "vmTrace" ] ], "id" : 109 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_stateDiff.json index 3814125ed..99ce7932b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca02a0751ced12903f0ff0f90da44f2a76d10b90dfffcdcc4be522162cdbf59519ea041b3c94bb6bbdcafbb510a678775ece69648fea10f263f5dc505f0b6b75eb0aa", [ "stateDiff" ] ], + "params" : [ "0xf8e21781ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0b4a26cb40178eb39d69bce3ae455d88b4ace92fc5a1a6e12633a57503d3694c2a038b4cfb75a716f82b54b8f18f1605b93b0d03cb246077a363430c154cc92aca1", [ "stateDiff" ] ], "id" : 4 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_trace.json index 708d1b1b6..f3880fd03 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca02a0751ced12903f0ff0f90da44f2a76d10b90dfffcdcc4be522162cdbf59519ea041b3c94bb6bbdcafbb510a678775ece69648fea10f263f5dc505f0b6b75eb0aa", [ "trace" ] ], + "params" : [ "0xf8e21781ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0b4a26cb40178eb39d69bce3ae455d88b4ace92fc5a1a6e12633a57503d3694c2a038b4cfb75a716f82b54b8f18f1605b93b0d03cb246077a363430c154cc92aca1", [ "trace" ] ], "id" : 57 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_vmTrace.json index ead03c0ad..7ef601633 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca02a0751ced12903f0ff0f90da44f2a76d10b90dfffcdcc4be522162cdbf59519ea041b3c94bb6bbdcafbb510a678775ece69648fea10f263f5dc505f0b6b75eb0aa", [ "vmTrace" ] ], + "params" : [ "0xf8e21781ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0b4a26cb40178eb39d69bce3ae455d88b4ace92fc5a1a6e12633a57503d3694c2a038b4cfb75a716f82b54b8f18f1605b93b0d03cb246077a363430c154cc92aca1", [ "vmTrace" ] ], "id" : 110 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_stateDiff.json index e43e26446..bb7efdf25 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba0aabf9e3beeae05957a6b663f57f559fce4379d3b1f255245f42e0080e254254ca018e484db063e0ff3831bd2791a4e36cff6a982e74f57a0f5c43d966e2185736f", [ "stateDiff" ] ], + "params" : [ "0xf8e21e81ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba067e3f9241dd0288a0d33e3e33361a8854469830cd3833c22fa44ac55884a1387a045c3adb00d0f301c99d5349d30948e4cbdb9016d503ec49c37af86324110cab8", [ "stateDiff" ] ], "id" : 5 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_trace.json index 51a5aece5..6bd97174d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba0aabf9e3beeae05957a6b663f57f559fce4379d3b1f255245f42e0080e254254ca018e484db063e0ff3831bd2791a4e36cff6a982e74f57a0f5c43d966e2185736f", [ "trace" ] ], + "params" : [ "0xf8e21e81ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba067e3f9241dd0288a0d33e3e33361a8854469830cd3833c22fa44ac55884a1387a045c3adb00d0f301c99d5349d30948e4cbdb9016d503ec49c37af86324110cab8", [ "trace" ] ], "id" : 58 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_vmTrace.json index af69cee28..0fde053bf 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba0aabf9e3beeae05957a6b663f57f559fce4379d3b1f255245f42e0080e254254ca018e484db063e0ff3831bd2791a4e36cff6a982e74f57a0f5c43d966e2185736f", [ "vmTrace" ] ], + "params" : [ "0xf8e21e81ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba067e3f9241dd0288a0d33e3e33361a8854469830cd3833c22fa44ac55884a1387a045c3adb00d0f301c99d5349d30948e4cbdb9016d503ec49c37af86324110cab8", [ "vmTrace" ] ], "id" : 111 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_stateDiff.json index db5f8e06d..5f7c9addf 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8758081ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ba06e24ac7e9168aa87f1f36357c3da73f1a3b842c9cf3ba0061b88d7875236c999a0476b670755aceb691763507e32e293172ba95e216bd8c78b9b5ab8d6afe1f49e", [ "stateDiff" ] ], + "params" : [ "0xf8751e81ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ca00b4d27419dabf8945fd306fa1ec4ce0ee4765ff26f5d6eb15389dc92fd2c770da04958c967c1fa4192ce833a92e4d16c27db1fa06e00206fe146953ca6267878bf", [ "stateDiff" ] ], "id" : 6 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_trace.json index 7abee1986..55feb42b1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8758081ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ba06e24ac7e9168aa87f1f36357c3da73f1a3b842c9cf3ba0061b88d7875236c999a0476b670755aceb691763507e32e293172ba95e216bd8c78b9b5ab8d6afe1f49e", [ "trace" ] ], + "params" : [ "0xf8751e81ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ca00b4d27419dabf8945fd306fa1ec4ce0ee4765ff26f5d6eb15389dc92fd2c770da04958c967c1fa4192ce833a92e4d16c27db1fa06e00206fe146953ca6267878bf", [ "trace" ] ], "id" : 59 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_vmTrace.json index c5e0ffbd4..67a9af7ee 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8758081ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ba06e24ac7e9168aa87f1f36357c3da73f1a3b842c9cf3ba0061b88d7875236c999a0476b670755aceb691763507e32e293172ba95e216bd8c78b9b5ab8d6afe1f49e", [ "vmTrace" ] ], + "params" : [ "0xf8751e81ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ca00b4d27419dabf8945fd306fa1ec4ce0ee4765ff26f5d6eb15389dc92fd2c770da04958c967c1fa4192ce833a92e4d16c27db1fa06e00206fe146953ca6267878bf", [ "vmTrace" ] ], "id" : 112 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_stateDiff.json index bfe1074eb..d06547758 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8818081ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0acbf3999783a6ff94ce42e07c959af589bfe860436243152ae90bf3b97d07c62a009f992840128573e7473e22b5329eb063e0d35ed2b36765813da92aeb344cb92", [ "stateDiff" ] ], + "params" : [ "0xf8811e81ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0d59b6986fab8efc1ed84fdee1c9b56ee8e9ea9077f2a8ee847e58a273bc07cbba0094e1b8844fc96c3bb60732af7e1a082c527e32d51f8b2cbd7a543ff1d752f61", [ "stateDiff" ] ], "id" : 7 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_trace.json index dcf10f66d..2fe09a384 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8818081ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0acbf3999783a6ff94ce42e07c959af589bfe860436243152ae90bf3b97d07c62a009f992840128573e7473e22b5329eb063e0d35ed2b36765813da92aeb344cb92", [ "trace" ] ], + "params" : [ "0xf8811e81ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0d59b6986fab8efc1ed84fdee1c9b56ee8e9ea9077f2a8ee847e58a273bc07cbba0094e1b8844fc96c3bb60732af7e1a082c527e32d51f8b2cbd7a543ff1d752f61", [ "trace" ] ], "id" : 60 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_vmTrace.json index cc4bc5fd6..fea25fd80 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8818081ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0acbf3999783a6ff94ce42e07c959af589bfe860436243152ae90bf3b97d07c62a009f992840128573e7473e22b5329eb063e0d35ed2b36765813da92aeb344cb92", [ "vmTrace" ] ], + "params" : [ "0xf8811e81ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0d59b6986fab8efc1ed84fdee1c9b56ee8e9ea9077f2a8ee847e58a273bc07cbba0094e1b8844fc96c3bb60732af7e1a082c527e32d51f8b2cbd7a543ff1d752f61", [ "vmTrace" ] ], "id" : 113 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_stateDiff.json index bbf15094a..980f677e3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a28081ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba0227687bd85a4fc2cbf62bf0d7551be4efebeec740886ab4db7e17d54242f8d9da021ed85a8b09f1a20d80cba804281193113f3fc172421865670089f42bceb8fee", [ "stateDiff" ] ], + "params" : [ "0xf8a21e81ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0603dd74c278174534fe6a25cfc499cfeb1bc5a8f7a2d0fcadb960bf49a1ce01ca051e35b19841e496885c3a360cdf86e80e33f7825b575c3994b1f235dae466666", [ "stateDiff" ] ], "id" : 8 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_trace.json index d6bcd154e..7ef121232 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a28081ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba0227687bd85a4fc2cbf62bf0d7551be4efebeec740886ab4db7e17d54242f8d9da021ed85a8b09f1a20d80cba804281193113f3fc172421865670089f42bceb8fee", [ "trace" ] ], + "params" : [ "0xf8a21e81ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0603dd74c278174534fe6a25cfc499cfeb1bc5a8f7a2d0fcadb960bf49a1ce01ca051e35b19841e496885c3a360cdf86e80e33f7825b575c3994b1f235dae466666", [ "trace" ] ], "id" : 61 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_vmTrace.json index 4c632a77c..3d3993441 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a28081ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba0227687bd85a4fc2cbf62bf0d7551be4efebeec740886ab4db7e17d54242f8d9da021ed85a8b09f1a20d80cba804281193113f3fc172421865670089f42bceb8fee", [ "vmTrace" ] ], + "params" : [ "0xf8a21e81ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0603dd74c278174534fe6a25cfc499cfeb1bc5a8f7a2d0fcadb960bf49a1ce01ca051e35b19841e496885c3a360cdf86e80e33f7825b575c3994b1f235dae466666", [ "vmTrace" ] ], "id" : 114 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_stateDiff.json index e266e6e52..e5da822c6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba094e32d38bf8eb598113e948ab6540783d311efa0ce2f96cc5fd6bf49d645b979a03b8c2561f34996a4c8f82f83b0dedeb5cd6eb1a7b7ff8ea52a288c4af80993f4", [ "stateDiff" ] ], + "params" : [ "0xf8e21e81ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca00a13bc36487cea690a2ed2a2b65aa81b2283761bdf57cd1dd9c0f5ca1ac5141ba014cd8eec311bdf31fa55585b0e3d215ef760cfa3c9246a77bd1f91be6561670b", [ "stateDiff" ] ], "id" : 9 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_trace.json index 7da610dea..1d79e8cb1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba094e32d38bf8eb598113e948ab6540783d311efa0ce2f96cc5fd6bf49d645b979a03b8c2561f34996a4c8f82f83b0dedeb5cd6eb1a7b7ff8ea52a288c4af80993f4", [ "trace" ] ], + "params" : [ "0xf8e21e81ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca00a13bc36487cea690a2ed2a2b65aa81b2283761bdf57cd1dd9c0f5ca1ac5141ba014cd8eec311bdf31fa55585b0e3d215ef760cfa3c9246a77bd1f91be6561670b", [ "trace" ] ], "id" : 62 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_vmTrace.json index 3bf3deb74..57fc4b49a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8e28081ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba094e32d38bf8eb598113e948ab6540783d311efa0ce2f96cc5fd6bf49d645b979a03b8c2561f34996a4c8f82f83b0dedeb5cd6eb1a7b7ff8ea52a288c4af80993f4", [ "vmTrace" ] ], + "params" : [ "0xf8e21e81ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca00a13bc36487cea690a2ed2a2b65aa81b2283761bdf57cd1dd9c0f5ca1ac5141ba014cd8eec311bdf31fa55585b0e3d215ef760cfa3c9246a77bd1f91be6561670b", [ "vmTrace" ] ], "id" : 115 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_stateDiff.json index fb43ec75c..c18bfa5ac 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a18081ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0f5a778187bd9ad3bdaef19edeffcb2a8917ed24295f70f0c0d31b47854e493d69f23060788506d5d3a59338decc302d55af0ccfeafa230c2a7fc0815ce13971d", [ "stateDiff" ] ], + "params" : [ "0xf8a21e81ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01de39672357e70eba488646dd4b7957a1d4d6602b1b7c1fec6aebb4faae25172a074dda70e301cd5efb8324788150c7efb5cee5639a898103395753282c2e6d6b0", [ "stateDiff" ] ], "id" : 10 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_trace.json index 48aaf2259..d87e54f34 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a18081ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0f5a778187bd9ad3bdaef19edeffcb2a8917ed24295f70f0c0d31b47854e493d69f23060788506d5d3a59338decc302d55af0ccfeafa230c2a7fc0815ce13971d", [ "trace" ] ], + "params" : [ "0xf8a21e81ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01de39672357e70eba488646dd4b7957a1d4d6602b1b7c1fec6aebb4faae25172a074dda70e301cd5efb8324788150c7efb5cee5639a898103395753282c2e6d6b0", [ "trace" ] ], "id" : 63 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_vmTrace.json index b406dde49..8adea0f65 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a18081ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0f5a778187bd9ad3bdaef19edeffcb2a8917ed24295f70f0c0d31b47854e493d69f23060788506d5d3a59338decc302d55af0ccfeafa230c2a7fc0815ce13971d", [ "vmTrace" ] ], + "params" : [ "0xf8a21e81ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01de39672357e70eba488646dd4b7957a1d4d6602b1b7c1fec6aebb4faae25172a074dda70e301cd5efb8324788150c7efb5cee5639a898103395753282c2e6d6b0", [ "vmTrace" ] ], "id" : 116 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_stateDiff.json index 9ffe09589..17abc4f2d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a28081ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01caa106cf71c1bce1cc77a1292bb78a0b54f983b323f24128f4b3b6ddf9ee6d3a072d4eb63594b91cbee2bb203298ae128abe99dc8d7270d213c48a6242d2bc605", [ "stateDiff" ] ], + "params" : [ "0xf8a21e81ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0a125ae26c1952dfdc260e90b890911cb7084d1f2883f48e72253b8623d5b7ac3a06b8e88fa4fb083a673982378410ee0bfd50bc377ea6926a69f48a5f9cbcd6f37", [ "stateDiff" ] ], "id" : 11 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_trace.json index 061c5a07d..5283e6786 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a28081ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01caa106cf71c1bce1cc77a1292bb78a0b54f983b323f24128f4b3b6ddf9ee6d3a072d4eb63594b91cbee2bb203298ae128abe99dc8d7270d213c48a6242d2bc605", [ "trace" ] ], + "params" : [ "0xf8a21e81ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0a125ae26c1952dfdc260e90b890911cb7084d1f2883f48e72253b8623d5b7ac3a06b8e88fa4fb083a673982378410ee0bfd50bc377ea6926a69f48a5f9cbcd6f37", [ "trace" ] ], "id" : 64 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_vmTrace.json index d8bc71b77..03d747dc4 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a28081ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01caa106cf71c1bce1cc77a1292bb78a0b54f983b323f24128f4b3b6ddf9ee6d3a072d4eb63594b91cbee2bb203298ae128abe99dc8d7270d213c48a6242d2bc605", [ "vmTrace" ] ], + "params" : [ "0xf8a21e81ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0a125ae26c1952dfdc260e90b890911cb7084d1f2883f48e72253b8623d5b7ac3a06b8e88fa4fb083a673982378410ee0bfd50bc377ea6926a69f48a5f9cbcd6f37", [ "vmTrace" ] ], "id" : 117 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_stateDiff.json index 4a802aa05..373deea58 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294007000000000000000000000000000000000000080801ca037d0695dc0e97dafd4e2f08d7b9c05ec8f6825409ff49ded4714632ee49c5d4ca05123df205d2b5344b4693feb1a341c1b1d0c38cc53b105c58e0b8dbec3c0288b", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294007000000000000000000000000000000000000080801ba05e1c758b2c37564fa59fe73a387935856da257506d7dff36e887cca222af922fa0185e3626c32a3a6cd609924bf5b32207cb8cdb5e9b5af003dc24ab71b5f25e33", [ "stateDiff" ] ], "id" : 12 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_trace.json index 5043fb3a0..ec9b02aea 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294007000000000000000000000000000000000000080801ca037d0695dc0e97dafd4e2f08d7b9c05ec8f6825409ff49ded4714632ee49c5d4ca05123df205d2b5344b4693feb1a341c1b1d0c38cc53b105c58e0b8dbec3c0288b", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294007000000000000000000000000000000000000080801ba05e1c758b2c37564fa59fe73a387935856da257506d7dff36e887cca222af922fa0185e3626c32a3a6cd609924bf5b32207cb8cdb5e9b5af003dc24ab71b5f25e33", [ "trace" ] ], "id" : 65 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_vmTrace.json index 9a6021aa8..c3a8e3225 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294007000000000000000000000000000000000000080801ca037d0695dc0e97dafd4e2f08d7b9c05ec8f6825409ff49ded4714632ee49c5d4ca05123df205d2b5344b4693feb1a341c1b1d0c38cc53b105c58e0b8dbec3c0288b", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294007000000000000000000000000000000000000080801ba05e1c758b2c37564fa59fe73a387935856da257506d7dff36e887cca222af922fa0185e3626c32a3a6cd609924bf5b32207cb8cdb5e9b5af003dc24ab71b5f25e33", [ "vmTrace" ] ], "id" : 118 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_stateDiff.json index 9caba89e9..37f629117 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294008000000000000000000000000000000000000080801ba0bbc28666e07f9906314109d70eba6b66298e48733d65ff0f8c299a21e51c3e7ca03e39b147df2ebce6326c93e3c9c42ba1dece7b994be120ab39e39c6da830acd2", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294008000000000000000000000000000000000000080801ca02181724e96e87656255b1683ef765cad788c0fd3e9f7366c4a8a8bf86ac0b905a016b637b583fa3b788d54ee655844cb5a60ceccb7abc431d6c21ae73909e7767e", [ "stateDiff" ] ], "id" : 13 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_trace.json index 8fe03da18..6b4f36da9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294008000000000000000000000000000000000000080801ba0bbc28666e07f9906314109d70eba6b66298e48733d65ff0f8c299a21e51c3e7ca03e39b147df2ebce6326c93e3c9c42ba1dece7b994be120ab39e39c6da830acd2", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294008000000000000000000000000000000000000080801ca02181724e96e87656255b1683ef765cad788c0fd3e9f7366c4a8a8bf86ac0b905a016b637b583fa3b788d54ee655844cb5a60ceccb7abc431d6c21ae73909e7767e", [ "trace" ] ], "id" : 66 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_vmTrace.json index 152fa3e54..9995f69a4 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294008000000000000000000000000000000000000080801ba0bbc28666e07f9906314109d70eba6b66298e48733d65ff0f8c299a21e51c3e7ca03e39b147df2ebce6326c93e3c9c42ba1dece7b994be120ab39e39c6da830acd2", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294008000000000000000000000000000000000000080801ca02181724e96e87656255b1683ef765cad788c0fd3e9f7366c4a8a8bf86ac0b905a016b637b583fa3b788d54ee655844cb5a60ceccb7abc431d6c21ae73909e7767e", [ "vmTrace" ] ], "id" : 119 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_stateDiff.json index 6b39c1df6..59b801b33 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "stateDiff" ] ], "id" : 14 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_trace.json index b2172b375..6548a0d0f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "trace" ] ], "id" : 67 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_vmTrace.json index f3bbe6289..cfbb22b94 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "vmTrace" ] ], "id" : 120 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_stateDiff.json index 299a98474..4a888a00e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "stateDiff" ] ], "id" : 15 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_trace.json index b73bbb6a6..c5470b695 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "trace" ] ], "id" : 68 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_vmTrace.json index fcc0f83f5..50f788584 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "vmTrace" ] ], "id" : 121 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_stateDiff.json index 20532f467..63967eb9a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "stateDiff" ] ], "id" : 16 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_trace.json index d4f259097..d7b0d77f8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "trace" ] ], "id" : 69 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_vmTrace.json index 0216005f1..22aeb312b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294009000000000000000000000000000000000000080801ba06d4cf2dbd66884ca1256f3ca5e78a43ab9a0a641c4d0a920237d2533e791eccfa05b100df1d529a311d3222e2b05be800f60d4b0dc869236731406d40d17348489", [ "vmTrace" ] ], "id" : 122 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_stateDiff.json index ea32997ec..549be7e5b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400a000000000000000000000000000000000000080801ba0f42215cd96cc735c648c6e6779e4b0276270aa18355f9b248e68075c464784d2a01a5f04f9cfd276e8f3676061c88ca123f2f98a626b74bd6aece887354db82523", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff29400a000000000000000000000000000000000000080801ca0963eb3e3c47eba85d21586f17f85a998e34b3c28583d6448db3f5a822996bd98a07700e83bf28e109acf77eec486297a34a18e7fb2b3071aca1a0b9fdcca5dd589", [ "stateDiff" ] ], "id" : 17 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_trace.json index 142dbd0bc..394dfc937 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400a000000000000000000000000000000000000080801ba0f42215cd96cc735c648c6e6779e4b0276270aa18355f9b248e68075c464784d2a01a5f04f9cfd276e8f3676061c88ca123f2f98a626b74bd6aece887354db82523", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff29400a000000000000000000000000000000000000080801ca0963eb3e3c47eba85d21586f17f85a998e34b3c28583d6448db3f5a822996bd98a07700e83bf28e109acf77eec486297a34a18e7fb2b3071aca1a0b9fdcca5dd589", [ "trace" ] ], "id" : 70 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_vmTrace.json index 1e9533ab5..0d861cd5f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400a000000000000000000000000000000000000080801ba0f42215cd96cc735c648c6e6779e4b0276270aa18355f9b248e68075c464784d2a01a5f04f9cfd276e8f3676061c88ca123f2f98a626b74bd6aece887354db82523", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff29400a000000000000000000000000000000000000080801ca0963eb3e3c47eba85d21586f17f85a998e34b3c28583d6448db3f5a822996bd98a07700e83bf28e109acf77eec486297a34a18e7fb2b3071aca1a0b9fdcca5dd589", [ "vmTrace" ] ], "id" : 123 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_stateDiff.json index 4d9d43b96..13af5fa9a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400b000000000000000000000000000000000000080801ca0f0f0940cb847f877c7ff97f008ee5765c274ca1c6e96fd7f47f333aadf9f3047a00611937b19b220c7e81c80b372e8338fde6ab792e15aebd631cb0110b7bf0f09", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff29400b000000000000000000000000000000000000080801ba0861a10257f56944e4c7c3316590b588f357fd99c89282f774b41d108322c3956a01e896fc32a14c17477bb9301b450e1412516b2e9309a69a51c64fe46db13a73b", [ "stateDiff" ] ], "id" : 18 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_trace.json index b6bbbd9ae..2d1495da7 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400b000000000000000000000000000000000000080801ca0f0f0940cb847f877c7ff97f008ee5765c274ca1c6e96fd7f47f333aadf9f3047a00611937b19b220c7e81c80b372e8338fde6ab792e15aebd631cb0110b7bf0f09", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff29400b000000000000000000000000000000000000080801ba0861a10257f56944e4c7c3316590b588f357fd99c89282f774b41d108322c3956a01e896fc32a14c17477bb9301b450e1412516b2e9309a69a51c64fe46db13a73b", [ "trace" ] ], "id" : 71 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_vmTrace.json index aa776d595..2f773b516 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400b000000000000000000000000000000000000080801ca0f0f0940cb847f877c7ff97f008ee5765c274ca1c6e96fd7f47f333aadf9f3047a00611937b19b220c7e81c80b372e8338fde6ab792e15aebd631cb0110b7bf0f09", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff29400b000000000000000000000000000000000000080801ba0861a10257f56944e4c7c3316590b588f357fd99c89282f774b41d108322c3956a01e896fc32a14c17477bb9301b450e1412516b2e9309a69a51c64fe46db13a73b", [ "vmTrace" ] ], "id" : 124 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_stateDiff.json index 6fcab1b2c..52555a833 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400c000000000000000000000000000000000000080801ba0d91c27daad8e1eb6b4063bd4300aa75310bbd0eb5cdbde908bcb20f5335f891ea0326703eb5dab4aea5451b387c8ca0e6546f4446efd5383f0ba7efbd2af3801ef", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff29400c000000000000000000000000000000000000080801ba0480a7ca976e4ab1d6d819df86d87d9087c670921c1823d0a6aa98bdb755edffda028fc0b85fd57ae18f6bf138869b7819c87d20ea625ce7edbcb7bff197ca25fdd", [ "stateDiff" ] ], "id" : 19 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_trace.json index d7376ce96..4b2ae1f2a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400c000000000000000000000000000000000000080801ba0d91c27daad8e1eb6b4063bd4300aa75310bbd0eb5cdbde908bcb20f5335f891ea0326703eb5dab4aea5451b387c8ca0e6546f4446efd5383f0ba7efbd2af3801ef", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff29400c000000000000000000000000000000000000080801ba0480a7ca976e4ab1d6d819df86d87d9087c670921c1823d0a6aa98bdb755edffda028fc0b85fd57ae18f6bf138869b7819c87d20ea625ce7edbcb7bff197ca25fdd", [ "trace" ] ], "id" : 72 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_vmTrace.json index 4e5b09438..1c71e1b8a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400c000000000000000000000000000000000000080801ba0d91c27daad8e1eb6b4063bd4300aa75310bbd0eb5cdbde908bcb20f5335f891ea0326703eb5dab4aea5451b387c8ca0e6546f4446efd5383f0ba7efbd2af3801ef", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff29400c000000000000000000000000000000000000080801ba0480a7ca976e4ab1d6d819df86d87d9087c670921c1823d0a6aa98bdb755edffda028fc0b85fd57ae18f6bf138869b7819c87d20ea625ce7edbcb7bff197ca25fdd", [ "vmTrace" ] ], "id" : 125 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_stateDiff.json index e35a4f32e..82fe943b1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400d000000000000000000000000000000000000080801ca07a612f4e688476ec724ca1b43bf42554fbb6fe7e23b9e11f266fb02d943fa0d7a06dc7585f54af231d7127f4461f0e12175582c106c890f34d5d0f9eeef76896a9", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff29400d000000000000000000000000000000000000080801ba0e8609ea3fef696eceeba6ad4d66ad743412215a30fa9fdb1cbec878fdc9bdf5aa01304ec7b176a6ea56330f4c65d30e4c2226940e41d8ade0291d5d63d68903bb4", [ "stateDiff" ] ], "id" : 20 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_trace.json index affa7406b..daa1521d6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400d000000000000000000000000000000000000080801ca07a612f4e688476ec724ca1b43bf42554fbb6fe7e23b9e11f266fb02d943fa0d7a06dc7585f54af231d7127f4461f0e12175582c106c890f34d5d0f9eeef76896a9", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff29400d000000000000000000000000000000000000080801ba0e8609ea3fef696eceeba6ad4d66ad743412215a30fa9fdb1cbec878fdc9bdf5aa01304ec7b176a6ea56330f4c65d30e4c2226940e41d8ade0291d5d63d68903bb4", [ "trace" ] ], "id" : 73 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_vmTrace.json index 652b72d42..a7e6333ba 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400d000000000000000000000000000000000000080801ca07a612f4e688476ec724ca1b43bf42554fbb6fe7e23b9e11f266fb02d943fa0d7a06dc7585f54af231d7127f4461f0e12175582c106c890f34d5d0f9eeef76896a9", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff29400d000000000000000000000000000000000000080801ba0e8609ea3fef696eceeba6ad4d66ad743412215a30fa9fdb1cbec878fdc9bdf5aa01304ec7b176a6ea56330f4c65d30e4c2226940e41d8ade0291d5d63d68903bb4", [ "vmTrace" ] ], "id" : 126 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_stateDiff.json index fd5e2df12..8415de9e0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400e000000000000000000000000000000000000080801ca028b46afe2345d255199e0df8a46e8e75cdb52d0360473f0f375f3b853d66a3c7a07c46f3eb520a65c3bce2ce47eb25223a62ac2d68b865e83d92d215334e93c9cd", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff29400e000000000000000000000000000000000000080801ca0d787034c104063b0c3358d5eb0eb1b5e6d6b0f466fe41c0f5b40abbb87f0b8bda02b5e0a4de7b6209d2a91ce30efb41b93f6e9f78ff57cbc35a1b290944856bd35", [ "stateDiff" ] ], "id" : 21 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_trace.json index 2e291874c..f6872f281 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400e000000000000000000000000000000000000080801ca028b46afe2345d255199e0df8a46e8e75cdb52d0360473f0f375f3b853d66a3c7a07c46f3eb520a65c3bce2ce47eb25223a62ac2d68b865e83d92d215334e93c9cd", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff29400e000000000000000000000000000000000000080801ca0d787034c104063b0c3358d5eb0eb1b5e6d6b0f466fe41c0f5b40abbb87f0b8bda02b5e0a4de7b6209d2a91ce30efb41b93f6e9f78ff57cbc35a1b290944856bd35", [ "trace" ] ], "id" : 74 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_vmTrace.json index 7f87126bd..4d82dea81 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400e000000000000000000000000000000000000080801ca028b46afe2345d255199e0df8a46e8e75cdb52d0360473f0f375f3b853d66a3c7a07c46f3eb520a65c3bce2ce47eb25223a62ac2d68b865e83d92d215334e93c9cd", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff29400e000000000000000000000000000000000000080801ca0d787034c104063b0c3358d5eb0eb1b5e6d6b0f466fe41c0f5b40abbb87f0b8bda02b5e0a4de7b6209d2a91ce30efb41b93f6e9f78ff57cbc35a1b290944856bd35", [ "vmTrace" ] ], "id" : 127 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_stateDiff.json index c02b63112..dd98102b1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400f000000000000000000000000000000000000080801ca0b8b3fb6e8fcd85310a5a1fa9af5e2cfa90ba245e9328296cfc20a3880b26d390a079a15ed4130ec373e0f8fd897482fd4545891f5398f934254060085e4edc51c6", [ "stateDiff" ] ], + "params" : [ "0xf8601e81ef83fffff29400f000000000000000000000000000000000000080801c9f92dcc55a26dd8fed13423a7fe962d7d291a9d9923a7747d54135ed925476c9a01bf415e42283d76af306f9e9fc72bddf4ad4502ffc5e3604c1cdb3c835fc6aea", [ "stateDiff" ] ], "id" : 22 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_trace.json index 01b42cc5d..374e749f5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400f000000000000000000000000000000000000080801ca0b8b3fb6e8fcd85310a5a1fa9af5e2cfa90ba245e9328296cfc20a3880b26d390a079a15ed4130ec373e0f8fd897482fd4545891f5398f934254060085e4edc51c6", [ "trace" ] ], + "params" : [ "0xf8601e81ef83fffff29400f000000000000000000000000000000000000080801c9f92dcc55a26dd8fed13423a7fe962d7d291a9d9923a7747d54135ed925476c9a01bf415e42283d76af306f9e9fc72bddf4ad4502ffc5e3604c1cdb3c835fc6aea", [ "trace" ] ], "id" : 75 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_vmTrace.json index 6d4f5b7d5..29187d3e9 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff29400f000000000000000000000000000000000000080801ca0b8b3fb6e8fcd85310a5a1fa9af5e2cfa90ba245e9328296cfc20a3880b26d390a079a15ed4130ec373e0f8fd897482fd4545891f5398f934254060085e4edc51c6", [ "vmTrace" ] ], + "params" : [ "0xf8601e81ef83fffff29400f000000000000000000000000000000000000080801c9f92dcc55a26dd8fed13423a7fe962d7d291a9d9923a7747d54135ed925476c9a01bf415e42283d76af306f9e9fc72bddf4ad4502ffc5e3604c1cdb3c835fc6aea", [ "vmTrace" ] ], "id" : 128 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_stateDiff.json index a29b32715..192a4f173 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294010000000000000000000000000000000000000080801ca02ef8d1f672cc0eb51035ae00fbee408f89653b04d60d1df04a143563841c3e84a05168865a0f5f5102a3c4204afc3a0cf6c952562f66fac49143338c827da5f584", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294010000000000000000000000000000000000000080801ca0408dba3acbde3b0670b4d987973960c5b44708e0c15937ac0e4230b3bb7affc3a0031bd0cffae1a36edd36d3683f05b76afd85e52953eacbcd99c063e01ffa2f5b", [ "stateDiff" ] ], "id" : 23 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_trace.json index 4390da920..b1c98ebb2 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294010000000000000000000000000000000000000080801ca02ef8d1f672cc0eb51035ae00fbee408f89653b04d60d1df04a143563841c3e84a05168865a0f5f5102a3c4204afc3a0cf6c952562f66fac49143338c827da5f584", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294010000000000000000000000000000000000000080801ca0408dba3acbde3b0670b4d987973960c5b44708e0c15937ac0e4230b3bb7affc3a0031bd0cffae1a36edd36d3683f05b76afd85e52953eacbcd99c063e01ffa2f5b", [ "trace" ] ], "id" : 76 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_vmTrace.json index ff1036c0f..bc9a2403c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294010000000000000000000000000000000000000080801ca02ef8d1f672cc0eb51035ae00fbee408f89653b04d60d1df04a143563841c3e84a05168865a0f5f5102a3c4204afc3a0cf6c952562f66fac49143338c827da5f584", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294010000000000000000000000000000000000000080801ca0408dba3acbde3b0670b4d987973960c5b44708e0c15937ac0e4230b3bb7affc3a0031bd0cffae1a36edd36d3683f05b76afd85e52953eacbcd99c063e01ffa2f5b", [ "vmTrace" ] ], "id" : 129 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_stateDiff.json index dcf9f3a4f..a996e4506 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294011000000000000000000000000000000000000080801ba011e7a12824856b23b46fcf302e3a51c94093143c0d18c2de32b38c3ef3b1251ca04eb5fa78e936ab47980dd424d34ef4e4f579daf1652db1a9b1fa442992451885", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294011000000000000000000000000000000000000080801ba0217729615fe6b3eee0051fe7e0b78a7527a6f896dffd606de0da276e89b920f6a02c3ac4a267ef4056240ef774e62f20fbd8bbe16e07498ca1fdda0ba1be668e2b", [ "stateDiff" ] ], "id" : 24 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_trace.json index faa638012..dd092e10c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294011000000000000000000000000000000000000080801ba011e7a12824856b23b46fcf302e3a51c94093143c0d18c2de32b38c3ef3b1251ca04eb5fa78e936ab47980dd424d34ef4e4f579daf1652db1a9b1fa442992451885", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294011000000000000000000000000000000000000080801ba0217729615fe6b3eee0051fe7e0b78a7527a6f896dffd606de0da276e89b920f6a02c3ac4a267ef4056240ef774e62f20fbd8bbe16e07498ca1fdda0ba1be668e2b", [ "trace" ] ], "id" : 77 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_vmTrace.json index 45c5c5e00..9122e245e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294011000000000000000000000000000000000000080801ba011e7a12824856b23b46fcf302e3a51c94093143c0d18c2de32b38c3ef3b1251ca04eb5fa78e936ab47980dd424d34ef4e4f579daf1652db1a9b1fa442992451885", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294011000000000000000000000000000000000000080801ba0217729615fe6b3eee0051fe7e0b78a7527a6f896dffd606de0da276e89b920f6a02c3ac4a267ef4056240ef774e62f20fbd8bbe16e07498ca1fdda0ba1be668e2b", [ "vmTrace" ] ], "id" : 130 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_stateDiff.json index fa52901b5..9d598942d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "stateDiff" ] ], "id" : 25 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_trace.json index e5b44e827..661d7e019 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "trace" ] ], "id" : 78 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_vmTrace.json index 01ef93094..467b24c34 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "vmTrace" ] ], "id" : 131 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_stateDiff.json index 072ca2d21..86077b14b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ba0289116cd7bd226e6cc31cbd20382b9632ac9aca596f03be9927240957cca3b13a021ec53811de779577040a16c294d920fc5d3056c6cc3dd87763b2cf16fa2d3cf", [ "stateDiff" ] ], + "params" : [ "0xf8901781ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ca0a5ee2d53496de70b910d3908617280416adc5210ff8d45690d730f2626a98c91a010f87c716954430f630e6ae09169b40f7e31c55e57f8f551eb7fa07c49af15c0", [ "stateDiff" ] ], "id" : 26 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_trace.json index c57681375..0783fa7ae 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ba0289116cd7bd226e6cc31cbd20382b9632ac9aca596f03be9927240957cca3b13a021ec53811de779577040a16c294d920fc5d3056c6cc3dd87763b2cf16fa2d3cf", [ "trace" ] ], + "params" : [ "0xf8901781ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ca0a5ee2d53496de70b910d3908617280416adc5210ff8d45690d730f2626a98c91a010f87c716954430f630e6ae09169b40f7e31c55e57f8f551eb7fa07c49af15c0", [ "trace" ] ], "id" : 79 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_vmTrace.json index 067751b11..262dcb05a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ba0289116cd7bd226e6cc31cbd20382b9632ac9aca596f03be9927240957cca3b13a021ec53811de779577040a16c294d920fc5d3056c6cc3dd87763b2cf16fa2d3cf", [ "vmTrace" ] ], + "params" : [ "0xf8901781ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ca0a5ee2d53496de70b910d3908617280416adc5210ff8d45690d730f2626a98c91a010f87c716954430f630e6ae09169b40f7e31c55e57f8f551eb7fa07c49af15c0", [ "vmTrace" ] ], "id" : 132 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_stateDiff.json index d93fe373f..ed5fa8a44 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "stateDiff" ] ], "id" : 27 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_trace.json index 84fde1492..211fb6ee0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "trace" ] ], "id" : 80 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_vmTrace.json index 7461629c0..0b238f827 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "vmTrace" ] ], "id" : 133 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_stateDiff.json index edef415cb..4f3e8d50e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca025631cda5dbd0c7232559a52b68cc0d36407d58dd8a68b1cf75c0e000a2c3c83a02c66c8028eb722940b53c0f6d5a989f69590b202d4c93d47650e1e328240dc46", [ "stateDiff" ] ], + "params" : [ "0xf8901781ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca052750698eea72104d374a503325038faa3b9fb2c0a7ad7030f8c5091f9067cdfa01bd9fd49de2ffa4cdd41438dd3588f0da3f349cd445acd9cba9b693fbac3bd9e", [ "stateDiff" ] ], "id" : 28 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_trace.json index 2f40557e8..c804b29b5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca025631cda5dbd0c7232559a52b68cc0d36407d58dd8a68b1cf75c0e000a2c3c83a02c66c8028eb722940b53c0f6d5a989f69590b202d4c93d47650e1e328240dc46", [ "trace" ] ], + "params" : [ "0xf8901781ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca052750698eea72104d374a503325038faa3b9fb2c0a7ad7030f8c5091f9067cdfa01bd9fd49de2ffa4cdd41438dd3588f0da3f349cd445acd9cba9b693fbac3bd9e", [ "trace" ] ], "id" : 81 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_vmTrace.json index f40a427bb..5168e739b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca025631cda5dbd0c7232559a52b68cc0d36407d58dd8a68b1cf75c0e000a2c3c83a02c66c8028eb722940b53c0f6d5a989f69590b202d4c93d47650e1e328240dc46", [ "vmTrace" ] ], + "params" : [ "0xf8901781ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca052750698eea72104d374a503325038faa3b9fb2c0a7ad7030f8c5091f9067cdfa01bd9fd49de2ffa4cdd41438dd3588f0da3f349cd445acd9cba9b693fbac3bd9e", [ "vmTrace" ] ], "id" : 134 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_stateDiff.json index 10920a29f..eda32e237 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "stateDiff" ] ], "id" : 29 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_trace.json index 6e3c6ee2b..4b6705c7f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "trace" ] ], "id" : 82 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_vmTrace.json index a99f7ebb4..925485e6a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ], + "params" : [ "0xf85d1781ef83fffff28080906004600c60003960046000f3600035ff1ca0de34cea135096251fed1e795829a7fcc86c83e1d0c4deeff6076f58ecb08374ba0683c9a7f8cf19bb073cf12dd99a72b946ba4b2adb9ece7d8ad357860a4d6e973", [ "vmTrace" ] ], "id" : 135 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_stateDiff.json index 139cdbeb6..1c9112ba3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf88c8081ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba078d4cb280f228684a50ec9e98a467f4bb45064549feebbbe278944b5550892d5a011eb2ed6aad0ce9bf03a35dcd80264611c8415b7dfc2a0eadf0e74d15d2fefd9", [ "stateDiff" ] ], + "params" : [ "0xf88c1781ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba09af2949d28bd8df6102c1081c596a9b7aded47547af99084457bf81b85e8cb53a00a04af6c465acbc68e0e7b22f2c3b9051706fbde137155d10a8c61320b8e025c", [ "stateDiff" ] ], "id" : 30 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_trace.json index 9529b1a38..4b23402ef 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf88c8081ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba078d4cb280f228684a50ec9e98a467f4bb45064549feebbbe278944b5550892d5a011eb2ed6aad0ce9bf03a35dcd80264611c8415b7dfc2a0eadf0e74d15d2fefd9", [ "trace" ] ], + "params" : [ "0xf88c1781ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba09af2949d28bd8df6102c1081c596a9b7aded47547af99084457bf81b85e8cb53a00a04af6c465acbc68e0e7b22f2c3b9051706fbde137155d10a8c61320b8e025c", [ "trace" ] ], "id" : 83 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_vmTrace.json index 4adc58507..9c9b15a6b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf88c8081ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba078d4cb280f228684a50ec9e98a467f4bb45064549feebbbe278944b5550892d5a011eb2ed6aad0ce9bf03a35dcd80264611c8415b7dfc2a0eadf0e74d15d2fefd9", [ "vmTrace" ] ], + "params" : [ "0xf88c1781ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba09af2949d28bd8df6102c1081c596a9b7aded47547af99084457bf81b85e8cb53a00a04af6c465acbc68e0e7b22f2c3b9051706fbde137155d10a8c61320b8e025c", [ "vmTrace" ] ], "id" : 136 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_stateDiff.json index fed78af19..57a99079b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294013000000000000000000000000000000000000080801ca0520dc757d985e2dc024c64213cb34bae49d9ea9651542403f12792d12849e7bda05e302b1d126293a98420c5c731278ab3f4133708930eceea320f7f77f6e52fa8", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294013000000000000000000000000000000000000080801ca0ea0ed87fa2fd22934bdc66dce2a07e8de6d373e2ea083cf3f1e1a0cf80c9df96a0269acc66497fd4e4a8c253a0db3f07706290daaf21de6092e34a15f36f9a9fab", [ "stateDiff" ] ], "id" : 31 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_trace.json index cc74ea361..a890b7cc1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294013000000000000000000000000000000000000080801ca0520dc757d985e2dc024c64213cb34bae49d9ea9651542403f12792d12849e7bda05e302b1d126293a98420c5c731278ab3f4133708930eceea320f7f77f6e52fa8", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294013000000000000000000000000000000000000080801ca0ea0ed87fa2fd22934bdc66dce2a07e8de6d373e2ea083cf3f1e1a0cf80c9df96a0269acc66497fd4e4a8c253a0db3f07706290daaf21de6092e34a15f36f9a9fab", [ "trace" ] ], "id" : 84 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_vmTrace.json index e45186a55..95e655344 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294013000000000000000000000000000000000000080801ca0520dc757d985e2dc024c64213cb34bae49d9ea9651542403f12792d12849e7bda05e302b1d126293a98420c5c731278ab3f4133708930eceea320f7f77f6e52fa8", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294013000000000000000000000000000000000000080801ca0ea0ed87fa2fd22934bdc66dce2a07e8de6d373e2ea083cf3f1e1a0cf80c9df96a0269acc66497fd4e4a8c253a0db3f07706290daaf21de6092e34a15f36f9a9fab", [ "vmTrace" ] ], "id" : 137 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_stateDiff.json index 99a8b086c..1bda05f2d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294014000000000000000000000000000000000000080801ba02806a0625bd207bb1d798f9665a498208e579e81f5252d6b84d67fa54e7f3ee7a052655604404f68ee4c1a4b2775d346d529af467c747ae0f8de5bc4de3dadac65", [ "stateDiff" ] ], + "params" : [ "0xf8611e81ef83fffff294014000000000000000000000000000000000000080801ca0cea7d4023f0762bb24ab50ef1cfc921444ed2bf734878a5ab7e043c9bf42faefa07aca379610ce0c891822b990ebd4a0eb8905fb6faecb06e752b122142dc3e43e", [ "stateDiff" ] ], "id" : 32 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_trace.json index 9fc05d054..29931ec59 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294014000000000000000000000000000000000000080801ba02806a0625bd207bb1d798f9665a498208e579e81f5252d6b84d67fa54e7f3ee7a052655604404f68ee4c1a4b2775d346d529af467c747ae0f8de5bc4de3dadac65", [ "trace" ] ], + "params" : [ "0xf8611e81ef83fffff294014000000000000000000000000000000000000080801ca0cea7d4023f0762bb24ab50ef1cfc921444ed2bf734878a5ab7e043c9bf42faefa07aca379610ce0c891822b990ebd4a0eb8905fb6faecb06e752b122142dc3e43e", [ "trace" ] ], "id" : 85 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_vmTrace.json index 8ce08365a..7700cd875 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294014000000000000000000000000000000000000080801ba02806a0625bd207bb1d798f9665a498208e579e81f5252d6b84d67fa54e7f3ee7a052655604404f68ee4c1a4b2775d346d529af467c747ae0f8de5bc4de3dadac65", [ "vmTrace" ] ], + "params" : [ "0xf8611e81ef83fffff294014000000000000000000000000000000000000080801ca0cea7d4023f0762bb24ab50ef1cfc921444ed2bf734878a5ab7e043c9bf42faefa07aca379610ce0c891822b990ebd4a0eb8905fb6faecb06e752b122142dc3e43e", [ "vmTrace" ] ], "id" : 138 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_stateDiff.json index 8cf2a5db6..5f97ef600 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca00c14e70efe2cbc93d707aa5585018e7cab9e6e1d9ee2b52421e76fb235b72fe0a03d79b933403d282d2fbb1354eb024ac696f3a0a1f322523c836fba9c61ec050d", [ "stateDiff" ] ], + "params" : [ "0xf901011781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0251b9a87c054d5e0299eddd1cedcbc1f5dc8cdc8a3dd84e1d641a7dccbcb97619fff59dca5fc805da2f202a0507b26cc8e36c95d270c7d66a08018570dd0427c", [ "stateDiff" ] ], "id" : 33 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_trace.json index 9b1010245..81c5e9cb6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca00c14e70efe2cbc93d707aa5585018e7cab9e6e1d9ee2b52421e76fb235b72fe0a03d79b933403d282d2fbb1354eb024ac696f3a0a1f322523c836fba9c61ec050d", [ "trace" ] ], + "params" : [ "0xf901011781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0251b9a87c054d5e0299eddd1cedcbc1f5dc8cdc8a3dd84e1d641a7dccbcb97619fff59dca5fc805da2f202a0507b26cc8e36c95d270c7d66a08018570dd0427c", [ "trace" ] ], "id" : 86 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_vmTrace.json index 3558c136d..57b9d6ab3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca00c14e70efe2cbc93d707aa5585018e7cab9e6e1d9ee2b52421e76fb235b72fe0a03d79b933403d282d2fbb1354eb024ac696f3a0a1f322523c836fba9c61ec050d", [ "vmTrace" ] ], + "params" : [ "0xf901011781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0251b9a87c054d5e0299eddd1cedcbc1f5dc8cdc8a3dd84e1d641a7dccbcb97619fff59dca5fc805da2f202a0507b26cc8e36c95d270c7d66a08018570dd0427c", [ "vmTrace" ] ], "id" : 139 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_stateDiff.json index 74d28e18c..6821382dc 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba05214eb40c07ac8c966fa4e9ea982da95fac9b4f8d7a19ab4554f3b6857213155a00933ef346d55b6eff54f58b4ec5a4f35e8cee52c5e7d5bb3c4cf9b81869d24b7", [ "stateDiff" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca060042b2b8008576509461700ca5a70f71806f54cef8cfcd4597449fe44baf250a009303ec4ded18a5253bf0522801590c77edef893e91f15bb792380ae5d693f06", [ "stateDiff" ] ], "id" : 34 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_trace.json index 39ac74b2d..86eb40ec5 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba05214eb40c07ac8c966fa4e9ea982da95fac9b4f8d7a19ab4554f3b6857213155a00933ef346d55b6eff54f58b4ec5a4f35e8cee52c5e7d5bb3c4cf9b81869d24b7", [ "trace" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca060042b2b8008576509461700ca5a70f71806f54cef8cfcd4597449fe44baf250a009303ec4ded18a5253bf0522801590c77edef893e91f15bb792380ae5d693f06", [ "trace" ] ], "id" : 87 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_vmTrace.json index 4acab9c07..915665697 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba05214eb40c07ac8c966fa4e9ea982da95fac9b4f8d7a19ab4554f3b6857213155a00933ef346d55b6eff54f58b4ec5a4f35e8cee52c5e7d5bb3c4cf9b81869d24b7", [ "vmTrace" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca060042b2b8008576509461700ca5a70f71806f54cef8cfcd4597449fe44baf250a009303ec4ded18a5253bf0522801590c77edef893e91f15bb792380ae5d693f06", [ "vmTrace" ] ], "id" : 140 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_stateDiff.json index 10e3494f0..059fa2ee3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0ae0dfb6a5936e47c231ffb6d5f2bd1c8af85dea061f50ba0c577a02a2b9e5ccaa03080f5b3c2aac67a2dd58663ef623e5ba81d33953c76eb728af915986f8a5813", [ "stateDiff" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0cd4dfabc9a42c082f436369e724cf55a95c155f123f698a84de32b40676b41d1a064afc3a7368b0e728c4c1a4c7ed02dcd030adb786384d079a037cc7d5638b2fa", [ "stateDiff" ] ], "id" : 35 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_trace.json index 6e455c66e..8c22ff9a8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0ae0dfb6a5936e47c231ffb6d5f2bd1c8af85dea061f50ba0c577a02a2b9e5ccaa03080f5b3c2aac67a2dd58663ef623e5ba81d33953c76eb728af915986f8a5813", [ "trace" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0cd4dfabc9a42c082f436369e724cf55a95c155f123f698a84de32b40676b41d1a064afc3a7368b0e728c4c1a4c7ed02dcd030adb786384d079a037cc7d5638b2fa", [ "trace" ] ], "id" : 88 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_vmTrace.json index a02567093..cd7e324bd 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0ae0dfb6a5936e47c231ffb6d5f2bd1c8af85dea061f50ba0c577a02a2b9e5ccaa03080f5b3c2aac67a2dd58663ef623e5ba81d33953c76eb728af915986f8a5813", [ "vmTrace" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0cd4dfabc9a42c082f436369e724cf55a95c155f123f698a84de32b40676b41d1a064afc3a7368b0e728c4c1a4c7ed02dcd030adb786384d079a037cc7d5638b2fa", [ "vmTrace" ] ], "id" : 141 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_stateDiff.json index afa590fd2..341952131 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c748a345ce159827f5ab0139ddb910d58bb11791fb1afc2d113e0d4a748dcf4fa0482a8da9516acea2b34fa4f20968ee30c9f3cffdb3afa9744f5e3d8c0cb53596", [ "stateDiff" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca091a2d7baa0d0be7c6399c716d23cb4e8d6b6a0b38cc9feb992ee5ef32021283ba036ece660687621a2a15c981675a65778ba48dc9afa9ce412c48bb60d6f6f1e11", [ "stateDiff" ] ], "id" : 36 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_trace.json index 4db5dec10..b87816bcf 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c748a345ce159827f5ab0139ddb910d58bb11791fb1afc2d113e0d4a748dcf4fa0482a8da9516acea2b34fa4f20968ee30c9f3cffdb3afa9744f5e3d8c0cb53596", [ "trace" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca091a2d7baa0d0be7c6399c716d23cb4e8d6b6a0b38cc9feb992ee5ef32021283ba036ece660687621a2a15c981675a65778ba48dc9afa9ce412c48bb60d6f6f1e11", [ "trace" ] ], "id" : 89 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_vmTrace.json index 411a3d2c8..e24a46424 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c748a345ce159827f5ab0139ddb910d58bb11791fb1afc2d113e0d4a748dcf4fa0482a8da9516acea2b34fa4f20968ee30c9f3cffdb3afa9744f5e3d8c0cb53596", [ "vmTrace" ] ], + "params" : [ "0xf901021781ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca091a2d7baa0d0be7c6399c716d23cb4e8d6b6a0b38cc9feb992ee5ef32021283ba036ece660687621a2a15c981675a65778ba48dc9afa9ce412c48bb60d6f6f1e11", [ "vmTrace" ] ], "id" : 142 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_stateDiff.json index 86c5e1ca4..a83036382 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba084903af53adee596c2b895610c41dca5da1ee4ed381f276de2698058e4e2209ca0717f119089f7f743f7a6586ce9dc7116103d4588a9d8ff2e81ac31f7ebbd4a29", [ "stateDiff" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0a3e4d7ce21897e3c21bf17fa793273ad0bb1b76eb1f8bf676021353c1ef6b798a02fcf39db199784b6ed701ef3415188e49cf4c52791ab24e147a79ddb21f7f9f7", [ "stateDiff" ] ], "id" : 37 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_trace.json index ca9e043c2..3e580aa84 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba084903af53adee596c2b895610c41dca5da1ee4ed381f276de2698058e4e2209ca0717f119089f7f743f7a6586ce9dc7116103d4588a9d8ff2e81ac31f7ebbd4a29", [ "trace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0a3e4d7ce21897e3c21bf17fa793273ad0bb1b76eb1f8bf676021353c1ef6b798a02fcf39db199784b6ed701ef3415188e49cf4c52791ab24e147a79ddb21f7f9f7", [ "trace" ] ], "id" : 90 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_vmTrace.json index 1231ce70b..480905062 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba084903af53adee596c2b895610c41dca5da1ee4ed381f276de2698058e4e2209ca0717f119089f7f743f7a6586ce9dc7116103d4588a9d8ff2e81ac31f7ebbd4a29", [ "vmTrace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba0a3e4d7ce21897e3c21bf17fa793273ad0bb1b76eb1f8bf676021353c1ef6b798a02fcf39db199784b6ed701ef3415188e49cf4c52791ab24e147a79ddb21f7f9f7", [ "vmTrace" ] ], "id" : 143 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_stateDiff.json index cd392bb00..34c833433 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca00d29c006b870d19f20ee457aa54a3a121fd18274161c9c3908f71599558f19b7a056ed2dbffa79e65be4bd5f885857595d5fd40175e0be065d49de7027fe8d8a54", [ "stateDiff" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca069b1e6db5e65b8f08b530e547ce0c5902b63f73f9a395d21190887c2c7dd675ba05c3b0893d635413a3e5b770c814d2e4cff34e57ad03ba58158cbd956726d2e74", [ "stateDiff" ] ], "id" : 38 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_trace.json index eaead7015..66cc05d42 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca00d29c006b870d19f20ee457aa54a3a121fd18274161c9c3908f71599558f19b7a056ed2dbffa79e65be4bd5f885857595d5fd40175e0be065d49de7027fe8d8a54", [ "trace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca069b1e6db5e65b8f08b530e547ce0c5902b63f73f9a395d21190887c2c7dd675ba05c3b0893d635413a3e5b770c814d2e4cff34e57ad03ba58158cbd956726d2e74", [ "trace" ] ], "id" : 91 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_vmTrace.json index 8e0ba543f..9fc726e4c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca00d29c006b870d19f20ee457aa54a3a121fd18274161c9c3908f71599558f19b7a056ed2dbffa79e65be4bd5f885857595d5fd40175e0be065d49de7027fe8d8a54", [ "vmTrace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca069b1e6db5e65b8f08b530e547ce0c5902b63f73f9a395d21190887c2c7dd675ba05c3b0893d635413a3e5b770c814d2e4cff34e57ad03ba58158cbd956726d2e74", [ "vmTrace" ] ], "id" : 144 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_stateDiff.json index 72bb63d48..92e2cb8ed 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba03574aa082992029a0cce17baf01fab3ca78a9985b44b9ec1a48277ad18491283a01b70f4fb965d631dc9f9647400c091d639b055186e2d8882e07e6337b9a86bd9", [ "stateDiff" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba0574ccc3ed566829bfbb201719740f4bbd54094a359056f2b38c479edfeef172aa04477a3519afb448c7ce9967ee6359db8ee717f6d0db0e27277ec24728053cf27", [ "stateDiff" ] ], "id" : 39 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_trace.json index 50c200c92..ce9db3ab1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba03574aa082992029a0cce17baf01fab3ca78a9985b44b9ec1a48277ad18491283a01b70f4fb965d631dc9f9647400c091d639b055186e2d8882e07e6337b9a86bd9", [ "trace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba0574ccc3ed566829bfbb201719740f4bbd54094a359056f2b38c479edfeef172aa04477a3519afb448c7ce9967ee6359db8ee717f6d0db0e27277ec24728053cf27", [ "trace" ] ], "id" : 92 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_vmTrace.json index ca7161ad9..7a3daec71 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba03574aa082992029a0cce17baf01fab3ca78a9985b44b9ec1a48277ad18491283a01b70f4fb965d631dc9f9647400c091d639b055186e2d8882e07e6337b9a86bd9", [ "vmTrace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba0574ccc3ed566829bfbb201719740f4bbd54094a359056f2b38c479edfeef172aa04477a3519afb448c7ce9967ee6359db8ee717f6d0db0e27277ec24728053cf27", [ "vmTrace" ] ], "id" : 145 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_stateDiff.json index 09783e51c..0b3d3553f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c80b46c92075c830dd0da28397934a3d5a88b3834f10387508b5a53ba5b7ada1a0306b2d632afbf8af3344123fe72df3e7e4c3dca75a8bf9bf11963afedbdf75c4", [ "stateDiff" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0a5a60d9ecb72e756cdd8cc6c321b5d182ae23932b234796da16715006378fecda018001348422965d60301b000a97e3dd7c0f9e5c869c042109f9866063dcd92ea", [ "stateDiff" ] ], "id" : 40 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_trace.json index 088a0d54b..fb813cadb 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c80b46c92075c830dd0da28397934a3d5a88b3834f10387508b5a53ba5b7ada1a0306b2d632afbf8af3344123fe72df3e7e4c3dca75a8bf9bf11963afedbdf75c4", [ "trace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0a5a60d9ecb72e756cdd8cc6c321b5d182ae23932b234796da16715006378fecda018001348422965d60301b000a97e3dd7c0f9e5c869c042109f9866063dcd92ea", [ "trace" ] ], "id" : 93 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_vmTrace.json index 4096030e7..e0c6b7aa0 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c80b46c92075c830dd0da28397934a3d5a88b3834f10387508b5a53ba5b7ada1a0306b2d632afbf8af3344123fe72df3e7e4c3dca75a8bf9bf11963afedbdf75c4", [ "vmTrace" ] ], + "params" : [ "0xf901021781ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0a5a60d9ecb72e756cdd8cc6c321b5d182ae23932b234796da16715006378fecda018001348422965d60301b000a97e3dd7c0f9e5c869c042109f9866063dcd92ea", [ "vmTrace" ] ], "id" : 146 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_stateDiff.json index 01a84c6a9..af5200656 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8f5800183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba00c83105e5af46d8b2f2aaa5c1b7437e8f182f6d146254e6ce1448e5544215701a037212e599b54c405191df381fcf6aca71fbfeafd052521cc61e24a9fd405728f", [ "stateDiff" ] ], + "params" : [ "0xf8f5170183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0433a07676e5a08df53d1196ccb18b7085bd693b20eb4de343183b6f0f9c5f7aaa0458752f753ede06ad2147e61154192132cde051019d343cd48aefc2cfd69cb1d", [ "stateDiff" ] ], "id" : 41 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_trace.json index 112aa72ce..98ac7a371 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8f5800183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba00c83105e5af46d8b2f2aaa5c1b7437e8f182f6d146254e6ce1448e5544215701a037212e599b54c405191df381fcf6aca71fbfeafd052521cc61e24a9fd405728f", [ "trace" ] ], + "params" : [ "0xf8f5170183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0433a07676e5a08df53d1196ccb18b7085bd693b20eb4de343183b6f0f9c5f7aaa0458752f753ede06ad2147e61154192132cde051019d343cd48aefc2cfd69cb1d", [ "trace" ] ], "id" : 94 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_vmTrace.json index 5c0d0a909..e4d05aa5b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8f5800183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba00c83105e5af46d8b2f2aaa5c1b7437e8f182f6d146254e6ce1448e5544215701a037212e599b54c405191df381fcf6aca71fbfeafd052521cc61e24a9fd405728f", [ "vmTrace" ] ], + "params" : [ "0xf8f5170183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ca0433a07676e5a08df53d1196ccb18b7085bd693b20eb4de343183b6f0f9c5f7aaa0458752f753ede06ad2147e61154192132cde051019d343cd48aefc2cfd69cb1d", [ "vmTrace" ] ], "id" : 147 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_stateDiff.json index e21dfd0d3..37307c16f 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901368081ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba05ce5005ae44f75f18a6f8fb4adc23dc5c3a8790625ee40c3bf0800a434f7d46da057dc1f834fbb3e40fe074e2e2917eb9c24d6623d01bc41f1e7797206c2d955c4", [ "stateDiff" ] ], + "params" : [ "0xf901361e81ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0fef5458e2e76851cf41edfc5c63751bc9a5852c1ca3e517c8eb9674194eacf0fa034aaf9e70a4a1f8f59d26ad3ea43de4c49aebf8affc9efaf399dc6457eab95f8", [ "stateDiff" ] ], "id" : 42 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_trace.json index ac624ad4b..37df602c8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901368081ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba05ce5005ae44f75f18a6f8fb4adc23dc5c3a8790625ee40c3bf0800a434f7d46da057dc1f834fbb3e40fe074e2e2917eb9c24d6623d01bc41f1e7797206c2d955c4", [ "trace" ] ], + "params" : [ "0xf901361e81ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0fef5458e2e76851cf41edfc5c63751bc9a5852c1ca3e517c8eb9674194eacf0fa034aaf9e70a4a1f8f59d26ad3ea43de4c49aebf8affc9efaf399dc6457eab95f8", [ "trace" ] ], "id" : 95 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_vmTrace.json index ee85f4e1b..cd855181d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901368081ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba05ce5005ae44f75f18a6f8fb4adc23dc5c3a8790625ee40c3bf0800a434f7d46da057dc1f834fbb3e40fe074e2e2917eb9c24d6623d01bc41f1e7797206c2d955c4", [ "vmTrace" ] ], + "params" : [ "0xf901361e81ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba0fef5458e2e76851cf41edfc5c63751bc9a5852c1ca3e517c8eb9674194eacf0fa034aaf9e70a4a1f8f59d26ad3ea43de4c49aebf8affc9efaf399dc6457eab95f8", [ "vmTrace" ] ], "id" : 148 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_stateDiff.json index da15e0cb3..5cbc8f707 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf918278081ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca085af0f32688f0cfb7322bc82816f287ec5dae28b73e6edeb1bf4584e8fbc9ab4a03ba76883af2506574d6f60db96862670be4e095bbc56ff5a15f89a59525c0bc0", [ "stateDiff" ] ], + "params" : [ "0xf918271781ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca07c396a95075146cd0bde364cb63f619fd5796f6490b437ee8336caead68fd8c6a0486cd94e5bc3a8b273677855bb4acf0a41a57080ac23d03ff9054486a2138deb", [ "stateDiff" ] ], "id" : 43 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_trace.json index 092ee82de..7cb2e9ad4 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf918278081ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca085af0f32688f0cfb7322bc82816f287ec5dae28b73e6edeb1bf4584e8fbc9ab4a03ba76883af2506574d6f60db96862670be4e095bbc56ff5a15f89a59525c0bc0", [ "trace" ] ], + "params" : [ "0xf918271781ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca07c396a95075146cd0bde364cb63f619fd5796f6490b437ee8336caead68fd8c6a0486cd94e5bc3a8b273677855bb4acf0a41a57080ac23d03ff9054486a2138deb", [ "trace" ] ], "id" : 96 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_vmTrace.json index 610166794..845a0327d 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf918278081ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca085af0f32688f0cfb7322bc82816f287ec5dae28b73e6edeb1bf4584e8fbc9ab4a03ba76883af2506574d6f60db96862670be4e095bbc56ff5a15f89a59525c0bc0", [ "vmTrace" ] ], + "params" : [ "0xf918271781ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca07c396a95075146cd0bde364cb63f619fd5796f6490b437ee8336caead68fd8c6a0486cd94e5bc3a8b273677855bb4acf0a41a57080ac23d03ff9054486a2138deb", [ "vmTrace" ] ], "id" : 149 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_stateDiff.json index 85212c334..57951d589 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a98085023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001b9fa752f720d59c20bb9e5523fc2d5c798c97e85286bc10caddf14e4a0e70abc3a02487da1189c3819b89b2f34e96bf6998b4e64c20380b80eaaf6f9138d58d9af2", [ "stateDiff" ] ], + "params" : [ "0xf8aa1785023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001ba018fa4ff35e2aaa0b90ab1b54659bdee8a72452256c3650d3ca91a6f5f441b62da02c106af93aa9bdfe7decf92965009cbdc822b133a41c9ef217d16f74864b9b7b", [ "stateDiff" ] ], "id" : 44 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_trace.json index f4f6e3c35..9db67192e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a98085023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001b9fa752f720d59c20bb9e5523fc2d5c798c97e85286bc10caddf14e4a0e70abc3a02487da1189c3819b89b2f34e96bf6998b4e64c20380b80eaaf6f9138d58d9af2", [ "trace" ] ], + "params" : [ "0xf8aa1785023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001ba018fa4ff35e2aaa0b90ab1b54659bdee8a72452256c3650d3ca91a6f5f441b62da02c106af93aa9bdfe7decf92965009cbdc822b133a41c9ef217d16f74864b9b7b", [ "trace" ] ], "id" : 97 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_vmTrace.json index eb7f6d8b5..c92cda7b2 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8a98085023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001b9fa752f720d59c20bb9e5523fc2d5c798c97e85286bc10caddf14e4a0e70abc3a02487da1189c3819b89b2f34e96bf6998b4e64c20380b80eaaf6f9138d58d9af2", [ "vmTrace" ] ], + "params" : [ "0xf8aa1785023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001ba018fa4ff35e2aaa0b90ab1b54659bdee8a72452256c3650d3ca91a6f5f441b62da02c106af93aa9bdfe7decf92965009cbdc822b133a41c9ef217d16f74864b9b7b", [ "vmTrace" ] ], "id" : 150 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_stateDiff.json index 93b7b686e..627823ae4 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0c518ea0f936f43969e36335ba480ed8997bba40cc67b1de2197f61d20b847216a0039662d59802be842caf53d4cf22e952572e06c6c0f4abd8c9a6b0401d51b352", [ "stateDiff" ] ], + "params" : [ "0xf901021e81ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca037bb1ba02b2e10c36991c96eb8f732cde51f5ecc056d679bb3561af7930bd7b6a01dbf630579ca212e262f51483de395f7c20a18e2eaa53ae9b9f963c48f95baa5", [ "stateDiff" ] ], "id" : 45 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_trace.json index 40dc5754f..c2f583345 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0c518ea0f936f43969e36335ba480ed8997bba40cc67b1de2197f61d20b847216a0039662d59802be842caf53d4cf22e952572e06c6c0f4abd8c9a6b0401d51b352", [ "trace" ] ], + "params" : [ "0xf901021e81ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca037bb1ba02b2e10c36991c96eb8f732cde51f5ecc056d679bb3561af7930bd7b6a01dbf630579ca212e262f51483de395f7c20a18e2eaa53ae9b9f963c48f95baa5", [ "trace" ] ], "id" : 98 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_vmTrace.json index 5eb225ab0..608f1103c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0c518ea0f936f43969e36335ba480ed8997bba40cc67b1de2197f61d20b847216a0039662d59802be842caf53d4cf22e952572e06c6c0f4abd8c9a6b0401d51b352", [ "vmTrace" ] ], + "params" : [ "0xf901021e81ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca037bb1ba02b2e10c36991c96eb8f732cde51f5ecc056d679bb3561af7930bd7b6a01dbf630579ca212e262f51483de395f7c20a18e2eaa53ae9b9f963c48f95baa5", [ "vmTrace" ] ], "id" : 151 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_stateDiff.json index ebb0bc094..81b21757a 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8758081ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0d4e0bc58b66988dbda935ddbbd86947e82ab33eff8a8f2601a8662f012641dd9a05f96e65ab05bfceadd224172895f85c1ffedc514eb8ad496675736f0e8a6f1f6", [ "stateDiff" ] ], + "params" : [ "0xf8751e81ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0cee3473829cd0637075c1be11120d48da1e97fe7f8d20c59396da9602a541088a046e64bedea7e3f9b03fb2f0848c02bca29b46bb0b672e53ac5830ffec270bff6", [ "stateDiff" ] ], "id" : 46 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_trace.json index 89b571659..cd61eedd4 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8758081ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0d4e0bc58b66988dbda935ddbbd86947e82ab33eff8a8f2601a8662f012641dd9a05f96e65ab05bfceadd224172895f85c1ffedc514eb8ad496675736f0e8a6f1f6", [ "trace" ] ], + "params" : [ "0xf8751e81ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0cee3473829cd0637075c1be11120d48da1e97fe7f8d20c59396da9602a541088a046e64bedea7e3f9b03fb2f0848c02bca29b46bb0b672e53ac5830ffec270bff6", [ "trace" ] ], "id" : 99 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_vmTrace.json index a43e52bb9..643a816ca 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8758081ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0d4e0bc58b66988dbda935ddbbd86947e82ab33eff8a8f2601a8662f012641dd9a05f96e65ab05bfceadd224172895f85c1ffedc514eb8ad496675736f0e8a6f1f6", [ "vmTrace" ] ], + "params" : [ "0xf8751e81ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0cee3473829cd0637075c1be11120d48da1e97fe7f8d20c59396da9602a541088a046e64bedea7e3f9b03fb2f0848c02bca29b46bb0b672e53ac5830ffec270bff6", [ "vmTrace" ] ], "id" : 152 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_stateDiff.json index 41e99cbd6..80333b1f6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf86b8081ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba0392fdcde965c4f2b5149af02fbb43816cb7415bb9d320d48151179f01774d28ba04c52e1e0db0ccc4e1fa11f07e82beb5468af4c061883f9b3bab286167f1b637e", [ "stateDiff" ] ], + "params" : [ "0xf86b1781ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba01d5240ed4a81256e52a2bfe84ebc830d8aea63a7ebd4949ed48051cb6abdb725a03535a0565885a38aabe3fc53cf0ac9a99d6f912efdc3576755f256852b8be709", [ "stateDiff" ] ], "id" : 47 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_trace.json index 52dbd682b..7b44ac6a8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf86b8081ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba0392fdcde965c4f2b5149af02fbb43816cb7415bb9d320d48151179f01774d28ba04c52e1e0db0ccc4e1fa11f07e82beb5468af4c061883f9b3bab286167f1b637e", [ "trace" ] ], + "params" : [ "0xf86b1781ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba01d5240ed4a81256e52a2bfe84ebc830d8aea63a7ebd4949ed48051cb6abdb725a03535a0565885a38aabe3fc53cf0ac9a99d6f912efdc3576755f256852b8be709", [ "trace" ] ], "id" : 100 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_vmTrace.json index aad7e8cf6..64fa9a68b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf86b8081ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba0392fdcde965c4f2b5149af02fbb43816cb7415bb9d320d48151179f01774d28ba04c52e1e0db0ccc4e1fa11f07e82beb5468af4c061883f9b3bab286167f1b637e", [ "vmTrace" ] ], + "params" : [ "0xf86b1781ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba01d5240ed4a81256e52a2bfe84ebc830d8aea63a7ebd4949ed48051cb6abdb725a03535a0565885a38aabe3fc53cf0ac9a99d6f912efdc3576755f256852b8be709", [ "vmTrace" ] ], "id" : 153 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_stateDiff.json index 720a9bbbb..4891ac225 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf84f8001830119408080836000f11ca0c77fe66bd7dee72c85f3fa03b81de0a5f8ca56e8c20c285cc241bda3dbb78c2fa026479c2a83de1d47ddde7e5d606044927ba7269ca8cf4cce20b1fd3588887c73", [ "stateDiff" ] ], + "params" : [ "0xf84f1e01830119408080836000f11ca09b03e5c59d31ee87dc81426da4132cf096e9b996b9943a87896ddf5f41842b97a069f9c0608c8b002e8f91480ff70f6b74f014ac8d29d932db6479fb6213f5c660", [ "stateDiff" ] ], "id" : 48 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_trace.json index 0a4deaf95..0bd625195 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf84f8001830119408080836000f11ca0c77fe66bd7dee72c85f3fa03b81de0a5f8ca56e8c20c285cc241bda3dbb78c2fa026479c2a83de1d47ddde7e5d606044927ba7269ca8cf4cce20b1fd3588887c73", [ "trace" ] ], + "params" : [ "0xf84f1e01830119408080836000f11ca09b03e5c59d31ee87dc81426da4132cf096e9b996b9943a87896ddf5f41842b97a069f9c0608c8b002e8f91480ff70f6b74f014ac8d29d932db6479fb6213f5c660", [ "trace" ] ], "id" : 101 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_vmTrace.json index 503bcdf19..d2daeaa6e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf84f8001830119408080836000f11ca0c77fe66bd7dee72c85f3fa03b81de0a5f8ca56e8c20c285cc241bda3dbb78c2fa026479c2a83de1d47ddde7e5d606044927ba7269ca8cf4cce20b1fd3588887c73", [ "vmTrace" ] ], + "params" : [ "0xf84f1e01830119408080836000f11ca09b03e5c59d31ee87dc81426da4132cf096e9b996b9943a87896ddf5f41842b97a069f9c0608c8b002e8f91480ff70f6b74f014ac8d29d932db6479fb6213f5c660", [ "vmTrace" ] ], "id" : 154 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_stateDiff.json index 31f55356e..33ecbfb96 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8808001839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ca0ac4588a676585985805d4607b85ff0f925f5975d1249f842f1a01e3b910553faa0551434f8fec86b2a8a00f988142c0bf3f0564e313c5e05ba277a64644560af82", [ "stateDiff" ] ], + "params" : [ "0xf8801e01839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ba031b9f6570ab7eea16c2329cb344cd4df0edf3bee966e1f5c0830d753961dee79a0056c01d3fa2510a51317871f3e7c1dc0db5edfb59180dee47725215fd1ff415f", [ "stateDiff" ] ], "id" : 49 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_trace.json index 1ff1abd70..34d4f9b3c 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8808001839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ca0ac4588a676585985805d4607b85ff0f925f5975d1249f842f1a01e3b910553faa0551434f8fec86b2a8a00f988142c0bf3f0564e313c5e05ba277a64644560af82", [ "trace" ] ], + "params" : [ "0xf8801e01839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ba031b9f6570ab7eea16c2329cb344cd4df0edf3bee966e1f5c0830d753961dee79a0056c01d3fa2510a51317871f3e7c1dc0db5edfb59180dee47725215fd1ff415f", [ "trace" ] ], "id" : 102 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_vmTrace.json index ac31a5e1e..8040ae3f1 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8808001839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ca0ac4588a676585985805d4607b85ff0f925f5975d1249f842f1a01e3b910553faa0551434f8fec86b2a8a00f988142c0bf3f0564e313c5e05ba277a64644560af82", [ "vmTrace" ] ], + "params" : [ "0xf8801e01839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ba031b9f6570ab7eea16c2329cb344cd4df0edf3bee966e1f5c0830d753961dee79a0056c01d3fa2510a51317871f3e7c1dc0db5edfb59180dee47725215fd1ff415f", [ "vmTrace" ] ], "id" : 155 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_stateDiff.json index d3d76ca16..c936fcfe3 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000000180801ca06bfb6514dc702ed8d3bcd6e31a32733a7215d574918a9e44fce67dbcffd6f91fa01b5966882a9c81a484f662634dc066c47918ac568e2d80b5ca9d3dc1fa4d6208", [ "stateDiff" ] ], + "params" : [ "0xf8611781ef83fffff294000000000000000000000000000000000000000180801ba036302267633998221141b7a73845649db60497d467902fb80a5e9228c9068984a00afebe79b251b9f0be7ede57c259680588fe40f58091251c20b7f246821a78d6", [ "stateDiff" ] ], "id" : 50 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_trace.json index 3ed43123d..b1195adf8 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000000180801ca06bfb6514dc702ed8d3bcd6e31a32733a7215d574918a9e44fce67dbcffd6f91fa01b5966882a9c81a484f662634dc066c47918ac568e2d80b5ca9d3dc1fa4d6208", [ "trace" ] ], + "params" : [ "0xf8611781ef83fffff294000000000000000000000000000000000000000180801ba036302267633998221141b7a73845649db60497d467902fb80a5e9228c9068984a00afebe79b251b9f0be7ede57c259680588fe40f58091251c20b7f246821a78d6", [ "trace" ] ], "id" : 103 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_vmTrace.json index 4d822043f..0f95bb257 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000000180801ca06bfb6514dc702ed8d3bcd6e31a32733a7215d574918a9e44fce67dbcffd6f91fa01b5966882a9c81a484f662634dc066c47918ac568e2d80b5ca9d3dc1fa4d6208", [ "vmTrace" ] ], + "params" : [ "0xf8611781ef83fffff294000000000000000000000000000000000000000180801ba036302267633998221141b7a73845649db60497d467902fb80a5e9228c9068984a00afebe79b251b9f0be7ede57c259680588fe40f58091251c20b7f246821a78d6", [ "vmTrace" ] ], "id" : 156 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_stateDiff.json index 2ac533cbe..8a7b5a13e 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf880801083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba0fe83c0fb93afd79bdd52ede0bd5a42dca96354f89a5fcaec6665ed6ed74e003ca0247aeceb63d540425eac8e6def3ab2cbceab34eb0ac7a4058ebda5d58839284f", [ "stateDiff" ] ], + "params" : [ "0xf8801e1083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca0d7b87be2e1723dd94e01493f6e9fdaae3fd55197be795f6acedadfe557f41c01a06417820e640ee8f2eaa95b84416d9ab94baca74d02c1386ba36364fcf81fee2f", [ "stateDiff" ] ], "id" : 51 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_trace.json index 98fbaf26a..19c869d70 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf880801083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba0fe83c0fb93afd79bdd52ede0bd5a42dca96354f89a5fcaec6665ed6ed74e003ca0247aeceb63d540425eac8e6def3ab2cbceab34eb0ac7a4058ebda5d58839284f", [ "trace" ] ], + "params" : [ "0xf8801e1083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca0d7b87be2e1723dd94e01493f6e9fdaae3fd55197be795f6acedadfe557f41c01a06417820e640ee8f2eaa95b84416d9ab94baca74d02c1386ba36364fcf81fee2f", [ "trace" ] ], "id" : 104 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_vmTrace.json index e8f5eea9b..6f5bb82f6 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf880801083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba0fe83c0fb93afd79bdd52ede0bd5a42dca96354f89a5fcaec6665ed6ed74e003ca0247aeceb63d540425eac8e6def3ab2cbceab34eb0ac7a4058ebda5d58839284f", [ "vmTrace" ] ], + "params" : [ "0xf8801e1083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca0d7b87be2e1723dd94e01493f6e9fdaae3fd55197be795f6acedadfe557f41c01a06417820e640ee8f2eaa95b84416d9ab94baca74d02c1386ba36364fcf81fee2f", [ "vmTrace" ] ], "id" : 157 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_stateDiff.json index b30d680ec..c7a087f0b 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_stateDiff.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_stateDiff.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85080018347b760808084602af3001ba05fdcab69046b0aa875c5613e95ce0a8d9201c8a46681f2e7424a771252e49749a01c92706a2077ccf458e9ea614c418598707249e090bd67e90a80da574ac8cd6a", [ "stateDiff" ] ], + "params" : [ "0xf8501e018347b760808084602af3001ca05a48260886c4a9882f04821103730ad4a466f8d8cf878758c109cfb6059d040aa0167e20b5fb0dce99f45ce1e3a56cd6696deee8495ed7a84145a0ff205d9ef6cc", [ "stateDiff" ] ], "id" : 52 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_trace.json index a9c786ebf..a076c6ef2 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_trace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_trace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85080018347b760808084602af3001ba05fdcab69046b0aa875c5613e95ce0a8d9201c8a46681f2e7424a771252e49749a01c92706a2077ccf458e9ea614c418598707249e090bd67e90a80da574ac8cd6a", [ "trace" ] ], + "params" : [ "0xf8501e018347b760808084602af3001ca05a48260886c4a9882f04821103730ad4a466f8d8cf878758c109cfb6059d040aa0167e20b5fb0dce99f45ce1e3a56cd6696deee8495ed7a84145a0ff205d9ef6cc", [ "trace" ] ], "id" : 105 }, "response" : { diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_vmTrace.json index dfe888121..82fb756d4 100644 --- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_vmTrace.json +++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_vmTrace.json @@ -3,7 +3,7 @@ "request" : { "jsonrpc" : "2.0", "method" : "trace_rawTransaction", - "params" : [ "0xf85080018347b760808084602af3001ba05fdcab69046b0aa875c5613e95ce0a8d9201c8a46681f2e7424a771252e49749a01c92706a2077ccf458e9ea614c418598707249e090bd67e90a80da574ac8cd6a", [ "vmTrace" ] ], + "params" : [ "0xf8501e018347b760808084602af3001ca05a48260886c4a9882f04821103730ad4a466f8d8cf878758c109cfb6059d040aa0167e20b5fb0dce99f45ce1e3a56cd6696deee8495ed7a84145a0ff205d9ef6cc", [ "vmTrace" ] ], "id" : 158 }, "response" : { diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java index ce2e63a71..74a2e7f9a 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java @@ -50,6 +50,7 @@ public class CallParameter { private final Optional> accessList; private final Optional> blobVersionedHashes; + private final Optional nonce; public CallParameter( final Address from, @@ -70,6 +71,30 @@ public class CallParameter { this.payload = payload; this.maxFeePerBlobGas = Optional.empty(); this.blobVersionedHashes = Optional.empty(); + this.nonce = Optional.empty(); + } + + public CallParameter( + final Address from, + final Address to, + final long gasLimit, + final Wei gasPrice, + final Wei value, + final Bytes payload, + final Optional nonce) { + this.chainId = Optional.empty(); + this.from = from; + this.to = to; + this.gasLimit = gasLimit; + this.accessList = Optional.empty(); + this.maxPriorityFeePerGas = Optional.empty(); + this.maxFeePerGas = Optional.empty(); + this.gasPrice = gasPrice; + this.value = value; + this.payload = payload; + this.maxFeePerBlobGas = Optional.empty(); + this.blobVersionedHashes = Optional.empty(); + this.nonce = nonce; } public CallParameter( @@ -81,7 +106,8 @@ public class CallParameter { final Optional maxFeePerGas, final Wei value, final Bytes payload, - final Optional> accessList) { + final Optional> accessList, + final Optional nonce) { this.chainId = Optional.empty(); this.from = from; this.to = to; @@ -94,6 +120,7 @@ public class CallParameter { this.accessList = accessList; this.maxFeePerBlobGas = Optional.empty(); this.blobVersionedHashes = Optional.empty(); + this.nonce = nonce; } public CallParameter( @@ -108,7 +135,8 @@ public class CallParameter { final Bytes payload, final Optional> accessList, final Optional maxFeePerBlobGas, - final Optional> blobVersionedHashes) { + final Optional> blobVersionedHashes, + final Optional nonce) { this.chainId = chainId; this.from = from; this.to = to; @@ -121,6 +149,7 @@ public class CallParameter { this.accessList = accessList; this.maxFeePerBlobGas = maxFeePerBlobGas; this.blobVersionedHashes = blobVersionedHashes; + this.nonce = nonce; } public Optional getChainId() { @@ -171,6 +200,10 @@ public class CallParameter { return blobVersionedHashes; } + public Optional getNonce() { + return nonce; + } + @Override public boolean equals(final Object o) { if (this == o) { @@ -191,7 +224,8 @@ public class CallParameter { && Objects.equals(payload, that.payload) && Objects.equals(accessList, that.accessList) && Objects.equals(maxFeePerBlobGas, that.maxFeePerBlobGas) - && Objects.equals(blobVersionedHashes, that.blobVersionedHashes); + && Objects.equals(blobVersionedHashes, that.blobVersionedHashes) + && Objects.equals(nonce, that.nonce); } @Override @@ -208,7 +242,8 @@ public class CallParameter { payload, accessList, maxFeePerBlobGas, - blobVersionedHashes); + blobVersionedHashes, + nonce); } @Override @@ -238,6 +273,8 @@ public class CallParameter { + accessList.map(List::size) + ", blobVersionedHashesSize=" + blobVersionedHashes.map(List::size) + + ", nonce=" + + nonce.map(Object::toString).orElse("N/A") + '}'; } @@ -254,7 +291,8 @@ public class CallParameter { tx.getPayload(), tx.getAccessList(), tx.getMaxFeePerBlobGas(), - tx.getVersionedHashes()); + tx.getVersionedHashes(), + Optional.of(tx.getNonce())); } public static CallParameter fromTransaction(final org.hyperledger.besu.datatypes.Transaction tx) { @@ -270,6 +308,7 @@ public class CallParameter { tx.getPayload(), tx.getAccessList(), tx.getMaxFeePerBlobGas().map(Wei::fromQuantity), - tx.getVersionedHashes()); + tx.getVersionedHashes(), + Optional.of(tx.getNonce())); } } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java index cc0f77bb2..7615f7e37 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java @@ -399,8 +399,11 @@ public class TransactionSimulator { } } - final Account sender = updater.get(senderAddress); - final long nonce = sender != null ? sender.getNonce() : 0L; + final long nonce = + callParams + .getNonce() + .orElse( + Optional.ofNullable(updater.get(senderAddress)).map(Account::getNonce).orElse(0L)); final long simulationGasCap = calculateSimulationGasCap(callParams.getGasLimit(), blockHeaderToProcess.getGasLimit()); @@ -635,4 +638,8 @@ public class TransactionSimulator { } return callParams.getBlobVersionedHashes().isPresent(); } + + public WorldStateArchive getWorldStateArchive() { + return worldStateArchive; + } } diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java index f0e32ead3..43d44911b 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java @@ -34,7 +34,9 @@ import org.hyperledger.besu.datatypes.Hash; import org.hyperledger.besu.datatypes.StateOverride; import org.hyperledger.besu.datatypes.TransactionType; import org.hyperledger.besu.datatypes.Wei; +import org.hyperledger.besu.datatypes.parameters.UnsignedLongParameter; import org.hyperledger.besu.ethereum.GasLimitCalculator; +import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter.JsonCallParameterBuilder; import org.hyperledger.besu.ethereum.chain.Blockchain; import org.hyperledger.besu.ethereum.core.BlobTestFixture; import org.hyperledger.besu.ethereum.core.BlockHeader; @@ -153,20 +155,19 @@ public class TransactionSimulatorTest { when(blockchain.getBlockHeader(eq(1L))).thenReturn(Optional.empty()); final Optional result = - transactionSimulator.process(legacyTransactionCallParameter(), 1L); + transactionSimulator.process(legacyTransactionCallParameterBuilder().build(), 1L); assertThat(result.isPresent()).isFalse(); } @Test public void shouldReturnSuccessfulResultWhenProcessingIsSuccessful() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -191,12 +192,11 @@ public class TransactionSimulatorTest { @Test public void simulateOnPendingBlockWorks() { - final CallParameter callParameter = eip1559TransactionCallParameter(); + final CallParameter callParameter = eip1559TransactionCallParameterBuilder().build(); final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -228,13 +228,13 @@ public class TransactionSimulatorTest { @Test public void shouldSetGasPriceToZeroWhenExceedingBalanceAllowed() { - final CallParameter callParameter = legacyTransactionCallParameter(Wei.ONE); + final CallParameter callParameter = + legacyTransactionCallParameterBuilder().withGasPrice(Wei.ONE).build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -262,12 +262,13 @@ public class TransactionSimulatorTest { @Test public void shouldSetFeePerGasToZeroWhenExceedingBalanceAllowed() { final CallParameter callParameter = - eip1559TransactionCallParameter(Wei.ONE, Wei.ONE, TRANSFER_GAS_LIMIT); + eip1559TransactionCallParameterBuilder() + .withMaxFeePerGas(Wei.ONE) + .withMaxPriorityFeePerGas(Wei.ONE) + .withGas(TRANSFER_GAS_LIMIT) + .build(); - final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -297,13 +298,13 @@ public class TransactionSimulatorTest { @Test public void shouldNotSetGasPriceToZeroWhenExceedingBalanceIsNotAllowed() { - final CallParameter callParameter = legacyTransactionCallParameter(Wei.ONE); + final CallParameter callParameter = + legacyTransactionCallParameterBuilder().withGasPrice(Wei.ONE).build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -332,12 +333,13 @@ public class TransactionSimulatorTest { @Test public void shouldNotSetFeePerGasToZeroWhenExceedingBalanceIsNotAllowed() { final CallParameter callParameter = - eip1559TransactionCallParameter(Wei.ONE, Wei.ONE, TRANSFER_GAS_LIMIT); + eip1559TransactionCallParameterBuilder() + .withMaxFeePerGas(Wei.ONE) + .withMaxPriorityFeePerGas(Wei.ONE) + .withGas(TRANSFER_GAS_LIMIT) + .build(); - final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -366,7 +368,7 @@ public class TransactionSimulatorTest { @Test public void shouldUseDefaultValuesWhenMissingOptionalFields() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); @@ -395,7 +397,7 @@ public class TransactionSimulatorTest { @Test public void shouldUseZeroNonceWhenAccountDoesNotExist() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); @@ -422,9 +424,42 @@ public class TransactionSimulatorTest { verifyTransactionWasProcessed(expectedTransaction); } + @Test + public void shouldUseSpecifiedNonceWhenProvided() { + long expectedNonce = 2L; + long accountNonce = 1L; + final CallParameter callParameter = + eip1559TransactionCallParameterBuilder() + .withNonce(new UnsignedLongParameter(expectedNonce)) + .build(); + + final BlockHeader blockHeader = + blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); + + mockBlockchainForBlockHeader(blockHeader); + mockWorldStateForAccount(blockHeader, Address.fromHexString("0x0"), accountNonce); + + final Transaction expectedTransaction = + Transaction.builder() + .type(TransactionType.FRONTIER) + .nonce(expectedNonce) + .gasPrice(Wei.ZERO) + .gasLimit(0L) + .to(DEFAULT_FROM) + .sender(Address.fromHexString("0x0")) + .value(Wei.ZERO) + .payload(Bytes.EMPTY) + .signature(FAKE_SIGNATURE) + .build(); + mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL); + + transactionSimulator.process(callParameter, 1L); + verifyTransactionWasProcessed(expectedTransaction); + } + @Test public void shouldReturnFailureResultWhenProcessingFails() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); @@ -458,14 +493,14 @@ public class TransactionSimulatorTest { when(blockchain.getBlockHeader(eq(Hash.ZERO))).thenReturn(Optional.empty()); final Optional result = - transactionSimulator.process(legacyTransactionCallParameter(), Hash.ZERO); + transactionSimulator.process(legacyTransactionCallParameterBuilder().build(), Hash.ZERO); assertThat(result.isPresent()).isFalse(); } @Test public void shouldReturnSuccessfulResultWhenProcessingIsSuccessfulByHash() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); @@ -496,7 +531,7 @@ public class TransactionSimulatorTest { @Test public void shouldUseDefaultValuesWhenMissingOptionalFieldsByHash() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); @@ -525,7 +560,7 @@ public class TransactionSimulatorTest { @Test public void shouldUseZeroNonceWhenAccountDoesNotExistByHash() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); @@ -554,7 +589,7 @@ public class TransactionSimulatorTest { @Test public void shouldReturnFailureResultWhenProcessingFailsByHash() { - final CallParameter callParameter = legacyTransactionCallParameter(); + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader(); @@ -585,12 +620,11 @@ public class TransactionSimulatorTest { @Test public void shouldReturnSuccessfulResultWhenEip1559TransactionProcessingIsSuccessful() { - final CallParameter callParameter = eip1559TransactionCallParameter(); + final CallParameter callParameter = eip1559TransactionCallParameterBuilder().build(); final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -618,12 +652,9 @@ public class TransactionSimulatorTest { @Test public void shouldCapGasLimitWhenOriginalTransactionExceedsGasCap() { final CallParameter callParameter = - eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, GAS_CAP + 1); + eip1559TransactionCallParameterBuilder().withGas(GAS_CAP + 1).build(); - final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -653,12 +684,11 @@ public class TransactionSimulatorTest { @Test public void shouldUseProvidedGasLimitWhenBelowRpcCapGas() { final CallParameter callParameter = - eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, GAS_CAP / 2); + eip1559TransactionCallParameterBuilder().withGas(GAS_CAP / 2).build(); - final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); + mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -689,12 +719,11 @@ public class TransactionSimulatorTest { public void shouldUseRpcGasCapWhenGasLimitNoPresent() { // generate call parameters that do not specify a gas limit, // expect the rpc gas cap to be used for simulation - final CallParameter callParameter = eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, -1); - final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); + final CallParameter callParameter = + eip1559TransactionCallParameterBuilder().withGas(-1L).build(); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); mockProtocolSpecForProcessWithWorldUpdater(); final Transaction expectedTransaction = @@ -723,34 +752,11 @@ public class TransactionSimulatorTest { @Test public void shouldReturnSuccessfulResultWhenBlobTransactionProcessingIsSuccessful() { - final CallParameter callParameter = - blobTransactionCallParameter(Wei.ONE, Wei.ONE, Wei.ONE, 300, 3); + final CallParameter callParameter = blobTransactionCallParameter(); + mockBlockchainAndWorldState(callParameter); - final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); - - final Transaction expectedTransaction = - Transaction.builder() - .type(TransactionType.BLOB) - .chainId(BigInteger.ONE) - .nonce(1L) - .gasLimit(callParameter.getGasLimit()) - .maxFeePerGas(callParameter.getMaxFeePerGas().orElseThrow()) - .maxPriorityFeePerGas(callParameter.getMaxPriorityFeePerGas().orElseThrow()) - .to(callParameter.getTo()) - .sender(callParameter.getFrom()) - .value(callParameter.getValue()) - .payload(callParameter.getPayload()) - .maxFeePerBlobGas(callParameter.getMaxFeePerBlobGas().get()) - .versionedHashes(callParameter.getBlobVersionedHashes().get()) - .signature(FAKE_SIGNATURE) - .build(); - - final CallParameter reverseEngineeredCallParam = - CallParameter.fromTransaction(expectedTransaction); - assertThat(reverseEngineeredCallParam).isEqualTo(callParameter); + final Transaction expectedTransaction = buildExpectedTransaction(callParameter); + assertCallParametersEqual(callParameter, CallParameter.fromTransaction(expectedTransaction)); mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL); @@ -763,34 +769,11 @@ public class TransactionSimulatorTest { @Test public void shouldReturnFailureResultWhenBlobTransactionProcessingFails() { - final CallParameter callParameter = - blobTransactionCallParameter(Wei.ONE, Wei.ONE, Wei.ONE, 300, 3); + final CallParameter callParameter = blobTransactionCallParameter(); + mockBlockchainAndWorldState(callParameter); - final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); - - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); - - final Transaction expectedTransaction = - Transaction.builder() - .type(TransactionType.BLOB) - .chainId(BigInteger.ONE) - .nonce(1L) - .gasLimit(callParameter.getGasLimit()) - .maxFeePerGas(callParameter.getMaxFeePerGas().orElseThrow()) - .maxPriorityFeePerGas(callParameter.getMaxPriorityFeePerGas().orElseThrow()) - .to(callParameter.getTo()) - .sender(callParameter.getFrom()) - .value(callParameter.getValue()) - .payload(callParameter.getPayload()) - .maxFeePerBlobGas(callParameter.getMaxFeePerBlobGas().get()) - .versionedHashes(callParameter.getBlobVersionedHashes().get()) - .signature(FAKE_SIGNATURE) - .build(); - - final CallParameter reverseEngineeredCallParam = - CallParameter.fromTransaction(expectedTransaction); - assertThat(reverseEngineeredCallParam).isEqualTo(callParameter); + final Transaction expectedTransaction = buildExpectedTransaction(callParameter); + assertCallParametersEqual(callParameter, CallParameter.fromTransaction(expectedTransaction)); mockProcessorStatusForTransaction(expectedTransaction, Status.FAILED); @@ -801,6 +784,30 @@ public class TransactionSimulatorTest { verifyTransactionWasProcessed(expectedTransaction); } + private void mockBlockchainAndWorldState(final CallParameter callParameter) { + final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE); + mockBlockchainForBlockHeader(blockHeader); + mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + } + + private Transaction buildExpectedTransaction(final CallParameter callParameter) { + return Transaction.builder() + .type(TransactionType.BLOB) + .chainId(callParameter.getChainId().orElseThrow()) + .nonce(callParameter.getNonce().orElseThrow()) + .gasLimit(callParameter.getGasLimit()) + .maxFeePerGas(callParameter.getMaxFeePerGas().orElseThrow()) + .maxPriorityFeePerGas(callParameter.getMaxPriorityFeePerGas().orElseThrow()) + .to(callParameter.getTo()) + .sender(callParameter.getFrom()) + .value(callParameter.getValue()) + .payload(callParameter.getPayload()) + .maxFeePerBlobGas(callParameter.getMaxFeePerBlobGas().orElseThrow()) + .versionedHashes(callParameter.getBlobVersionedHashes().orElseThrow()) + .signature(FAKE_SIGNATURE) + .build(); + } + private void mockWorldStateForAccount( final BlockHeader blockHeader, final Address address, final long nonce) { final Account account = mock(Account.class); @@ -895,72 +902,40 @@ public class TransactionSimulatorTest { any(Wei.class)); } - private CallParameter legacyTransactionCallParameter() { - return legacyTransactionCallParameter(Wei.ZERO); + private JsonCallParameterBuilder legacyTransactionCallParameterBuilder() { + return new JsonCallParameterBuilder() + .withFrom(Address.fromHexString("0x0")) + .withTo(Address.fromHexString("0x0")) + .withGas(-1L) + .withGasPrice(Wei.ZERO) + .withValue(Wei.ZERO) + .withInput(Bytes.EMPTY); } - private CallParameter legacyTransactionCallParameter(final Wei gasPrice) { - return new CallParameter( - Address.fromHexString("0x0"), - Address.fromHexString("0x0"), - -1, - gasPrice, - Wei.of(0), - Bytes.EMPTY); + private JsonCallParameterBuilder eip1559TransactionCallParameterBuilder() { + return legacyTransactionCallParameterBuilder() + .withMaxFeePerGas(Wei.ZERO) + .withMaxPriorityFeePerGas(Wei.ZERO); } - private CallParameter eip1559TransactionCallParameter() { - return eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO); - } - - private CallParameter eip1559TransactionCallParameter( - final Wei maxFeePerGas, final Wei maxPriorityFeePerGas) { - return eip1559TransactionCallParameter(maxFeePerGas, maxPriorityFeePerGas, -1); - } - - private CallParameter eip1559TransactionCallParameter( - final Wei maxFeePerGas, final Wei maxPriorityFeePerGas, final long gasLimit) { - return new CallParameter( - Address.fromHexString("0x0"), - Address.fromHexString("0x0"), - gasLimit, - Wei.of(0), - Optional.of(maxFeePerGas), - Optional.of(maxPriorityFeePerGas), - Wei.of(0), - Bytes.EMPTY, - Optional.empty()); - } - - private CallParameter blobTransactionCallParameter( - final Wei maxFeePerBlobGas, - final Wei maxFeePerGas, - final Wei maxPriorityFeePerGas, - final long gasLimit, - final int numberOfBlobs) { - BlobsWithCommitments bwc = new BlobTestFixture().createBlobsWithCommitments(numberOfBlobs); - return new CallParameter( - Optional.of(BigInteger.ONE), - Address.fromHexString("0x0"), - Address.fromHexString("0x0"), - gasLimit, - Wei.of(0), - Optional.of(maxFeePerGas), - Optional.of(maxPriorityFeePerGas), - Wei.of(0), - Bytes.EMPTY, - Optional.empty(), - Optional.of(maxFeePerBlobGas), - Optional.of(bwc.getVersionedHashes())); + private CallParameter blobTransactionCallParameter() { + BlobsWithCommitments bwc = new BlobTestFixture().createBlobsWithCommitments(3); + return eip1559TransactionCallParameterBuilder() + .withNonce(new UnsignedLongParameter(1L)) + .withChainId(BigInteger.ONE) + .withMaxFeePerGas(Wei.ZERO) + .withMaxPriorityFeePerGas(Wei.ZERO) + .withMaxFeePerBlobGas(Wei.ZERO) + .withGas(0L) + .withBlobVersionedHashes(bwc.getVersionedHashes()) + .build(); } @Test public void shouldSimulateLegacyTransactionWhenBaseFeeNotZero() { // tests that the transaction simulator will simulate a legacy transaction when the base fee is - // not zero - // and the transaction is a legacy transaction - - final CallParameter callParameter = legacyTransactionCallParameter(); + // not zero and the transaction is a legacy transaction + final CallParameter callParameter = legacyTransactionCallParameterBuilder().build(); final BlockHeader blockHeader = blockHeaderTestFixture @@ -969,8 +944,7 @@ public class TransactionSimulatorTest { .baseFeePerGas(Wei.of(7)) .buildHeader(); - mockBlockchainForBlockHeader(blockHeader); - mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L); + mockBlockchainAndWorldState(callParameter); final Transaction expectedTransaction = Transaction.builder() @@ -992,4 +966,20 @@ public class TransactionSimulatorTest { verifyTransactionWasProcessed(expectedTransaction); assertThat(result.get().isSuccessful()).isTrue(); } + + private void assertCallParametersEqual(final CallParameter expected, final CallParameter actual) { + assertThat(actual.getChainId()).isEqualTo(expected.getChainId()); + assertThat(actual.getFrom()).isEqualTo(expected.getFrom()); + assertThat(actual.getTo()).isEqualTo(expected.getTo()); + assertThat(actual.getGasLimit()).isEqualTo(expected.getGasLimit()); + assertThat(actual.getGasPrice()).isEqualTo(expected.getGasPrice()); + assertThat(actual.getMaxPriorityFeePerGas()).isEqualTo(expected.getMaxPriorityFeePerGas()); + assertThat(actual.getMaxFeePerGas()).isEqualTo(expected.getMaxFeePerGas()); + assertThat(actual.getValue()).isEqualTo(expected.getValue()); + assertThat(actual.getPayload()).isEqualTo(expected.getPayload()); + assertThat(actual.getAccessList()).isEqualTo(expected.getAccessList()); + assertThat(actual.getMaxFeePerBlobGas()).isEqualTo(expected.getMaxFeePerBlobGas()); + assertThat(actual.getBlobVersionedHashes()).isEqualTo(expected.getBlobVersionedHashes()); + assertThat(actual.getNonce()).isEqualTo(expected.getNonce()); + } }