mirror of https://github.com/hyperledger/besu
EIP-7702: devnet-4 changes (#7809)
* warm up to address at tx start if account is delegated, restrict auth nonce to 2**64-1 Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * rename requestsRoot to requestsHash Signed-off-by: Jason Frame <jason.frame@consensys.net> * return no code if account has delegated code to precompile, treat precompile always as warm account when resolving code Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * make accessListWarmAddresses generic again Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * warm delegatee account if transaction destination has delegated code Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * * verify auth nonce less than 2**64-1 during auth processing * auth to zero address deletes delegation * auth to precompile returns empty code * auth nonce < 2**8 * increase auth base cost to 12500 Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * generalised requests flat encoding and engine api changes Signed-off-by: Jason Frame <jason.frame@consensys.net> * javadoc Signed-off-by: Jason Frame <jason.frame@consensys.net> * get tests passing Signed-off-by: Jason Frame <jason.frame@consensys.net> * get tests passing Signed-off-by: Jason Frame <jason.frame@consensys.net> * clean code Signed-off-by: Jason Frame <jason.frame@consensys.net> * change requests to single requestData for each requestType Signed-off-by: Jason Frame <jason.frame@consensys.net> * fix PoWBlockCreatorTest after requests data type change Signed-off-by: Jason Frame <jason.frame@consensys.net> * don't return request type in getPayload result Signed-off-by: Jason Frame <jason.frame@consensys.net> don't return request type in getPayload result Signed-off-by: Jason Frame <jason.frame@consensys.net> * include requests in t8n response Signed-off-by: Jason Frame <jason.frame@consensys.net> * update contract addresses for consolidation requests and withdrawal requests Signed-off-by: Jason Frame <jason.frame@consensys.net> * fix requestHash calculation Signed-off-by: Jason Frame <jason.frame@consensys.net> * Ensure that execution requests always return a response Signed-off-by: Jason Frame <jason.frame@consensys.net> * added and fixed bound checks, fixed some compilation errors after the rebase Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * revert changes to evm tool spec tests Signed-off-by: Jason Frame <jason.frame@consensys.net> * clean up Signed-off-by: Jason Frame <jason.frame@consensys.net> * replace AbstractSystemCallRequestProcessor to concrete class and remove specific processors Signed-off-by: Jason Frame <jason.frame@consensys.net> * spotless Signed-off-by: Jason Frame <jason.frame@consensys.net> * update evmtool tests for 7685 changes Signed-off-by: Jason Frame <jason.frame@consensys.net> * use empty requests hash prague fork at genesis Signed-off-by: Jason Frame <jason.frame@consensys.net> * review suggestions Signed-off-by: Jason Frame <jason.frame@consensys.net> * temporarily comment out osakaTime from Prague Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * engine API validation Signed-off-by: Jason Frame <jason.frame@consensys.net> * update plugin API hash Signed-off-by: Jason Frame <jason.frame@consensys.net> * fix GenesisStateTest Signed-off-by: Jason Frame <jason.frame@consensys.net> * comment out unused evmWorldUpdater.parentUpdater() check Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * added CodeDelegationProcessorTest Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * code clean up Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> * spotless Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> --------- Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net> Signed-off-by: Jason Frame <jason.frame@consensys.net> Co-authored-by: Jason Frame <jason.frame@consensys.net>pull/7951/merge
daniellehrner
2 days ago
committed by
GitHub
parent
747a378017
commit
07637cfc12
@ -0,0 +1,236 @@ |
|||||||
|
/* |
||||||
|
* 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.ethereum.mainnet; |
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat; |
||||||
|
import static org.mockito.ArgumentMatchers.any; |
||||||
|
import static org.mockito.Mockito.mock; |
||||||
|
import static org.mockito.Mockito.never; |
||||||
|
import static org.mockito.Mockito.verify; |
||||||
|
import static org.mockito.Mockito.when; |
||||||
|
|
||||||
|
import org.hyperledger.besu.crypto.SECPSignature; |
||||||
|
import org.hyperledger.besu.datatypes.Address; |
||||||
|
import org.hyperledger.besu.datatypes.CodeDelegation; |
||||||
|
import org.hyperledger.besu.ethereum.core.Transaction; |
||||||
|
import org.hyperledger.besu.evm.account.Account; |
||||||
|
import org.hyperledger.besu.evm.account.MutableAccount; |
||||||
|
import org.hyperledger.besu.evm.worldstate.DelegatedCodeService; |
||||||
|
import org.hyperledger.besu.evm.worldstate.EVMWorldUpdater; |
||||||
|
|
||||||
|
import java.math.BigInteger; |
||||||
|
import java.util.List; |
||||||
|
import java.util.Optional; |
||||||
|
|
||||||
|
import org.junit.jupiter.api.BeforeEach; |
||||||
|
import org.junit.jupiter.api.Test; |
||||||
|
import org.junit.jupiter.api.extension.ExtendWith; |
||||||
|
import org.mockito.Mock; |
||||||
|
import org.mockito.junit.jupiter.MockitoExtension; |
||||||
|
|
||||||
|
@ExtendWith(MockitoExtension.class) |
||||||
|
class CodeDelegationProcessorTest { |
||||||
|
|
||||||
|
@Mock private EVMWorldUpdater worldUpdater; |
||||||
|
|
||||||
|
@Mock private Transaction transaction; |
||||||
|
|
||||||
|
@Mock private DelegatedCodeService authorizedCodeService; |
||||||
|
|
||||||
|
@Mock private MutableAccount authority; |
||||||
|
|
||||||
|
private CodeDelegationProcessor processor; |
||||||
|
private static final BigInteger CHAIN_ID = BigInteger.valueOf(1); |
||||||
|
private static final BigInteger HALF_CURVE_ORDER = BigInteger.valueOf(1000); |
||||||
|
private static final Address DELEGATE_ADDRESS = |
||||||
|
Address.fromHexString("0x9876543210987654321098765432109876543210"); |
||||||
|
|
||||||
|
@BeforeEach |
||||||
|
void setUp() { |
||||||
|
processor = new CodeDelegationProcessor(Optional.of(CHAIN_ID), HALF_CURVE_ORDER); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldRejectInvalidChainId() { |
||||||
|
// Arrange
|
||||||
|
CodeDelegation codeDelegation = createCodeDelegation(BigInteger.valueOf(2), 0L); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(worldUpdater, never()).createAccount(any()); |
||||||
|
verify(worldUpdater, never()).getAccount(any()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldRejectMaxNonce() { |
||||||
|
// Arrange
|
||||||
|
CodeDelegation codeDelegation = createCodeDelegation(CHAIN_ID, Account.MAX_NONCE); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(worldUpdater, never()).createAccount(any()); |
||||||
|
verify(worldUpdater, never()).getAccount(any()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldProcessValidDelegationForNewAccount() { |
||||||
|
// Arrange
|
||||||
|
when(worldUpdater.authorizedCodeService()).thenReturn(authorizedCodeService); |
||||||
|
CodeDelegation codeDelegation = createCodeDelegation(CHAIN_ID, 0L); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
when(worldUpdater.getAccount(any())).thenReturn(null); |
||||||
|
when(worldUpdater.createAccount(any())).thenReturn(authority); |
||||||
|
when(authority.getNonce()).thenReturn(0L); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(worldUpdater).createAccount(any()); |
||||||
|
verify(authority).incrementNonce(); |
||||||
|
verify(authorizedCodeService).processDelegatedCodeAuthorization(authority, DELEGATE_ADDRESS); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldProcessValidDelegationForExistingAccount() { |
||||||
|
// Arrange
|
||||||
|
when(worldUpdater.authorizedCodeService()).thenReturn(authorizedCodeService); |
||||||
|
CodeDelegation codeDelegation = createCodeDelegation(CHAIN_ID, 1L); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
when(worldUpdater.getAccount(any())).thenReturn(authority); |
||||||
|
when(authority.getNonce()).thenReturn(1L); |
||||||
|
when(authorizedCodeService.canSetDelegatedCode(any())).thenReturn(true); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isEqualTo(1); |
||||||
|
verify(worldUpdater, never()).createAccount(any()); |
||||||
|
verify(authority).incrementNonce(); |
||||||
|
verify(authorizedCodeService).processDelegatedCodeAuthorization(authority, DELEGATE_ADDRESS); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldRejectDelegationWithInvalidNonce() { |
||||||
|
// Arrange
|
||||||
|
when(worldUpdater.authorizedCodeService()).thenReturn(authorizedCodeService); |
||||||
|
CodeDelegation codeDelegation = createCodeDelegation(CHAIN_ID, 2L); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
when(worldUpdater.getAccount(any())).thenReturn(authority); |
||||||
|
when(authorizedCodeService.canSetDelegatedCode(any())).thenReturn(true); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(authority, never()).incrementNonce(); |
||||||
|
verify(authorizedCodeService, never()).processDelegatedCodeAuthorization(any(), any()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldRejectDelegationWithSGreaterThanHalfCurveOrder() { |
||||||
|
// Arrange
|
||||||
|
CodeDelegation codeDelegation = |
||||||
|
createCodeDelegation(CHAIN_ID, 1L, HALF_CURVE_ORDER.add(BigInteger.ONE)); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(authority, never()).incrementNonce(); |
||||||
|
verify(authorizedCodeService, never()).processDelegatedCodeAuthorization(any(), any()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldRejectDelegationWithRecIdNeitherZeroNorOne() { |
||||||
|
// Arrange
|
||||||
|
final SECPSignature signature = new SECPSignature(BigInteger.ONE, BigInteger.ONE, (byte) 2); |
||||||
|
CodeDelegation codeDelegation = |
||||||
|
new org.hyperledger.besu.ethereum.core.CodeDelegation( |
||||||
|
CHAIN_ID, CodeDelegationProcessorTest.DELEGATE_ADDRESS, 1L, signature); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(authority, never()).incrementNonce(); |
||||||
|
verify(authorizedCodeService, never()).processDelegatedCodeAuthorization(any(), any()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldRejectDelegationWithInvalidSignature() { |
||||||
|
// Arrange
|
||||||
|
CodeDelegation codeDelegation = mock(org.hyperledger.besu.ethereum.core.CodeDelegation.class); |
||||||
|
when(codeDelegation.chainId()).thenReturn(CHAIN_ID); |
||||||
|
when(codeDelegation.nonce()).thenReturn(1L); |
||||||
|
when(codeDelegation.signature()) |
||||||
|
.thenReturn(new SECPSignature(BigInteger.ONE, BigInteger.ONE, (byte) 0)); |
||||||
|
when(codeDelegation.authorizer()).thenReturn(Optional.empty()); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(authority, never()).incrementNonce(); |
||||||
|
verify(authorizedCodeService, never()).processDelegatedCodeAuthorization(any(), any()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void shouldRejectDelegationWhenCannotSetDelegatedCode() { |
||||||
|
// Arrange
|
||||||
|
when(worldUpdater.authorizedCodeService()).thenReturn(authorizedCodeService); |
||||||
|
CodeDelegation codeDelegation = createCodeDelegation(CHAIN_ID, 1L); |
||||||
|
when(transaction.getCodeDelegationList()).thenReturn(Optional.of(List.of(codeDelegation))); |
||||||
|
when(worldUpdater.getAccount(any())).thenReturn(authority); |
||||||
|
when(authorizedCodeService.canSetDelegatedCode(any())).thenReturn(false); |
||||||
|
|
||||||
|
// Act
|
||||||
|
CodeDelegationResult result = processor.process(worldUpdater, transaction); |
||||||
|
|
||||||
|
// Assert
|
||||||
|
assertThat(result.alreadyExistingDelegators()).isZero(); |
||||||
|
verify(authority, never()).incrementNonce(); |
||||||
|
verify(authorizedCodeService, never()).processDelegatedCodeAuthorization(any(), any()); |
||||||
|
} |
||||||
|
|
||||||
|
private CodeDelegation createCodeDelegation(final BigInteger chainId, final long nonce) { |
||||||
|
return createCodeDelegation(chainId, nonce, BigInteger.ONE); |
||||||
|
} |
||||||
|
|
||||||
|
private CodeDelegation createCodeDelegation( |
||||||
|
final BigInteger chainId, final long nonce, final BigInteger s) { |
||||||
|
final SECPSignature signature = new SECPSignature(BigInteger.ONE, s, (byte) 0); |
||||||
|
|
||||||
|
return new org.hyperledger.besu.ethereum.core.CodeDelegation( |
||||||
|
chainId, CodeDelegationProcessorTest.DELEGATE_ADDRESS, nonce, signature); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue