Skip to content

Commit 7bd81f1

Browse files
committed
wip
1 parent b944fe7 commit 7bd81f1

26 files changed

+1108
-7
lines changed

cabal.project

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ source-repository-package
3030
tag: d71becf49c092cd7697f39e4f4fb55b289af3d31
3131
--sha256: qr2x4XbY66pXK/8u5PcGrXWrupG6Rt3yXshgOqKCsBs=
3232

33+
source-repository-package
34+
type: git
35+
location: https://github.com/hamishmack/hs-memory.git
36+
tag: 8a4784839354826c5dcd27656f7fd83e4814048d
37+
--sha256: 2oOkNRGcDawzxDkX++8B4AOdXYclkhKlKH9StFmPs7Y=
38+
3339
if impl(ghc >= 9)
3440
source-repository-package
3541
type: git
@@ -109,6 +115,7 @@ if arch(wasm32)
109115

110116
if arch(javascript)
111117
packages:
118+
pub/hs-bitcoin-hash/bitcoin-hash/*.cabal
112119
pub/hs-bitcoin-keys/bitcoin-keys/*.cabal
113120
pub/haskell-bitcoin-script/*.cabal
114121
pub/singlethongs/*.cabal

ghcjs/delivery-calculator/delivery-calculator.cabal

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ common pkg
1919
js-sources: static/app.js
2020

2121
else
22-
js-sources:
23-
static/app.js
24-
static/hashable.js
25-
static/material-components-web.min.js
22+
-- static/hashable.js
23+
-- static/material-components-web.min.js
24+
js-sources: static/app.js
2625

2726
other-modules:
2827
App.Misc
@@ -94,7 +93,6 @@ common pkg
9493
TypeOperators
9594

9695
build-depends:
97-
, aeson
9896
, barbies
9997
, base
10098
, base64-bytestring
@@ -125,7 +123,12 @@ executable delivery-calculator
125123
ghcjs-options: -dedupe
126124
build-depends: containers
127125

128-
if !((impl(ghcjs) || arch(javascript)) || os(wasi))
126+
if ((impl(ghcjs) || arch(javascript)) || os(wasi))
127+
build-depends:
128+
, jsaddle
129+
, network-uri
130+
131+
else
129132
build-depends:
130133
, jsaddle-warp
131134
, wai

ghcjs/delivery-calculator/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
./static/material-icons.css \
115115
./static/app.css
116116
117-
app_jsexe_path=$(find ../../dist-newstyle -name "app.jsexe")
117+
app_jsexe_path=$(find ../../dist-newstyle -name "${label}.jsexe")
118118
119119
#
120120
# TODO : fix this!

pub/hs-bitcoin-hash/.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
dist-newstyle*
2+
.*.sw[a-p]
3+
*~
4+
.ghc.environment.*
5+
cabal*.project.local
6+
result
7+
*.lock
8+
dist
9+
dist-newstyle
10+
dist-ghc
11+
dist-ghcjs
12+
tags
13+
tmp
14+
result-*
15+
node_modules/
16+
package-lock.json
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Version 0.1
2+
3+
* Initial version.
Lines changed: 219 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
Copyright 2020, Renzo Carbonara.
2+
3+
Except where otherwise explicitly mentioned, all of contents of the
4+
"bitcoin-hash" project are licensed under the Apache License,
5+
Version 2.0 (the "License"); you may not use this file except in
6+
compliance with the License. You may obtain a copy of the License at the
7+
end of this file or at http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
14+
15+
16+
-------------------------------------------------------------------------------
17+
18+
19+
Apache License
20+
Version 2.0, January 2004
21+
http://www.apache.org/licenses/
22+
23+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
24+
25+
1. Definitions.
26+
27+
"License" shall mean the terms and conditions for use, reproduction,
28+
and distribution as defined by Sections 1 through 9 of this document.
29+
30+
"Licensor" shall mean the copyright owner or entity authorized by
31+
the copyright owner that is granting the License.
32+
33+
"Legal Entity" shall mean the union of the acting entity and all
34+
other entities that control, are controlled by, or are under common
35+
control with that entity. For the purposes of this definition,
36+
"control" means (i) the power, direct or indirect, to cause the
37+
direction or management of such entity, whether by contract or
38+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
39+
outstanding shares, or (iii) beneficial ownership of such entity.
40+
41+
"You" (or "Your") shall mean an individual or Legal Entity
42+
exercising permissions granted by this License.
43+
44+
"Source" form shall mean the preferred form for making modifications,
45+
including but not limited to software source code, documentation
46+
source, and configuration files.
47+
48+
"Object" form shall mean any form resulting from mechanical
49+
transformation or translation of a Source form, including but
50+
not limited to compiled object code, generated documentation,
51+
and conversions to other media types.
52+
53+
"Work" shall mean the work of authorship, whether in Source or
54+
Object form, made available under the License, as indicated by a
55+
copyright notice that is included in or attached to the work
56+
(an example is provided in the Appendix below).
57+
58+
"Derivative Works" shall mean any work, whether in Source or Object
59+
form, that is based on (or derived from) the Work and for which the
60+
editorial revisions, annotations, elaborations, or other modifications
61+
represent, as a whole, an original work of authorship. For the purposes
62+
of this License, Derivative Works shall not include works that remain
63+
separable from, or merely link (or bind by name) to the interfaces of,
64+
the Work and Derivative Works thereof.
65+
66+
"Contribution" shall mean any work of authorship, including
67+
the original version of the Work and any modifications or additions
68+
to that Work or Derivative Works thereof, that is intentionally
69+
submitted to Licensor for inclusion in the Work by the copyright owner
70+
or by an individual or Legal Entity authorized to submit on behalf of
71+
the copyright owner. For the purposes of this definition, "submitted"
72+
means any form of electronic, verbal, or written communication sent
73+
to the Licensor or its representatives, including but not limited to
74+
communication on electronic mailing lists, source code control systems,
75+
and issue tracking systems that are managed by, or on behalf of, the
76+
Licensor for the purpose of discussing and improving the Work, but
77+
excluding communication that is conspicuously marked or otherwise
78+
designated in writing by the copyright owner as "Not a Contribution."
79+
80+
"Contributor" shall mean Licensor and any individual or Legal Entity
81+
on behalf of whom a Contribution has been received by Licensor and
82+
subsequently incorporated within the Work.
83+
84+
2. Grant of Copyright License. Subject to the terms and conditions of
85+
this License, each Contributor hereby grants to You a perpetual,
86+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
87+
copyright license to reproduce, prepare Derivative Works of,
88+
publicly display, publicly perform, sublicense, and distribute the
89+
Work and such Derivative Works in Source or Object form.
90+
91+
3. Grant of Patent License. Subject to the terms and conditions of
92+
this License, each Contributor hereby grants to You a perpetual,
93+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
94+
(except as stated in this section) patent license to make, have made,
95+
use, offer to sell, sell, import, and otherwise transfer the Work,
96+
where such license applies only to those patent claims licensable
97+
by such Contributor that are necessarily infringed by their
98+
Contribution(s) alone or by combination of their Contribution(s)
99+
with the Work to which such Contribution(s) was submitted. If You
100+
institute patent litigation against any entity (including a
101+
cross-claim or counterclaim in a lawsuit) alleging that the Work
102+
or a Contribution incorporated within the Work constitutes direct
103+
or contributory patent infringement, then any patent licenses
104+
granted to You under this License for that Work shall terminate
105+
as of the date such litigation is filed.
106+
107+
4. Redistribution. You may reproduce and distribute copies of the
108+
Work or Derivative Works thereof in any medium, with or without
109+
modifications, and in Source or Object form, provided that You
110+
meet the following conditions:
111+
112+
(a) You must give any other recipients of the Work or
113+
Derivative Works a copy of this License; and
114+
115+
(b) You must cause any modified files to carry prominent notices
116+
stating that You changed the files; and
117+
118+
(c) You must retain, in the Source form of any Derivative Works
119+
that You distribute, all copyright, patent, trademark, and
120+
attribution notices from the Source form of the Work,
121+
excluding those notices that do not pertain to any part of
122+
the Derivative Works; and
123+
124+
(d) If the Work includes a "NOTICE" text file as part of its
125+
distribution, then any Derivative Works that You distribute must
126+
include a readable copy of the attribution notices contained
127+
within such NOTICE file, excluding those notices that do not
128+
pertain to any part of the Derivative Works, in at least one
129+
of the following places: within a NOTICE text file distributed
130+
as part of the Derivative Works; within the Source form or
131+
documentation, if provided along with the Derivative Works; or,
132+
within a display generated by the Derivative Works, if and
133+
wherever such third-party notices normally appear. The contents
134+
of the NOTICE file are for informational purposes only and
135+
do not modify the License. You may add Your own attribution
136+
notices within Derivative Works that You distribute, alongside
137+
or as an addendum to the NOTICE text from the Work, provided
138+
that such additional attribution notices cannot be construed
139+
as modifying the License.
140+
141+
You may add Your own copyright statement to Your modifications and
142+
may provide additional or different license terms and conditions
143+
for use, reproduction, or distribution of Your modifications, or
144+
for any such Derivative Works as a whole, provided Your use,
145+
reproduction, and distribution of the Work otherwise complies with
146+
the conditions stated in this License.
147+
148+
5. Submission of Contributions. Unless You explicitly state otherwise,
149+
any Contribution intentionally submitted for inclusion in the Work
150+
by You to the Licensor shall be under the terms and conditions of
151+
this License, without any additional terms or conditions.
152+
Notwithstanding the above, nothing herein shall supersede or modify
153+
the terms of any separate license agreement you may have executed
154+
with Licensor regarding such Contributions.
155+
156+
6. Trademarks. This License does not grant permission to use the trade
157+
names, trademarks, service marks, or product names of the Licensor,
158+
except as required for reasonable and customary use in describing the
159+
origin of the Work and reproducing the content of the NOTICE file.
160+
161+
7. Disclaimer of Warranty. Unless required by applicable law or
162+
agreed to in writing, Licensor provides the Work (and each
163+
Contributor provides its Contributions) on an "AS IS" BASIS,
164+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
165+
implied, including, without limitation, any warranties or conditions
166+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
167+
PARTICULAR PURPOSE. You are solely responsible for determining the
168+
appropriateness of using or redistributing the Work and assume any
169+
risks associated with Your exercise of permissions under this License.
170+
171+
8. Limitation of Liability. In no event and under no legal theory,
172+
whether in tort (including negligence), contract, or otherwise,
173+
unless required by applicable law (such as deliberate and grossly
174+
negligent acts) or agreed to in writing, shall any Contributor be
175+
liable to You for damages, including any direct, indirect, special,
176+
incidental, or consequential damages of any character arising as a
177+
result of this License or out of the use or inability to use the
178+
Work (including but not limited to damages for loss of goodwill,
179+
work stoppage, computer failure or malfunction, or any and all
180+
other commercial damages or losses), even if such Contributor
181+
has been advised of the possibility of such damages.
182+
183+
9. Accepting Warranty or Additional Liability. While redistributing
184+
the Work or Derivative Works thereof, You may choose to offer,
185+
and charge a fee for, acceptance of support, warranty, indemnity,
186+
or other liability obligations and/or rights consistent with this
187+
License. However, in accepting such obligations, You may act only
188+
on Your own behalf and on Your sole responsibility, not on behalf
189+
of any other Contributor, and only if You agree to indemnify,
190+
defend, and hold each Contributor harmless for any liability
191+
incurred by, or claims asserted against, such Contributor by reason
192+
of your accepting any such warranty or additional liability.
193+
194+
END OF TERMS AND CONDITIONS
195+
196+
APPENDIX: How to apply the Apache License to your work.
197+
198+
To apply the Apache License to your work, attach the following
199+
boilerplate notice, with the fields enclosed by brackets "[]"
200+
replaced with your own identifying information. (Don't include
201+
the brackets!) The text should be enclosed in the appropriate
202+
comment syntax for the file format. We also recommend that a
203+
file or class name and description of purpose be included on the
204+
same "printed page" as the copyright notice for easier
205+
identification within third-party archives.
206+
207+
Copyright [yyyy] [name of copyright owner]
208+
209+
Licensed under the Apache License, Version 2.0 (the "License");
210+
you may not use this file except in compliance with the License.
211+
You may obtain a copy of the License at
212+
213+
http://www.apache.org/licenses/LICENSE-2.0
214+
215+
Unless required by applicable law or agreed to in writing, software
216+
distributed under the License is distributed on an "AS IS" BASIS,
217+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
218+
See the License for the specific language governing permissions and
219+
limitations under the License.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# bitcoin-hash
2+
3+
Bitcoin hashing primitives.
4+
5+
This library builds on GHC and GHCJS.
6+
7+
8+
## Developing in GHCJS
9+
10+
* `cabal --ghcjs build` will build the Haskell `bitcoin-hash` library with the
11+
JavaScript dependencies already compiled at `js/index.compiled.js`.
12+
13+
* If the `js/index.js` file changes, run `npx webpack` to regenerate
14+
`js/index.compiled.js` and commit both files to the repository.
15+
16+
* If the `package.json` file changes, run `npm install -D` to get new JS
17+
dependencies, and then run `npx webpack` as above.
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
cabal-version: 2.4
2+
name: bitcoin-hash
3+
version: 0.1
4+
license: Apache-2.0
5+
license-file: LICENSE
6+
extra-source-files:
7+
CHANGELOG.md
8+
README.md
9+
10+
author: Renzo Carbonara
11+
maintainer: renλren.zone
12+
copyright: Copyright (c) Renzo Carbonara 2020
13+
category: Cryptography
14+
build-type: Simple
15+
synopsis: Bitcoin hash primitives
16+
description:
17+
Bitcoin hash primitives.
18+
.
19+
This library builds in GHC and GHCJS.
20+
21+
homepage: https://gitlab.com/k0001/hs-bitcoin-hash
22+
bug-reports: https://gitlab.com/k0001/hs-bitcoin-hash/issues
23+
tested-with:
24+
GHC ==8.6.5 || ==8.8.3
25+
, GHCJS ==8.6.0
26+
27+
common basic
28+
default-language: Haskell2010
29+
ghc-options: -O2 -Wall -Werror=incomplete-patterns
30+
ghcjs-options: -O3 -Wall -Werror=incomplete-patterns
31+
build-depends:
32+
, base >=4 && <5
33+
, bytestring
34+
35+
library
36+
import: basic
37+
hs-source-dirs: lib
38+
exposed-modules:
39+
Bitcoin.Hash
40+
Bitcoin.Hash.Prim
41+
42+
other-modules: Bitcoin.Hash.Internal
43+
44+
if ((impl(ghcjs) || arch(javascript)) || os(wasi))
45+
other-modules: Bitcoin.Hash.GHCJS
46+
build-depends: ghcjs-base
47+
js-sources: js/index.compiled.js
48+
49+
-- This file is generated. See README.md.
50+
else
51+
other-modules: Bitcoin.Hash.GHC
52+
build-depends:
53+
, cryptonite
54+
, memory
55+
56+
test-suite test
57+
import: basic
58+
type: exitcode-stdio-1.0
59+
hs-source-dirs: test
60+
main-is: Main.hs
61+
build-depends:
62+
, bitcoin-hash
63+
, tasty
64+
, tasty-hunit
65+
, time

pub/hs-bitcoin-hash/bitcoin-hash/js/index.compiled.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)