From caffdfba20a311d7a4c3bb524868bbfadc8f03f3 Mon Sep 17 00:00:00 2001 From: Hongrui Fang Date: Fri, 20 Jan 2023 17:24:43 +0800 Subject: [PATCH 1/3] use v2 hash in the linker --- agora/Agora/Linker.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agora/Agora/Linker.hs b/agora/Agora/Linker.hs index 8791d8d..4b22af4 100644 --- a/agora/Agora/Linker.hs +++ b/agora/Agora/Linker.hs @@ -7,10 +7,10 @@ import Agora.SafeMoney (AuthorityTokenTag, GTTag, GovernorSTTag, ProposalSTTag, import Data.Aeson qualified as Aeson import Data.Map (fromList) import Data.Tagged (Tagged (Tagged)) -import Plutarch.Api.V1 (scriptHash) +import Plutarch.Api.V2 (scriptHash) import Plutarch.Extra.AssetClass (AssetClass (AssetClass)) import Plutarch.Extra.ScriptContext (scriptHashToTokenName) -import PlutusLedgerApi.V1 (CurrencySymbol (CurrencySymbol), ScriptHash, TxOutRef, getScriptHash) +import PlutusLedgerApi.V2 (CurrencySymbol (CurrencySymbol), ScriptHash, TxOutRef, getScriptHash) import Ply ( ScriptRole (MintingPolicyRole, ValidatorRole), (#), From 58629562da930a92ee1f5effef10fab73ed99280 Mon Sep 17 00:00:00 2001 From: Hongrui Fang Date: Fri, 20 Jan 2023 17:55:35 +0800 Subject: [PATCH 2/3] fix tests --- agora-specs/Sample/Shared.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agora-specs/Sample/Shared.hs b/agora-specs/Sample/Shared.hs index cb9dc8d..4bf4c94 100644 --- a/agora-specs/Sample/Shared.hs +++ b/agora-specs/Sample/Shared.hs @@ -78,7 +78,7 @@ import Data.Tagged (Tagged (..)) import Data.Text (Text) import Optics (view) import Plutarch (Config (..), Script, TracingMode (DetTracing)) -import Plutarch.Api.V1 (scriptHash) +import Plutarch.Api.V2 (scriptHash) import Plutarch.Extra.AssetClass (AssetClass (AssetClass)) import Plutarch.Extra.ScriptContext (scriptHashToTokenName) import PlutusLedgerApi.V1.Address (scriptHashAddress) From 8b673356d3967c58fc8b2b913a83c4c27430c936 Mon Sep 17 00:00:00 2001 From: Hongrui Fang Date: Fri, 20 Jan 2023 18:01:51 +0800 Subject: [PATCH 3/3] fix `make ci` --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 37c916a..a622b2d 100644 --- a/Makefile +++ b/Makefile @@ -100,4 +100,4 @@ build: requires_nix_shell ci: @ [[ "$$(uname -sm)" == "Linux x86_64" ]] || (echo "NOTE: CI only builds on Linux x86_64. Your system is $$(uname -sm), continuing...") - nix build .#check.$(shell nix eval -f '' system) + nix build .#checks.$(shell nix eval -f '' system).required