chore: release master (#128 )

chore(deps): update dependency bs58 to v5 (#122 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-07-04 00:51:41 +00:00 · 2023-12-25 17:42:20 +03:00 · 2023-12-20 14:23:52 -03:00 · 2023-12-20 14:23:29 -03:00 · 2023-12-20 14:22:43 -03:00 · 2023-10-10 15:01:07 +02:00
30 changed files with 1179 additions and 714 deletions
--- a/.github/release-please/manifest.json
+++ b/.github/release-please/manifest.json
@ -1,7 +1,7 @@
 {
-  "trust-graph": "0.4.7",
-  "aqua": "0.4.7",
-  "service": "0.4.7",
-  "keypair": "0.10.3",
-  "distro": "0.4.7"
+  "trust-graph": "0.4.8",
+  "aqua": "0.4.8",
+  "service": "0.4.8",
+  "keypair": "0.10.4",
+  "distro": "0.4.8"
 }
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -105,45 +105,6 @@ jobs:
        run: npm publish --access public
        working-directory: aqua

-      - name: Install ipfs
-        uses: nahsi/setup-ipfs@v1
-
-      - name: Create builtin distribution package
-        if: needs.release-please.outputs.trust-graph-release-created
-        run: ./builtin-package/package.sh
-
-      - name: Calculate SHA256
-        if: needs.release-please.outputs.trust-graph-release-created
-        id: sha
-        run: |
-          # Calculate sha256
-          du -hs trust-graph.tar.gz
-          sha256sum trust-graph.tar.gz
-          sha=($(sha256sum trust-graph.tar.gz))
-          echo "sha256=${sha}" >> $GITHUB_OUTPUT
-
-      - name: Upload trust-graph package
-        if: needs.release-please.outputs.trust-graph-release-created
-        uses: softprops/action-gh-release@v1
-        with:
-          files: trust-graph.tar.gz
-          tag_name: ${{ needs.release-please.outputs.trust-graph-tag-name }}
-
-      - name: Update version in node-distro repo
-        if: needs.release-please.outputs.trust-graph-release-created
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: update_service
-          repo: fluencelabs/node-distro
-          ref: "main"
-          token: ${{ secrets.PERSONAL_TOKEN }}
-          inputs: '{
-            "name": "trust-graph",
-            "version": "${{ needs.release-please.outputs.trust-graph-version }}",
-            "url": "https://github.com/fluencelabs/trust-graph/releases/download/${{ needs.release-please.outputs.trust-graph-tag-name }}/trust-graph.tar.gz",
-            "sha256": "${{ steps.sha.outputs.sha256 }}"
-          }'
-
  slack:
    if: always()
    name: "Notify"
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -21,6 +21,8 @@ jobs:

      - name: Setup marine
        uses: fluencelabs/setup-marine@v1
+        with:
+          artifact-name: marine

      - name: Build
        run: ./build.sh
@ -31,11 +33,8 @@ jobs:
          command: clippy
          args: -Z unstable-options --all

-      - name: Install cargo-nextest
-        uses: baptiste0928/cargo-install@v1.3.0
-        with:
-          crate: cargo-nextest
-          version: 0.9.22
+      - name: Setup nextest
+        uses: taiki-e/install-action@nextest

      - name: Run cargo nextest
        env:
@ -57,15 +56,3 @@ jobs:

      - run: npm run build
        working-directory: aqua
-
-      - name: Install ipfs
-        uses: nahsi/setup-ipfs@v1
-
-      - name: Create distribution package
-        run: ./builtin-package/package.sh
-
-      - name: Upload trust-graph
-        uses: actions/upload-artifact@v3
-        with:
-          name: trust-graph
-          path: trust-graph.tar.gz
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@ -14,7 +14,7 @@
        "@fluencelabs/fluence": "^0.27.5",
        "@fluencelabs/fluence-network-environment": "^1.0.13",
        "@fluencelabs/trust-graph": "file:../aqua",
-        "bs58": "^4.0.1"
+        "bs58": "^5.0.0"
      },
      "devDependencies": {
        "typescript": "^4.4.3"
@ -22,7 +22,7 @@
    },
    "../aqua": {
      "name": "@fluencelabs/trust-graph",
-      "version": "0.4.6",
+      "version": "0.4.7",
      "license": "MIT",
      "dependencies": {
        "@fluencelabs/aqua-lib": "^0.7.0"
@ -758,19 +758,6 @@
        "pnpm": ">=3"
      }
    },
-    "node_modules/@fluencelabs/aqua/node_modules/base-x": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
-    },
-    "node_modules/@fluencelabs/aqua/node_modules/bs58": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
-      "dependencies": {
-        "base-x": "^4.0.0"
-      }
-    },
    "node_modules/@fluencelabs/avm": {
      "version": "0.31.10",
      "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.31.10.tgz",
@ -849,19 +836,6 @@
      "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz",
      "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA=="
    },
-    "node_modules/@fluencelabs/fluence/node_modules/base-x": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
-    },
-    "node_modules/@fluencelabs/fluence/node_modules/bs58": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
-      "dependencies": {
-        "base-x": "^4.0.0"
-      }
-    },
    "node_modules/@fluencelabs/interfaces": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/@fluencelabs/interfaces/-/interfaces-0.1.0.tgz",
@ -1947,11 +1921,9 @@
      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
    },
    "node_modules/base-x": {
-      "version": "3.0.8",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
+      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
    },
    "node_modules/base64-js": {
      "version": "1.5.1",
@ -2128,10 +2100,11 @@
      }
    },
    "node_modules/bs58": {
-      "version": "4.0.1",
-      "license": "MIT",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
+      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
      "dependencies": {
-        "base-x": "^3.0.2"
+        "base-x": "^4.0.0"
      }
    },
    "node_modules/bser": {
@ -8027,19 +8000,6 @@
            "ts-pattern": "3.3.3",
            "uuid": "8.3.2"
          }
-        },
-        "base-x": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-          "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
-        },
-        "bs58": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-          "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
-          "requires": {
-            "base-x": "^4.0.0"
-          }
        }
      }
    },
@ -8118,21 +8078,6 @@
        "rxjs": "^7.5.5",
        "ts-pattern": "3.3.3",
        "uuid": "8.3.2"
-      },
-      "dependencies": {
-        "base-x": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-          "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
-        },
-        "bs58": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-          "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
-          "requires": {
-            "base-x": "^4.0.0"
-          }
-        }
      }
    },
    "@fluencelabs/fluence-network-environment": {
@ -9075,10 +9020,9 @@
      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
    },
    "base-x": {
-      "version": "3.0.8",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
+      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
    },
    "base64-js": {
      "version": "1.5.1",
@ -9207,9 +9151,11 @@
      }
    },
    "bs58": {
-      "version": "4.0.1",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
+      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
      "requires": {
-        "base-x": "^3.0.2"
+        "base-x": "^4.0.0"
      }
    },
    "bser": {
--- a/admin/package.json
+++ b/admin/package.json
@ -18,7 +18,7 @@
    "@fluencelabs/fluence": "^0.27.5",
    "@fluencelabs/fluence-network-environment": "^1.0.13",
    "@fluencelabs/trust-graph": "file:../aqua",
-    "bs58": "^4.0.1"
+    "bs58": "^5.0.0"
  },
  "devDependencies": {
    "typescript": "^4.4.3"
--- a/aqua/CHANGELOG.md
+++ b/aqua/CHANGELOG.md
@ -1,5 +1,12 @@
 # Changelog

+## [0.4.8](https://github.com/fluencelabs/trust-graph/compare/trust-graph-api-v0.4.7...trust-graph-api-v0.4.8) (2023-12-20)
+
+
+### Miscellaneous Chores
+
+* **trust-graph-api:** Synchronize trust-graph, wasm and api versions
+
 ## [0.4.7](https://github.com/fluencelabs/trust-graph/compare/trust-graph-api-v0.4.6...trust-graph-api-v0.4.7) (2023-07-04)


--- a/aqua/package-lock.json
+++ b/aqua/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "@fluencelabs/trust-graph",
-  "version": "0.4.7",
+  "version": "0.4.8",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@fluencelabs/trust-graph",
-      "version": "0.4.7",
+      "version": "0.4.8",
      "license": "MIT",
      "dependencies": {
        "@fluencelabs/aqua-lib": "^0.7.0"
--- a/aqua/package.json
+++ b/aqua/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fluencelabs/trust-graph",
-  "version": "0.4.7",
+  "version": "0.4.8",
  "description": "Aqua Trust Graph API library",
  "files": [
    "*.aqua"
--- a/distro/CHANGELOG.md
+++ b/distro/CHANGELOG.md
@ -1,5 +1,12 @@
 # Changelog

+## [0.4.8](https://github.com/fluencelabs/trust-graph/compare/distro-v0.4.7...distro-v0.4.8) (2023-12-20)
+
+
+### Features
+
+* update marine sdk's, configs and sqlite connector ([#129](https://github.com/fluencelabs/trust-graph/issues/129)) ([0b66f4e](https://github.com/fluencelabs/trust-graph/commit/0b66f4e0536633879de46f69ac8391c72ece7e77))
+
 ## [0.4.7](https://github.com/fluencelabs/trust-graph/compare/distro-v0.4.6...distro-v0.4.7) (2023-07-04)


--- a/distro/Cargo.toml
+++ b/distro/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "trust-graph-distro"
-version = "0.4.7"
+version = "0.4.8"
 edition = "2021"
 build = "build.rs"
 license = "Apache-2.0"
--- a/distro/Config.toml
+++ b/distro/Config.toml
@ -1,4 +1,5 @@
 modules_dir = "."
+total_memory_limit = "Infinity"

 [[module]]
    name = "sqlite3"
--- a/example/package-lock.json
+++ b/example/package-lock.json
@ -13,7 +13,7 @@
        "@fluencelabs/fluence": "^0.23.0",
        "@fluencelabs/fluence-network-environment": "^1.0.10",
        "@fluencelabs/trust-graph": "3.1.2",
-        "bs58": "^4.0.1"
+        "bs58": "^5.0.0"
      },
      "devDependencies": {
        "@fluencelabs/aqua": "^0.10.0",
@ -752,6 +752,12 @@
        "@fluencelabs/aqua-lib": "^0.5.2"
      }
    },
+    "node_modules/@fluencelabs/aqua-ipfs/node_modules/@fluencelabs/aqua-lib": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.5.2.tgz",
+      "integrity": "sha512-fmoFFE8myhLH9d+YR0+0ZPL2YIQyR6M1woAGu5d1xXI02Sjzn4id6dE4PpxHb8cSBPRie8AwsKobHCNqGxI8oA==",
+      "dev": true
+    },
    "node_modules/@fluencelabs/aqua-lib": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.6.0.tgz",
