.github/release-please/manifest.json

@@ -1,7 +1,7 @@
 {
-  "trust-graph": "0.4.11",
+  "trust-graph": "0.4.9",
-  "aqua": "0.4.11",
+  "aqua": "0.4.9",
-  "service": "0.4.11",
+  "service": "0.4.9",
   "keypair": "0.10.4",
-  "distro": "0.4.11"
+  "distro": "0.4.9"
 }

.github/workflows/release.yml

@@ -97,12 +97,6 @@ jobs:
       - run: npm i
         working-directory: aqua
 
-      - name: Setup fcli
-        uses: fluencelabs/setup-fluence@v1
-        with:
-          artifact: fcli
-          version: unstable
-
       - run: npm run build
         working-directory: aqua
 

.github/workflows/tests.yml

@@ -2,11 +2,6 @@ name: Run tests with workflow_call
 
 on:
   workflow_call:
-    inputs:
-      fcli-version:
-        description: "@fluencelabs/cli version"
-        type: string
-        default: "main"
 
 jobs:
   trust-graph:
@@ -56,12 +51,6 @@ jobs:
           cache-dependency-path: "aqua/package-lock.json"
           cache: "npm"
 
-      - name: Setup fcli
-        uses: fluencelabs/setup-fluence@v1
-        with:
-          artifact: fcli
-          version: ${{ inputs.fcli-version }}
-
       - run: npm i
         working-directory: aqua
 

Cargo.lock

