Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Try #129:
Browse files Browse the repository at this point in the history
  • Loading branch information
iohk-bors[bot] authored Dec 11, 2020
2 parents 6a8ca3a + 9b2c549 commit 38e87b6
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 8 deletions.
13 changes: 12 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
# Changelog for smash

## Next version
## 1.3.0

### Story

- [CAD-2169] - Expose API types in a separate package
- [CAD-2177] - smash should work also with pool_ids in Bech32 format
- [CAD-2182] - Pool insertion and ticker insertion should be added into API
- [CAD-2183] - Add/remove admin user via CLI
- [CAD-2323] - Bump up to Allegra Hard Fork

### Bug

- [CAD-2176] - errors endpoint doesn't validate poolId properly
- [CAD-2178] - The retryCount from the /errors endpoint is not correctly incremented
- [CAD-2179] - pool_id delist endpoint is returning 200 for any string (not only for valid pool_ids)
- [CAD-2181] - All queries that don't return anything should return 404

## 1.2.0

Expand Down
2 changes: 1 addition & 1 deletion doc/getting-started/how-to-install-smash.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ cardano-node --genesis-file genesis.json --socket-path node.socket --config conf

You can then run ``smash`` using e.g:
```
SMASHPGPASSFILE=./config/pgpass cabal run smash-exe -- run-app-with-db-sync --config config.yaml --socket-path node.socket --schema-dir schema/
SMASHPGPASSFILE=./config/pgpass cabal run smash-exe -- run-app-with-db-sync --config config.yaml --socket-path node.socket --schema-dir schema/ --state-dir ledger-state/mainnet
```
You can also run a mainnet node using a Nix command:
```
Expand Down
2 changes: 1 addition & 1 deletion doc/getting-started/how-to-run-smash.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ We need to run it using appropriate parameters, since running it requires it to
The socket path is just pointing to a socket that will be used for communication with the node.
The example:
```
SMASHPGPASSFILE=config/pgpass ./smash-local run-app-with-db-sync --config config/testnet-config.yaml --socket-path ../cardano-node/state-node-shelley_testnet/node.socket --schema-dir schema/
SMASHPGPASSFILE=config/pgpass ./smash-local run-app-with-db-sync --config config/testnet-config.yaml --socket-path ../cardano-node/state-node-shelley_testnet/node.socket --schema-dir schema/ --state-dir ledger-state/shelley-testnet
```

After this, the SMASH application should start syncing blocks and picking up pools.
Expand Down
6 changes: 4 additions & 2 deletions nix/nixos/smash-service.nix
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,14 @@ in {
exec ${cfg.package}/bin/smash-exe run-app-with-db-sync \
--config ${configFile} \
--socket-path "$CARDANO_NODE_SOCKET_PATH" \
--schema-dir ${../../schema}
--schema-dir ${../../schema} \
--state-dir $STATE_DIRECTORY
'';
environment.systemPackages = [ cfg.package config.services.postgresql.package ];
systemd.services.smash = {
path = [ cfg.package pkgs.netcat pkgs.postgresql ];
preStart = ''
for x in {1..30}; do
for x in {1..60}; do
nc -z localhost ${toString config.services.smash.postgres.port} && break
echo loop $x: waiting for postgresql 2 sec...
sleep 2
Expand All @@ -139,6 +140,7 @@ in {
ExecStart = config.services.smash.script;
DynamicUser = true;
RuntimeDirectory = "smash";
StateDirectory = "smash";
};

wantedBy = [ "multi-user.target" ];
Expand Down
2 changes: 1 addition & 1 deletion smash-servant-types/smash-servant-types.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: smash-servant-types
version: 1.2.0
version: 1.3.0
description:
Shared servant API types for SMASH

Expand Down
2 changes: 1 addition & 1 deletion smash/smash.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: smash
version: 1.2.0
version: 1.3.0
description:
Please see the README on GitHub at <https://github.com/input-output-hk/smash#readme>

Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/master/snapshots/cardano-1.24.1.yaml
resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/5ed4af4df2a609361260f159cd0e47e1c4073e2c/snapshots/cardano-1.24.2.yaml
compiler: ghc-8.6.5

#allow-newer: true
Expand Down

0 comments on commit 38e87b6

Please sign in to comment.