From 5ca2e0c4487442ebc77ba46f1c05d36152083059 Mon Sep 17 00:00:00 2001
From: Daniel Hines <d4hines@gmail.com>
Date: Wed, 23 Nov 2022 23:08:07 -0500
Subject: [PATCH] wip: buildling all our stuff with nix

---
 deku-p/deku-toolkit/package.json       |   6 +-
 deku-p/src/core/bin/node/dune          |   3 +-
 dune                                   |   2 +-
 flake.nix                              |  19 +++++
 networks/betanets/fleet.nix            | Bin 4472 -> 4446 bytes
 networks/betanets/modules/promtail.nix | Bin 981 -> 980 bytes
 nix/deku-c/tuna.nix                    |  93 +++++++++++++++++++++----
 nix/deku-p/deku.nix                    |   1 +
 website/package.json                   |   1 -
 yarn.lock                              |  10 +++
 10 files changed, 112 insertions(+), 23 deletions(-)

diff --git a/deku-p/deku-toolkit/package.json b/deku-p/deku-toolkit/package.json
index e9c3518d50..bb717ae4cd 100644
--- a/deku-p/deku-toolkit/package.json
+++ b/deku-p/deku-toolkit/package.json
@@ -19,7 +19,7 @@
   ],
   "author": "contact@marigold.dev",
   "license": "ISC",
-  "devDependencies": {
+  "dependencies": {
     "typescript": "^4.7.4",
     "@types/bs58check": "^2.1.0",
     "@types/node": "^18.7.13",
@@ -29,9 +29,7 @@
     "rollup": "^2.79.1",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
-    "rollup-plugin-typescript2": "^0.34.0"
-  },
-  "dependencies": {
+    "rollup-plugin-typescript2": "^0.34.0",
     "@tzstamp/helpers": "^0.3.4",
     "@taquito/taquito": "^13.0.1",
     "blakejs": "^1.2.1",
diff --git a/deku-p/src/core/bin/node/dune b/deku-p/src/core/bin/node/dune
index ea9fb45915..21ea91ef28 100644
--- a/deku-p/src/core/bin/node/dune
+++ b/deku-p/src/core/bin/node/dune
@@ -17,8 +17,7 @@
   fmt.cli
   logs.cli
   logs.threaded
-  piaf
-  routes)
+  piaf)
  (preprocess
   (pps ppx_let_binding ppx_deriving_cmdliner ppx_yojson_conv)))
 
