Skip to content

Commit a1f1d0e

Browse files
samuelWilliams99samuelWilliams99
authored
Merge pull request #157 from mlabs-haskell/sam/add-vasil-features
Add vasil features
2 parents cd192e5 + b337b85 commit a1f1d0e

33 files changed

+1618
-1113
lines changed

‎Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,11 @@ nixpkgsfmt: requires_nix_shell
101101
nixpkgsfmt_check: requires_nix_shell
102102
nixpkgs-fmt --check $(NIX_SOURCES)
103103

104-
# Check with hlint, currently I couldn't get --refactor to work
104+
# Check with hlint
105105
lint: requires_nix_shell
106+
echo "$(FORMAT_SOURCES)" | xargs -n 1 -t hlint --refactor --refactor-options="--inplace"
107+
108+
lint_check: requires_nix_shell
106109
hlint $(FORMAT_SOURCES)
107110

108111
readme_contents:

‎bot-plutus-interface.cabal

+10
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ library
8686
BotPlutusInterface.CoinSelection
8787
BotPlutusInterface.Collateral
8888
BotPlutusInterface.Config
89+
BotPlutusInterface.Constraints
8990
BotPlutusInterface.Contract
9091
BotPlutusInterface.Effects
9192
BotPlutusInterface.ExBudget
9293
BotPlutusInterface.Files
9394
BotPlutusInterface.Helpers
95+
BotPlutusInterface.Metadata
9496
BotPlutusInterface.Server
9597
BotPlutusInterface.TimeSlot
9698
BotPlutusInterface.Types
@@ -105,15 +107,20 @@ library
105107
build-depends:
106108
, aeson
107109
, attoparsec >=0.13.2.2
110+
, base16
111+
, basement
108112
, bytestring ^>=0.10.12.0
109113
, cardano-api
110114
, cardano-crypto
115+
, cardano-crypto-class
116+
, cardano-crypto-wrapper
111117
, cardano-ledger-alonzo
112118
, cardano-ledger-babbage
113119
, cardano-ledger-core
114120
, cardano-ledger-shelley
115121
, cardano-prelude
116122
, cardano-slotting
123+
, cborg
117124
, config-schema
118125
, config-value
119126
, containers
@@ -200,6 +207,8 @@ test-suite bot-plutus-interface-test
200207
, bytestring ^>=0.10.12.0
201208
, cardano-api
202209
, cardano-crypto-class
210+
, cardano-prelude
211+
, cardano-slotting
203212
, containers
204213
, data-default
205214
, data-default-class
@@ -241,6 +250,7 @@ test-suite bot-plutus-interface-test
241250
, tasty-quickcheck
242251
, temporary
243252
, text ^>=1.2.4.0
253+
, transformers-either
244254
, utf8-string
245255
, uuid
246256
, vector

‎examples/plutus-nft/plutus-nft.cabal

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ library
7777
, aeson
7878
, attoparsec >=0.13.2.2
7979
, base16-bytestring
80+
, bot-plutus-interface
8081
, bytestring ^>=0.10.12.0
8182
, cardano-api
8283
, cardano-crypto

‎examples/plutus-nft/src/Cardano/PlutusExample/NFT.hs

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
module Cardano.PlutusExample.NFT where
55

