Skip to content

Commit ba1c8fb

Browse files
lxgr-linuxlxgr-linux
authored
Merge pull request #266 from DecentralCardGame/feat/244-card-upgrades
Feat/244 card upgrades
2 parents e1b6358 + 696d026 commit ba1c8fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2673
-957
lines changed

‎buf.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ deps:
55
commit: 04467658e59e44bbb22fe568206e1f70
66
digest: b5:8058c0aadbee8c9af67a9cefe86492c6c0b0bd5b4526b0ec820507b91fc9b0b5efbebca97331854576d2d279b0b3f5ed6a7abb0640cb640c4186532239c48fc4
77
- name: buf.build/cosmos/cosmos-sdk
8-
commit: 05419252bcc241ea8023acf1ed4cadc5
9-
digest: b5:bec474e46596bf183fa85eb5c33106d432992ae696785c1c5fc1ce2a8f8819cab80c89d0b11557f3e916fd65133451fca4471a05f75ed163c688a8964ecb97b8
8+
commit: 650cd9ad7f7a468e8e19975269958658
9+
digest: b5:652a0cd9aa3c220bb12b558f29b30ca5c248b994420472c9c2a54eed3d33356b1307e51687c1909ea4f535a2a1e180895b8cda83b58a4697003009d17fdbc154
1010
- name: buf.build/cosmos/gogo-proto
1111
commit: 88ef6483f90f478fb938c37dde52ece3
1212
digest: b5:f0c69202c9bca9672dc72a9737ea9bc83744daaed2b3da77e3a95b0e53b86dee76b5a7405b993181d6c863fd64afaca0976a302f700d6c4912eb1692a1782c0a
13+
- name: buf.build/cosmos/ibc
14+
commit: 857539074f9c4dda961f9db5dcf8e462
15+
digest: b5:35746d095f73e8b59b7430388be8a72b1e01c2d36ec49df2025ec96a983a62441f67c0843219e06675186e155bfd25624187bd7c512e59e1e355750bb5586ce2
1316
- name: buf.build/cosmos/ics23
1417
commit: dc427cb4519143d8996361c045a29ad7
1518
digest: b5:8693e72e230bfaf58a88a47a4093ba99f6252c1957a45582567959b38a8563e2abd11443372283d75f4f2306a7e3cc9bf63604d284a016c11966fca4b74b7a28
1619
- name: buf.build/googleapis/googleapis
17-
commit: acd896313c55464b993332136ded1b6e
18-
digest: b5:025d83e25193feb8dac5e5576113c8737006218b3b09fbc0d0ff652614da5424b336edb15bea139eb90d14eba656774a979d1fbdae81cbab2013932b84b98f53
20+
commit: 004180b77378443887d3b55cabc00384
21+
digest: b5:e8f475fe3330f31f5fd86ac689093bcd274e19611a09db91f41d637cb9197881ce89882b94d13a58738e53c91c6e4bae7dc1feba85f590164c975a89e25115dc
1922
- name: buf.build/protocolbuffers/wellknowntypes
20-
commit: 384f8deef6ae4110b57d996aad0032c4
21-
digest: b5:8b023f5c2a872028738eef7ca2323d17379d05332f95fad1d3db3d356ad29f0644bf5868a14069f350bb967a7c8f4bd010228d2deb482e05f56ffd1a5bfc79b3
22-
- name: buf.build/tendermint/tendermint
23-
commit: 33ed361a90514289beabf3189e1d7665
24-
digest: b5:72e7b167e6a474c8ed7763e3fc811d756d48dd0e70d897c1d3b661656aa4ad3cf2adabadf1fa9a8fd644567678a1acd27bec139895b0469258cfa4c3ebae7aab
23+
commit: 4e1ccfa6827947beb55974645a315b8d
24+
digest: b5:eb5228b1abd02064d6ff0248918500c1ec1ce7df69126af3f220c0b67d81ff45bdf9f016a8e66cd9c1e534f18afc6d8e090d400604c5331d551a68d05f7e7be9

‎config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ faucet:
2020
client:
2121
typescript:
2222
path: ../decentralcardgame-cardchain-client-ts
23-
vuex:
24-
path: vue/src/store
25-
composables:
26-
path: vue/src/composables
23+
#vuex:
24+
# path: vue/src/store
25+
#composables:
26+
# path: vue/src/composables
2727
openapi:
2828
path: docs/static/openapi.yml
2929
genesis:

‎docs/static/openapi.yml‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎proto/cardchain/cardchain/card.proto‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
syntax = "proto3";
22
package cardchain.cardchain;
33

4-
import "gogoproto/gogo.proto";
5-
import "cosmos/base/v1beta1/coin.proto";
64
import "cardchain/cardchain/parameter.proto";
5+
import "cosmos/base/v1beta1/coin.proto";
6+
import "gogoproto/gogo.proto";
77

88
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
99

@@ -63,4 +63,6 @@ enum CardType {
6363
headquarter = 3;
6464
}
6565

66-
message TimeStamp {uint64 timeStamp = 1;}
66+
message TimeStamp {
67+
uint64 timeStamp = 1;
68+
}

‎proto/cardchain/cardchain/card_with_image.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
syntax = "proto3";
22
package cardchain.cardchain;
33

