Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: add evm builder #186

Merged
merged 34 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4959475
wip
alfonsobries Nov 5, 2024
49562b0
wip
alfonsobries Nov 5, 2024
9ec0f47
wip
alfonsobries Nov 5, 2024
79f4aed
wip
alfonsobries Nov 5, 2024
cbf378a
style: resolve style guide violations
alfonsobries Nov 5, 2024
ea3efbc
rollback ecsda classes
alfonsobries Nov 18, 2024
cf3758c
style: resolve style guide violations
alfonsobries Nov 18, 2024
98d3e76
wip
alfonsobries Nov 18, 2024
d0d814d
Merge branch 'refactor/evm-builder' of github.com:ArkEcosystem/java-c…
alfonsobries Nov 18, 2024
1d1448f
abi encoder tests
alfonsobries Nov 18, 2024
f51c0b3
wip
alfonsobries Nov 18, 2024
4ffe410
wip
alfonsobries Nov 18, 2024
ebb1220
style: resolve style guide violations
alfonsobries Nov 18, 2024
2240dd7
wip
alfonsobries Nov 18, 2024
6c5013c
remove deprecated tests
alfonsobries Nov 18, 2024
14571c6
Merge branch 'refactor/evm-builder' of github.com:ArkEcosystem/java-c…
alfonsobries Nov 18, 2024
18497ff
style: resolve style guide violations
alfonsobries Nov 18, 2024
5f45d12
test serializer
alfonsobries Nov 18, 2024
4c7e3ab
Update SerializerTest.java
alfonsobries Nov 18, 2024
a19b875
style: resolve style guide violations
alfonsobries Nov 18, 2024
c71d2f4
Delete FixtureLoader.java
alfonsobries Nov 18, 2024
ad38563
fix deserializer & tests
alfonsobries Nov 18, 2024
1d6dd0c
style: resolve style guide violations
alfonsobries Nov 18, 2024
d415d93
cleanup
alfonsobries Nov 18, 2024
9c6ed33
Merge branch 'refactor/evm-builder' of github.com:ArkEcosystem/java-c…
alfonsobries Nov 18, 2024
793918c
remove more deprecated stuff
alfonsobries Nov 18, 2024
d47ce74
style: resolve style guide violations
alfonsobries Nov 18, 2024
0fe024e
Delete Schnorr.java
alfonsobries Nov 18, 2024
031965d
cleanuo dependencies
alfonsobries Nov 18, 2024
cf4d753
Merge branch 'refactor/evm-builder' of github.com:ArkEcosystem/java-c…
alfonsobries Nov 18, 2024
06a4b94
Update test.yml
alfonsobries Nov 18, 2024
4a4e38c
adjustment so I can publish to maven local
alfonsobries Nov 20, 2024
680b773
use temporal version
alfonsobries Nov 20, 2024
8f0848f
default skipSignature to false
alfonsobries Nov 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 49 additions & 71 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,76 +1,54 @@
name: Test

on:
push:
branches:
- "master"
- "develop"
pull_request:
types: [ready_for_review, synchronize, opened]
push:
branches:
- "master"
- "develop"
pull_request:
types: [ready_for_review, synchronize, opened]

jobs:
format:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}

- name: Merge Conflict finder
uses: olivernybroe/[email protected]

- name: Use Java Version 22
uses: actions/setup-java@v2
with:
distribution: "adopt"
java-version: "22"
cache: "gradle"

- name: Format code
run: gradle format

- name: Commit fixed code
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "style: resolve style guide violations"
branch: ${{ github.head_ref }}

unit:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}

- name: Merge Conflict finder
uses: olivernybroe/[email protected]

- name: Install Nix
uses: cachix/install-nix-action@v27

- name: Install libsecp256k1
run: |
nix profile install nixpkgs#secp256k1
env:
NIX_PATH: $HOME/.nix-profile/bin

- name: Set LD_LIBRARY_PATH
run: echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/.nix-profile/lib" >> $GITHUB_ENV

- name: Use Java Version 22
uses: actions/setup-java@v2
with:
distribution: "adopt"
java-version: "22"
cache: "gradle"

- name: Install
run: gradle dependencies

- name: Test
run: gradle test && gradle jacocoTestReport

- name: Codecov
run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}
unit:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Java 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
cache: 'gradle'

- name: Install Dependencies
run: ./gradlew dependencies

- name: Run Tests
run: ./gradlew test jacocoTestReport

- name: Upload Test Results
uses: actions/upload-artifact@v3
with:
name: test-results
path: build/reports/tests/test

- name: Upload Coverage Report
uses: actions/upload-artifact@v3
with:
name: code-coverage-report
path: build/reports/jacoco/test/html

- name: Upload Jacoco XML Report
uses: actions/upload-artifact@v3
with:
name: jacoco-xml-report
path: build/reports/jacoco/test/jacocoTestReport.xml

- name: Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: build/reports/jacoco/test/jacocoTestReport.xml
fail_ci_if_error: true
26 changes: 14 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ plugins {
}

group = 'org.arkecosystem'
version = '2.0.0'
version = '2.0.0-mainsail'

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
withJavadocJar()
withSourcesJar()
}
Expand All @@ -22,15 +22,13 @@ repositories {
}

dependencies {
implementation 'org.web3j:core:4.8.7'
// Core dependencies
implementation 'org.bitcoinj:bitcoinj-core:0.16.3'
implementation files('libs/secp256k1-api-0.0.1.jar')
implementation files('libs/secp256k1-foreign-0.0.1.jar')
implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
implementation 'org.web3j:core:4.8.7'
implementation 'com.google.code.gson:gson:2.11.0'
implementation 'com.google.guava:guava:30.2.0-jre'

testImplementation 'org.slf4j:slf4j-api:2.0.13'
testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.13'
// Test dependencies
testImplementation 'org.hamcrest:hamcrest-library:3.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
Expand All @@ -42,7 +40,6 @@ test {
useJUnitPlatform()
testLogging {
events 'PASSED', 'FAILED', 'SKIPPED'
showStandardStreams = true
}
}

Expand Down Expand Up @@ -155,8 +152,13 @@ publishing {
}

signing {
// Only sign when publishing to remote repository
required { gradle.taskGraph.hasTask("publish") && !gradle.taskGraph.hasTask("publishToMavenLocal") }

def signingKey = findProperty("signingKey")
def signingPassword = findProperty("signingPassword")
useInMemoryPgpKeys(signingKey as String, signingPassword as String)
sign publishing.publications.mavenJava
if (signingKey && signingPassword) {
useInMemoryPgpKeys(signingKey as String, signingPassword as String)
sign publishing.publications.mavenJava
}
}
Binary file removed libs/secp256k1-api-0.0.1.jar
Binary file not shown.
Binary file removed libs/secp256k1-foreign-0.0.1.jar
Binary file not shown.
18 changes: 18 additions & 0 deletions src/main/java/org/arkecosystem/crypto/enums/AbiFunction.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package org.arkecosystem.crypto.enums;

public enum AbiFunction {
VOTE("vote"),
UNVOTE("unvote"),
VALIDATOR_REGISTRATION("registerValidator"),
VALIDATOR_RESIGNATION("resignValidator");

private final String functionName;

AbiFunction(String functionName) {
this.functionName = functionName;
}

public String toString() {
return functionName;
}
}

This file was deleted.

23 changes: 0 additions & 23 deletions src/main/java/org/arkecosystem/crypto/enums/Fees.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading