Skip to content

Commit

Permalink
Fixed conflicts. added missing proto files
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fim-84
Fim-84 committed Mar 26, 2024
2 parents 8e9dacc + 8ec1835 commit a2d4628
Show file tree
Hide file tree
Showing 3 changed files with 129 additions and 38 deletions.
149 changes: 117 additions & 32 deletions pax-sdk/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.unigrid</groupId>
<artifactId>pax-sdk</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
<!-- gRPC dependencies -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.unigrid</groupId>
<artifactId>pax-sdk</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
<!-- gRPC dependencies -->
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
Expand All @@ -34,7 +32,7 @@
<artifactId>grpc-stub</artifactId>
<version>1.45.0</version>
</dependency>
<dependency>
<dependency>
<groupId>org.bitcoinj</groupId>
<artifactId>bitcoinj-core</artifactId>
<version>0.16.1</version>
Expand All @@ -49,7 +47,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
Expand All @@ -66,7 +64,7 @@
<version>4.0.1</version>
<type>jar</type>
</dependency>
<dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>5.1.2.Final</version>
Expand All @@ -78,7 +76,7 @@
<version>1.18.30</version>
<type>jar</type>
</dependency>
<dependency>
<dependency>
<groupId>org.web3j</groupId>
<artifactId>crypto</artifactId>
<version>5.0.0</version>
Expand All @@ -90,17 +88,36 @@
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<extensions>
</dependencies>

<!-- MAVEN PUBLISH -->

<distributionManagement>
<repository>
<id>github</id>
<name>GitHub Apache Maven Packages</name>
<url>https://maven.pkg.github.com/unigrid-project/pax-sdk-java</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>github</id>
<name>Unigrid Cosmos SDK Java Apache Maven Packages</name>
<url>https://maven.pkg.github.com/unigrid-project/pax-sdk-java</url>
</repository>
</repositories>

<build>
<extensions>
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.6.2</version>
</extension>
</extensions>
<plugins>
<plugin>
</extensions>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<configuration>
Expand All @@ -123,7 +140,7 @@
</execution>
</executions>
</plugin>
<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
Expand Down Expand Up @@ -170,7 +187,13 @@
<mkdir dir="${project.build.directory}/proto/ibc/core/connection/v1/"/>
<mkdir dir="${project.build.directory}/proto/ibc/core/commitment/v1/"/>
<mkdir dir="${project.build.directory}/proto/cosmos/gov/v1beta1/"/>
<mkdir dir="${project.build.directory}/proto/cosmos/ics23/v1/"/>

<get src="https://raw.githubusercontent.com/cosmos/ibc-go/main/proto/ibc/core/channel/v1/upgrade.proto"
dest="${project.build.directory}/proto/ibc/core/channel/v1/"
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/ibc-go/main/proto/ibc/core/client/v1/tx.proto"
dest="${project.build.directory}/proto/ibc/core/client/v1/"
verbose="false"
Expand All @@ -180,14 +203,24 @@
dest="${project.build.directory}/proto/cosmos/distribution/v1beta1/"
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/cosmos-sdk/main/x/gov/proto/cosmos/gov/v1beta1/gov.proto"
dest="${project.build.directory}/proto/cosmos/gov/v1beta1/"
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/cosmos-sdk/main/x/distribution/proto/cosmos/distribution/v1beta1/distribution.proto"
dest="${project.build.directory}/proto/cosmos/distribution/v1beta1/"
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/cosmos-sdk/main/x/gov/proto/cosmos/gov/v1beta1/tx.proto"
dest="${project.build.directory}/proto/cosmos/gov/v1beta1/"
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/ics23/master/proto/cosmos/ics23/v1/proofs.proto"
dest="${project.build.directory}/proto/"
dest="${project.build.directory}/proto/cosmos/ics23/v1/"
verbose="false"
usetimestamp="true"/>

Expand Down Expand Up @@ -242,11 +275,15 @@
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/ibc-go/main/proto/ibc/applications/transfer/v1/tx.proto"
<get src="https://raw.githubusercontent.com/cosmos/ibc-go/main/proto/ibc/applications/transfer/v1/transfer.proto"
dest="${project.build.directory}/proto/ibc/applications/transfer/v1/"
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/ibc-go/main/proto/ibc/applications/transfer/v1/tx.proto"
dest="${project.build.directory}/proto/ibc/applications/transfer/v1/"
verbose="false"
usetimestamp="true"/>

<get src="https://raw.githubusercontent.com/cosmos/ibc-go/main/proto/ibc/core/channel/v1/tx.proto"
dest="${project.build.directory}/proto/ibc/core/channel/v1/"
Expand Down Expand Up @@ -687,7 +724,7 @@
<plugin>
<groupId>io.github.floverfelt</groupId>
<artifactId>find-and-replace-maven-plugin</artifactId>
<version>1.1.0</version>
<version>1.1.0</version>
<executions>
<execution>
<id>exec-protobuf</id>
Expand Down Expand Up @@ -739,10 +776,58 @@
</execution>
</executions>
</plugin>
<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<archive>
<manifestEntries>
<Sealed>true</Sealed>
<Implementation-Title>Cosmos SDK Java Unigrid</Implementation-Title>
<Implementation-Version>1.0</Implementation-Version>
<Implementation-Vendor>Unigrid</Implementation-Vendor>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<excludePackageNames>com.google.*:cosmos.*:ibc.*:ics23.*:tendermint.*:ics23:cosmos_proto</excludePackageNames>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<configuration>
<release>17</release>
</configuration>
</plugin>
</plugins>
</build>
</plugins>
</build>
</project>
14 changes: 10 additions & 4 deletions pax-sdk/src/main/java/module-info.java → ...sdk/src/main/java/module-info-backup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@
* addended copy of the GNU Affero General Public License with this program. If
* not, see <http://www.gnu.org/licenses/> and
* <https://github.com/unigrid-project/janus-java>.
*/
module fx {
//requires static lombok;
requires com.google.
module paxsdk {
requires utils;
requires static lombok;
requires protobuf.java.util;
requires grpc.core;
requires grpc.stub;
requires grpc.protobuf;
requires crypto;
requires grpc.api;
}
*/
4 changes: 2 additions & 2 deletions pax-sdk/src/main/java/org/unigrid/pax/sdk/cosmos/JsonToProtoObjectUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ public static JsonFormat.TypeRegistry getTypeRegistry() {
builder.add(cosmos.staking.v1beta1.Tx.getDescriptor().getMessageTypes());
builder.add(ibc.core.client.v1.Client.getDescriptor().getMessageTypes());
builder.add(ibc.core.client.v1.Tx.getDescriptor().getMessageTypes());
builder.add(ibc.core.client.v1.QueryOuterClass.getDescriptor().getMessageTypes());
//builder.add(ibc.core.client.v1.QueryOuterClass.getDescriptor().getMessageTypes());
builder.add(ibc.core.client.v1.Genesis.getDescriptor().getMessageTypes());
builder.add(Tendermint.getDescriptor().getMessageTypes());
builder.add(ibc.lightclients.solomachine.v1.Solomachine.getDescriptor().getMessageTypes());
//builder.add(ibc.lightclients.solomachine.v1.Solomachine.getDescriptor().getMessageTypes());
builder.add(ibc.core.channel.v1.Tx.getDescriptor().getMessageTypes());
builder.add(ibc.applications.transfer.v1.Tx.getDescriptor().getMessageTypes());
builder.add(cosmos.gov.v1beta1.Tx.getDescriptor().getMessageTypes());
Expand Down

0 comments on commit a2d4628

Please sign in to comment.