diff --git a/acceptance-tests/src/test/java/linea/plugin/acc/test/LineaPluginTestBase.java b/acceptance-tests/src/test/java/linea/plugin/acc/test/LineaPluginTestBase.java index ff777ceb0..8b6050e9a 100644 --- a/acceptance-tests/src/test/java/linea/plugin/acc/test/LineaPluginTestBase.java +++ b/acceptance-tests/src/test/java/linea/plugin/acc/test/LineaPluginTestBase.java @@ -89,7 +89,10 @@ public class LineaPluginTestBase extends AcceptanceTestBase { public void setup() throws Exception { minerNode = createCliqueNodeWithExtraCliOptionsAndRpcApis( - "miner1", LINEA_CLIQUE_OPTIONS, getTestCliOptions(), Set.of("LINEA", "MINER")); + "miner1", + LINEA_CLIQUE_OPTIONS, + getTestCliOptions(), + Set.of("LINEA", "MINER", "PLUGINS")); minerNode.setTransactionPoolConfiguration( ImmutableTransactionPoolConfiguration.builder() .from(TransactionPoolConfiguration.DEFAULT) diff --git a/acceptance-tests/src/test/java/linea/plugin/acc/test/TransactionPoolDenyListReloadTest.java b/acceptance-tests/src/test/java/linea/plugin/acc/test/TransactionPoolDenyListReloadTest.java new file mode 100644 index 000000000..f573e7343 --- /dev/null +++ b/acceptance-tests/src/test/java/linea/plugin/acc/test/TransactionPoolDenyListReloadTest.java @@ -0,0 +1,142 @@ +/* + * Copyright Consensys Software Inc. + * + * 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 linea.plugin.acc.test; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.IOException; +import java.math.BigInteger; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests; +import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.web3j.crypto.Credentials; +import org.web3j.protocol.Web3j; +import org.web3j.protocol.core.Request; +import org.web3j.protocol.core.methods.response.EthSendTransaction; +import org.web3j.tx.RawTransactionManager; +import org.web3j.utils.Convert; + +public class TransactionPoolDenyListReloadTest extends LineaPluginTestBase { + + private static final BigInteger GAS_PRICE = Convert.toWei("20", Convert.Unit.GWEI).toBigInteger(); + private static final BigInteger GAS_LIMIT = BigInteger.valueOf(210000); + private static final BigInteger VALUE = BigInteger.ONE; // 1 wei + + final Credentials notDenied = Credentials.create(Accounts.GENESIS_ACCOUNT_ONE_PRIVATE_KEY); + final Credentials willBeDenied = Credentials.create(Accounts.GENESIS_ACCOUNT_TWO_PRIVATE_KEY); + + @TempDir static Path tempDir; + static Path tempDenyList; + + @Override + public List getTestCliOptions() { + tempDenyList = tempDir.resolve("denyList.txt"); + if (!Files.exists(tempDenyList)) { + + try { + Files.createFile(tempDenyList); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + return new TestCommandLineOptionsBuilder() + .set("--plugin-linea-deny-list-path=", tempDenyList.toString()) + .build(); + } + + @Test + public void emptyDenyList() throws Exception { + final Web3j miner = minerNode.nodeRequests().eth(); + + RawTransactionManager transactionManager = + new RawTransactionManager(miner, willBeDenied, CHAIN_ID); + assertAddressAllowed(transactionManager, willBeDenied.getAddress()); + } + + @Test + public void emptyDenyList_thenDenySender_cannotAddTxToPool() throws Exception { + final Web3j miner = minerNode.nodeRequests().eth(); + RawTransactionManager transactionManager = + new RawTransactionManager(miner, willBeDenied, CHAIN_ID); + + assertAddressAllowed(transactionManager, willBeDenied.getAddress()); + + addAddressToDenyList(willBeDenied.getAddress()); + reloadPluginConfig(); + + assertAddressNotAllowed(transactionManager, willBeDenied.getAddress()); + } + + private void addAddressToDenyList(final String address) throws IOException { + Files.writeString(tempDenyList, address); + } + + private void assertAddressAllowed( + final RawTransactionManager transactionManager, final String address) throws IOException { + EthSendTransaction transactionResponse = + transactionManager.sendTransaction(GAS_PRICE, GAS_LIMIT, address, "", VALUE); + assertThat(transactionResponse.getTransactionHash()).isNotNull(); + assertThat(transactionResponse.getError()).isNull(); + } + + private void assertAddressNotAllowed( + final RawTransactionManager transactionManager, final String address) throws IOException { + EthSendTransaction transactionResponse = + transactionManager.sendTransaction(GAS_PRICE, GAS_LIMIT, address, "", VALUE); + + assertThat(transactionResponse.getTransactionHash()).isNull(); + assertThat(transactionResponse.getError().getMessage()) + .isEqualTo( + "sender " + + address + + " is blocked as appearing on the SDN or other legally prohibited list"); + } + + private void reloadPluginConfig() { + final var reqLinea = new ReloadPluginConfigRequest(); + final var respLinea = reqLinea.execute(minerNode.nodeRequests()); + assertThat(respLinea).isEqualTo("Success"); + } + + static class ReloadPluginConfigRequest implements Transaction { + + public ReloadPluginConfigRequest() {} + + @Override + public String execute(final NodeRequests nodeRequests) { + try { + // plugin name is class name + return new Request<>( + "plugins_reloadPluginConfig", + List.of( + "net.consensys.linea.sequencer.txpoolvalidation.LineaTransactionPoolValidatorPlugin"), + nodeRequests.getWeb3jService(), + ReloadPluginConfigResponse.class) + .send() + .getResult(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + static class ReloadPluginConfigResponse extends org.web3j.protocol.core.Response {} +} diff --git a/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java b/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java index 427796a14..4f2e8f11a 100644 --- a/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java +++ b/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java @@ -34,7 +34,10 @@ public abstract class AbstractLineaRequiredPlugin extends AbstractLineaSharedPri public void register(final BesuContext context) { super.register(context); try { - log.info("Registering Linea plugin {}", this.getClass().getName()); + log.info( + "Registering Linea plugin of type {} with name {}", + this.getClass().getName(), + this.getName()); doRegister(context); diff --git a/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java b/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java index 410e83e92..98af6c889 100644 --- a/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java +++ b/sequencer/src/main/java/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.util.Optional; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -81,7 +82,10 @@ public void doRegister(final BesuContext context) { @Override public void start() { super.start(); + loadDenyListAndRegisterPluginTxValidatorFactory(); + } + private void loadDenyListAndRegisterPluginTxValidatorFactory() { try (Stream lines = Files.lines( Path.of(new File(transactionPoolValidatorConfiguration().denyListPath()).toURI()))) { @@ -118,6 +122,12 @@ public void start() { } } + @Override + public CompletableFuture reloadConfiguration() { + loadDenyListAndRegisterPluginTxValidatorFactory(); + return CompletableFuture.completedFuture(null); + } + @Override public void stop() { super.stop();