6-
import Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV1)
6+
import BotPlutusInterface.Constraints (mustIncludeMetadata, submitBpiTxConstraintsWith)
7+
import BotPlutusInterface.Metadata (NftMetadata (NftMetadata), NftMetadataToken (NftMetadataToken), TxMetadata (TxMetadata))
8+
import Cardano.Api.Shelley (PlutusScript (PlutusScriptSerialised), PlutusScriptV1)
79
import Codec.Serialise (serialise)
810
import Control.Monad (void)
911
import Data.Aeson.TH (defaultOptions, deriveJSON)
@@ -31,7 +33,7 @@ import Ledger.Constraints as Constraints
3133
import Ledger.Scripts qualified as Scripts
3234
import Ledger.Typed.Scripts qualified as TypedScripts
3335
import Ledger.Value (flattenValue, singleton)
34-
import Plutus.Contract (Contract, Endpoint, submitTxConstraintsWith, tell, utxosAt)
36+
import Plutus.Contract (Contract, Endpoint, tell, utxosAt)
3537
import Plutus.Contract qualified as Contract
3638
import Plutus.Script.Utils.V1.Scripts qualified as ScriptUtils
3739
import PlutusTx qualified
@@ -100,8 +102,6 @@ mintNft MintParams {..} = do
100102
tell $ Last $ Just $ "Using oref:" Hask.<> Text.pack (Hask.show oref)
101103
let cs = curSymbol oref mpTokenName
102104
val = singleton cs mpTokenName 1
103-
-- TODO: Add metadata in the tx.
104-
-- Currently this is not possible, as metadata is not supported.
105105
lookups =
106106
Hask.mconcat
107107
[ Constraints.plutusV1MintingPolicy (policy oref mpTokenName)
@@ -113,6 +113,10 @@ mintNft MintParams {..} = do
113113
, Constraints.mustSpendPubKeyOutput oref
114114
, Constraints.mustPayToPubKeyAddress mpPubKeyHash mpStakeHash val
115115
]
116-
void $ submitTxConstraintsWith @Void lookups tx
116+
tokenMetadata = NftMetadataToken mpName mpImage (Just "image/jpeg") mpDescription Hask.mempty Hask.mempty
117+
txMetadata = TxMetadata (Just $ NftMetadata $ Map.singleton cs $ Map.singleton mpTokenName tokenMetadata) Hask.mempty
118+
bpiConstraints = mustIncludeMetadata txMetadata
119+
120+
void $ submitBpiTxConstraintsWith @Void lookups tx bpiConstraints
117121
Contract.logInfo @Hask.String $ printf "forged %s" (Hask.show val)
118122
tell $ Last $ Just "Finished"

‎flake.lock

