Skip to content

Commit 0d59ed9

Browse files
DrBlastDrBlast
authored
Merge pull request #17 from wavesplatform/commit-to-generation-tx
CommitToGeneration transaction
2 parents dd15678 + d1c6241 commit 0d59ed9

11 files changed

Lines changed: 500 additions & 147 deletions

File tree

‎.github/workflows/mvn-publish.yml‎

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,12 @@ on:
1111

1212
jobs:
1313
publish:
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: actions/checkout@v2
17-
- uses: actions/setup-java@v1
18-
with:
19-
java-version: 1.8
20-
- uses: actions/cache@v2
21-
with:
22-
key: ${{ hashFiles('pom.xml') }}
23-
path: ~/.m2/repository
24-
- name: Prepare version
25-
id: maven-version
26-
run: |
27-
mvn_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
28-
git_ref=${GITHUB_REF##*/}
29-
pr_number=${{ github.event.number }}
30-
if [[ $git_ref =~ v[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
31-
if [[ v$mvn_version != $git_ref ]] ; then
32-
echo Maven version $mvn_version does not match tag $git_ref
33-
exit 1
34-
fi
35-
elif [[ $pr_number != "" && $mvn_version =~ -SNAPSHOT$ ]] ; then
36-
pattern="s/(.+)-SNAPSHOT/\1-"$pr_number"-SNAPSHOT/g"
37-
mvn_version=$(echo $mvn_version | sed -E $pattern)
38-
mvn versions:set -DnewVersion=$mvn_version -DgenerateBackupPoms=false -q -DforceStdout
39-
elif [[ ! $mvn_version =~ -SNAPSHOT$ ]] ; then
40-
echo Refusing to publish non-snapshot version $mvn_version
41-
echo '::set-output name=skip-publish::true'
42-
fi
43-
- uses: samuelmeuli/action-maven-publish@v1.4.0
44-
if:
45-
${{ steps.maven-version.outputs.skip-publish != 'true' }}
46-
with:
47-
gpg_private_key: ${{ secrets.OSSRH_GPG_KEY_ASCII }}
48-
gpg_passphrase: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
49-
nexus_username: ${{ secrets.OSSRH_USERNAME }}
50-
nexus_password: ${{ secrets.OSSRH_PASSWORD }}
14+
uses: wavesplatform/protobuf-schemas/.github/workflows/mvn-publish.yml@e7cf7fb33a89e52117ac932596a7338f1e23e82b
15+
with:
16+
github-ref-name: ${{ github.ref_name }}
17+
github-event-number: ${{ github.event.number }}
18+
secrets:
19+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
20+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
21+
OSSRH_GPG_KEY: ${{ secrets.OSSRH_GPG_KEY }}
22+
OSSRH_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }}

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,14 @@ on:
1010

1111
jobs:
1212
run_tests:
13-
1413
runs-on: ubuntu-latest
15-
1614
steps:
17-
- name: Checkout the repository
18-
uses: actions/checkout@v2
15+
- uses: actions/checkout@v5
16+
- uses: actions/setup-java@v5
1917
with:
20-
fetch-depth: 1
21-
22-
- name: Set up JDK 8
23-
uses: actions/setup-java@v1
24-
with:
25-
java-version: 8
26-
27-
- name: Cache Maven packages
28-
uses: actions/cache@v2
29-
with:
30-
path: ~/.m2
31-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
32-
restore-keys: ${{ runner.os }}-m2
33-
34-
- name: Run tests
35-
run: mvn -B test -Dmaven.test.failure.ignore=true
36-
18+
java-version: 11
19+
distribution: temurin
20+
cache: maven
21+
- run: mvn -B test -Dmaven.test.failure.ignore=true
3722
- name: Publish test report
3823
uses: scacap/action-surefire-report@v1
39-
with:
40-
github_token: ${{ secrets.GITHUB_TOKEN }}

‎pom.xml‎

Lines changed: 95 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
<groupId>com.wavesplatform</groupId>
88
<artifactId>waves-transactions</artifactId>
9-
<version>1.2.5</version>
9+
<version>1.2.6-SNAPSHOT</version>
10+
<packaging>jar</packaging>
1011

1112
<properties>
1213
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -43,80 +44,51 @@
4344
</developer>
4445
</developers>
4546

46-
<profiles>
47-
<!-- Deployment profile (required so these plugins are only used when deploying) -->
48-
<profile>
49-
<id>deploy</id>
50-
<build>
51-
<plugins>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-javadoc-plugin</artifactId>
55-
<version>3.3.0</version>
56-
<configuration>
57-
<source>8</source>
58-
</configuration>
59-
<executions>
60-
<execution>
61-
<id>attach-javadocs</id>
62-
<goals>
63-
<goal>jar</goal>
64-
</goals>
65-
</execution>
66-
</executions>
67-
</plugin>
68-
<plugin>
69-
<groupId>org.apache.maven.plugins</groupId>
70-
<artifactId>maven-gpg-plugin</artifactId>
71-
<version>1.6</version>
72-
<configuration>
73-
<!-- Prevent `gpg` from using pinentry programs -->
74-
<gpgArguments>
75-
<arg>--pinentry-mode</arg>
76-
<arg>loopback</arg>
77-
</gpgArguments>
78-
</configuration>
79-
<executions>
80-
<execution>
81-
<id>sign-artifacts</id>
82-
<phase>verify</phase>
83-
<goals>
84-
<goal>sign</goal>
85-
</goals>
86-
</execution>
87-
</executions>
88-
</plugin>
89-
<plugin>
90-
<groupId>org.sonatype.plugins</groupId>
91-
<artifactId>nexus-staging-maven-plugin</artifactId>
92-
<version>1.6.8</version>
93-
<extensions>true</extensions>
94-
<configuration>
95-
<serverId>ossrh</serverId>
96-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
97-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
98-
</configuration>
99-
</plugin>
100-
</plugins>
101-
</build>
102-
</profile>
103-
</profiles>
104-
10547
<build>
10648
<plugins>
49+
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-enforcer-plugin</artifactId>
52+
<version>3.6.2</version>
53+
<executions>
54+
<execution>
55+
<id>enforce-maven</id>
56+
<goals>
57+
<goal>enforce</goal>
58+
</goals>
59+
<configuration>
60+
<rules>
61+
<requireMavenVersion>
62+
<version>3.6.3</version>
63+
</requireMavenVersion>
64+
</rules>
65+
</configuration>
66+
</execution>
67+
</executions>
68+
</plugin>
69+
<plugin>
70+
<groupId>org.sonatype.central</groupId>
71+
<artifactId>central-publishing-maven-plugin</artifactId>
72+
<version>0.9.0</version>
73+
<extensions>true</extensions>
74+
<configuration>
75+
<autoPublish>true</autoPublish>
76+
<waitUntil>published</waitUntil>
77+
</configuration>
78+
</plugin>
10779
<plugin>
10880
<groupId>org.apache.maven.plugins</groupId>
10981
<artifactId>maven-compiler-plugin</artifactId>
110-
<version>3.8.1</version>
82+
<version>3.14.1</version>
11183
<configuration>
112-
<source>8</source>
113-
<target>8</target>
84+
<source>11</source>
85+
<target>11</target>
11486
</configuration>
11587
</plugin>
11688
<plugin>
11789
<groupId>org.apache.maven.plugins</groupId>
11890
<artifactId>maven-source-plugin</artifactId>
119-
<version>3.2.1</version>
91+
<version>3.3.1</version>
12092
<executions>
12193
<execution>
12294
<id>attach-sources</id>
@@ -126,15 +98,29 @@
12698
</execution>
12799
</executions>
128100
</plugin>
101+
<plugin>
102+
<groupId>org.apache.maven.plugins</groupId>
103+
<artifactId>maven-gpg-plugin</artifactId>
104+
<version>3.2.8</version>
105+
<executions>
106+
<execution>
107+
<id>sign-artifacts</id>
108+
<phase>verify</phase>
109+
<goals>
110+
<goal>sign</goal>
111+
</goals>
112+
</execution>
113+
</executions>
114+
</plugin>
129115
<plugin>
130116
<groupId>org.apache.maven.plugins</groupId>
131117
<artifactId>maven-surefire-plugin</artifactId>
132-
<version>2.22.2</version>
118+
<version>3.5.4</version>
133119
</plugin>
134120
<plugin>
135121
<groupId>org.apache.maven.plugins</groupId>
136122
<artifactId>maven-jar-plugin</artifactId>
137-
<version>3.2.0</version>
123+
<version>3.5.0</version>
138124
<configuration>
139125
<archive>
140126
<manifest>
@@ -151,52 +137,76 @@
151137
</configuration>
152138
</plugin>
153139
<plugin>
154-
<groupId>org.apache.maven.plugins</groupId>
155-
<artifactId>maven-dependency-plugin</artifactId>
156-
<version>3.3.0</version>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-javadoc-plugin</artifactId>
142+
<version>3.12.0</version>
143+
<executions>
144+
<execution>
145+
<id>attach-javadocs</id>
146+
<goals>
147+
<goal>jar</goal>
148+
</goals>
149+
<configuration>
150+
<source>11</source>
151+
<doclint>none</doclint>
152+
</configuration>
153+
</execution>
154+
</executions>
155+
<configuration>
156+
<source>11</source>
157+
<doclint>none</doclint>
158+
</configuration>
157159
</plugin>
158160
</plugins>
159161
</build>
160162

163+
<repositories>
164+
<repository>
165+
<id>central-portal-snapshots</id>
166+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
167+
<releases>
168+
<enabled>false</enabled>
169+
</releases>
170+
<snapshots>
171+
<enabled>true</enabled>
172+
</snapshots>
173+
</repository>
174+
</repositories>
175+
161176
<distributionManagement>
162177
<snapshotRepository>
163-
<id>ossrh</id>
164-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
178+
<id>central</id>
179+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
165180
</snapshotRepository>
166-
<repository>
167-
<id>ossrh</id>
168-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
169-
</repository>
170181
</distributionManagement>
171182

172183
<dependencies>
173-
<!-- waves -->
174184
<dependency>
175185
<groupId>com.wavesplatform</groupId>
176186
<artifactId>waves-crypto</artifactId>
177-
<version>2.0.5</version>
187+
<version>2.0.6</version>
178188
</dependency>
179189
<dependency>
180190
<groupId>com.wavesplatform</groupId>
181191
<artifactId>protobuf-schemas</artifactId>
182-
<version>1.5.2</version>
192+
<version>1.6.0</version>
183193
</dependency>
184-
185-
<!-- json -->
186194
<dependency>
187195
<groupId>com.fasterxml.jackson.core</groupId>
188196
<artifactId>jackson-databind</artifactId>
189197
<version>2.16.1</version>
190198
</dependency>
191-
192-
<!-- ethereum transaction -->
193199
<dependency>
194200
<groupId>org.web3j</groupId>
195-
<artifactId>core</artifactId>
201+
<artifactId>crypto</artifactId>
196202
<version>4.9.8</version>
203+
<exclusions>
204+
<exclusion>
205+
<groupId>org.bouncycastle</groupId>
206+
<artifactId>bcprov-jdk15on</artifactId>
207+
</exclusion>
208+
</exclusions>
197209
</dependency>
198-
199-
<!-- testing -->
200210
<dependency>
201211
<groupId>org.junit.jupiter</groupId>
202212
<artifactId>junit-jupiter</artifactId>

0 commit comments

Comments
 (0)