CI: pack builtin-service with generated .wasm and scheduled scripts (#57)

.github/workflows/release.yml

@@ -78,9 +78,7 @@ jobs:
 
       - name: Create builtin distribution package
         run: |
-          mv builtin-package aqua-dht
-          tar -f aqua-dht.tar.gz -zcv ./aqua-dht
-          mv aqua-dht builtin-package
+          ./builtin-package/package.sh
 
       - name: Build Changelog
         id: changelog

.gitignore

@@ -1,4 +1,7 @@
 service/target
+builtin-package/*.wasm
+builtin-package/scheduled/*.air
+aqua-dht.tar.gz
 
 **/*.rs.bk
 **/.idea

aqua/dht-scheduled-scripts.aqua

@@ -1,5 +1,7 @@
 module Aqua.DHT.Scheduled declares *
 
+export clearExpired_86400, replicate_3600
+
 import "dht.aqua"
 import "@fluencelabs/aqua-lib/builtin.aqua"
 

builtin-package/package.sh

@@ -11,8 +11,6 @@ SCHEDULED="${SCRIPT_DIR}/scheduled"
     cd ../aqua
     npx aqua --no-relay --air -i ./dht-scheduled-scripts.aqua -o "$SCHEDULED"
 )
-# mv "${SCHEDULED}/dht-scheduled-scripts.clearExpired.air" "clearExpired_86400.air"
-# mv "${SCHEDULED}/dht-scheduled-scripts.replicate.air" "replicate_3600.air"
 
 (
     echo "*** copy wasm files ***"
@@ -20,4 +18,12 @@ SCHEDULED="${SCRIPT_DIR}/scheduled"
     cp artifacts/*.wasm "$SCRIPT_DIR"
 )
 
+(
+    echo "*** create builtin distribution package ***"
+    cd ..
+    mv builtin-package aqua-dht
+    tar --exclude="package.sh" -f aqua-dht.tar.gz -zcv ./aqua-dht
+    mv aqua-dht builtin-package
+)
+
 echo "*** done ***"

builtin-package/scheduled/dht-scheduled-scripts.clearExpired_86400.air

@@ -1,10 +0,0 @@
-(xor
- (xor
-  (seq
-   (call %init_peer_id% ("peer" "timestamp_sec") [] t)
-   (call %init_peer_id% ("aqua-dht" "clear_expired") [t])
-  )
-  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
- )
- (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
-)

builtin-package/scheduled/dht-scheduled-scripts.replicate_3600.air

@@ -1,35 +0,0 @@
-(xor
- (xor
-  (seq
-   (seq
-    (call %init_peer_id% ("peer" "timestamp_sec") [] t)
-    (call %init_peer_id% ("aqua-dht" "evict_stale") [t] res)
-   )
-   (fold res.$.results! r
-    (par
-     (seq
-      (seq
-       (call %init_peer_id% ("op" "string_to_b58") [r.$.key.key!] k)
-       (call %init_peer_id% ("kad" "neighborhood") [k $nil $nil] nodes)
-      )
-      (fold nodes n
-       (par
-        (xor
-         (seq
-          (call n ("aqua-dht" "republish_key") [r.$.key! t])
-          (call n ("aqua-dht" "republish_values") [r.$.key.key! r.$.records! t])
-         )
-         (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-        )
-        (next n)
-       )
-      )
-     )
-     (next r)
-    )
-   )
-  )
-  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
- )
- (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
-)