Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SECP256k1 support #4368

Merged
merged 42 commits into from
Apr 25, 2022
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
fe75d82
Initial core support for SECP256k1 verification
kozross Jan 25, 2022
96f1a65
Add SECP256k1 builtins for plutus-tx
kozross Jan 25, 2022
8385d7e
Merge branch 'master' into koz/secp256k1
kozross Jan 31, 2022
ddbadaa
Ensure tests for SECP256k1 pass
kozross Feb 1, 2022
f318f1a
Merge branch 'master' into koz/secp256k1
kozross Feb 1, 2022
f404533
Merge branch 'master' into koz/secp256k1
kozross Feb 3, 2022
a7f3864
Use upstream cardano-base again
kozross Feb 3, 2022
34917a5
Merge branch 'master' of https://github.com/input-output-hk/plutus in…
effectfully Feb 5, 2022
cee6a8a
Fix a semantic conflict, fix 'stack'
effectfully Feb 5, 2022
4aad145
Merge pull request #2 from input-output-hk/mlabs-haskell-koz/secp256k1
kozross Feb 6, 2022
4693f32
Use EvaluationResult instead of Identity for Emit tracing
kozross Feb 6, 2022
c2602c0
Merge branch 'master' into koz/secp256k1
kozross Feb 8, 2022
f906b7c
Merge branch 'master' into koz/secp256k1
kozross Feb 21, 2022
35e3f7c
Attempt to bump haskell.nix
kozross Feb 22, 2022
172c527
Merge branch 'master' into koz/secp256k1
kozross Feb 22, 2022
d1ff1a0
Try bumping nixpkgs
kozross Feb 22, 2022
fbde278
Ensure everything builds with newer cardano-base
kozross Feb 23, 2022
8248e51
Schnorr verification builtin and tests
kozross Feb 24, 2022
9234494
Rename old SECP builtin for clarity, add Schnorr builtin
kozross Feb 24, 2022
6531d47
Merge branch 'master' into koz/secp256k1
kozross Feb 28, 2022
22f0ee0
Add note about sequencing, Emitter and EvaluationFailure
kozross Feb 28, 2022
f3e50d6
Merge branch 'master' into koz/secp256k1
kozross Mar 1, 2022
58dae9c
Merge branch 'master' into koz/secp256k1
kozross Mar 2, 2022
05bffea
Aim at cardano-base master for Schnorr support
kozross Mar 2, 2022
e393b71
Merge branch 'master' into koz/secp256k1
kozross Mar 8, 2022
61802df
Ensure Windows can find libsecp256k1
kozross Mar 8, 2022
05a2e24
Fix parser
michaelpj Mar 9, 2022
da10c4c
Remove unused import
michaelpj Mar 9, 2022
48d35e3
Fix plugin
michaelpj Mar 9, 2022
b43101b
Fix extra
michaelpj Mar 9, 2022
62f06b2
Merge pull request #3 from michaelpj/mpj/fix-schnorr
kozross Mar 9, 2022
c2b8e1e
Merge branch 'master' into koz/secp256k1
kozross Mar 16, 2022
e8efd94
Fix Windows build issues, update to use new Emitter
kozross Mar 17, 2022
8235576
Merge branch 'koz/secp256k1' of github.com:mlabs-haskell/plutus into …
kozross Mar 17, 2022
f825469
Renumber builtins to avoid clashes
kozross Mar 17, 2022
ff89ede
Merge branch 'master' into koz/secp256k1
kozross Mar 17, 2022
bc61887
Ensure the SECP builtins are shown as available
kozross Mar 17, 2022
4931531
Merge branch 'master' into koz/secp256k1
kozross Apr 19, 2022
511e9d3
Ensure plutus-tx-plugin names SECP builtins properly
kozross Apr 20, 2022
e39461b
Merge branch 'master' into koz/secp256k1
kozross Apr 21, 2022
fc7f918
Merge branch 'master' into koz/secp256k1
kozross Apr 24, 2022
6dadeaa
Roll back deconstructorData2 golden test
kozross Apr 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ source-repository-package

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-base
tag: 0b1b5b37e305c4bb10791f843bc8c81686a0cba4
location: https://github.com/mlabs-haskell/cardano-base
tag: 3caf9f80f8cbed545475752ad493360f182e7847
subdir:
base-deriving-via
binary
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions nix/pkgs/haskell/extra.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let
agdaProject = haskell-nix.hackage-project {
name = "Agda";
version = "2.6.2.1";
plan-sha256 = lib.removeSuffix "\n" (builtins.readFile ./agda.sha);
plan-sha256 = "sha256-gk2BF1qBhWT1Oa2z31Kw79wLOiS3FrFUnyqUB/BE+2A="; # lib.removeSuffix "\n" (builtins.readFile ./agda.sha);
# Should use the index-state from the target cabal.project, but that disables plan-sha256. Fixed
# in recent haskell.nix, delete the index-state passing when we update.
inherit compiler-nix-name index-state checkMaterialization;
Expand Down Expand Up @@ -54,12 +54,12 @@ let
name = "cabal-install";
version = "3.6.2.0";
inherit compiler-nix-name index-state checkMaterialization;
plan-sha256 = lib.removeSuffix "\n" (builtins.readFile ./cabal-install.sha);
plan-sha256 = "sha256-JnDI7ooAr7Quz1GZQfkBjg4xFoN0QcQR0n7PXQCUjyc="; # lib.removeSuffix "\n" (builtins.readFile ./cabal-install.sha);
};
cardanoRepoToolProject = haskell-nix.cabalProject' {
src = sources.cardano-repo-tool;
inherit compiler-nix-name index-state checkMaterialization;
plan-sha256 = lib.removeSuffix "\n" (builtins.readFile ./cardano-repo-tool.sha);
plan-sha256 = "sha256-D/P+WxOspEiRmmUS6gWElTTd1dQauXedTvtmoKSQ84w="; # lib.removeSuffix "\n" (builtins.readFile ./cardano-repo-tool.sha);
sha256map = {
"https://github.com/input-output-hk/nix-archive"."7dcf21b2af54d0ab267f127b6bd8fa0b31cfa49d" = "0mhw896nfqbd2iwibzymydjlb3yivi9gm0v2g1nrjfdll4f7d8ly";
};
Expand All @@ -78,7 +78,7 @@ let
'';
src = sources.haskell-language-server;
inherit compiler-nix-name index-state checkMaterialization;
plan-sha256 = lib.removeSuffix "\n" (builtins.readFile hlsShaFile);
plan-sha256 = "sha256-tCpSRSZz8GmzfVoF+uIPf2orZ+O4lrXAmxiXettAlDY="; # lib.removeSuffix "\n" (builtins.readFile hlsShaFile);
modules = [{
# for compatibility with the GHC patch for extensible interfaces, not needed on mainline GHC.
packages.ghcide.patches = [ ../../patches/ghcide_partial_iface.patch ];
Expand Down
2 changes: 1 addition & 1 deletion nix/pkgs/haskell/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let
inherit checkMaterialization;
sha256map = {
"https://github.com/Quid2/flat.git"."ee59880f47ab835dbd73bea0847dab7869fc20d8" = "1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm";
"https://github.com/input-output-hk/cardano-base"."0b1b5b37e305c4bb10791f843bc8c81686a0cba4" = "1z98f3m4skmqy782dpcpd3y0k7hccdrz5yl1fjgjs524swh4vv56";
"https://github.com/mlabs-haskell/cardano-base"."3caf9f80f8cbed545475752ad493360f182e7847" = "sha256-KTkolYrjS3t6TU82OFYZ9ltPlwQDFz3l4ij2mXQlih4=";
"https://github.com/input-output-hk/cardano-crypto.git"."07397f0e50da97eaa0575d93bee7ac4b2b2576ec" = "06sdx5ndn2g722jhpicmg96vsrys89fl81k8290b3lr6b1b0w4m3";
"https://github.com/input-output-hk/cardano-prelude"."fd773f7a58412131512b9f694ab95653ac430852" = "02jddik1yw0222wd6q0vv10f7y8rdgrlqaiy83ph002f9kjx7mh6";
"https://github.com/input-output-hk/Win32-network"."3825d3abf75f83f406c1f7161883c438dac7277d" = "19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx";
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions nix/pkgs/haskell/materialized-darwin/default.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading