Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ deps:
commit: 04467658e59e44bbb22fe568206e1f70
digest: b5:8058c0aadbee8c9af67a9cefe86492c6c0b0bd5b4526b0ec820507b91fc9b0b5efbebca97331854576d2d279b0b3f5ed6a7abb0640cb640c4186532239c48fc4
- name: buf.build/cosmos/cosmos-sdk
commit: 05419252bcc241ea8023acf1ed4cadc5
digest: b5:bec474e46596bf183fa85eb5c33106d432992ae696785c1c5fc1ce2a8f8819cab80c89d0b11557f3e916fd65133451fca4471a05f75ed163c688a8964ecb97b8
commit: 650cd9ad7f7a468e8e19975269958658
digest: b5:652a0cd9aa3c220bb12b558f29b30ca5c248b994420472c9c2a54eed3d33356b1307e51687c1909ea4f535a2a1e180895b8cda83b58a4697003009d17fdbc154
- name: buf.build/cosmos/gogo-proto
commit: 88ef6483f90f478fb938c37dde52ece3
digest: b5:f0c69202c9bca9672dc72a9737ea9bc83744daaed2b3da77e3a95b0e53b86dee76b5a7405b993181d6c863fd64afaca0976a302f700d6c4912eb1692a1782c0a
- name: buf.build/cosmos/ibc
commit: 857539074f9c4dda961f9db5dcf8e462
digest: b5:35746d095f73e8b59b7430388be8a72b1e01c2d36ec49df2025ec96a983a62441f67c0843219e06675186e155bfd25624187bd7c512e59e1e355750bb5586ce2
- name: buf.build/cosmos/ics23
commit: dc427cb4519143d8996361c045a29ad7
digest: b5:8693e72e230bfaf58a88a47a4093ba99f6252c1957a45582567959b38a8563e2abd11443372283d75f4f2306a7e3cc9bf63604d284a016c11966fca4b74b7a28
- name: buf.build/googleapis/googleapis
commit: acd896313c55464b993332136ded1b6e
digest: b5:025d83e25193feb8dac5e5576113c8737006218b3b09fbc0d0ff652614da5424b336edb15bea139eb90d14eba656774a979d1fbdae81cbab2013932b84b98f53
commit: 004180b77378443887d3b55cabc00384
digest: b5:e8f475fe3330f31f5fd86ac689093bcd274e19611a09db91f41d637cb9197881ce89882b94d13a58738e53c91c6e4bae7dc1feba85f590164c975a89e25115dc
- name: buf.build/protocolbuffers/wellknowntypes
commit: 384f8deef6ae4110b57d996aad0032c4
digest: b5:8b023f5c2a872028738eef7ca2323d17379d05332f95fad1d3db3d356ad29f0644bf5868a14069f350bb967a7c8f4bd010228d2deb482e05f56ffd1a5bfc79b3
- name: buf.build/tendermint/tendermint
commit: 33ed361a90514289beabf3189e1d7665
digest: b5:72e7b167e6a474c8ed7763e3fc811d756d48dd0e70d897c1d3b661656aa4ad3cf2adabadf1fa9a8fd644567678a1acd27bec139895b0469258cfa4c3ebae7aab
commit: 4e1ccfa6827947beb55974645a315b8d
digest: b5:eb5228b1abd02064d6ff0248918500c1ec1ce7df69126af3f220c0b67d81ff45bdf9f016a8e66cd9c1e534f18afc6d8e090d400604c5331d551a68d05f7e7be9
8 changes: 4 additions & 4 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ faucet:
client:
typescript:
path: ../decentralcardgame-cardchain-client-ts
vuex:
path: vue/src/store
composables:
path: vue/src/composables
#vuex:
# path: vue/src/store
#composables:
# path: vue/src/composables
openapi:
path: docs/static/openapi.yml
genesis:
Expand Down
2 changes: 1 addition & 1 deletion docs/static/openapi.yml

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions proto/cardchain/cardchain/card.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
syntax = "proto3";
package cardchain.cardchain;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cardchain/cardchain/parameter.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

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

Expand Down Expand Up @@ -63,4 +63,6 @@ enum CardType {
headquarter = 3;
}

message TimeStamp {uint64 timeStamp = 1;}
message TimeStamp {
uint64 timeStamp = 1;
}
4 changes: 2 additions & 2 deletions proto/cardchain/cardchain/card_with_image.proto
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
syntax = "proto3";
package cardchain.cardchain;

import "gogoproto/gogo.proto";
import "cardchain/cardchain/card.proto";
import "gogoproto/gogo.proto";

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

message CardWithImage {
Card card = 1 [ (gogoproto.nullable) = false ];
Card card = 1 [(gogoproto.nullable) = false];
string image = 2;
string hash = 3;
}
4 changes: 2 additions & 2 deletions proto/cardchain/cardchain/council.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
syntax = "proto3";
package cardchain.cardchain;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

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

