Merge branch 'main' into syn/use-flake

Author: aciceri

README.md

@@ -7,7 +7,6 @@
   * [Setup `nft.storage` key](#setup--nftstorage--key)
   * [Optional: Copy testnet node database](#optional--copy-testnet-node-database)
   * [Start services](#start-services)
-  * [Start ogmios-datum-cache block fetcher](#start-ogmios-datum-cache-block-fetcher)
   * [Optional: Mint your own NFTs](#optional--mint-your-own-nfts)
 - [Components](#components)
   * [`nft-marketplace`](#-nft-marketplace-)
@@ -22,7 +21,9 @@
 ## Prerequisites
 
 - nix
-- arion - Use patched one from `nix develop`!
+- [IOHK binary cache](https://github.com/input-output-hk/plutus#how-to-set-up-the-iohk-binary-caches)
+- arion - Provided by devshell
+- [docker](https://docs.docker.com/get-docker/)
 - [nami wallet](https://namiwallet.io/) installed as browser extension
 - Funds in wallet obtained from [faucet](https://testnets.cardano.org/en/testnets/cardano/tools/faucet/)
 
@@ -39,6 +40,7 @@ $ git clone --recurse-submodules [email protected]:mlabs-haskell/seabug.git
 ```shell
 $ nix develop --extra-experimental-features nix-command --extra-experimental-features flakes
 ```
+From now, execute every command in devshell dropped by `nix develop`
 
 ### Setup `nft.storage` key
 
@@ -65,24 +67,6 @@ Once the chain is synced, you should be able to view the dApp UI from `localhost
 
 Ensure that Nami is set to Testnet, that you have some Test Ada, and that you've set collateral in Nami.
 
-
-### Start ogmios-datum-cache block fetcher
-
-Necessary untill [#20](https://github.com/mlabs-haskell/ogmios-datum-cache/issues/20) is implemented.
-
-```shell
-$ curl --location --request POST 'localhost:9999/control/fetch_blocks' -i\
-    --header 'Content-Type: application/json' \
-    --data-raw '
-     {
-       "slot": 44366242,
-       "id": "d2a4249fe3d0607535daa26caf12a38da2233586bc51e79ed0b3a36170471bf5"
-     }
-    '
-```
-
-Detaild block fetcher api is described [here](https://github.com/mlabs-haskell/ogmios-datum-cache/tree/9e8bcbe00f88715afdb202cd9654ec2adc72c09e#control-api).
-
 ### Optional: Mint your own NFTs
 
 This process will be simplified in the future.
@@ -123,19 +107,21 @@ $ nix develop -L -c cabal run efficient-nft-pab
 
 $ # In other console
 $ # Mint underlying CNFTs, replace "CONVERTED_CID" with the result of `ipfs` command
-$ curl --location --request POST 'localhost:3003/api/contract/activate'
+$ curl --location --request POST 'localhost:3003/api/contract/activate' \
     --header 'Content-Type: application/json' \
     --data-raw '
      {
-        "tag":"MintCnft",
-        "contents":[
-           {
-              "mc'"'"'name":"Cat number 123",
-              "mc'"'"'description":"Cat eating piece of cheese",
-              "mc'"'"'image":"ipfs://CONVERTED_CID",
-              "mc'"'"'tokenName":"cat-123"
-           }
-        ]
+        "caID": {
+            "tag":"MintCnft",
+            "contents":[
+               {
+                  "mc'"'"'name":"Cat number 123",
+                  "mc'"'"'description":"Cat eating piece of cheese",
+                  "mc'"'"'image":"ipfs://CONVERTED_CID",
+                  "mc'"'"'tokenName":"cat-123" # This should be hex encoded (without 0x)
+               }
+            ]
+        }
      }'
 
 $ # Go back to previous terminal and stop BPI

arion-compose.nix

@@ -1,6 +1,12 @@
 { pkgs, ... }:
-
-{
+let
+  nft-marketplace-server =
+    (pkgs.callPackage (import nft-marketplace-server/release.nix)
+      { }).nft-marketplace-server;
+  ogmios-datum-cache = (import ogmios-datum-cache/default.nix).packages.x86_64-linux.ogmios-datum-cache;
+  cardano-transaction-lib-server = (import
+    cardano-transaction-lib/default.nix).packages.x86_64-linux."cardano-browser-tx-server:exe:cardano-browser-tx-server";
+in {
   # NOTE: still can't remember it...
   # ports = [ "host:container" ]
   config.services = {
@@ -109,6 +115,7 @@
         [ "${toString ./.}/data/postgres-data:/var/lib/postgresql/data" ];
     };
     nft-marketplace-server.service = {
+      image = "alpine";
       command = [
         "${pkgs.nft-marketplace-server}/bin/nft-marketplace-server"
         "--db-connection"

config/datum-cache-config.toml

@@ -1,11 +1,16 @@
 dbConnectionString = "host=postgresql-db port=5432 user=seabug dbname=seabug password=seabug"
 
-saveAllDatums = true
-
 server.port = 9999
 
 ogmios.address = "ogmios"
 ogmios.port = 1337
 
-firstFetchBlock.slot = 44366242
-firstFetchBlock.id = "d2a4249fe3d0607535daa26caf12a38da2233586bc51e79ed0b3a36170471bf5"
+blockFetcher.autoStart = true
+blockFetcher.startFromLast = true
+blockFetcher.firstBlock.slot = 44366242
+blockFetcher.firstBlock.id = "d2a4249fe3d0607535daa26caf12a38da2233586bc51e79ed0b3a36170471bf5"
+blockFetcher.filter = '''
+{
+    "address": "addr_test1wr05mmuhd3nvyjan9u4a7c76gj756am40qg7vuz90vnkjzczfulda"
+}
+'''