4-
import "gogoproto/gogo.proto";
54
import "cardchain/cardchain/card.proto";
5+
import "gogoproto/gogo.proto";
66

77
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
88

99
message CardWithImage {
10-
Card card = 1 [ (gogoproto.nullable) = false ];
10+
Card card = 1 [(gogoproto.nullable) = false];
1111
string image = 2;
1212
string hash = 3;
1313
}

‎proto/cardchain/cardchain/council.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
syntax = "proto3";
22
package cardchain.cardchain;
33

4-
import "gogoproto/gogo.proto";
54
import "cosmos/base/v1beta1/coin.proto";
5+
import "gogoproto/gogo.proto";
66

77
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
88

@@ -11,7 +11,7 @@ message Council {
1111
repeated string voters = 2;
1212
repeated WrapHashResponse hashResponses = 3;
1313
repeated WrapClearResponse clearResponses = 4;
14-
cosmos.base.v1beta1.Coin treasury = 8 [ (gogoproto.nullable) = false ];
14+
cosmos.base.v1beta1.Coin treasury = 8 [(gogoproto.nullable) = false];
1515
CouncelingStatus status = 6;
1616
uint64 trialStart = 7;
1717
}

‎proto/cardchain/cardchain/encounter.proto‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
syntax = "proto3";
22
package cardchain.cardchain;
33

4-
import "gogoproto/gogo.proto";
54
import "cardchain/cardchain/parameter.proto";
5+
import "gogoproto/gogo.proto";
66

77
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
88

9-
109
message Encounter {
1110
uint64 id = 1;
1211
repeated uint64 drawlist = 2;

‎proto/cardchain/cardchain/encounter_with_image.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
syntax = "proto3";
22
package cardchain.cardchain;
33

4-
import "gogoproto/gogo.proto";
54
import "cardchain/cardchain/encounter.proto";
5+
import "gogoproto/gogo.proto";
66

77
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
88

99
message EncounterWithImage {
10-
Encounter encounter = 1 [ (gogoproto.nullable) = false ];
10+
Encounter encounter = 1 [(gogoproto.nullable) = false];
1111
string image = 2;
1212
}

‎proto/cardchain/cardchain/genesis.proto‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,46 @@ syntax = "proto3";
33
package cardchain.cardchain;
44

55
import "amino/amino.proto";
6-
import "gogoproto/gogo.proto";
7-
import "cardchain/cardchain/params.proto";
86
import "cardchain/cardchain/card.proto";
9-
import "cardchain/cardchain/user.proto";
10-
import "cardchain/cardchain/match.proto";
11-
import "cardchain/cardchain/set.proto";
12-
import "cardchain/cardchain/sell_offer.proto";
13-
import "cardchain/cardchain/running_average.proto";
147
import "cardchain/cardchain/council.proto";
8+
import "cardchain/cardchain/encounter.proto";
159
import "cardchain/cardchain/image.proto";
10+
import "cardchain/cardchain/match.proto";
11+
import "cardchain/cardchain/params.proto";
12+
import "cardchain/cardchain/running_average.proto";
13+
import "cardchain/cardchain/sell_offer.proto";
1614
import "cardchain/cardchain/server.proto";
15+
import "cardchain/cardchain/set.proto";
16+
import "cardchain/cardchain/upgrade_factor.proto";
17+
import "cardchain/cardchain/user.proto";
1718
import "cardchain/cardchain/zealy.proto";
18-
import "cardchain/cardchain/encounter.proto";
1919
import "cosmos/base/v1beta1/coin.proto";
20+
import "gogoproto/gogo.proto";
2021

2122
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
2223

2324
// GenesisState defines the cardchain module's genesis state.
2425
message GenesisState {
2526
// params defines all the parameters of the module.
26-
Params params = 1
27-
[ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
27+
Params params = 1 [
28+
(gogoproto.nullable) = false,
29+
(amino.dont_omitempty) = true
30+
];
2831
repeated Card cardRecords = 2;
2932
repeated User users = 3;
3033
repeated string addresses = 4;
3134
repeated Match matches = 6;
3235
repeated Set sets = 7;
3336
repeated SellOffer sellOffers = 8;
3437
repeated cosmos.base.v1beta1.Coin pools = 9;
35-
cosmos.base.v1beta1.Coin cardAuctionPrice = 11
36-
[ (gogoproto.nullable) = false ];
38+
cosmos.base.v1beta1.Coin cardAuctionPrice = 11 [(gogoproto.nullable) = false];
3739
repeated Council councils = 12;
3840
repeated RunningAverage runningAverages = 13;
3941
repeated Image images = 14;
4042
repeated Server servers = 15;
41-
TimeStamp lastCardModified = 16 [ (gogoproto.nullable) = false ];
43+
TimeStamp lastCardModified = 16 [(gogoproto.nullable) = false];
4244
repeated Zealy zealys = 17;
4345
repeated Encounter encounters = 18;
46+
repeated UpgradeFactor upgradeFactors = 19;
4447
// this line is used by starport scaffolding # genesis/proto/state
4548
}

‎proto/cardchain/cardchain/image.proto‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ package cardchain.cardchain;
33

44
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
55

6-
message Image { bytes image = 1; }
6+
message Image {
7+
bytes image = 1;
8+
}

0 commit comments

Comments
 (0)