Skip to content

Commit b06fa9e

Browse files
prolenkingprolenking
authored
Merge pull request #85 from junjie-bianjie/master
Support latest nft proto
2 parents a6a71df + 5efb117 commit b06fa9e

File tree

14 files changed

+296
-178
lines changed

14 files changed

+296
-178
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.bianjieai</groupId>
88
<artifactId>opb-sdk</artifactId>
9-
<version>0.1.12-rc4</version>
9+
<version>0.1.12-rc5</version>
1010
<url>https://github.com/bianjieai/opb-sdk-java</url>
1111
<name>opb-sdk</name>
1212
<licenses>

‎src/main/java/irita/sdk/module/nft/EditNFTRequest.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ public class EditNFTRequest {
55
private String id = "";
66
private String name = "";
77
private String uri = "";
8+
private String uriHash = "";
89
private String data = "";
910

1011
public String getDenom() {
@@ -43,6 +44,15 @@ public EditNFTRequest setUri(String uri) {
4344
return this;
4445
}
4546

47+
public String getUriHash() {
48+
return uriHash;
49+
}
50+
51+
public EditNFTRequest setUriHash(String uriHash) {
52+
this.uriHash = uriHash;
53+
return this;
54+
}
55+
4656
public String getData() {
4757
return data;
4858
}

‎src/main/java/irita/sdk/module/nft/IssueDenomRequest.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ public class IssueDenomRequest {
77
private String symbol = "";
88
private boolean mintRestricted;
99
private boolean updateRestricted;
10+
private String uri = "";
11+
private String uriHash = "";
12+
private String Data = "";
1013

1114
public String getId() {
1215
return id;
@@ -61,4 +64,31 @@ public IssueDenomRequest setUpdateRestricted(boolean updateRestricted) {
6164
this.updateRestricted = updateRestricted;
6265
return this;
6366
}
67+
68+
public String getUri() {
69+
return uri;
70+
}
71+
72+
public IssueDenomRequest setUri(String uri) {
73+
this.uri = uri;
74+
return this;
75+
}
76+
77+
public String getUriHash() {
78+
return uriHash;
79+
}
80+
81+
public IssueDenomRequest setUriHash(String uriHash) {
82+
this.uriHash = uriHash;
83+
return this;
84+
}
85+
86+
public String getData() {
87+
return Data;
88+
}
89+
90+
public IssueDenomRequest setData(String data) {
91+
Data = data;
92+
return this;
93+
}
6494
}

‎src/main/java/irita/sdk/module/nft/MintNFTRequest.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ public class MintNFTRequest {
55
private String id = "";
66
private String name = "";
77
private String uri = "";
8+
private String uriHash = "";
89
private String data = "";
910
private String recipient = "";
1011

@@ -44,6 +45,15 @@ public MintNFTRequest setUri(String uri) {
4445
return this;
4546
}
4647

48+
public String getUriHash() {
49+
return uriHash;
50+
}
51+
52+
public MintNFTRequest setUriHash(String uriHash) {
53+
this.uriHash = uriHash;
54+
return this;
55+
}
56+
4757
public String getData() {
4858
return data;
4959
}

‎src/main/java/irita/sdk/module/nft/NftClient.java‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ public ResultTx issueDenom(IssueDenomRequest req, BaseTx baseTx) throws IOExcept
3939
.setSymbol(req.getSymbol())
4040
.setMintRestricted(req.isMintRestricted())
4141
.setUpdateRestricted(req.isUpdateRestricted())
42+
.setUri(req.getUri())
43+
.setUriHash(req.getUriHash())
44+
.setData(req.getData())
4245
.setSender(account.getAddress())
4346
.build();
4447
List<GeneratedMessageV3> msgs = Collections.singletonList(msg);
@@ -65,6 +68,7 @@ public ResultTx mintNft(MintNFTRequest req, BaseTx baseTx) throws IOException {
6568
.setId(req.getId())
6669
.setName(req.getName())
6770
.setUri(req.getUri())
71+
.setUriHash(req.getUriHash())
6872
.setData(req.getData())
6973
.setSender(account.getAddress());
7074

@@ -88,6 +92,9 @@ public ResultTx editNft(EditNFTRequest req, BaseTx baseTx) throws IOException {
8892
if (StringUtils.isEmpty(req.getName())) {
8993
req.setName(DO_NOT_MODIFY);
9094
}
95+
if (StringUtils.isEmpty(req.getUriHash())) {
96+
req.setUriHash(DO_NOT_MODIFY);
97+
}
9198

9299
Account account = baseClient.queryAccount(baseTx);
93100
Tx.MsgEditNFT msg = Tx.MsgEditNFT
@@ -96,6 +103,7 @@ public ResultTx editNft(EditNFTRequest req, BaseTx baseTx) throws IOException {
96103
.setId(req.getId())
97104
.setName(req.getName())
98105
.setUri(req.getUri())
106+
.setUriHash(req.getUriHash())
99107
.setData(req.getData())
100108
.setSender(account.getAddress())
101109
.build();
@@ -113,6 +121,9 @@ public ResultTx transferNFt(TransferNFTRequest req, BaseTx baseTx) throws IOExce
113121
if (StringUtils.isEmpty(req.getName())) {
114122
req.setName(DO_NOT_MODIFY);
115123
}
124+
if (StringUtils.isEmpty(req.getUriHash())) {
125+
req.setUriHash(DO_NOT_MODIFY);
126+
}
116127

117128
Account account = baseClient.queryAccount(baseTx);
118129
Tx.MsgTransferNFT.Builder builder = Tx.MsgTransferNFT
@@ -122,6 +133,7 @@ public ResultTx transferNFt(TransferNFTRequest req, BaseTx baseTx) throws IOExce
122133
.setUri(req.getUri())
123134
.setData(req.getData())
124135
.setName(req.getName())
136+
.setUriHash(req.getUriHash())
125137
.setSender(account.getAddress());
126138

127139
if (StringUtils.isEmpty(req.getRecipient())) {
@@ -159,14 +171,21 @@ public long querySupply(String denomID, String owner) {
159171
return resp.getAmount();
160172
}
161173

162-
public QueryOwnerResp queryOwner(String denomID, String owner) {
174+
public QueryOwnerResp queryOwner(String denomID, String owner, Pagination.PageRequest page) {
163175
Channel channel = baseClient.getGrpcClient();
164-
QueryOuterClass.QueryOwnerRequest req = QueryOuterClass.QueryOwnerRequest
176+
QueryOuterClass.QueryOwnerRequest.Builder builder = QueryOuterClass.QueryOwnerRequest
165177
.newBuilder()
166178
.setDenomId(Optional.ofNullable(denomID).orElse(""))
167-
.setOwner(owner)
168-
.build();
179+
.setOwner(owner);
169180

181+
if (page == null) {
182+
page = Pagination.PageRequest.newBuilder()
183+
.setOffset(0)
184+
.setLimit(100)
185+
.build();
186+
}
187+
builder.setPagination(page);
188+
QueryOuterClass.QueryOwnerRequest req = builder.build();
170189
QueryOuterClass.QueryOwnerResponse resp = QueryGrpc.newBlockingStub(channel).owner(req);
171190
return Convert.toQueryOwnerResp(resp.getOwner());
172191
}
@@ -256,7 +275,7 @@ public static QueryCollectionResp toQueryCollectionResp(Nft.Collection collectio
256275
}
257276

258277
QueryCollectionResp res = new QueryCollectionResp();
259-
res.setDenom(new QueryDenomResp(denom.getId(), denom.getName(), denom.getSchema(), denom.getCreator(),denom.getSymbol(),denom.getMintRestricted(),denom.getUpdateRestricted()));
278+
res.setDenom(new QueryDenomResp(denom.getId(), denom.getName(), denom.getSchema(), denom.getSymbol(), denom.getMintRestricted(), denom.getUpdateRestricted(), denom.getUri(), denom.getUriHash(), denom.getData(), denom.getCreator()));
260279
res.setNfts(nfts);
261280
return res;
262281
}
@@ -268,6 +287,9 @@ public static QueryDenomResp toQueryDenomResp(Nft.Denom denom) {
268287
res.setSchema(denom.getSchema());
269288
res.setCreator(denom.getCreator());
270289
res.setSymbol(denom.getSymbol());
290+
res.setUri(denom.getUri());
291+
res.setUriHash(denom.getUriHash());
292+
res.setData(denom.getData());
271293
res.setMintRestricted(denom.getMintRestricted());
272294
res.setUpdateRestricted(denom.getUpdateRestricted());
273295
return res;
@@ -287,6 +309,7 @@ public static QueryNFTResp toQueryNFTResp(Nft.BaseNFT baseNFT) {
287309
res.setId(baseNFT.getId());
288310
res.setName(baseNFT.getName());
289311
res.setUri(baseNFT.getUri());
312+
res.setUriHash(baseNFT.getUriHash());
290313
res.setData(baseNFT.getData());
291314
res.setOwner(baseNFT.getOwner());
292315
return res;

‎src/main/java/irita/sdk/module/nft/QueryDenomResp.java‎

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,24 @@ public class QueryDenomResp {
77
private String symbol;
88
private boolean mintRestricted;
99
private boolean updateRestricted;
10+
private String uri;
11+
private String uriHash;
12+
private String data;
1013
private String creator;
1114

1215
public QueryDenomResp() {
1316
}
1417

15-
public QueryDenomResp(String id, String name, String schema, String creator) {
16-
this.id = id;
17-
this.name = name;
18-
this.schema = schema;
19-
this.creator = creator;
20-
}
21-
22-
public QueryDenomResp(String id, String name, String schema, String creator, String symbol, boolean mintRestricted, boolean updateRestricted) {
18+
public QueryDenomResp(String id, String name, String schema, String symbol, boolean mintRestricted, boolean updateRestricted, String uri, String uriHash, String data, String creator) {
2319
this.id = id;
2420
this.name = name;
2521
this.schema = schema;
2622
this.symbol = symbol;
2723
this.mintRestricted = mintRestricted;
2824
this.updateRestricted = updateRestricted;
25+
this.uri = uri;
26+
this.uriHash = uriHash;
27+
this.data = data;
2928
this.creator = creator;
3029
}
3130

@@ -53,14 +52,6 @@ public void setSchema(String schema) {
5352
this.schema = schema;
5453
}
5554

56-
public String getCreator() {
57-
return creator;
58-
}
59-
60-
public void setCreator(String creator) {
61-
this.creator = creator;
62-
}
63-
6455
public String getSymbol() {
6556
return symbol;
6657
}
@@ -84,4 +75,36 @@ public boolean isUpdateRestricted() {
8475
public void setUpdateRestricted(boolean updateRestricted) {
8576
this.updateRestricted = updateRestricted;
8677
}
78+
79+
public String getUri() {
80+
return uri;
81+
}
82+
83+
public void setUri(String uri) {
84+
this.uri = uri;
85+
}
86+
87+
public String getUriHash() {
88+
return uriHash;
89+
}
90+
91+
public void setUriHash(String uriHash) {
92+
this.uriHash = uriHash;
93+
}
94+
95+
public String getData() {
96+
return data;
97+
}
98+
99+
public void setData(String data) {
100+
this.data = data;
101+
}
102+
103+
public String getCreator() {
104+
return creator;
105+
}
106+
107+
public void setCreator(String creator) {
108+
this.creator = creator;
109+
}
87110
}

‎src/main/java/irita/sdk/module/nft/QueryNFTResp.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public class QueryNFTResp {
44
private String id;
55
private String name;
66
private String uri;
7+
private String uriHash;
78
private String data;
89
private String owner;
910

@@ -31,6 +32,14 @@ public void setUri(String uri) {
3132
this.uri = uri;
3233
}
3334

35+
public String getUriHash() {
36+
return uriHash;
37+
}
38+
39+
public void setUriHash(String uriHash) {
40+
this.uriHash = uriHash;
41+
}
42+
3443
public String getData() {
3544
return data;
3645
}

‎src/main/java/irita/sdk/module/nft/TransferNFTRequest.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public class TransferNFTRequest {
44
private String denom = "";
55
private String id = "";
66
private String uri = "";
7+
private String uriHash = "";
78
private String data = "";
89
private String name = "";
910
private String recipient = "";
@@ -35,6 +36,15 @@ public TransferNFTRequest setUri(String uri) {
3536
return this;
3637
}
3738

39+
public String getUriHash() {
40+
return uriHash;
41+
}
42+
43+
public TransferNFTRequest setUriHash(String uriHash) {
44+
this.uriHash = uriHash;
45+
return this;
46+
}
47+
3848
public String getData() {
3949
return data;
4050
}

‎src/main/proto/nft/genesis.proto‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)