Skip to content

Commit cd6f7a9

Browse files
committed
Fixed README and bumped Plutip/BPI deps
1 parent 423c59e commit cd6f7a9

File tree

3 files changed

+39
-33
lines changed

3 files changed

+39
-33
lines changed

README.md

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
2-
**Table of Contents**
2+
# Table of Contents
33

44
- [Cardano open oracle protocol](#cardano-open-oracle-protocol)
5-
- [Introduction](#introduction)
6-
- [Documentation](#documentation)
7-
- [Getting Started](#getting-started)
8-
- [Installing Nix](#installing-nix)
9-
- [Building and developing](#building-and-developing)
10-
- [Tutorial](#tutorial)
11-
- [1. Preparing the environment](#1-preparing-the-environment)
12-
- [2. Running a local Cardano network](#2-running-a-local-cardano-network)
13-
- [3. Initializing the Protocol](#3-initializing-the-protocol)
14-
- [4. Running a TxBuilder gRPC service](#4-running-a-txbuilder-grpc-service)
15-
- [5. Running a FactStatementStore gRPC service](#5-running-a-factstatementstore-grpc-service)
16-
- [6. Running a Publisher gRPC service](#6-running-a-publisher-grpc-service)
17-
- [7. Publishing a Fact Statement](#7-publishing-a-fact-statement)
18-
- [8. Garbage collecting obsolete Fact Statement UTxOs](#8-garbage-collecting-obsolete-fact-statement-utxos)
19-
- [9. Garbage collecting obsolete Certificate UTxOs](#9-garbage-collecting-obsolete-certificate-utxos)
20-
- [10. Referencing published Fact Statement in Consumer dApps](#10-referencing-published-fact-statement-in-consumer-dapps)
5+
- [Introduction](#introduction)
6+
- [Documentation](#documentation)
7+
- [Getting Started](#getting-started)
8+
- [Installing Nix](#installing-nix)
9+
- [Building and developing](#building-and-developing)
10+
- [Tutorial](#tutorial)
11+
- [1. Preparing the environment](#1-preparing-the-environment)
12+
- [2. Running a local Cardano network](#2-running-a-local-cardano-network)
13+
- [3. Initializing the Protocol](#3-initializing-the-protocol)
14+
- [4. Running a TxBuilder gRPC service](#4-running-a-txbuilder-grpc-service)
15+
- [5. Running a FactStatementStore gRPC service](#5-running-a-factstatementstore-grpc-service)
16+
- [6. Running a Publisher gRPC service](#6-running-a-publisher-grpc-service)
17+
- [7. Publishing a Fact Statement](#7-publishing-a-fact-statement)
18+
- [8. Garbage collecting obsolete Fact Statement UTxOs](#8-garbage-collecting-obsolete-fact-statement-utxos)
19+
- [9. Garbage collecting obsolete Certificate UTxOs](#9-garbage-collecting-obsolete-certificate-utxos)
20+
- [10. Referencing published Fact Statement in Consumer dApps](#10-referencing-published-fact-statement-in-consumer-dapps)
2121

2222
<!-- markdown-toc end -->
2323

@@ -63,7 +63,7 @@ distribution.
6363
To install run the following command:
6464

6565
```sh
66-
$ sh <(curl -L https://nixos.org/nix/install) --daemon
66+
sh <(curl -L https://nixos.org/nix/install) --daemon
6767
```
6868

6969
and follow the instructions.
@@ -88,7 +88,7 @@ Optionally, to improve build speed, it is possible to set up a binary caches
8888
maintained by IOHK and Plutonomicon by setting additional configuration entries:
8989

9090
```yaml
91-
substituters = https://cache.nixos.org https://hydra.iohk.io https://iohk.cachix.org https://cache.iog.io https://public-plutonomicon.cachix.org
91+
substituters = https://cache.nixos.org https://iohk.cachix.org https://cache.iog.io https://public-plutonomicon.cachix.org
9292
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= public-plutonomicon.cachix.org-1:3AKJMhCLn32gri1drGuaZmFrmnue+KkKrhhubQk/CWc=
9393
```
9494

@@ -357,6 +357,7 @@ Before we proceed, let's check in on the state of our Protocol now that we actua
357357
[coop-env ~ coop-tutorial] $ coop-get-state
358358
getState: Success
359359
```
360+
360361
```json
361362
{
362363
"cs'certificates" : [

flake.lock

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
inputs = {
55
# Plutip maintains a compatible Plutus/Cardano derivation set
6-
# TODO: Set to a stable release
7-
bot-plutus-interface.url = "github:mlabs-haskell/bot-plutus-interface/sam/add-vasil-features";
6+
bot-plutus-interface.url = "github:mlabs-haskell/bot-plutus-interface";
87

9-
# TODO: Set to a stable release
108
plutip.url = "github:mlabs-haskell/plutip/bladyjoker/upgrade-to-sam-vasil";
119
plutip.inputs.bot-plutus-interface.follows = "bot-plutus-interface";
1210
plutip.inputs.haskell-nix.follows = "bot-plutus-interface/haskell-nix";
@@ -115,6 +113,7 @@
115113
compiler-nix-name = "ghc8107";
116114
};
117115
coopPublisherFlake = coopPublisherProj.flake { };
116+
coopPublisherCli = coopPublisherFlake.packages."coop-publisher:exe:coop-publisher-cli";
118117

119118
# Docs
120119
coopDocsDevShell = import ./coop-docs/build.nix {
@@ -205,6 +204,7 @@
205204
compiler-nix-name = "ghc8107";
206205
};
207206
coopExtrasJsonFactStatementStoreFlake = coopExtrasJsonFactStatementStore.flake { };
207+
jsFsStoreCli = coopExtrasJsonFactStatementStoreFlake.packages."json-fact-statement-store:exe:json-fs-store-cli";
208208

209209
cardanoProtoExtras = import ./coop-proto/cardano-proto-extras/build.nix {
210210
inherit pkgs plutip;
@@ -218,9 +218,7 @@
218218
coopEnvShell = import ./coop-extras/coop-env/build.nix {
219219
inherit pkgs;
220220
plutipLocalCluster = plutip.packages.${system}."plutip:exe:local-cluster";
221-
jsFsStoreCli = coopExtrasJsonFactStatementStoreFlake.packages."json-fact-statement-store:exe:json-fs-store-cli";
222-
inherit coopPabCli coopPlutusCli;
223-
coopPublisherCli = coopPublisherFlake.packages."coop-publisher:exe:coop-publisher-cli";
221+
inherit coopPabCli coopPlutusCli jsFsStoreCli coopPublisherCli;
224222
cardanoNode = coopPabProj.hsPkgs.cardano-node.components.exes.cardano-node;
225223
cardanoCli = coopPabProj.hsPkgs.cardano-cli.components.exes.cardano-cli;
226224
};
@@ -231,9 +229,16 @@
231229
# Useful for nix repl
232230
inherit pkgs pkgsWithOverlay pkgsForPlutarch;
233231

232+
# Instruction for the Hercules CI to build on x86_64-linux only, to avoid errors about systems without agents.
233+
herculesCI.ciSystems = [ "x86_64-linux" ];
234+
234235
# Standard flake attributes
235236
packages = coopPlutusFlake.packages // coopPublisherFlake.packages // coopPabFlake.packages // coopHsTypesFlake.packages // {
237+
"coop-plutus-cli" = coopPlutusCli;
236238
"coop-pab-cli" = coopPabCli;
239+
"coop-publisher-cli" = coopPublisherCli;
240+
"js-fs-store-cli" = jsFsStoreCli;
241+
"default" = coopPabCli;
237242
};
238243

239244
devShells = rec {
@@ -248,9 +253,10 @@
248253
dev-extras-json-store = coopExtrasJsonFactStatementStoreFlake.devShell;
249254
coop-env = coopEnvShell;
250255
dev-cardano-proto-extras = cardanoProtoExtrasFlake.devShell;
251-
default = dev-proto;
256+
default = pre-commit-devShell;
252257
};
253258

259+
# nix flake check --impure --keep-going --allow-import-from-derivation
254260
checks = renameAttrs (n: "check-${n}")
255261
(coopPlutusFlake.checks //
256262
coopPublisherFlake.checks //

0 commit comments

Comments
 (0)