+17-35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+46-40
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@
7777
url = "github:input-output-hk/hedgehog-extras/714ee03a5a786a05fc57ac5d2f1c2edce4660d85";
7878
flake = false;
7979
};
80-
hysterical-screams = {
81-
url = "github:raduom/hysterical-screams/4c523469e9efd3f0d10d17da3304923b7b0e0674";
82-
flake = false;
83-
};
8480
hw-aeson = {
8581
url = "github:haskell-works/hw-aeson/b5ef03a7d7443fcd6217ed88c335f0c411a05408";
8682
flake = false;
@@ -105,14 +101,14 @@
105101
"github:input-output-hk/ouroboros-network/cb9eba406ceb2df338d8384b35c8addfe2067201";
106102
flake = false;
107103
};
108-
plutus = {
104+
plutus-core = {
109105
url =
110106
"github:input-output-hk/plutus/a56c96598b4b25c9e28215214d25189331087244";
111107
flake = false;
112108
};
113109
plutus-apps = {
114110
url =
115-
"github:mlabs-haskell/plutus-apps/31bfd4c7fff5158c9f2618b76b68dbbae410221d";
111+
"github:input-output-hk/plutus-apps/a2045141fc0b4f14470ebf4679c6abe40aac4db7";
116112
flake = false;
117113
};
118114
purescript-bridge = {
@@ -290,10 +286,6 @@
290286
src = inputs.hedgehog-extras;
291287
subdirs = [ "." ];
292288
}
293-
{
294-
src = inputs.hysterical-screams;
295-
subdirs = [ "." ];
296-
}
297289
{
298290
src = inputs.hw-aeson;
299291
subdirs = [ "." ];
@@ -339,7 +331,7 @@
339331
];
340332
}
341333
{
342-
src = inputs.plutus;
334+
src = inputs.plutus-core;
343335
subdirs = [
344336
"plutus-core"
345337
"plutus-ledger-api"
@@ -353,22 +345,27 @@
353345
{
354346
src = inputs.plutus-apps;
355347
subdirs = [
348+
"cardano-streaming"
356349
"doc"
357350
"freer-extras"
351+
"marconi"
352+
"marconi-mamba"
358353
"playground-common"
354+
"pab-blockfrost"
359355
"plutus-chain-index"
360356
"plutus-chain-index-core"
361-
"plutus-hysterical-screams"
362357
"plutus-contract"
363358
"plutus-contract-certification"
359+
"plutus-example"
364360
"plutus-ledger"
365361
"plutus-ledger-constraints"
366362
"plutus-pab"
363+
"plutus-pab-executables"
367364
"plutus-playground-server"
368365
"plutus-script-utils"
369-
"plutus-streaming"
370366
"plutus-tx-constraints"
371367
"plutus-use-cases"
368+
"rewindable-index"
372369
"web-ghc"
373370
];
374371
}
@@ -402,33 +399,36 @@
402399
let
403400
pkgs = nixpkgsFor system;
404401
pkgs' = nixpkgsFor' system;
405-
in
406-
pkgs.haskell-nix.cabalProject' {
407-
src = ./.;
408-
inherit cabalProjectLocal extraSources;
409-
name = "bot-plutus-interface";
410-
compiler-nix-name = "ghc8107";
411-
shell = {
412-
additional = ps: [
413-
ps.plutus-pab
414-
];
415-
withHoogle = true;
416-
tools.haskell-language-server = { };
417-
exactDeps = true;
418-
nativeBuildInputs = with pkgs'; [
419-
cabal-install
420-
haskellPackages.cabal-fmt
421-
haskellPackages.implicit-hie
422-
haskellPackages.fourmolu
423-
hlint
424-
jq
425-
websocat
426-
fd
427-
nixpkgs-fmt
428-
];
402+
project = pkgs.haskell-nix.cabalProject' {
403+
src = ./.;
404+
inherit cabalProjectLocal extraSources;
405+
name = "bot-plutus-interface";
406+
compiler-nix-name = "ghc8107";
407+
shell = {
408+
additional = ps: [
409+
ps.plutus-pab
410+
];
411+
withHoogle = true;
412+
tools.haskell-language-server = { };
413+
exactDeps = true;
414+
nativeBuildInputs = with pkgs'; [
415+
cabal-install
416+
haskellPackages.cabal-fmt
417+
haskellPackages.implicit-hie
418+
haskellPackages.fourmolu
419+
haskellPackages.apply-refact
420+
hlint
421+
jq
422+
websocat
423+
fd
424+
nixpkgs-fmt
425+
project.hsPkgs.cardano-cli.components.exes.cardano-cli
426+
];
427+
};
428+
modules = haskellModules;
429429
};
430-
modules = haskellModules;
431-
};
430+
in
431+
project;
432432

433433
formatCheckFor = system:
434434
let
@@ -441,7 +441,7 @@
441441
export LC_ALL=C.UTF-8
442442
export LANG=C.UTF-8
443443
export IN_NIX_SHELL='pure'
444-
make format_check cabalfmt_check nixpkgsfmt_check lint
444+
make format_check cabalfmt_check nixpkgsfmt_check lint_check
445445
mkdir $out
446446
'';
447447

@@ -475,5 +475,11 @@
475475
checks = perSystem (system: self.flake.${system}.checks // {
476476
formatCheck = formatCheckFor system;
477477
});
478+
479+
hydraJobs = {
480+
checks = { inherit (self.checks) x86_64-linux; };
481+
packages = { inherit (self.packages) x86_64-linux; };
482+
devShells = { inherit (self.devShells) x86_64-linux; };
483+
};
478484
};
479485
}

0 commit comments

Comments
 (0)