Merge

Author: HughParry

.github/workflows/cache.yml

@@ -96,16 +96,13 @@ jobs:
             - name: Cleanup npm caches
               if: always()
               run: |
-                  set -euxo pipefail # stop on errors, print commands, fail on pipe fails
-
                   # remove all but the latest cache, leaving only the cache we just saved
-                  set +e; gh extension install actions/gh-actions-cache; set -e
                   echo "Fetching list of cache key"
-                  cacheKeys=$(gh actions-cache list --sort created-at --order desc --limit 100 -R "${{ github.repository }}" --key "npm-${{ runner.os }}-${{ runner.arch }}-" | cut -f 1 | tail -n +3)
+                  cacheKeys=$(gh cache list --sort created_at --order desc --limit 100 -R "${{ github.repository }}" --key "npm-${{ runner.os }}-${{ runner.arch }}-" | cut -f 1 | tail -n +3)
                   echo caches to be removed:
                   echo "${cacheKeys}"
                   set +e
                   for cacheKey in $cacheKeys
                   do
-                      gh actions-cache delete "$cacheKey" -R "${{ github.repository }}" --confirm
+                      gh cache delete "$cacheKey" -R "${{ github.repository }}"
                   done

demos/client-example-server/src/controllers/auth.ts

@@ -16,7 +16,7 @@ import { blake2b } from "@noble/hashes/blake2b";
 import { u8aToHex } from "@polkadot/util";
 import { randomAsHex } from "@polkadot/util-crypto";
 import { ProsopoEnvError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
+import { getPairAsync } from "@prosopo/keyring";
 import { ProsopoServer } from "@prosopo/server";
 import {
 	ApiParams,

demos/client-example-server/tsconfig.json

@@ -10,9 +10,6 @@
 		{
 			"path": "../../packages/common"
 		},
-		{
-			"path": "../../packages/contract"
-		},
 		{
 			"path": "../../packages/dotenv"
 		},

demos/cypress-shared/cypress/e2e/captcha.cy.ts

@@ -15,8 +15,8 @@
 import "@cypress/xpath";
 import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
+import { getPairAsync } from "@prosopo/keyring";
 import {
 	AdminApiPaths,
 	type Captcha,

demos/cypress-shared/cypress/e2e/correct.captcha.cy.ts

@@ -15,8 +15,8 @@
 import "@cypress/xpath";
 import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
+import { getPairAsync } from "@prosopo/keyring";
 import {
 	AdminApiPaths,
 	type Captcha,

demos/cypress-shared/cypress/e2e/correct.captcha.signup.cy.ts

@@ -15,8 +15,8 @@
 import "@cypress/xpath";
 import { u8aToHex } from "@polkadot/util";
 import { ProsopoDatasetError } from "@prosopo/common";
-import { getPairAsync } from "@prosopo/contract";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
+import { getPairAsync } from "@prosopo/keyring";
 import {
 	AdminApiPaths,
 	type Captcha,

dev/config/src/projectInfo.ts

@@ -57,8 +57,6 @@ export const getCliPkgDir = () => `${getPackagesDir()}/cli`;
 
 export const getCommonPkgDir = () => `${getPackagesDir()}/common`;
 
-export const getContractPkgDir = () => `${getPackagesDir()}/contract`;
-
 export const getDatabasePkgDir = () => `${getPackagesDir()}/database`;
 
 export const getDatasetsPkgDir = () => `${getPackagesDir()}/datasets`;
@@ -92,8 +90,6 @@ export const getProviderPkgDir = () => `${getPackagesDir()}/provider`;
 
 export const getServerPkgDir = () => `${getPackagesDir()}/server`;
 
-export const getTxPkgDir = () => `${getPackagesDir()}/tx`;
-
 export const getTypesPkgDir = () => `${getPackagesDir()}/types`;
 
 export const getTypesDatabasePkgDir = () =>

dev/scripts/env.development

@@ -26,12 +26,6 @@ PROSOPO_PROVIDER_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton e
 PROSOPO_PROXY_COUNT=
 PROSOPO_SERVER_URL=http://localhost:9228
 PROSOPO_SITE_KEY=5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw
-WATCHTOWER_LABEL_ENABLE=true
-WATCHTOWER_LOG_FORMAT=JSON
-WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
-WATCHTOWER_NOTIFICATIONS=
-WATCHTOWER_POLL_INTERVAL=30
-WATCHTOWER_REMOVE_VOLUMES=true
 PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
 PROSOPO_ADMIN_JSON=
 PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant

dev/scripts/env.production

@@ -24,9 +24,3 @@ PROSOPO_PROVIDER_MNEMONIC=
 PROSOPO_PROXY_COUNT=
 PROSOPO_SITE_KEY=
 PROSOPO_SERVER_URL=
-WATCHTOWER_LABEL_ENABLE=true
-WATCHTOWER_LOG_FORMAT=JSON
-WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
-WATCHTOWER_NOTIFICATIONS=
-WATCHTOWER_POLL_INTERVAL=30
-WATCHTOWER_REMOVE_VOLUMES=true

dev/scripts/env.staging

@@ -29,12 +29,6 @@ PROSOPO_PROVIDER_MNEMONIC=
 PROSOPO_PROXY_COUNT=
 PROSOPO_SITE_KEY=
 PROSOPO_SERVER_URL=
-WATCHTOWER_LABEL_ENABLE=true
-WATCHTOWER_LOG_FORMAT=JSON
-WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
-WATCHTOWER_NOTIFICATIONS=
-WATCHTOWER_POLL_INTERVAL=30
-WATCHTOWER_REMOVE_VOLUMES=true
 PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
 PROSOPO_ADMIN_JSON=
 PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant

dev/scripts/env.test

@@ -29,12 +29,6 @@ PROSOPO_PROVIDER_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton e
 PROSOPO_PROXY_COUNT=
 PROSOPO_SERVER_URL=http://localhost:9228
 PROSOPO_SITE_KEY=5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw
-WATCHTOWER_LABEL_ENABLE=true
-WATCHTOWER_LOG_FORMAT=JSON
-WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
-WATCHTOWER_NOTIFICATIONS=
-WATCHTOWER_POLL_INTERVAL=30
-WATCHTOWER_REMOVE_VOLUMES=true
 PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
 PROSOPO_ADMIN_JSON=
 PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant

dev/scripts/package.json

@@ -26,13 +26,14 @@
 		"@polkadot/keyring": "12.6.2",
 		"@polkadot/util": "12.6.2",
 		"@polkadot/util-crypto": "12.6.2",
+		"@prosopo/account": "2.2.3",
 		"@prosopo/cli": "2.2.3",
 		"@prosopo/common": "2.2.3",
 		"@prosopo/config": "2.2.3",
-		"@prosopo/contract": "2.2.3",
 		"@prosopo/datasets": "2.2.3",
 		"@prosopo/dotenv": "2.2.3",
 		"@prosopo/env": "2.2.3",
+		"@prosopo/keyring": "2.2.3",
 		"@prosopo/provider": "2.2.3",
 		"@prosopo/types": "2.2.3",
 		"@prosopo/types-database": "2.2.3",

dev/scripts/src/scripts/generateMnemonic.ts

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import { LogLevel, getLogger } from "@prosopo/common";
-import { generateMnemonic } from "@prosopo/contract";
 import { loadEnv } from "@prosopo/dotenv";
+import { generateMnemonic } from "@prosopo/keyring";
 import { updateEnvFile } from "../setup/index.js";
 
 loadEnv();

dev/scripts/src/scripts/sign.ts

@@ -13,7 +13,7 @@ import { stringToU8a, u8aToHex } from "@polkadot/util";
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import type { KeypairType } from "@polkadot/util-crypto/types";
-import { getPairAsync } from "@prosopo/contract";
+import { getPairAsync } from "@prosopo/keyring";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 

dev/scripts/src/setup/setup.ts

@@ -16,9 +16,9 @@ import path from "node:path";
 import { BN } from "@polkadot/util";
 import { defaultConfig, getSecret } from "@prosopo/cli";
 import { LogLevel, ProsopoEnvError, getLogger } from "@prosopo/common";
-import { generateMnemonic, getPairAsync } from "@prosopo/contract";
 import { getEnvFile } from "@prosopo/dotenv";
 import { ProviderEnvironment } from "@prosopo/env";
+import { generateMnemonic, getPairAsync } from "@prosopo/keyring";
 import {
 	type IDappAccount,
 	type IProviderAccount,

dev/scripts/tsconfig.json

@@ -8,13 +8,13 @@
 	"include": ["src", "src/**/*.json"],
 	"references": [
 		{
-			"path": "../../packages/cli"
+			"path": "../../packages/account"
 		},
 		{
-			"path": "../../packages/common"
+			"path": "../../packages/cli"
 		},
 		{
-			"path": "../../packages/contract"
+			"path": "../../packages/common"
 		},
 		{
 			"path": "../../packages/datasets"
@@ -25,6 +25,9 @@
 		{
 			"path": "../../packages/env"
 		},
+		{
+			"path": "../../packages/keyring"
+		},
 		{
 			"path": "../../packages/provider"
 		},

docker/docker-compose.provider.yml

@@ -146,26 +146,6 @@ services:
             retries: 3
             start_period: 30s
             timeout: 10s
-    watchtower:
-        container_name: watchtower
-        profiles:
-            - production
-            - staging
-        image: containrrr/watchtower
-        command: ["--log-format", "JSON", "--remove-volumes", "--cleanup", "--warn-on-head-failure", "never", "--interval", "30", "--include-restarting"]
-        labels:
-            - "vector.watchtower=true" # enable logging as a watchtower
-            - "vector.docker=true" # log docker events
-        restart: unless-stopped  # unless the container has been stopped, it will be restarted, even on reboot
-        env_file:
-            - ../.env.${NODE_ENV}
-        volumes:
-            - /var/run/docker.sock:/var/run/docker.sock
-        logging:
-            driver: 'json-file'
-            options:
-                max-size: '100m'
-                max-file: '1'
     vector:
         container_name: vector
         profiles:

docker/images/vector/vector.toml

@@ -41,6 +41,9 @@ compression = "gzip"
 encoding.codec = "json"
 encoding.timestamp_format = "rfc3339"
 healthcheck.enabled = false
+batch.timeout_secs = 10 # time to wait before sending a batch
+batch.max_bytes = 10485760 # 10mb, max number of bytes per batch
+batch.max_events = 100000 # max number of events per batch
 
 # listen to docker events for containers starting+ending
 [sources.docker]
@@ -100,6 +103,9 @@ compression = "gzip"
 encoding.codec = "json"
 encoding.timestamp_format = "rfc3339"
 healthcheck.enabled = false
+batch.timeout_secs = 10 # time to wait before sending a batch
+batch.max_bytes = 10485760 # 10mb, max number of bytes per batch
+batch.max_events = 100000 # max number of events per batch
 
 [sources.caddy]
 type = "docker_logs"
@@ -135,31 +141,3 @@ compression = "gzip"
 encoding.codec = "json"
 encoding.timestamp_format = "rfc3339"
 healthcheck.enabled = false
-
-[sources.watchtower]
-type = "docker_logs"
-include_labels = ["vector.watchtower=true"]
-
-[transforms.watchtower_format]
-type = "remap"
-inputs = ["watchtower"]
-source = '''
-.=parse_json!(string!(.message))
-.host="$OO_HOST"
-del(.time)
-del(.notify)
-'''
-
-# send to openobserve
-[sinks.openobserve_watchtower]
-type = "http"
-inputs = ["watchtower_format"]
-uri = "https://api.openobserve.ai/api/$OO_ORG/${NODE_ENV}_provider_watchtower/_json"
-method = "post"
-auth.strategy = "basic"
-auth.user = "$OO_USERNAME"
-auth.password = "$OO_PASSWORD"
-compression = "gzip"
-encoding.codec = "json"
-encoding.timestamp_format = "rfc3339"
-healthcheck.enabled = false