Expand All @@ -11,7 +11,7 @@ message Council {
repeated string voters = 2;
repeated WrapHashResponse hashResponses = 3;
repeated WrapClearResponse clearResponses = 4;
cosmos.base.v1beta1.Coin treasury = 8 [ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin treasury = 8 [(gogoproto.nullable) = false];
CouncelingStatus status = 6;
uint64 trialStart = 7;
}
Expand Down
3 changes: 1 addition & 2 deletions proto/cardchain/cardchain/encounter.proto
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
syntax = "proto3";
package cardchain.cardchain;

import "gogoproto/gogo.proto";
import "cardchain/cardchain/parameter.proto";
import "gogoproto/gogo.proto";

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


message Encounter {
uint64 id = 1;
repeated uint64 drawlist = 2;
Expand Down
4 changes: 2 additions & 2 deletions proto/cardchain/cardchain/encounter_with_image.proto
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
syntax = "proto3";
package cardchain.cardchain;

import "gogoproto/gogo.proto";
import "cardchain/cardchain/encounter.proto";
import "gogoproto/gogo.proto";

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

message EncounterWithImage {
Encounter encounter = 1 [ (gogoproto.nullable) = false ];
Encounter encounter = 1 [(gogoproto.nullable) = false];
string image = 2;
}
29 changes: 16 additions & 13 deletions proto/cardchain/cardchain/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,46 @@ syntax = "proto3";
package cardchain.cardchain;

import "amino/amino.proto";
import "gogoproto/gogo.proto";
import "cardchain/cardchain/params.proto";
import "cardchain/cardchain/card.proto";
import "cardchain/cardchain/user.proto";
import "cardchain/cardchain/match.proto";
import "cardchain/cardchain/set.proto";
import "cardchain/cardchain/sell_offer.proto";
import "cardchain/cardchain/running_average.proto";
import "cardchain/cardchain/council.proto";
import "cardchain/cardchain/encounter.proto";
import "cardchain/cardchain/image.proto";
import "cardchain/cardchain/match.proto";
import "cardchain/cardchain/params.proto";
import "cardchain/cardchain/running_average.proto";
import "cardchain/cardchain/sell_offer.proto";
import "cardchain/cardchain/server.proto";
import "cardchain/cardchain/set.proto";
import "cardchain/cardchain/upgrade_factor.proto";
import "cardchain/cardchain/user.proto";
import "cardchain/cardchain/zealy.proto";
import "cardchain/cardchain/encounter.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

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

// GenesisState defines the cardchain module's genesis state.
message GenesisState {
// params defines all the parameters of the module.
Params params = 1
[ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
Params params = 1 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
repeated Card cardRecords = 2;
repeated User users = 3;
repeated string addresses = 4;
repeated Match matches = 6;
repeated Set sets = 7;
repeated SellOffer sellOffers = 8;
repeated cosmos.base.v1beta1.Coin pools = 9;
cosmos.base.v1beta1.Coin cardAuctionPrice = 11
[ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin cardAuctionPrice = 11 [(gogoproto.nullable) = false];
repeated Council councils = 12;
repeated RunningAverage runningAverages = 13;
repeated Image images = 14;
repeated Server servers = 15;
TimeStamp lastCardModified = 16 [ (gogoproto.nullable) = false ];
TimeStamp lastCardModified = 16 [(gogoproto.nullable) = false];
repeated Zealy zealys = 17;
repeated Encounter encounters = 18;
repeated UpgradeFactor upgradeFactors = 19;
// this line is used by starport scaffolding # genesis/proto/state
}
4 changes: 3 additions & 1 deletion proto/cardchain/cardchain/image.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ package cardchain.cardchain;

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

message Image { bytes image = 1; }
message Image {
bytes image = 1;
}
4 changes: 2 additions & 2 deletions proto/cardchain/cardchain/match.proto
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
syntax = "proto3";
package cardchain.cardchain;

option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
import "cardchain/cardchain/voting.proto";

message Match {
option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";

message Match {
uint64 timestamp = 1;
string reporter = 2;
MatchPlayer playerA = 3;
Expand Down
6 changes: 2 additions & 4 deletions proto/cardchain/cardchain/module/module.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";

// Module is the config object for the module.
message Module {
option (cosmos.app.v1alpha1.module) = {
go_import: "github.com/DecentralCardGame/cardchain/x/cardchain"
};
option (cosmos.app.v1alpha1.module) = {go_import: "github.com/DecentralCardGame/cardchain/x/cardchain"};

// authority defines the custom module authority. If not set, defaults to the governance module.
string authority = 1;
}
}
2 changes: 1 addition & 1 deletion proto/cardchain/cardchain/parameter.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ option go_package = "github.com/DecentralCardGame/cardchain/x/cardchain/types";
message Parameter {
string key = 1;
string value = 2;
}
}
16 changes: 7 additions & 9 deletions proto/cardchain/cardchain/params.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ syntax = "proto3";
package cardchain.cardchain;

import "amino/amino.proto";
import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";

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

Expand All @@ -14,24 +14,22 @@ message Params {

int64 votingRightsExpirationTime = 1;
uint64 setSize = 2;
cosmos.base.v1beta1.Coin setPrice = 3 [ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin setPrice = 3 [(gogoproto.nullable) = false];
uint64 activeSetsAmount = 4;
cosmos.base.v1beta1.Coin setCreationFee = 5 [ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin collateralDeposit = 6
[ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin setCreationFee = 5 [(gogoproto.nullable) = false];
cosmos.base.v1beta1.Coin collateralDeposit = 6 [(gogoproto.nullable) = false];
int64 winnerReward = 7;
cosmos.base.v1beta1.Coin hourlyFaucet = 9 [ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin hourlyFaucet = 9 [(gogoproto.nullable) = false];
string inflationRate = 10;
uint64 raresPerPack = 11;
uint64 commonsPerPack = 12;
uint64 unCommonsPerPack = 13;
uint64 trialPeriod = 14;
int64 gameVoteRatio = 15;
int64 cardAuctionPriceReductionPeriod = 16;
cosmos.base.v1beta1.Coin airDropValue = 17 [ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin airDropValue = 17 [(gogoproto.nullable) = false];
int64 airDropMaxBlockHeight = 18;
cosmos.base.v1beta1.Coin trialVoteReward = 19
[ (gogoproto.nullable) = false ];
cosmos.base.v1beta1.Coin trialVoteReward = 19 [(gogoproto.nullable) = false];
int64 votePoolFraction = 20;
int64 votingRewardCap = 8;
uint64 matchWorkerDelay = 21;
Expand Down
Loading