@ -823,21 +829,6 @@
      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
      "dev": true
    },
-    "node_modules/@fluencelabs/aqua/node_modules/base-x": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==",
-      "dev": true
-    },
-    "node_modules/@fluencelabs/aqua/node_modules/bs58": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
-      "dev": true,
-      "dependencies": {
-        "base-x": "^4.0.0"
-      }
-    },
    "node_modules/@fluencelabs/aqua/node_modules/buffer": {
      "version": "6.0.3",
      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@ -1332,6 +1323,14 @@
      "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz",
      "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA=="
    },
+    "node_modules/@fluencelabs/fluence/node_modules/bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+      "dependencies": {
+        "base-x": "^3.0.2"
+      }
+    },
    "node_modules/@fluencelabs/fluence/node_modules/buffer": {
      "version": "6.0.3",
      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@ -1477,6 +1476,11 @@
        "@fluencelabs/aqua-lib": "^0.5.2"
      }
    },
+    "node_modules/@fluencelabs/trust-graph/node_modules/@fluencelabs/aqua-lib": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.5.2.tgz",
+      "integrity": "sha512-fmoFFE8myhLH9d+YR0+0ZPL2YIQyR6M1woAGu5d1xXI02Sjzn4id6dE4PpxHb8cSBPRie8AwsKobHCNqGxI8oA=="
+    },
    "node_modules/@istanbuljs/load-nyc-config": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@ -2754,12 +2758,18 @@
      }
    },
    "node_modules/bs58": {
-      "version": "4.0.1",
-      "license": "MIT",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
+      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
      "dependencies": {
-        "base-x": "^3.0.2"
+        "base-x": "^4.0.0"
      }
    },
+    "node_modules/bs58/node_modules/base-x": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
+      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
+    },
    "node_modules/bser": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
@ -9611,21 +9621,6 @@
          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
          "dev": true
        },
