Merge branch 'master' into gergely/vasil

Author: mikekeke

.gitignore

@@ -59,3 +59,11 @@ geth-node/chaindata/geth/*
 geth-node/chaindata/history
 *.ipc
 .direnv
+
+# emacs stuff
+*.~undo-tree~
+
+# debug configs
+examples/debug/
+
+visualization/

STANDARDS.md

@@ -60,11 +60,11 @@ Haskell is a language that is older than some of the people currently writing
 it; parts of its ecosystem are not exempt from it. With age comes legacy, and
 much of it is based on historical decisions which we now know to be problematic
 or wrong. We can't avoid our history, but we can minimize its impact on our
-current work. 
+current work.
 
 Thus, we aim to codify good practices in this document _as seen today_. We also
 try to avoid obvious 'sharp edges' by proscribing them away in a principled,
-consistent and justifiable manner. 
+consistent and justifiable manner.
 
 ## Automate away drudgery
 
@@ -155,7 +155,7 @@ difficult to read even without a split screen. We don't _enforce_ a maximum of
 ## Naming
 
 camelCase MUST be used for all non-type, non-data-constructor names; otherwise,
-TitleCase MUST be used. Acronyms used as part of a naming identifier (such as 
+TitleCase MUST be used. Acronyms used as part of a naming identifier (such as
 'JSON', 'API', etc) SHOULD be downcased; thus ``repairJson`` and
 ``fromHttpService`` are correct. Exceptions are allowed for external libraries
 (Aeson's ``parseJSON`` for example).
@@ -315,11 +315,11 @@ wrappers around monadic stacks:
 ```haskell
 newtype FooM a = FooM (ReaderT Int (StateT Text IO) a)
   deriving newtype (
-    Functor, 
-    Applicative, 
-    Monad, 
-    MonadReader Int, 
-    MonadState Text, 
+    Functor,
+    Applicative,
+    Monad,
+    MonadReader Int,
+    MonadState Text,
     MonadIO
     )
 ```
@@ -341,8 +341,8 @@ Thus, even for popularity and compatibility reasons, these should be on by
 default.
 
 ``InstanceSigs`` are harmless by default, and introduce no complications. Their
-not being default is strange. ``ImportQualifiedPost`` is already a convention 
-of this project, and helps with formatting of imports. 
+not being default is strange. ``ImportQualifiedPost`` is already a convention
+of this project, and helps with formatting of imports.
 
 ``LambdaCase`` reduces a lot of code in the common case of analysis of sum
 types. Without it, we are forced to either write a dummy ``case`` argument:
@@ -383,7 +383,7 @@ instead of the one from ``base``.
 ``OverloadedStrings`` deals with the problem that ``String`` is a suboptimal
 choice of string representation for basically _any_ problem, with the general
 recommendation being to use ``Text`` instead. It is not, however, without its
-problems: 
+problems:
 
 * ``ByteString``s are treated as ASCII strings by their ``IsString`` instance;
 * Overly polymorphic behaviour of many functions (especially in the presence of
@@ -438,8 +438,8 @@ alternatives. This means that, when a non-``base`` ``Prelude`` is in scope, it
 often requires familiarity with its specific decisions, in addition to whatever
 cognitive load the current module and its other imports impose. Given that we
 already use an alternative prelude (in tandem with the one from ``base``),
-additional alternatives present an unnecessary cognitive load. Lastly, the 
-dependency footprint of many alternative ``Prelude``s is _highly_ non-trivial; 
+additional alternatives present an unnecessary cognitive load. Lastly, the
+dependency footprint of many alternative ``Prelude``s is _highly_ non-trivial;
 it isn't clear if we need all of this in our dependency tree.
 
 For all of the above reasons, the best choice is 'default to Plutus, with local
@@ -470,7 +470,7 @@ Every publically-exported definition MUST have a Haddock comment, detailing its
 purpose. If a definition is a function, it SHOULD also have examples of use
 using [Bird tracks][bird-tracks]. The Haddock for a publically-exported
 definition SHOULD also provide an explanation of any caveats, complexities of
-its use, or common issues a user is likely to encounter. 
+its use, or common issues a user is likely to encounter.
 
 If the code project is a library, these Haddock comments SHOULD carry an
 [``@since``][haddock-since] annotation, stating what version of the library they
@@ -502,15 +502,15 @@ also the expected behaviour of its instances.
 ## Other
 
 Lists SHOULD NOT be field values of types; this extends to ``String``s. Instead,
-``Vector``s (``Text``s) SHOULD be used, unless a more appropriate structure exists. 
+``Vector``s (``Text``s) SHOULD be used, unless a more appropriate structure exists.
 On-chain code, due to a lack of alternatives, is one place lists can be used as
 field values of types.
 
 Partial functions MUST NOT be defined. Partial functions SHOULD NOT be used
 except to ensure that another function is total (and the type system cannot be
-used to prove it). 
+used to prove it).
 
-Derivations MUST use an explicit [strategy][deriving-strategies]. Thus, the 
+Derivations MUST use an explicit [strategy][deriving-strategies]. Thus, the
 following is wrong:
 
 ```haskell

bot-plutus-interface.cabal

@@ -25,9 +25,11 @@ source-repository head
 common common-lang
   ghc-options:
     -Wall -Wcompat -Wincomplete-record-updates
-    -Wincomplete-uni-patterns -Wredundant-constraints -Werror
-    -fobject-code -fno-ignore-interface-pragmas
-    -fno-omit-interface-pragmas -fplugin=RecordDotPreprocessor
+    -Wincomplete-uni-patterns -Wredundant-constraints -fobject-code
+    -fno-ignore-interface-pragmas -fno-omit-interface-pragmas
+    -fplugin=RecordDotPreprocessor
+
+  -- -Werror
 
   build-depends:
     , base
@@ -80,6 +82,8 @@ library
     BotPlutusInterface.BodyBuilder
     BotPlutusInterface.CardanoCLI
     BotPlutusInterface.ChainIndex
+    BotPlutusInterface.CoinSelection
+    BotPlutusInterface.Collateral
     BotPlutusInterface.Config
     BotPlutusInterface.Contract
     BotPlutusInterface.Effects
@@ -176,13 +180,16 @@ test-suite bot-plutus-interface-test
   other-modules:
     Spec.BotPlutusInterface.AdjustUnbalanced
     Spec.BotPlutusInterface.Balance
+    Spec.BotPlutusInterface.CoinSelection
+    Spec.BotPlutusInterface.Collateral
     Spec.BotPlutusInterface.Config
     Spec.BotPlutusInterface.Contract
     Spec.BotPlutusInterface.ContractStats
     Spec.BotPlutusInterface.Server
     Spec.BotPlutusInterface.TxStatusChange
     Spec.BotPlutusInterface.UtxoParser
     Spec.MockContract
+    Spec.RandomLedger
 
   build-depends:
     , aeson
@@ -236,6 +243,7 @@ test-suite bot-plutus-interface-test
     , text                       ^>=1.2.4.0
     , utf8-string
     , uuid
+    , vector
     , warp
 
   hs-source-dirs: test

cabal.project

@@ -7,3 +7,4 @@ packages: ./bot-plutus-interface.cabal
 
 tests: true
 benchmarks: true
+test-show-details: direct

examples/plutus-game/cabal.project

@@ -2,7 +2,7 @@
 index-state: 2022-05-18T00:00:00Z
 
 packages:
-  ./. 
+  ./.
   ../../.
 
 -- You never, ever, want this.

examples/plutus-game/guess.sh

@@ -15,5 +15,5 @@ CONTRACT_INST_ID=$(curl --location --request POST 'localhost:9080/api/contract/a
 echo $CONTRACT_INST_ID
 
 
-echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws 
+echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws
 

examples/plutus-game/lock.sh

@@ -16,5 +16,5 @@ CONTRACT_INST_ID=$(curl --location --request POST 'localhost:9080/api/contract/a
 echo $CONTRACT_INST_ID
 
 
-echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws 
+echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws
 

examples/plutus-nft/cabal.project

@@ -2,7 +2,7 @@
 index-state: 2022-05-18T00:00:00Z
 
 packages:
-  ./. 
+  ./.
   ../../.
 
 -- You never, ever, want this.

examples/plutus-nft/run.sh

@@ -11,5 +11,5 @@ CONTRACT_INST_ID=$(curl --location --request POST 'localhost:9080/api/contract/a
 echo $CONTRACT_INST_ID
 
 
-echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws 
+echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws
 

examples/plutus-transfer/ada-transfer.sh

@@ -15,5 +15,5 @@ CONTRACT_INST_ID=$(curl --location --request POST 'localhost:9080/api/contract/a
 echo $CONTRACT_INST_ID
 
 
-echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws 
+echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws
 

examples/plutus-transfer/cabal.project

@@ -2,7 +2,7 @@
 index-state: 2022-05-18T00:00:00Z
 
 packages:
-  ./. 
+  ./.
   ../../.
 
 -- You never, ever, want this.

examples/plutus-transfer/token-transfer.sh

@@ -21,5 +21,5 @@ CONTRACT_INST_ID=$(curl --location --request POST 'localhost:9080/api/contract/a
 echo $CONTRACT_INST_ID
 
 
-echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws 
+echo "{ \"tag\": \"Subscribe\", \"contents\": { \"Left\": { \"unContractInstanceId\":\"$CONTRACT_INST_ID\" } } }" | websocat -n ws://localhost:9080/ws
 

flake.nix

@@ -474,7 +474,5 @@
       checks = perSystem (system: self.flake.${system}.checks // {
         formatCheck = formatCheckFor system;
       });
-
-      herculesCI.ciSystems = [ "x86_64-linux" ];
     };
 }