Sulkta-OSS/agora
3
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #217 from Liqwid-Labs/emiflake/bump-ln

Browse source 
bump liqwid-nix to 2.1.1
This commit is contained in:
emiflake 2023-01-03 15:38:48 +01:00 • committed by GitHub
commit 478dc36661
3 changed files with 123 additions and 4594 deletions
Download patch file Download diff file Expand all files Collapse all files

5
agora/Agora/Bootstrap.hs
View file

@ -17,6 +17,7 @@ import Agora.Treasury (treasuryValidator)
import Data.Map (fromList) import Data.Map (fromList)
import Data.Text (Text, unpack) import Data.Text (Text, unpack)
import Plutarch (Config) import Plutarch (Config)
import Plutarch.Api.V2 (PMintingPolicy)
import Ply (TypedScriptEnvelope) import Ply (TypedScriptEnvelope)
import Ply.Plutarch.TypedWriter (TypedWriter, mkEnvelope) import Ply.Plutarch.TypedWriter (TypedWriter, mkEnvelope)
import ScriptExport.ScriptInfo (RawScriptExport (..)) import ScriptExport.ScriptInfo (RawScriptExport (..))
@ -41,6 +42,10 @@ agoraScripts conf =
, envelope "agora:noOpValidator" noOpValidator , envelope "agora:noOpValidator" noOpValidator
, envelope "agora:treasuryWithdrawalValidator" treasuryWithdrawalValidator , envelope "agora:treasuryWithdrawalValidator" treasuryWithdrawalValidator
, envelope "agora:mutateGovernorValidator" mutateGovernorValidator , envelope "agora:mutateGovernorValidator" mutateGovernorValidator
, -- NOTE(Emily, Jan 3rd 2023): Adding this in here because it's useful for testnet GT.
-- In reality, it shouldn't be used by anyone on mainnet, but removing it is not
-- productive for off-chain testing.
envelope @PMintingPolicy "agora:alwaysSucceedsPolicy" $ plam $ \_ _ -> popaque $ pcon PUnit
] ]
where where
envelope :: envelope ::

4685
flake.lock generated
View file

File diff suppressed because it is too large Load diff

27
flake.nix
View file

@ -15,23 +15,20 @@
nixpkgs-latest.url = "github:NixOS/nixpkgs"; nixpkgs-latest.url = "github:NixOS/nixpkgs";
liqwid-nix = { liqwid-nix = {
url = "github:Liqwid-Labs/liqwid-nix/v2.0.1"; url = "github:Liqwid-Labs/liqwid-nix/v2.1.1";
inputs.nixpkgs-latest.follows = "nixpkgs-latest"; inputs.nixpkgs-latest.follows = "nixpkgs-latest";
}; };
liqwid-script-export.url = "github:Liqwid-Labs/liqwid-script-export"; liqwid-script-export.url = "github:Liqwid-Labs/liqwid-script-export";
}; };
outputs = { self, liqwid-nix, flake-parts, ... }: outputs = inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit self; } { flake-parts.lib.mkFlake { inherit inputs; } {
imports = liqwid-nix.allModules; imports = [
inputs.liqwid-nix.flakeModule
];
systems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" "aarch64-linux" ]; systems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" "aarch64-linux" ];
perSystem = { config, self', inputs', pkgs, system, ... }: perSystem = { config, self', inputs', pkgs, system, ... }:
let
pkgs = import self.inputs.nixpkgs {
inherit system;
};
in
{ {
onchain.default = { onchain.default = {
src = ./.; src = ./.;
@ -39,12 +36,12 @@
shell = { }; shell = { };
enableBuildChecks = true; enableBuildChecks = true;
extraHackageDeps = [ extraHackageDeps = [
"${self.inputs.liqwid-script-export.inputs.liqwid-plutarch-extra.inputs.plutarch-quickcheck}" "${inputs.liqwid-script-export.inputs.liqwid-plutarch-extra.inputs.plutarch-quickcheck}"
"${self.inputs.liqwid-script-export.inputs.liqwid-plutarch-extra.inputs.plutarch-context-builder}" "${inputs.liqwid-script-export.inputs.liqwid-plutarch-extra.inputs.plutarch-context-builder}"
"${self.inputs.liqwid-script-export.inputs.liqwid-plutarch-extra}" "${inputs.liqwid-script-export.inputs.liqwid-plutarch-extra}"
"${self.inputs.liqwid-script-export}" "${inputs.liqwid-script-export}"
"${self.inputs.liqwid-script-export.inputs.ply}/ply-core" "${inputs.liqwid-script-export.inputs.liqwid-plutarch-extra.inputs.ply}/ply-core"
"${self.inputs.liqwid-script-export.inputs.ply}/ply-plutarch" "${inputs.liqwid-script-export.inputs.liqwid-plutarch-extra.inputs.ply}/ply-plutarch"
]; ];
}; };
ci.required = [ "all_onchain" ]; ci.required = [ "all_onchain" ];