-        "base-x": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-          "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==",
-          "dev": true
-        },
-        "bs58": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-          "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
-          "dev": true,
-          "requires": {
-            "base-x": "^4.0.0"
-          }
-        },
        "buffer": {
          "version": "6.0.3",
          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@ -9757,6 +9752,14 @@
      "dev": true,
      "requires": {
        "@fluencelabs/aqua-lib": "^0.5.2"
+      },
+      "dependencies": {
+        "@fluencelabs/aqua-lib": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.5.2.tgz",
+          "integrity": "sha512-fmoFFE8myhLH9d+YR0+0ZPL2YIQyR6M1woAGu5d1xXI02Sjzn4id6dE4PpxHb8cSBPRie8AwsKobHCNqGxI8oA==",
+          "dev": true
+        }
      }
    },
    "@fluencelabs/aqua-lib": {
@ -10047,6 +10050,14 @@
        "uuid": "8.3.0"
      },
      "dependencies": {
+        "bs58": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+          "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+          "requires": {
+            "base-x": "^3.0.2"
+          }
+        },
        "buffer": {
          "version": "6.0.3",
          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@ -10156,6 +10167,13 @@
      "integrity": "sha512-HpyHtiomh09wv6/83z+bhbkqVngIUdqNGEXRTIPg4sArVPMZ9UCXBrkQsHDRqdMUx0lBAcgB3IjlbdhkwHGaXA==",
      "requires": {
        "@fluencelabs/aqua-lib": "^0.5.2"
+      },
+      "dependencies": {
+        "@fluencelabs/aqua-lib": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.5.2.tgz",
+          "integrity": "sha512-fmoFFE8myhLH9d+YR0+0ZPL2YIQyR6M1woAGu5d1xXI02Sjzn4id6dE4PpxHb8cSBPRie8AwsKobHCNqGxI8oA=="
+        }
      }
    },
    "@istanbuljs/load-nyc-config": {
@ -11208,9 +11226,18 @@
      }
    },
    "bs58": {
-      "version": "4.0.1",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
+      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
      "requires": {
-        "base-x": "^3.0.2"
+        "base-x": "^4.0.0"
+      },
+      "dependencies": {
+        "base-x": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
+          "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
+        }
      }
    },
    "bser": {
--- a/example/package.json
+++ b/example/package.json
@ -17,7 +17,7 @@
    "@fluencelabs/fluence": "^0.23.0",
    "@fluencelabs/fluence-network-environment": "^1.0.10",
    "@fluencelabs/trust-graph": "3.1.2",
-    "bs58": "^4.0.1"
+    "bs58": "^5.0.0"
  },
  "devDependencies": {
    "typescript": "^4.5.2",
--- a/keypair/CHANGELOG.md
+++ b/keypair/CHANGELOG.md
@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [0.10.4](https://github.com/fluencelabs/trust-graph/compare/keypair-v0.10.3...keypair-v0.10.4) (2023-12-20)
+
+
+### Features
+
+* **fluence-keypair:** bump ed25519-dalek to 0.2.0 ([#127](https://github.com/fluencelabs/trust-graph/issues/127)) ([ed5bd2c](https://github.com/fluencelabs/trust-graph/commit/ed5bd2c0ec50bef5ac7a12deacb73da491666912))
+* update marine sdk's, configs and sqlite connector ([#129](https://github.com/fluencelabs/trust-graph/issues/129)) ([0b66f4e](https://github.com/fluencelabs/trust-graph/commit/0b66f4e0536633879de46f69ac8391c72ece7e77))
+
 ## [0.10.3](https://github.com/fluencelabs/trust-graph/compare/keypair-v0.10.2...keypair-v0.10.3) (2023-07-04)


--- a/keypair/Cargo.toml
+++ b/keypair/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "fluence-keypair"
-version = "0.10.3"
+version = "0.10.4"
 authors = ["Fluence Labs"]
 edition = "2021"
 description = "unified keypair API based on libp2p-identity"
@ -10,7 +10,7 @@ repository = "https://github.com/fluencelabs/trust-graph"
 [dependencies]
 serde = { version = "1.0.118", features = ["derive"] }
 bs58 = "0.5.0"
-ed25519-dalek = { version = "1.0.1", features = ["serde", "std"] }
+ed25519-dalek = { version = "2.0.0", features = ["serde", "std", "rand_core"] }
 rand = "0.8.5"
 thiserror = "1.0.23"
 lazy_static = "1.4"
--- a/keypair/rust-toolchain.toml
+++ b/keypair/rust-toolchain.toml
@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-08-30"
+channel = "nightly-2023-12-06"
 targets = [ "x86_64-apple-darwin", "x86_64-unknown-linux-gnu" ]
--- a/keypair/src/ed25519.rs
+++ b/keypair/src/ed25519.rs
@ -19,16 +19,16 @@
 // DEALINGS IN THE SOFTWARE.

 //! Ed25519 keys.
-use crate::error::{DecodingError, SigningError, VerificationError};
+use crate::error::{DecodingError, DecodingError::InvalidLength, SigningError, VerificationError};
 use core::fmt;
 use ed25519_dalek::{self as ed25519, Signer as _, Verifier as _};
-use rand::RngCore;
 use serde::{Deserialize, Serialize};
 use std::convert::TryFrom;
 use zeroize::Zeroize;

-/// An Ed25519 keypair.
-pub struct Keypair(ed25519::Keypair);
+/// An Ed25519 keypair
+#[derive(Clone)]
+pub struct Keypair(ed25519::SigningKey);

 impl Keypair {
    /// Generate a new Ed25519 keypair.
@ -40,13 +40,15 @@ impl Keypair {
    /// of the secret scalar and the compressed public point,
    /// an informal standard for encoding Ed25519 keypairs.
    pub fn encode(&self) -> [u8; 64] {
-        self.0.to_bytes()
+        self.0.to_keypair_bytes()
    }

    /// Decode a keypair from the format produced by `encode`,
    /// zeroing the input on success.
    pub fn decode(kp: &mut [u8]) -> Result<Self, DecodingError> {
-        ed25519::Keypair::from_bytes(kp)
+        let bytes = <[u8; 64]>::try_from(&*kp).map_err(InvalidLength)?;
+
+        ed25519::SigningKey::from_keypair_bytes(&bytes)
            .map(|k| {
                kp.zeroize();
                Keypair(k)
@ -61,12 +63,12 @@ impl Keypair {

    /// Get the public key of this keypair.
    pub fn public(&self) -> PublicKey {
-        PublicKey(self.0.public)
+        PublicKey(self.0.verifying_key())
    }

    /// Get the secret key of this keypair.
    pub fn secret(&self) -> SecretKey {
-        SecretKey::from_bytes(&mut self.0.secret.to_bytes())
+        SecretKey::from_bytes(&mut self.0.to_bytes())
            .expect("ed25519::SecretKey::from_bytes(to_bytes(k)) != k")
    }
 }
@ -74,26 +76,14 @@ impl Keypair {
 impl fmt::Debug for Keypair {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        f.debug_struct("Keypair")
-            .field("public", &self.0.public)
+            .field("public", &self.0.verifying_key())
            .finish()
    }
 }

-impl Clone for Keypair {
-    fn clone(&self) -> Self {
-        let mut sk_bytes = self.0.secret.to_bytes();
-        let secret = SecretKey::from_bytes(&mut sk_bytes)
-            .expect("ed25519::SecretKey::from_bytes(to_bytes(k)) != k")
-            .0;
-        let public = ed25519::PublicKey::from_bytes(&self.0.public.to_bytes())
-            .expect("ed25519::PublicKey::from_bytes(to_bytes(k)) != k");
-        Keypair(ed25519::Keypair { secret, public })
-    }
-}
-
 /// Build keypair from existing ed25519 keypair
-impl From<ed25519::Keypair> for Keypair {
-    fn from(kp: ed25519::Keypair) -> Self {
+impl From<ed25519::SigningKey> for Keypair {
+    fn from(kp: ed25519::SigningKey) -> Self {
        Keypair(kp)
    }
 }
@ -101,25 +91,21 @@ impl From<ed25519::Keypair> for Keypair {
 /// Demote an Ed25519 keypair to a secret key.
 impl From<Keypair> for SecretKey {
    fn from(kp: Keypair) -> Self {
-        SecretKey(kp.0.secret)
+        SecretKey(kp.0.to_bytes())
    }
 }

 /// Promote an Ed25519 secret key into a keypair.
 impl From<SecretKey> for Keypair {
    fn from(sk: SecretKey) -> Self {
-        let secret: ed25519::ExpandedSecretKey = (&sk.0).into();
-        let public = ed25519::PublicKey::from(&secret);
-        Keypair(ed25519::Keypair {
-            secret: sk.0,
-            public,
-        })
+        let signing = ed25519::SigningKey::from_bytes(&sk.0);
+        Keypair(signing)
    }
 }

 /// An Ed25519 public key.
 #[derive(PartialEq, Eq, Debug, Clone, Deserialize, Serialize)]
-pub struct PublicKey(ed25519::PublicKey);
+pub struct PublicKey(ed25519::VerifyingKey);

 impl PublicKey {
    /// Verify the Ed25519 signature on a message using the public key.
@ -143,26 +129,21 @@ impl PublicKey {

    /// Decode a public key from a byte array as produced by `encode`.
    pub fn decode(bytes: &[u8]) -> Result<Self, DecodingError> {
-        ed25519::PublicKey::from_bytes(bytes)
+        let bytes = <[u8; 32]>::try_from(bytes).map_err(InvalidLength)?;
+        ed25519::VerifyingKey::from_bytes(&bytes)
            .map_err(DecodingError::Ed25519)
            .map(PublicKey)
    }
 }

 /// An Ed25519 secret key.
+#[derive(Clone)]
 pub struct SecretKey(pub ed25519::SecretKey);

 /// View the bytes of the secret key.
 impl AsRef<[u8]> for SecretKey {
    fn as_ref(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-}
-
-impl Clone for SecretKey {
-    fn clone(&self) -> Self {
-        let mut sk_bytes = self.0.to_bytes();
-        Self::from_bytes(&mut sk_bytes).expect("ed25519::SecretKey::from_bytes(to_bytes(k)) != k")
+        &self.0[..]
    }
 }

@ -175,13 +156,8 @@ impl fmt::Debug for SecretKey {
 impl SecretKey {
    /// Generate a new Ed25519 secret key.
    pub fn generate() -> Self {
-        let mut bytes = [0u8; 32];
-        rand::thread_rng().fill_bytes(&mut bytes);
-        SecretKey(
-            ed25519::SecretKey::from_bytes(&bytes).expect(
-                "this returns `Err` only if the length is wrong; the length is correct; qed",
-            ),
-        )
+        let signing = ed25519::SigningKey::generate(&mut rand::rngs::OsRng);
+        SecretKey(signing.to_bytes())
    }

    /// Create an Ed25519 secret key from a byte slice, zeroing the input on success.
@ -189,7 +165,7 @@ impl SecretKey {
    /// returned.
    pub fn from_bytes(mut sk_bytes: impl AsMut<[u8]>) -> Result<Self, DecodingError> {
        let sk_bytes = sk_bytes.as_mut();
-        let secret = ed25519::SecretKey::from_bytes(&*sk_bytes).map_err(DecodingError::Ed25519)?;
+        let secret = <[u8; 32]>::try_from(&*sk_bytes).map_err(InvalidLength)?;
        sk_bytes.zeroize();
        Ok(SecretKey(secret))
    }
@ -205,7 +181,7 @@ mod tests {
    use quickcheck::*;

    fn eq_keypairs(kp1: &Keypair, kp2: &Keypair) -> bool {
-        kp1.public() == kp2.public() && kp1.0.secret.as_bytes() == kp2.0.secret.as_bytes()
+        kp1.public() == kp2.public() && kp1.0.to_bytes() == kp2.0.to_bytes()
    }

    #[test]
@ -234,7 +210,7 @@ mod tests {
    fn ed25519_keypair_from_secret() {
        fn prop() -> bool {
            let kp1 = Keypair::generate();
-            let mut sk = kp1.0.secret.to_bytes();
+            let mut sk = kp1.0.to_bytes();
            let kp2 = Keypair::from(SecretKey::from_bytes(&mut sk).unwrap());
            eq_keypairs(&kp1, &kp2) && sk == [0u8; 32]
        }
--- a/keypair/src/error.rs
+++ b/keypair/src/error.rs
@ -31,6 +31,8 @@ pub enum Error {
 /// An error during decoding of key material.
 #[derive(ThisError, Debug)]
 pub enum DecodingError {
+    #[error("Failed to decode, invalid length: {0}")]
+    InvalidLength(#[from] std::array::TryFromSliceError),
    #[error("Failed to decode with ed25519: {0}")]
    Ed25519(
        #[from]
--- a/keypair/src/key_pair.rs
+++ b/keypair/src/key_pair.rs
@ -195,7 +195,7 @@ impl KeyPair {
    pub fn secret(&self) -> eyre::Result<Vec<u8>> {
        use KeyPair::*;
        match self {
-            Ed25519(pair) => Ok(pair.secret().0.to_bytes().to_vec()),
+            Ed25519(pair) => Ok(pair.secret().0.to_vec()),
            #[cfg(not(target_arch = "wasm32"))]
            Rsa(_) => Err(eyre::eyre!("secret key is not available for RSA")),
            Secp256k1(pair) => Ok(pair.secret().to_bytes().to_vec()),
@ -284,7 +284,7 @@ impl From<KeyPair> for libp2p_identity::Keypair {
            match key {
                KeyPair::Ed25519(kp) => {
                    // for some reason, libp2p takes SecretKey's 32 bytes here instead of Keypair's 64 bytes
-                    let secret_bytes = kp.secret().0.to_bytes();
+                    let secret_bytes = kp.secret().0;
                    let kp = libp2p_identity::Keypair::ed25519_from_bytes(secret_bytes)?;
                    Ok(kp)
                }
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-12-06"
+channel = "nightly-2023-12-06"
 targets = [ "x86_64-apple-darwin", "wasm32-wasi", "wasm32-unknown-unknown", "x86_64-unknown-linux-gnu" ]
 components = [ "rustfmt", "clippy" ]
--- a/service/CHANGELOG.md
+++ b/service/CHANGELOG.md
@ -9,6 +9,21 @@ 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.8](https://github.com/fluencelabs/trust-graph/compare/trust-graph-wasm-v0.4.7...trust-graph-wasm-v0.4.8) (2023-12-20)
+
+
+### Features
+
+* update marine sdk's, configs and sqlite connector ([#129](https://github.com/fluencelabs/trust-graph/issues/129)) ([0b66f4e](https://github.com/fluencelabs/trust-graph/commit/0b66f4e0536633879de46f69ac8391c72ece7e77))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * trust-graph bumped from 0.4.7 to 0.4.8
+    * fluence-keypair bumped from 0.10.3 to 0.10.4
+
 ## [0.4.7](https://github.com/fluencelabs/trust-graph/compare/trust-graph-wasm-v0.4.6...trust-graph-wasm-v0.4.7) (2023-07-04)


--- a/service/Cargo.toml
+++ b/service/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "trust-graph-wasm"
-version = "0.4.7"
+version = "0.4.8"
 authors = ["Fluence Labs"]
 edition = "2021"
 description = "trust graph wasm"
@ -12,16 +12,16 @@ name = "trust-graph"
 path = "src/main.rs"

 [dependencies]
-trust-graph = { version = "0.4.7", path = "../trust-graph" }
-fluence-keypair = { version = "0.10.3", path = "../keypair" }
-marine-rs-sdk = { version = "0.7.1", features = ["logger"] }
-marine-sqlite-connector = "0.8.0"
+trust-graph = { version = "0.4.8", 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"

 libp2p-identity = { workspace = true }

 log = "0.4.8"
 anyhow = "1.0.31"
-once_cell = "1.4.1"
+once_cell = "1.18.0"
 serde_json = "1.0"
 bs58 = "0.4.0"
 rmp-serde = "1.1.1"
@ -29,8 +29,8 @@ bincode = "1.3.1"
 thiserror = "1.0.23"

 [dev-dependencies]
-marine-rs-sdk-test = "0.9.1"
+marine-rs-sdk-test = "0.12.1"
 rusqlite = "0.28.0"

 [build-dependencies]
-marine-rs-sdk-test = "0.9.1"
+marine-rs-sdk-test = "0.12.1"
--- a/service/Config.toml
+++ b/service/Config.toml
@ -1,4 +1,5 @@
 modules_dir = "artifacts/"
+total_memory_limit = "Infinity"

 [[module]]
    name = "sqlite3"
--- a/service/rust-toolchain.toml
+++ b/service/rust-toolchain.toml
@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-12-06"
+channel = "nightly-2023-12-06"
 targets = [ "x86_64-apple-darwin", "wasm32-wasi", "wasm32-unknown-unknown", "x86_64-unknown-linux-gnu" ]
--- a/service/src/misc.rs
+++ b/service/src/misc.rs
@ -37,7 +37,7 @@ pub(crate) fn check_timestamp_tetraplets(
        .get(arg_number)
        .ok_or_else(|| InvalidTimestampTetraplet(format!("{:?}", call_parameters.tetraplets)))?;
    let tetraplet = tetraplets
-        .get(0)
+        .first()
        .ok_or_else(|| InvalidTimestampTetraplet(format!("{:?}", call_parameters.tetraplets)))?;
    (TRUSTED_TIMESTAMP.eq(&(&tetraplet.service_id, &tetraplet.function_name))
        && tetraplet.peer_pk == call_parameters.host_id)
--- a/trust-graph/CHANGELOG.md
+++ b/trust-graph/CHANGELOG.md
@ -4,6 +4,20 @@
  * dependencies
    * fluence-keypair bumped from 0.10.0 to 0.10.1

+## [0.4.8](https://github.com/fluencelabs/trust-graph/compare/trust-graph-v0.4.7...trust-graph-v0.4.8) (2023-12-20)
+
+
+### Features
+
+* update marine sdk's, configs and sqlite connector ([#129](https://github.com/fluencelabs/trust-graph/issues/129)) ([0b66f4e](https://github.com/fluencelabs/trust-graph/commit/0b66f4e0536633879de46f69ac8391c72ece7e77))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * fluence-keypair bumped from 0.10.3 to 0.10.4
+
 ## [0.4.7](https://github.com/fluencelabs/trust-graph/compare/trust-graph-v0.4.6...trust-graph-v0.4.7) (2023-07-04)


--- a/trust-graph/Cargo.toml
+++ b/trust-graph/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "trust-graph"
-version = "0.4.7"
+version = "0.4.8"
 authors = ["Fluence Labs"]
 edition = "2021"
 description = "trust graph"
@ -10,7 +10,7 @@ repository = "https://github.com/fluencelabs/trust-graph"
 [dependencies]
 serde = { version = "1.0.118", features = ["derive"] }

-fluence-keypair = { path = "../keypair", version = "0.10.3" }
+fluence-keypair = { path = "../keypair", version = "0.10.4" }
 bs58 = "0.4.0"
 failure = "0.1.6"
 log = "0.4.11"
--- a/trust-graph/src/public_key_hashable.rs
+++ b/trust-graph/src/public_key_hashable.rs
@ -29,7 +29,7 @@ use std::{
 #[repr(transparent)]
 pub struct PublicKeyHashable(PublicKey);

-#[allow(clippy::derive_hash_xor_eq)]
+#[allow(clippy::derived_hash_with_manual_eq)]
 impl Hash for PublicKeyHashable {
    fn hash<H: Hasher>(&self, state: &mut H) {
        state.write(&self.0.encode());
--- a/trust-graph/src/trust_graph.rs
+++ b/trust-graph/src/trust_graph.rs
@ -154,7 +154,7 @@ where
        C: Borrow<Certificate>,
    {
        let chain = &cert.borrow().chain;
-        let mut issued_by = chain.get(0).ok_or(EmptyChain)?.issued_for.clone();
+        let mut issued_by = chain.first().ok_or(EmptyChain)?.issued_for.clone();

        // TODO: optimize to check only root weight
        for trust in chain {
Author	SHA1	Message	Date
fluencebot	106bff637e	chore: release master (#128 )	2023-12-25 17:42:20 +03:00
renovate[bot]	120bedfafb	chore(deps): update dependency bs58 to v5 (#122 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-12-20 14:23:52 -03:00
renovate[bot]	48351d5562	chore(deps): update rust crate once_cell to 1.18.0 (#120 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-12-20 14:23:29 -03:00
Valery Antopol	0b66f4e053	feat: update marine sdk's, configs and sqlite connector (#129 ) * update marine and stuff * Release 0.10.4 fluence-keypair@0.10.4 trust-graph@0.10.4 trust-graph-distro@0.10.4 Generated by cargo-workspaces * Revert "Release 0.10.4" This reverts commit `11102a87e3`. * update sqlite and test sdk * update rust toolchain everywhere * fix lint warnings * update test sdk again	2023-12-20 14:22:43 -03:00
Aleksey Proshutisnkiy	ed5bd2c0ec	feat(fluence-keypair): bump ed25519-dalek to 0.2.0 (#127 )	2023-10-10 15:01:07 +02:00
Anatolios Laskaris	2f336f73cf	chore: Use marine from checks (#126 ) Use marine from checks	2023-09-04 14:57:50 +03:00
Anatolios Laskaris	d378fe2509	chore: Do not publish package (#124 ) Do not publish package	2023-08-02 14:21:16 +03:00