Skip to content

Commit 1d5cca4

Browse files
lxgr-linuxlxgr-linux
authored
Merge pull request #193 from DecentralCardGame/development
Development into master
2 parents 1359712 + 562799e commit 1d5cca4

File tree

10 files changed

+125
-34
lines changed

10 files changed

+125
-34
lines changed

‎config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ genesis:
8787
staking:
8888
params:
8989
bond_denom: ubpf
90-
chain_id: cardtestnet-6
90+
chain_id: cardtestnet-7
9191
validators:
9292
- name: alice
9393
bonded: 5000000ubpf

‎docker-run.sh‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
echo -e "\033[0;32mfasten your seatbelts\033[0m"
66
FAUCET_SECRET_KEY="0x6F1f5bd93f3D59d6eed1d5ec40E29C1821029759"
7-
CHAIN_ID=Cardchain
8-
USE_SNAP=true
7+
USE_SNAP=false
98

109
if [ -z "$FAUCET_SECRET_KEY" ]
1110
then
@@ -49,35 +48,40 @@ SEEDS=""
4948
echo "peers is:" $PEERS
5049
sed -i.bak -e "s/^seeds *=.*/seeds = \"$SEEDS\"/; s/^persistent_peers *=.*/persistent_peers = \"$PEERS\"/" $HOME/.Cardchain/config/config.toml
5150

52-
mapfile -t snap_rpcs < <(
53-
jq -r '.snap_rpcs[]' peer_nodes.json
54-
)
55-
56-
for i in "${snap_rpcs[@]}"; do
57-
if curl --output /dev/null --silent --head --fail --connect-timeout 5 $i; then
58-
echo "URL exists: $i"
59-
SNAP_RPC=$i
60-
break
61-
else
62-
echo "not reachable $i"
63-
fi
64-
done
65-
if [ -z "$SNAP_RPC" ]
51+
if [ -z $USE_SNAP ]
6652
then
67-
echo -e "\033[0;31mNo SNAP_RPC available\033[0m"
68-
exit
69-
fi
7053

71-
LATEST_HEIGHT=$(curl -s $SNAP_RPC/block | jq -r .result.block.header.height)
72-
echo $LATEST_HEIGHT
73-
BLOCK_HEIGHT=$((LATEST_HEIGHT)); \
74-
TRUST_HASH=$(curl -s "$SNAP_RPC/block?height=$BLOCK_HEIGHT" | jq -r .result.block_id.hash)
75-
echo -e "\033[0;36mlatest height: $LATEST_HEIGHT \nblock height: $BLOCK_HEIGHT \ntrust hash: $TRUST_HASH \033[0m"
54+
mapfile -t snap_rpcs < <(
55+
jq -r '.snap_rpcs[]' peer_nodes.json
56+
)
57+
58+
for i in "${snap_rpcs[@]}"; do
59+
if curl --output /dev/null --silent --head --fail --connect-timeout 5 $i; then
60+
echo "URL exists: $i"
61+
SNAP_RPC=$i
62+
break
63+
else
64+
echo "not reachable $i"
65+
fi
66+
done
67+
if [ -z "$SNAP_RPC" ]
68+
then
69+
echo -e "\033[0;31mNo SNAP_RPC available\033[0m"
70+
exit
71+
fi
72+
73+
LATEST_HEIGHT=$(curl -s $SNAP_RPC/block | jq -r .result.block.header.height)
74+
echo $LATEST_HEIGHT
75+
BLOCK_HEIGHT=$((LATEST_HEIGHT)); \
76+
TRUST_HASH=$(curl -s "$SNAP_RPC/block?height=$BLOCK_HEIGHT" | jq -r .result.block_id.hash)
77+
echo -e "\033[0;36mlatest height: $LATEST_HEIGHT \nblock height: $BLOCK_HEIGHT \ntrust hash: $TRUST_HASH \033[0m"
78+
79+
sed -i.bak -E "s|^(enable[[:space:]]+=[[:space:]]+).*$|\1true| ; \
80+
s|^(rpc_servers[[:space:]]+=[[:space:]]+).*$|\1\"$SNAP_RPC,$SNAP_RPC\"| ; \
81+
s|^(trust_height[[:space:]]+=[[:space:]]+).*$|\1$BLOCK_HEIGHT| ; \
82+
s|^(trust_hash[[:space:]]+=[[:space:]]+).*$|\1\"$TRUST_HASH\"|" $HOME/.Cardchain/config/config.toml ; \
7683