@@ -3019,7 +3019,7 @@ dependencies = [
 
 [[package]]
 name = "trust-graph"
-version = "0.4.11"
+version = "0.4.9"
 dependencies = [
  "bs58 0.4.0",
  "derivative",
@@ -3036,7 +3036,7 @@ dependencies = [
 
 [[package]]
 name = "trust-graph-distro"
-version = "0.4.11"
+version = "0.4.9"
 dependencies = [
  "built",
  "lazy_static",
@@ -3047,7 +3047,7 @@ dependencies = [
 
 [[package]]
 name = "trust-graph-wasm"
-version = "0.4.11"
+version = "0.4.9"
 dependencies = [
  "anyhow",
  "bincode",

admin/aqua/export.aqua

@@ -1,25 +1,19 @@
-aqua Admin
+import "@fluencelabs/trust-graph/trust-graph.aqua"
-
-export timestamp_sec, get_trust_bytes, issue_trust
 export get_trust_bytes, issue_trust
 
-import "@fluencelabs/trust-graph/trust-graph.aqua"
 import "@fluencelabs/aqua-lib/builtin.aqua"
 
 func timestamp_sec(node: string) -> u64:
     on node:
         result <- Peer.timestamp_sec()
-
     <- result
 
 func get_trust_bytes(node: string, issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64) -> GetTrustBytesResult:
     on node:
         result <- TrustGraph.get_trust_bytes(issued_for_peer_id, expires_at_sec, issued_at_sec)
-    
     <- result
 
 func issue_trust(node: string, issued_for_peer_id: string, expires_at_sec: u64, issued_at_sec: u64, trust_bytes: []u8) ->IssueTrustResult:
     on node:
         result <- TrustGraph.issue_trust(issued_for_peer_id, expires_at_sec, issued_at_sec, trust_bytes)
-    
     <- result

admin/package.json

@@ -4,7 +4,7 @@
   "description": "A simple example of how to use trust-graph in TS",
   "main": "index.js",
   "scripts": {
-    "compile-aqua": "fluence aqua -i aqua -o generated",
+    "compile-aqua": "aqua -i aqua -o generated",
     "prebuild": "npm run compile-aqua",
     "build": "tsc",
     "start": "node dist/index.js",
@@ -13,7 +13,8 @@
   "author": "Fluence Labs",
   "license": "MIT",
   "dependencies": {
-    "@fluencelabs/aqua-lib": "^0.9.0",
+    "@fluencelabs/aqua": "^0.10.0",
+    "@fluencelabs/aqua-lib": "^0.6.0",
     "@fluencelabs/fluence": "^0.27.5",
     "@fluencelabs/fluence-network-environment": "^1.1.2",
     "@fluencelabs/trust-graph": "file:../aqua",

aqua/CHANGELOG.md

@@ -1,24 +1,5 @@
 # Changelog
 
-## [0.4.11](https://github.com/fluencelabs/trust-graph/compare/trust-graph-api-v0.4.10...trust-graph-api-v0.4.11) (2024-01-17)
-
-
-### Miscellaneous Chores
-
-* **trust-graph-api:** Synchronize trust-graph, wasm and api versions
-
-## [0.4.10](https://github.com/fluencelabs/trust-graph/compare/trust-graph-api-v0.4.9...trust-graph-api-v0.4.10) (2024-01-03)
-
-
-### Features
-
-* **trust-graph:** Update aqua code ([#141](https://github.com/fluencelabs/trust-graph/issues/141)) ([175e51d](https://github.com/fluencelabs/trust-graph/commit/175e51d5db4d90dc6d884ce3113d68494da334a2))
-
-
-### Bug Fixes
-
-* **trust-graph:** Revert release 0.4.10 ([#153](https://github.com/fluencelabs/trust-graph/issues/153)) ([b263ce1](https://github.com/fluencelabs/trust-graph/commit/b263ce1fb13b937b629608ede35b6f436023dcac))
-
 ## [0.4.9](https://github.com/fluencelabs/trust-graph/compare/trust-graph-api-v0.4.8...trust-graph-api-v0.4.9) (2023-12-28)
 
 

aqua/labelling.aqua

@@ -1,7 +1,3 @@
-aqua Labelling declares *
-
-export isFluencePeer
-
 import "misc.aqua"
 import get_host_certs_from from "trust-graph-api.aqua"
 
@@ -24,7 +20,7 @@ func isFluencePeer() -> ?bool, ?Error:
     fluence_root_peer_id = "12D3KooWNbZKaPWRZ8wgjGvrxdJFz9Fq5uVwkR6ERV1f74HhPdyB"
     label_peer_id = "12D3KooWM45u7AQxsb4MuQJNYT3NWHHMLU7JTbBV66RTfF3KSzdR"
 
-    result: *bool
+    result: ?bool
     error: *Error
     -- get all certs issued by `label_peer_id` to current host
     certs_result <- get_host_certs_from(label_peer_id)
@@ -36,9 +32,8 @@ func isFluencePeer() -> ?bool, ?Error:
                 if cert.chain!0.issued_for == fluence_root_peer_id:
                     if cert.chain!1.issued_for == label_peer_id:
                         result <<- true
-        if result == []:
+        if result == nil:
             result <<- false
     else:
         error <<- certs_result.error
-
     <- result, error

aqua/misc.aqua

@@ -1,5 +1,3 @@
-aqua Misc declares *
-
 import "trust-graph.aqua"
 
 alias Error: string

aqua/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@fluencelabs/trust-graph",
-  "version": "0.4.11",
+  "version": "0.4.9",
   "description": "Aqua Trust Graph API library",
   "files": [
     "*.aqua"
   ],
   "dependencies": {
-    "@fluencelabs/aqua-lib": "^0.9.0"
+    "@fluencelabs/aqua-lib": "^0.7.0"
   },
   "scripts": {
     "generate-aqua": "../service/build.sh",
-    "compile-aqua": "fluence aqua -i . -o ./target/typescript",
+    "compile-aqua": "aqua -i . -o ./target/typescript",
     "build": "npm run compile-aqua"
   },
   "repository": {
@@ -29,5 +29,8 @@
   "bugs": {
     "url": "https://github.com/fluencelabs/trust-graph/issues"
   },
-  "homepage": "https://github.com/fluencelabs/trust-graph#readme"
+  "homepage": "https://github.com/fluencelabs/trust-graph#readme",
+  "devDependencies": {
+    "@fluencelabs/aqua": "^0.10.3"
+  }
 }

aqua/trust-graph-api.aqua

@@ -1,12 +1,3 @@
-aqua TrustGraphApi declares *
-
-export set_root, issue_trust, import_trust
-export add_trust, add_root_trust, verify_trust
-export get_weight, get_weight_from, issue_revocation
-export import_revocation, revoke, get_host_certs_from
-export get_all_certs, get_all_certs_from, get_host_certs
-export insert_cert
-
 import Sig, Peer, PeerId from "@fluencelabs/aqua-lib/builtin.aqua"
 import "misc.aqua"
 import "trust-graph.aqua"
@@ -33,7 +24,7 @@ func issue_trust(issuer: PeerId, issued_for: PeerId, expires_at_sec: u64) -> ?Tr
         issued_at_sec <- Peer.timestamp_sec()
         bytes <- TrustGraph.get_trust_bytes(issued_for, expires_at_sec, issued_at_sec)
 
-    result: *Trust
+    result: ?Trust
     error: *Error
     if bytes.success:
         Sig issuer
@@ -50,7 +41,6 @@ func issue_trust(issuer: PeerId, issued_for: PeerId, expires_at_sec: u64) -> ?Tr
             error <<- sig_res.error!
     else:
         error <<- bytes.error
-
     <- result, error
 
 -- Call context: any node with registered `trust-graph` service
@@ -61,9 +51,8 @@ func import_trust(trust: Trust, issuer: PeerId) -> ?Error:
     error: *Error
     timestamp_sec <- Peer.timestamp_sec()
     add_result <- TrustGraph.add_trust(trust, issuer, timestamp_sec)
-    if !add_result.success:
+    if add_result.success != true:
         error <<- add_result.error
-
     <- error
 
 -- Call context: %init_peer_id%
@@ -81,7 +70,6 @@ func add_trust(node: PeerId, issuer: PeerId, issued_for: PeerId, expires_at_sec:
         on node:
             import_error <- import_trust(trust!, issuer)
             append_error(error, import_error)
-
     <- error
 
 -- Call context: %init_peer_id%
@@ -111,7 +99,6 @@ func add_root_trust(node: PeerId, peer_id: PeerId, max_chain_len: u32, expires_a
 func verify_trust(trust: Trust, issuer: PeerId) -> VerifyTrustResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.verify_trust(trust, issuer, timestamp_sec)
-
     <- result
 
 -- Call context: any node with registered `trust-graph` service
@@ -120,7 +107,6 @@ func verify_trust(trust: Trust, issuer: PeerId) -> VerifyTrustResult:
 func get_weight(peer_id: PeerId) -> WeightResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.get_weight(peer_id, timestamp_sec)
-
     <- result
 
 -- Call context: any node with registered `trust-graph` service
@@ -128,7 +114,6 @@ func get_weight(peer_id: PeerId) -> WeightResult:
 func get_weight_from(peer_id: PeerId, issuer: PeerId) -> WeightResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.get_weight_from(peer_id, issuer, timestamp_sec)
-
     <- result
 
 -- Call context: %init_peer_id%
@@ -142,7 +127,7 @@ func issue_revocation(revoked_by: PeerId, revoked: PeerId) -> ?Revocation, ?Erro
         issued_at_sec <- Peer.timestamp_sec()
         bytes <- TrustGraph.get_revocation_bytes(revoked, issued_at_sec)
 
-    result: *Revocation
+    result: ?Revocation
     error: *Error
     if bytes.success:
         Sig revoked_by
@@ -160,7 +145,6 @@ func issue_revocation(revoked_by: PeerId, revoked: PeerId) -> ?Revocation, ?Erro
             error <<- sig_res.error!
     else:
         error <<- bytes.error
-
     <- result, error
 
 -- Call context: any node with registered `trust-graph` service
@@ -171,7 +155,7 @@ func import_revocation(revocation: Revocation) -> ?Error:
     error: *Error
     timestamp_sec <- Peer.timestamp_sec()
     add_result <- TrustGraph.revoke(revocation, timestamp_sec)
-    if !add_result.success:
+    if add_result.success != true:
         error <<- add_result.error
 
     <- error
@@ -192,7 +176,6 @@ func revoke(node: PeerId, revoked_by: PeerId, revoked: PeerId) -> ?Error:
         on node:
            import_error <- import_revocation(revocation!)
            append_error(error, import_error)
-
     <- error
 
 -- Call context: any node with registered `trust-graph` service
@@ -200,7 +183,6 @@ func revoke(node: PeerId, revoked_by: PeerId, revoked: PeerId) -> ?Error:
 func get_host_certs_from(issuer: PeerId) -> AllCertsResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.get_host_certs_from(issuer, timestamp_sec)
-
     <- result
 
 -- Call context: any node with registered `trust-graph` service
@@ -208,7 +190,6 @@ func get_host_certs_from(issuer: PeerId) -> AllCertsResult:
 func get_all_certs(issued_for: PeerId) -> AllCertsResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.get_all_certs(issued_for, timestamp_sec)
-
     <- result
 
 -- Call context: any node with registered `trust-graph` service
@@ -216,7 +197,6 @@ func get_all_certs(issued_for: PeerId) -> AllCertsResult:
 func get_all_certs_from(issued_for: PeerId, issuer: PeerId) -> AllCertsResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.get_all_certs_from(issued_for, issuer, timestamp_sec)
-
     <- result
 
 -- Call context: any node with registered `trust-graph` service
@@ -224,7 +204,6 @@ func get_all_certs_from(issued_for: PeerId, issuer: PeerId) -> AllCertsResult:
 func get_host_certs() -> AllCertsResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.get_host_certs(timestamp_sec)
-
     <- result
 
 -- Call context: any node with registered `trust-graph` service
@@ -232,5 +211,4 @@ func get_host_certs() -> AllCertsResult:
 func insert_cert(certificate: Certificate) -> InsertResult:
     timestamp_sec <- Peer.timestamp_sec()
     result <- TrustGraph.insert_cert(certificate, timestamp_sec)
-    
     <- result

aqua/trust-graph.aqua

@@ -1,4 +1,4 @@
-aqua TrustGraph declares *
+module TrustGraph declares *
 
 data AddTrustResult:
   success: bool

distro/CHANGELOG.md

@@ -1,19 +1,5 @@
 # Changelog
 
-## [0.4.11](https://github.com/fluencelabs/trust-graph/compare/distro-v0.4.10...distro-v0.4.11) (2024-01-17)
-
-
-### Miscellaneous Chores
-
-* **distro:** Synchronize trust-graph, wasm and api versions
-
-## [0.4.10](https://github.com/fluencelabs/trust-graph/compare/distro-v0.4.9...distro-v0.4.10) (2024-01-03)
-
-
-### Bug Fixes
-
-* **trust-graph:** Revert release 0.4.10 ([#153](https://github.com/fluencelabs/trust-graph/issues/153)) ([b263ce1](https://github.com/fluencelabs/trust-graph/commit/b263ce1fb13b937b629608ede35b6f436023dcac))
-
 ## [0.4.9](https://github.com/fluencelabs/trust-graph/compare/distro-v0.4.8...distro-v0.4.9) (2023-12-28)
 
 

distro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trust-graph-distro"
-version = "0.4.11"
+version = "0.4.9"
 edition = "2021"
 build = "build.rs"
 license = "Apache-2.0"

example/aqua/computation.aqua

@@ -1,4 +1,3 @@
-aqua Computation
 
 import "@fluencelabs/trust-graph/trust-graph-api.aqua"
 import "@fluencelabs/trust-graph/trust-graph.aqua"
@@ -13,21 +12,20 @@ service TrustedComputation("op"):
     identity(s: u64) -> u64
 
 func trusted_computation(node: string) -> ?u64, ?string:
-    result: *u64
+    result: ?u64
-    error: *string
+    error: ?string
     -- on our trusted relay
     on HOST_PEER_ID:
         -- get all certificates issued for given node by our client's peer id
-        certs_result <- get_all_certs_from(node, INIT_PEER_ID)
+        certs_result <- get_all_certs_from(node, %init_peer_id%)
         if certs_result.success:
             len <- CertOp.array_length(certs_result.certificates)
         -- if there is any certificate node is trusted and computation is possible
-            if len != 0:
+           if len != 0:
                 on node:
                     result <- TrustedComputation.identity(5)
             else:
                 error <<- "there is no certs for this peer"
         else:
             error <<- certs_result.error
-
     <- result, error

example/aqua/export.aqua

@@ -1,14 +1,11 @@
-aqua  Export
+module Export
-
 import add_root_trust, add_trust, revoke from "@fluencelabs/trust-graph/trust-graph-api.aqua"
-import Peer from "@fluencelabs/aqua-lib/builtin.aqua"
-
 export add_root_trust, add_trust, revoke, timestamp_sec
+import Peer from "@fluencelabs/aqua-lib/builtin.aqua"
 
 alias PeerId: string
 
 func timestamp_sec() -> u64:
     on HOST_PEER_ID:
         result <- Peer.timestamp_sec()
-
     <- result

example/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@fluencelabs/aqua-lib": "^0.9.0",
+        "@fluencelabs/aqua-lib": "^0.6.0",
         "@fluencelabs/fluence": "^0.23.0",
         "@fluencelabs/fluence-network-environment": "^1.1.2",
         "@fluencelabs/trust-graph": "3.1.2",
@@ -759,9 +759,9 @@
       "dev": true
     },
     "node_modules/@fluencelabs/aqua-lib": {
-      "version": "0.9.0",
+      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.9.0.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.6.0.tgz",
-      "integrity": "sha512-V0xhc0UXBF6kjfL9Y/agWGQuW+ie2zckj37KWv8Dq4teYuo9N94O4Ynm7XULWHaaWtbWvzFcDcc6nc9qG7gxcQ=="
+      "integrity": "sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw=="
     },
     "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": {
       "version": "0.6.0",
@@ -9775,9 +9775,9 @@
       }
     },
     "@fluencelabs/aqua-lib": {
-      "version": "0.9.0",
+      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.9.0.tgz",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.6.0.tgz",
-      "integrity": "sha512-V0xhc0UXBF6kjfL9Y/agWGQuW+ie2zckj37KWv8Dq4teYuo9N94O4Ynm7XULWHaaWtbWvzFcDcc6nc9qG7gxcQ=="
+      "integrity": "sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw=="
     },
     "@fluencelabs/avm": {
       "version": "0.24.2",

example/package.json

@@ -4,7 +4,7 @@
   "description": "A simple example of how to use trust-graph in TS",
   "main": "index.js",
   "scripts": {
-    "compile-aqua": "fluence aqua -i aqua -o generated",
+    "compile-aqua": "aqua -i aqua -o generated",
     "prebuild": "npm run compile-aqua",
     "build": "tsc",
     "start": "node dist/index.js",
@@ -13,7 +13,7 @@
   "author": "Fluence Labs",
   "license": "MIT",
   "dependencies": {
-    "@fluencelabs/aqua-lib": "^0.9.0",
+    "@fluencelabs/aqua-lib": "^0.6.0",
     "@fluencelabs/fluence": "^0.23.0",
     "@fluencelabs/fluence-network-environment": "^1.1.2",
     "@fluencelabs/trust-graph": "3.1.2",

service/CHANGELOG.md

@@ -9,34 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     * trust-graph bumped from 0.4.1 to 0.4.2
     * fluence-keypair bumped from 0.10.0 to 0.10.1
 
-## [0.4.11](https://github.com/fluencelabs/trust-graph/compare/trust-graph-wasm-v0.4.10...trust-graph-wasm-v0.4.11) (2024-01-17)
-
-
-### Bug Fixes
-
-* **trust-graph:** Regenerate aqua bindings from wasm ([#155](https://github.com/fluencelabs/trust-graph/issues/155)) ([fd145c5](https://github.com/fluencelabs/trust-graph/commit/fd145c5fe1a115e87539ec5c9496d8b4c8bbc468))
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * trust-graph bumped from 0.4.10 to 0.4.11
-
-## [0.4.10](https://github.com/fluencelabs/trust-graph/compare/trust-graph-wasm-v0.4.9...trust-graph-wasm-v0.4.10) (2024-01-03)
-
-
-### Bug Fixes
-
-* **trust-graph:** Revert release 0.4.10 ([#153](https://github.com/fluencelabs/trust-graph/issues/153)) ([b263ce1](https://github.com/fluencelabs/trust-graph/commit/b263ce1fb13b937b629608ede35b6f436023dcac))
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * trust-graph bumped from 0.4.9 to 0.4.10
-
 ## [0.4.9](https://github.com/fluencelabs/trust-graph/compare/trust-graph-wasm-v0.4.8...trust-graph-wasm-v0.4.9) (2023-12-28)
 
 

service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trust-graph-wasm"
-version = "0.4.11"
+version = "0.4.9"
 authors = ["Fluence Labs"]
 edition = "2021"
 description = "trust graph wasm"
@@ -12,7 +12,7 @@ name = "trust-graph"
 path = "src/main.rs"
 
 [dependencies]
-trust-graph = { version = "0.4.11", path = "../trust-graph" }
+trust-graph = { version = "0.4.9", path = "../trust-graph" }
 fluence-keypair = { version = "0.10.4", path = "../keypair" }
 marine-rs-sdk = { version = "0.10.2", features = ["logger"] }
 marine-sqlite-connector = "0.9.2"

service/build.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
-
 set -o errexit -o nounset -o pipefail
-set -x
 
 # set current working directory to script directory to run script from everywhere
 cd "$(dirname "$0")"

trust-graph/CHANGELOG.md

@@ -4,20 +4,6 @@
   * dependencies
     * fluence-keypair bumped from 0.10.0 to 0.10.1
 
-## [0.4.11](https://github.com/fluencelabs/trust-graph/compare/trust-graph-v0.4.10...trust-graph-v0.4.11) (2024-01-17)
-
-
-### Miscellaneous Chores
-
-* **trust-graph:** Synchronize trust-graph, wasm and api versions
-
-## [0.4.10](https://github.com/fluencelabs/trust-graph/compare/trust-graph-v0.4.9...trust-graph-v0.4.10) (2024-01-03)
-
-
-### Bug Fixes
-
-* **trust-graph:** Revert release 0.4.10 ([#153](https://github.com/fluencelabs/trust-graph/issues/153)) ([b263ce1](https://github.com/fluencelabs/trust-graph/commit/b263ce1fb13b937b629608ede35b6f436023dcac))
-
 ## [0.4.9](https://github.com/fluencelabs/trust-graph/compare/trust-graph-v0.4.8...trust-graph-v0.4.9) (2023-12-28)
 
 

trust-graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trust-graph"
-version = "0.4.11"
+version = "0.4.9"
 authors = ["Fluence Labs"]
 edition = "2021"
 description = "trust graph"