diff --git a/dune b/dune
index 4b7fd96a00..612f6de3ff 100644
--- a/dune
+++ b/dune
@@ -1,4 +1,4 @@
-(data_only_dirs flextesa_chain node_modules)
+(data_only_dirs flextesa_chain node_modules nix)
 
 (env
  (static
diff --git a/flake.nix b/flake.nix
index 8bc6cef2da..a5be7e367d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,6 +81,25 @@
             tuna = self'.packages.tuna;
             deploy-rs = deploy-rs.packages.${system}.default;
           };
+          checks = {
+            ensure_all_build = pkgs.symlinkJoin {
+              name = "all";
+              paths = with self';
+              with packages; [
+                packages."@marigold-dev/deku-c-toolkit"
+                packages."@marigold-dev/deku-p-sdk"
+                packages."@marigold-dev/deku-toolkit"
+                decookies-vm
+                deku
+                deku-static
+                deku-toolkit-nodejs-example
+                deku-toolkit-react-example
+                docker
+                tuna
+                website
+              ];
+            };
+          };
         };
       };
       flake = {
diff --git a/networks/betanets/fleet.nix b/networks/betanets/fleet.nix
index c94e50724fe9b97649b0f733af6a56307eae35db..4ead71c8923cc9aefa712cad41b54532ea98f56b 100644
GIT binary patch
literal 4446
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

literal 4472
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
KkCtd#?;%_@%+0a@

diff --git a/networks/betanets/modules/promtail.nix b/networks/betanets/modules/promtail.nix
index 0be5ef60825b5bfe75b54bbf801e4109079fd33d..cae4a8a16f85e63caf1523b911a22768366ee6e6 100644
GIT binary patch
literal 980
zcmV;_11tOhM@dveQdv+`0Ea{Ar$X&PiM~ts&)toqyQ#Mc4)STaky{_&coeV>;U(yC
zXnXi<21>gR;uTMw-L8J1xz<wMq#%?ty*9ODF9i)EZ9l-puFdINH~GxcW~V{IM=}jX
z-+ZFx6&8}(uRaP}imKc2(C4&WIL1+_Cg-Ajgmt9uIC(97qr6}A@B^W`-;sH}%%T*g
z6GTHE15z)xE-`uqJ>EsSILPPB*d%A3#Ly5Ps!;qkbLJ65E5e%ur@`GIMl4Iwr-)i{
zYDCc{&QZTgVie(FQcDZsBOYJND^{<G@h+pEfkP*=uxC-4LpzZO)o5xKNmj#*m8bD~
z70t;_I1}$%*pj<)bzJ)AOb5o6ku7QuE=5rYTiwg;g(PfiKOg8aiw1qq6wqhZ9j*ic
zkwZ%K$hW8QAgZr&zmUv}Vcmrv1OT^(C#EeM3yXsPig|*<$^>})5`&tcq)3X&xwC_n
zq>7v0&C19k$Z@L~a&<PHhLuJJ2S9M}%f2g6IZeWu8T(_{8<&L%RyiuO`P=_a(RW6)
zUq~&=guxP@@&~$;CKD3iR|0X9hDPuWEzMc2cI#MbaIY!jz4P-zEJ#h%%iGyqqR+Q~
z^b?D175*vKq<-hYl0t2wqKaL~l;!mypO<A6iadG<P+&MOZS3vx4EvlHh*sLKpj=p;
z^FStDH+%Lv(YPW{c-lc_v$?*W{3PbhHY{0<h#92WG~Qt?VR_^w`q>Qxv^e;ovOt^G
zzg4Rcu(PDK!8d3sCiRLvt7<h?#bw${R^2@c3mj8ME`1dlBa#+B1!O)2obOgXe!ZbB
zW^=j!Ym2$P*Ls&fU0gO+v?eg~Y;%=(X&>FVdSj)z(}-Kte>2)f*NPBMidtfNQp^*!
zASmA*IOf47D`_%v@1m}cUjj^WXzGJSvluHPx=6zV5HjkeJLiCF%@=?6*R8FbbbE?i
zvNgDr)Zk59DNz;AQ_R9UW{zwr4CRv5DuUB)|0soP+D9LwE6~r<x@v`A0_H1oIA3(q
z-VV68D7ZUX%%s6rz<NA<e`#Q}bXWyl0j#p`NCW<ks2c;N{~~&umT+U~?p;2g=@U`D
zeT;IcTbm=<aXo>&A)DbuF3Dap<Q!Ydj<6|U(_0+@KVQGP_po^JZdY0zlM+;I4}?5w
zhC3z5yyZ^pImSyOj_7B)H*hF6Z2)D<KUDGo_pW`8inP*;$SJgcz*3oazRgppA^c1<
z;YGg}O0@rfm#P8%;U%P|O(h4K5@8sJs|eC(`=eT2Y0vP^Jkb^iecik}yu<AX@_KsC
C!QR0D

literal 981
zcmV;`11kIgM@dveQdv+`0I24{20H6YelQmx(Mbhhk1IY-Y)l?I8K7`Dyb{*##t+zZ
zuv;hiq*;p&{!FFmdZgdPnWiWw%fiHqyw0$6TRV7(kT1+uzl@^fCg<L@VHX#`66#wM
zgp-Cv&B}zakwU3fr&H_P@%Fd@M*V1CLF(8K<YuyES7JV8p&CiHOzY(bIs|MeG+9g*
zbZ*wiOXQ^G44~NJ>5fyjav+61f(AFaC1dgNqGjpqI)jk+Jesh{oV`<>u>U0jd3mrs
z{TNE)9+;NnS$)txz|}m96x6_L_tmZ(S`KN|EH^R~7g{$#7ftfu`O<{k{$)JKj#~rg
zeB8fC(~hY?h`>Sa^WkowgeB@Nl<*!(I{0(_-a;Pak-5l%peOp~mC;1qjUe!R6kVAl
zUPYDaY*TYSbe=o<IwX*{4ZF@g+wRmM^uN!{MoAn^rN2%JMe`tocZ&yX``!}4ZQjT>
z0wT#Pvo@svUu}09gGbPO_1nN`90F2(wroayR+<Qyu-y=uVhM-V3#ia2w+z*<;h+ne
z>N{`_*}eqZ%P1Ys^cso9oHRp#8`;?bjLDwr%k1I)!#6(>kXToM^z3<e3u_l^SB+aU
zlf3S&yO2FD@oG-NzSnIs+R#|!CHmE<vhKbii%@K9kiYyS&87J~W|O!u=bUl)A-0^2
z;FCbzAb>up(fKhe$-B<FPKg8O^|-)EA*aF5+bTzn;SiHP(c8GfmYE><YLwf?e0U1w
zVbo8~XsmkLo@Vvl87DlQ5qc~rADv(LdQ&gfz4KX`PU9#MRuvWI9oAn+79YRZ+lXvm
zNM}7ep3fp&diXy5s_#BvDw+W%e@4FRiidKvu>jsejmXHhRTAk`z|f)E4jQ$KD>MYL
z#vv0#vXzwIE4Vy)Oy%i8$p!3n#<Oc~p`sNYuEZlGuP&X;Sb3{GqGeJWqB1>QrdWQd
zp=}(4I@IpRw*@f>`Omf3Z{K&$U0{)|;axsqd#joBI|Utw>N!WZUn}{Jl_$CnnStk@
zlsWdl#5FFYsp%?$+{kcIs-6%6<oFV3$^sYt_~qqd1lJA7|65JM&grwf0Bv2XMT;<b
z{1aoNw1G2*U1U-32{R1@wq)#e0@)?y;M}%ZFj-j%{72i4C_R8@OTwPdd>M#yVYVp#
zI#TAZ#R(3s_XjS2!EHoa!sP-XkR@JVYwSmN_c(Db=H)OTfygs;*@6<{Dk3E*vr2x)
zWwkDH*`T_xSy4WR62!XXsSvJ6t|sOGugxW;LNEd+6N!GYAshe3&x%D7lyXtLrUE<K
D92xI0

diff --git a/nix/deku-c/tuna.nix b/nix/deku-c/tuna.nix
index 88ccd9752b..dd645603a2 100644
--- a/nix/deku-c/tuna.nix
+++ b/nix/deku-c/tuna.nix
@@ -1,18 +1,39 @@
-{
-  nix-filter,
-  lib,
-  buildDunePackage,
-  zarith,
-  ppx_deriving,
-  ppx_yojson_conv,
-  yojson,
-  wasm,
-  data-encoding,
-  tezos-micheline,
-  core,
-  core_unix,
-  ppx_jane,
-  alcotest,
+{ nix-filter
+, lib
+, buildDunePackage
+# This is probably a super set of what is actually needed
+# TODO: maybe we should figure out how to re-use deku.nix?
+, eio
+, eio_main
+, zarith
+, ppx_deriving
+, ppx_yojson_conv
+, data-encoding
+, wasm
+, tezos-micheline
+, ppx_deriving_cmdliner
+, mirage-crypto
+, mirage-crypto-ec
+, mirage-crypto-rng
+, digestif
+, tezos-crypto
+, secp256k1-internal
+, piaf
+, cmdliner
+, ppx_blob
+, caqti
+, caqti-driver-sqlite3
+, dream
+, caqti-eio
+, routes
+, ppx_rapper
+, ppx_rapper_eio
+, ezgzip
+, ppx_jane # TODO: do we need this?
+, core
+, core_unix
+, yojson
+, alcotest
 }:
 buildDunePackage rec {
   pname = "deku";
@@ -24,17 +45,59 @@ buildDunePackage rec {
       include = [
         "deku.opam"
         "deku-c/tunac"
+        "deku-c/interpreter"
+        "deku-c/wasm-vm-ocaml"
+        # TODO: why isn't tuna part of the deku build? Seems like we duplicate stuff here.
+        "deku-p/src/core"
         "dune-project"
       ];
+      exclude = [
+        "deku-p/src/core/bin"
+      ];
     };
 
   propagatedBuildInputs = [
+    eio
+    eio_main
     zarith
     ppx_deriving
     ppx_yojson_conv
     data-encoding
     wasm
     tezos-micheline
+    ppx_deriving_cmdliner
+    mirage-crypto
+    mirage-crypto-ec
+    mirage-crypto-rng
+    digestif
+    tezos-micheline
+    tezos-crypto
+    ppx_deriving
+    ppx_yojson_conv
+    zarith
+    digestif
+    mirage-crypto
+    mirage-crypto-ec
+    mirage-crypto-rng
+    secp256k1-internal
+    piaf
+    cmdliner
+    ppx_blob
+    data-encoding
+    caqti
+    caqti-driver-sqlite3
+    ppx_deriving_cmdliner
+    dream
+    eio
+    eio_main
+    caqti-eio
+    routes
+    ppx_rapper
+    ppx_rapper_eio
+    ezgzip
+    ppx_jane # TODO: do we need this?
+    core
+    core_unix
   ];
 
   buildInputs = [
diff --git a/nix/deku-p/deku.nix b/nix/deku-p/deku.nix
index 40603f60a9..4567485325 100644
--- a/nix/deku-p/deku.nix
+++ b/nix/deku-p/deku.nix
@@ -88,6 +88,7 @@ in
           ppx_deriving_cmdliner
           dream
           eio
+          eio_main
           caqti-eio
           routes
           ppx_rapper
diff --git a/website/package.json b/website/package.json
index 32c7432e40..92019541f4 100644
--- a/website/package.json
+++ b/website/package.json
@@ -35,7 +35,6 @@
     "@taquito/michelson-encoder": "^14.0.0",
     "@taquito/remote-signer": "^14.0.0",
     "@taquito/rpc": "^14.0.0",
-    "@taquito/sapling": "^14.0.0",
     "@taquito/signer": "^14.0.0",
     "@taquito/taquito": "^14.0.0",
     "@taquito/tezbridge-wallet": "^14.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0e1bfc0889..b452995223 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4094,9 +4094,19 @@
   version "0.1.12"
   dependencies:
     "@taquito/taquito" "^13.0.1"
+    "@types/bs58check" "^2.1.0"
+    "@types/node" "^18.7.13"
+    "@typescript-eslint/eslint-plugin" "^5.35.1"
+    "@typescript-eslint/parser" "^5.35.1"
     "@tzstamp/helpers" "^0.3.4"
     blakejs "^1.2.1"
     bs58check "^2.1.2"
+    eslint "^8.23.0"
+    rollup "^2.79.1"
+    rollup-plugin-json "^4.0.0"
+    rollup-plugin-sourcemaps "^0.6.3"
+    rollup-plugin-typescript2 "^0.34.0"
+    typescript "^4.7.4"
 
 "@mdx-js/mdx@^1.6.22":
   version "1.6.22"