Skip to content

Commit

Permalink
Remove filecoin mode (#1027)
Browse files Browse the repository at this point in the history
* build: Remove filecoin lotus devnet from CircleCi configuration
* remove FilecoinSubCommand from Web3SignerApp
* Remove filecoin related classes
* changelog
  • Loading branch information
usmansaleem authored Oct 15, 2024
1 parent 545c59b commit b2f1506
Show file tree
Hide file tree
Showing 52 changed files with 6 additions and 2,791 deletions.
23 changes: 1 addition & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,6 @@ executors:
JAVA_TOOL_OPTIONS: -Xmx4096m
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4 -Xmx4096m

executor_large_with_fc_devnet: # 4cpu, 8G ram
docker:
# Primary container
- image: cimg/openjdk:21.0
auth:
<<: *docker-auth
# Secondary container running lotus as devnet on port 7777
- image: textile/lotus-devnet
auth:
<<: *docker-auth
environment:
TEXLOTUSDEVNET_BIGSECTORS: false
resource_class: large
working_directory: ~/project
environment:
JAVA_TOOL_OPTIONS: -Xmx4096m
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4 -Xmx4096m
LOTUS_PORT: 7777

executor_node:
docker:
- image: cimg/node:17.1.0
Expand Down Expand Up @@ -203,13 +184,11 @@ jobs:
- ./

acceptanceTests:
executor: executor_large_with_fc_devnet
executor: executor_large
steps:
- prepare
- attach_workspace:
at: ~/project
# Wait for FC-DevNet to be up
- run: sleep 5 && nc -vz localhost 7777
- run:
name: Acceptance Tests
no_output_timeout: 20m
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## Next Release
### Breaking Changes
- Filecoin mode has been removed.

### Features Added
- Java 21 for build and runtime. [#995](https://github.com/Consensys/web3signer/pull/995)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
import static tech.pegasys.web3signer.dsl.tls.TlsClientHelper.createRequestSpecification;
import static tech.pegasys.web3signer.dsl.utils.WaitUtils.waitFor;
import static tech.pegasys.web3signer.signing.KeyType.BLS;
import static tech.pegasys.web3signer.tests.AcceptanceTestBase.JSON_RPC_PATH;

import tech.pegasys.web3signer.core.service.http.SigningObjectMapperFactory;
import tech.pegasys.web3signer.core.service.http.handlers.signing.eth2.Eth2SigningRequestBody;
import tech.pegasys.web3signer.dsl.Accounts;
import tech.pegasys.web3signer.dsl.Eth;
import tech.pegasys.web3signer.dsl.PublicContracts;
import tech.pegasys.web3signer.dsl.Transactions;
import tech.pegasys.web3signer.dsl.lotus.FilecoinJsonRpcEndpoint;
import tech.pegasys.web3signer.dsl.signer.runner.Web3SignerRunner;
import tech.pegasys.web3signer.dsl.tls.ClientTlsConfig;
import tech.pegasys.web3signer.signing.KeyType;
Expand Down Expand Up @@ -54,7 +52,7 @@
import org.web3j.protocol.core.JsonRpc2_0Web3j;
import org.web3j.protocol.http.HttpService;

public class Signer extends FilecoinJsonRpcEndpoint {
public class Signer {

private static final Logger LOG = LogManager.getLogger();
public static final String ETH1_SIGN_ENDPOINT =
Expand Down Expand Up @@ -84,7 +82,6 @@ public class Signer extends FilecoinJsonRpcEndpoint {
private Web3j jsonRpc;

public Signer(final SignerConfiguration signerConfig, final ClientTlsConfig clientTlsConfig) {
super(JSON_RPC_PATH);
this.signerConfig = signerConfig;
this.runner = Web3SignerRunner.createRunner(signerConfig);
this.hostname = signerConfig.hostname();
Expand Down Expand Up @@ -130,7 +127,6 @@ public void awaitStartupCompletion() {
LOG.info("Signer is now responsive");
}

@Override
public String getUrl() {
return String.format(urlFormatting, hostname, runner.httpPort());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
public class AcceptanceTestBase {

protected Signer signer;
public static final String JSON_RPC_PATH = "/rpc/v0";

public static final Long FILECOIN_CHAIN_ID = 314L;
public static final Long DEFAULT_CHAIN_ID = 1337L;
protected static final String ETH_2_SLASHINGPROTECTION_PERMITTED_SIGNINGS =
"eth2_slashingprotection_permitted_signings_total";
Expand Down
Loading

0 comments on commit b2f1506

Please sign in to comment.