77-
sed -i.bak -E "s|^(enable[[:space:]]+=[[:space:]]+).*$|\1true| ; \
78-
s|^(rpc_servers[[:space:]]+=[[:space:]]+).*$|\1\"$SNAP_RPC,$SNAP_RPC\"| ; \
79-
s|^(trust_height[[:space:]]+=[[:space:]]+).*$|\1$BLOCK_HEIGHT| ; \
80-
s|^(trust_hash[[:space:]]+=[[:space:]]+).*$|\1\"$TRUST_HASH\"|" $HOME/.Cardchain/config/config.toml; \
84+
fi
8185

8286
# config pruning
8387
indexer="kv"

‎peer_nodes.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"https://rpc-testnet-cardchain.nodeist.net"
77
],
88
"peers": [
9+
"202.61.225.157:26656",
910
"cardchain-testnet-peer.itrocket.net:31656",
1011
"crowd.peer.stavr.tech:21206",
1112
"rpc-testnet-cardchain.nodeist.net:26656"

‎scripts/migrate_with_data.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
for user in new_dict["app_state"]["cardchain"]["users"]:
126126
if "voteRights" in user:
127127
del user["voteRights"]
128+
user["boosterPacks"] = [pack for pack in user["boosterPacks"] if pack["setId"] not in ["0", "2"]] # turn of later
128129

129130
with open(file_path_new, "w") as file:
130131
json.dump(new_dict, file, indent=2)

‎scripts/paramchange/paramchange.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"title": "Param change setSize: 140",
2+
"title": "Param change setSize: 135",
33
"description": "We want to change the set size",
44
"changes": [
55
{
66
"subspace": "cardchain",
77
"key": "SetSize",
8-
"value": "120"
8+
"value": "135"
99
}
1010
],
1111
"deposit": "10000000ubpf"

‎scripts/paramchange/submitproposal.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
33

44
cd "$parent_path"
55

6-
Cardchaind tx gov submit-legacy-proposal param-change paramchange.json --from jannik
6+
Cardchaind tx gov submit-legacy-proposal param-change paramchange.json --from jannik
7+
8+
Cardchaind q gov proposals

‎scripts/sets/add-cards.sh‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ if [ $# -lt 1 ]; then
44
exit 2
55
fi
66

7+
#technology
78
Cardchaind tx cardchain add-card-to-set $1 71 --from jannik
89
Cardchaind tx cardchain add-card-to-set $1 44 --from jannik
910
Cardchaind tx cardchain add-card-to-set $1 142 --from jannik
@@ -35,9 +36,10 @@ Cardchaind tx cardchain add-card-to-set $1 139 --from jannik
3536
Cardchaind tx cardchain add-card-to-set $1 253 --from jannik
3637
Cardchaind tx cardchain add-card-to-set $1 381 --from jannik
3738
Cardchaind tx cardchain add-card-to-set $1 412 --from jannik
39+
#nature
3840
Cardchaind tx cardchain add-card-to-set $1 407 --from jannik
3941
Cardchaind tx cardchain add-card-to-set $1 73 --from jannik
40-
Cardchaind tx cardchain add-card-to-set $1 411 --from jannik SHIT
42+
Cardchaind tx cardchain add-card-to-set $1 411 --from jannik
4143
Cardchaind tx cardchain add-card-to-set $1 154 --from jannik
4244
Cardchaind tx cardchain add-card-to-set $1 147 --from jannik
4345
Cardchaind tx cardchain add-card-to-set $1 156 --from jannik
@@ -65,6 +67,7 @@ Cardchaind tx cardchain add-card-to-set $1 397 --from jannik
6567
Cardchaind tx cardchain add-card-to-set $1 159 --from jannik
6668
Cardchaind tx cardchain add-card-to-set $1 410 --from jannik
6769
Cardchaind tx cardchain add-card-to-set $1 158 --from jannik
70+
#mysticism
6871
Cardchaind tx cardchain add-card-to-set $1 47 --from jannik
6972
Cardchaind tx cardchain add-card-to-set $1 36 --from jannik
7073
Cardchaind tx cardchain add-card-to-set $1 65 --from jannik
@@ -95,6 +98,7 @@ Cardchaind tx cardchain add-card-to-set $1 24 --from jannik
9598
Cardchaind tx cardchain add-card-to-set $1 102 --from jannik
9699
Cardchaind tx cardchain add-card-to-set $1 104 --from jannik
97100
Cardchaind tx cardchain add-card-to-set $1 224 --from jannik
101+
#culture
98102
Cardchaind tx cardchain add-card-to-set $1 255 --from jannik
99103
Cardchaind tx cardchain add-card-to-set $1 41 --from jannik
100104
Cardchaind tx cardchain add-card-to-set $1 8 --from jannik
@@ -124,3 +128,26 @@ Cardchaind tx cardchain add-card-to-set $1 141 --from jannik
124128
Cardchaind tx cardchain add-card-to-set $1 257 --from jannik
125129
Cardchaind tx cardchain add-card-to-set $1 16 --from jannik
126130
Cardchaind tx cardchain add-card-to-set $1 138 --from jannik
131+
# multi class
132+
Cardchaind tx cardchain add-card-to-set $1 562 --from jannik
133+
Cardchaind tx cardchain add-card-to-set $1 189 --from jannik
134+
Cardchaind tx cardchain add-card-to-set $1 152 --from jannik
135+
Cardchaind tx cardchain add-card-to-set $1 126 --from jannik
136+
Cardchaind tx cardchain add-card-to-set $1 514 --from jannik
137+
Cardchaind tx cardchain add-card-to-set $1 379 --from jannik
138+
Cardchaind tx cardchain add-card-to-set $1 238 --from jannik
139+
Cardchaind tx cardchain add-card-to-set $1 128 --from jannik
140+
Cardchaind tx cardchain add-card-to-set $1 118 --from jannik
141+
Cardchaind tx cardchain add-card-to-set $1 13 --from jannik
142+
Cardchaind tx cardchain add-card-to-set $1 132 --from jannik
143+
Cardchaind tx cardchain add-card-to-set $1 87 --from jannik
144+
Cardchaind tx cardchain add-card-to-set $1 29 --from jannik
145+
Cardchaind tx cardchain add-card-to-set $1 1 --from jannik
146+
Cardchaind tx cardchain add-card-to-set $1 397 --from jannik
147+
Cardchaind tx cardchain add-card-to-set $1 131 --from jannik
148+
Cardchaind tx cardchain add-card-to-set $1 129 --from jannik
149+
Cardchaind tx cardchain add-card-to-set $1 120 --from jannik
150+
Cardchaind tx cardchain add-card-to-set $1 507 --from jannik
151+
Cardchaind tx cardchain add-card-to-set $1 215 --from jannik
152+
Cardchaind tx cardchain add-card-to-set $1 124 --from jannik
153+
Cardchaind tx cardchain add-card-to-set $1 115 --from jannik

‎scripts/sets/card-rarity.sh‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ if [ $# -lt 1 ]; then
44
exit 2
55
fi
66

7+
#technology
78
Cardchaind tx cardchain set-card-rarity 71 $1 common --from jannik
89
Cardchaind tx cardchain set-card-rarity 44 $1 common --from jannik
910
Cardchaind tx cardchain set-card-rarity 142 $1 uncommon --from jannik
@@ -35,6 +36,7 @@ Cardchaind tx cardchain set-card-rarity 139 $1 uncommon --from jannik
3536
Cardchaind tx cardchain set-card-rarity 253 $1 uncommon --from jannik
3637
Cardchaind tx cardchain set-card-rarity 381 $1 uncommon --from jannik
3738
Cardchaind tx cardchain set-card-rarity 412 $1 rare --from jannik
39+
#nature
3840
Cardchaind tx cardchain set-card-rarity 407 $1 uncommon --from jannik
3941
Cardchaind tx cardchain set-card-rarity 73 $1 common --from jannik
4042
Cardchaind tx cardchain set-card-rarity 411 $1 common --from jannik SHIT
@@ -65,6 +67,7 @@ Cardchaind tx cardchain set-card-rarity 397 $1 rare --from jannik
6567
Cardchaind tx cardchain set-card-rarity 159 $1 rare --from jannik
6668
Cardchaind tx cardchain set-card-rarity 410 $1 uncommon --from jannik
6769
Cardchaind tx cardchain set-card-rarity 158 $1 uncommon --from jannik
70+
#mysticism
6871
Cardchaind tx cardchain set-card-rarity 47 $1 common --from jannik
6972
Cardchaind tx cardchain set-card-rarity 36 $1 uncommon --from jannik
7073
Cardchaind tx cardchain set-card-rarity 65 $1 uncommon --from jannik
@@ -95,6 +98,7 @@ Cardchaind tx cardchain set-card-rarity 24 $1 uncommon --from jannik
9598
Cardchaind tx cardchain set-card-rarity 102 $1 uncommon --from jannik
9699
Cardchaind tx cardchain set-card-rarity 104 $1 uncommon --from jannik
97100
Cardchaind tx cardchain set-card-rarity 224 $1 rare --from jannik
101+
#culture
98102
Cardchaind tx cardchain set-card-rarity 255 $1 uncommon --from jannik
99103
Cardchaind tx cardchain set-card-rarity 41 $1 common --from jannik
100104
Cardchaind tx cardchain set-card-rarity 8 $1 common --from jannik
@@ -123,4 +127,27 @@ Cardchaind tx cardchain set-card-rarity 20 $1 common --from jannik
123127
Cardchaind tx cardchain set-card-rarity 141 $1 rare --from jannik
124128
Cardchaind tx cardchain set-card-rarity 257 $1 common --from jannik
125129
Cardchaind tx cardchain set-card-rarity 16 $1 rare --from jannik
126-
Cardchaind tx cardchain set-card-rarity 138 $1 uncommon --from jannik
130+
Cardchaind tx cardchain set-card-rarity 138 $1 uncommon --from jannik
131+
# multi class
132+
Cardchaind tx cardchain set-card-rarity 562 $1 common --from jannik
133+
Cardchaind tx cardchain set-card-rarity 189 $1 common --from jannik
134+
Cardchaind tx cardchain set-card-rarity 152 $1 common --from jannik
135+
Cardchaind tx cardchain set-card-rarity 126 $1 common --from jannik
136+
Cardchaind tx cardchain set-card-rarity 514 $1 common --from jannik
137+
Cardchaind tx cardchain set-card-rarity 379 $1 common --from jannik
138+
Cardchaind tx cardchain set-card-rarity 238 $1 common --from jannik
139+
Cardchaind tx cardchain set-card-rarity 128 $1 uncommon --from jannik
140+
Cardchaind tx cardchain set-card-rarity 118 $1 uncommon --from jannik
141+
Cardchaind tx cardchain set-card-rarity 13 $1 uncommon --from jannik
142+
Cardchaind tx cardchain set-card-rarity 132 $1 uncommon --from jannik
143+
Cardchaind tx cardchain set-card-rarity 87 $1 uncommon --from jannik
144+
Cardchaind tx cardchain set-card-rarity 29 $1 uncommon --from jannik
145+
Cardchaind tx cardchain set-card-rarity 1 $1 uncommon --from jannik
146+
Cardchaind tx cardchain set-card-rarity 397 $1 rare --from jannik
147+
Cardchaind tx cardchain set-card-rarity 131 $1 rare --from jannik
148+
Cardchaind tx cardchain set-card-rarity 129 $1 rare --from jannik
149+
Cardchaind tx cardchain set-card-rarity 120 $1 rare --from jannik
150+
Cardchaind tx cardchain set-card-rarity 507 $1 rare --from jannik
151+
Cardchaind tx cardchain set-card-rarity 215 $1 rare --from jannik
152+
Cardchaind tx cardchain set-card-rarity 124 $1 rare --from jannik
153+
Cardchaind tx cardchain set-card-rarity 115 $1 rare --from jannik

‎scripts/sets/howto.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
1. voting power to jannik -> delegate to validator
2+
Cardchaind q staking validators
3+
Cardchaind tx staking delegate ccvaloper1c2htcglks224ua32qd4p95p4ydumd0zaq9y3sj 5000000ubpf --from jannik
4+
5+
2. set size adjust? => paramchange folder
6+
7+
3.
8+
bash create-set.sh
9+
Cardchaind query cardchain q-sets design "[]" "[]" ""
10+
11+
4.
12+
yes | bash add-cards.sh 1
13+
14+
5.
15+
yes | bash card-rarity.sh 1
16+
17+
6.
18+
bash story.sh
19+
20+
7.
21+
bash add-artwork.sh
22+
23+
8.
24+
bash finalize-set.sh
25+
26+
9.
27+
bash vote.sh

‎x/cardchain/keeper/msg_server_open_booster_pack.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
func (k msgServer) OpenBoosterPack(goCtx context.Context, msg *types.MsgOpenBoosterPack) (*types.MsgOpenBoosterPackResponse, error) {
1414
ctx := sdk.UnwrapSDKContext(goCtx)
1515

16+
rand.Seed(ctx.BlockHeight())
17+
1618
creator, err := k.GetUserFromString(ctx, msg.Creator)
1719
if err != nil {
1820
return nil, sdkerrors.Wrap(types.ErrUserDoesNotExist, err.Error())

0 commit comments

Comments
 (0)