diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b936944d15..8a81393441 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,9 @@ name: Full Clients Build on: push: - branches: [development, development_314] + branches: [development, development_2.6] pull_request: - branches: [development, development_314] + branches: [development, development_2.6] jobs: build: diff --git a/.github/workflows/grid_client_nightly.yml b/.github/workflows/grid_client_nightly.yml index 07623b11be..c6f40644d9 100644 --- a/.github/workflows/grid_client_nightly.yml +++ b/.github/workflows/grid_client_nightly.yml @@ -26,15 +26,15 @@ jobs: - uses: actions/checkout@v4 if: ${{ env.NETWORK == 'qa' }} with: - ref: refs/tags/v2.3.5 + ref: refs/tags/v2.4.3 - uses: actions/checkout@v4 if: ${{ env.NETWORK == 'test' }} with: - ref: refs/tags/v2.3.5 + ref: refs/tags/v2.4.3 - uses: actions/checkout@v4 if: ${{ env.NETWORK == 'main' }} with: - ref: refs/tags/v2.3.5 + ref: refs/tags/v2.4.3 - name: Set up node 18 uses: actions/setup-node@v3 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e7f17fccab..ba40884c5a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,9 +5,9 @@ name: Full Clients Lint on: push: - branches: [development, development_314] + branches: [development, development_2.6] pull_request: - branches: [development, development_314] + branches: [development, development_2.6] jobs: lint: diff --git a/.github/workflows/mass_deployments.yml b/.github/workflows/mass_deployments.yml index bf10d35e46..475b1b84cf 100644 --- a/.github/workflows/mass_deployments.yml +++ b/.github/workflows/mass_deployments.yml @@ -19,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + ref: refs/tags/v2.4.3 - name: Set up node 18 uses: actions/setup-node@v3 with: diff --git a/.github/workflows/playground_build.yml b/.github/workflows/playground_build.yml index abbd78c1da..6301773009 100644 --- a/.github/workflows/playground_build.yml +++ b/.github/workflows/playground_build.yml @@ -6,13 +6,13 @@ on: push: branches: - development - - development_314 + - development_2.6 paths: - "packages/playground/**" pull_request: branches: - development - - development_314 + - development_2.6 paths: - "packages/playground/**" diff --git a/.github/workflows/stats_build.yaml b/.github/workflows/stats_build.yaml index 613f22293a..b17162672b 100644 --- a/.github/workflows/stats_build.yaml +++ b/.github/workflows/stats_build.yaml @@ -4,11 +4,11 @@ name: Stats Build on: push: - branches: [development, development_314] + branches: [development, development_2.6] paths: - "packages/stats/**" pull_request: - branches: [development, development_314] + branches: [development, development_2.6] paths: - "packages/stats/**" diff --git a/lerna.json b/lerna.json index dbd7ddb204..4b44c82e1f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "npmClient": "yarn" } diff --git a/packages/UI/package.json b/packages/UI/package.json index c650311c7f..0dad113737 100644 --- a/packages/UI/package.json +++ b/packages/UI/package.json @@ -1,6 +1,6 @@ { "name": "@threefold/ui", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "private": false, "main": "dist/threefold-ui.umd.js", "publishConfig": { diff --git a/packages/graphql_client/package.json b/packages/graphql_client/package.json index 40040a0a0d..76ac37b111 100644 --- a/packages/graphql_client/package.json +++ b/packages/graphql_client/package.json @@ -1,6 +1,6 @@ { "name": "@threefold/graphql_client", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "main": "dist/index.js", "types": "dist/index.d.ts", "license": "MIT", @@ -8,7 +8,7 @@ "build": "tsc" }, "dependencies": { - "@threefold/types": "^2.5.0-rc1", + "@threefold/types": "^2.5.0-rc2", "ts-mixer": "^6.0.2" }, "devDependencies": { diff --git a/packages/grid_client/package.json b/packages/grid_client/package.json index c7410a2287..fd431c70c1 100644 --- a/packages/grid_client/package.json +++ b/packages/grid_client/package.json @@ -1,7 +1,7 @@ { "name": "@threefold/grid_client", "author": "Ahmed Hanafy", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "license": "ISC", "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md", "repository": { @@ -14,9 +14,9 @@ "dependencies": { "@jimber/pkid": "1.0.4", "@noble/secp256k1": "^1.7.1", - "@threefold/rmb_direct_client": "^2.5.0-rc1", - "@threefold/tfchain_client": "^2.5.0-rc1", - "@threefold/types": "^2.5.0-rc1", + "@threefold/rmb_direct_client": "^2.5.0-rc2", + "@threefold/tfchain_client": "^2.5.0-rc2", + "@threefold/types": "^2.5.0-rc2", "algosdk": "^1.19.0", "appdata-path": "^1.0.0", "await-lock": "^2.2.2", diff --git a/packages/grid_client/tests/modules/zmount.test.ts b/packages/grid_client/tests/modules/zmount.test.ts new file mode 100644 index 0000000000..81ee902ba9 --- /dev/null +++ b/packages/grid_client/tests/modules/zmount.test.ts @@ -0,0 +1,58 @@ +import { Zmount } from "../../src"; + +let zmount: Zmount; + +beforeEach(() => { + zmount = new Zmount(); +}); +describe("Zmount module", () => { + test("Zmount instance is of type Zmount.", () => { + expect(zmount).toBeInstanceOf(Zmount); + }); + + test("Min value for size.", () => { + const size = 100 * 1025 ** 2; + + zmount.size = size; + + const result = () => zmount.challenge(); + + expect(result).toThrow(); + }); + + test("Max value for size.", () => { + const size = 100 * 1025 ** 4; + + zmount.size = size; + + const result = () => zmount.challenge(); + + expect(result).toThrow(); + }); + + test("Size doesn't accept decimal value.", () => { + const size = 1.5; + + zmount.size = size; + + const result = () => zmount.challenge(); + + expect(result).toThrow(); + }); + + test("Size empty value.", () => { + const result = () => zmount.challenge(); + + expect(result).toThrow(); + }); + + test("Size negative value.", () => { + const negative_size = -1; + + zmount.size = negative_size; + + const result = () => zmount.challenge(); + + expect(result).toThrow(); + }); +}); diff --git a/packages/grid_http_server/package.json b/packages/grid_http_server/package.json index 5fee6d6bc6..3b4ad42ce8 100644 --- a/packages/grid_http_server/package.json +++ b/packages/grid_http_server/package.json @@ -1,7 +1,7 @@ { "name": "@threefold/grid_http_server", "author": "Ahmed Hanafy", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "license": "ISC", "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md", "repository": { @@ -12,7 +12,7 @@ "access": "public" }, "dependencies": { - "@threefold/grid_client": "^2.5.0-rc1", + "@threefold/grid_client": "^2.5.0-rc2", "express": "^4.18.1", "http-server": "^14.1.1", "typescript": "^4.7.4" diff --git a/packages/grid_rmb_server/package.json b/packages/grid_rmb_server/package.json index 917fa242c9..4f7290a7bd 100644 --- a/packages/grid_rmb_server/package.json +++ b/packages/grid_rmb_server/package.json @@ -1,7 +1,7 @@ { "name": "@threefold/grid_rmb_server", "author": "Ahmed Hanafy", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "license": "ISC", "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md", "repository": { @@ -12,12 +12,12 @@ "access": "public" }, "dependencies": { - "@threefold/grid_client": "^2.5.0-rc1", - "@threefold/rmb_peer_server": "^2.5.0-rc1", + "@threefold/grid_client": "^2.5.0-rc2", + "@threefold/rmb_peer_server": "^2.5.0-rc2", "typescript": "^4.7.4" }, "devDependencies": { - "@threefold/rmb_peer_client": "^2.5.0-rc1", + "@threefold/rmb_peer_client": "^2.5.0-rc2", "ts-node": "^10.9.1" }, "main": "./dist/index.js", diff --git a/packages/gridproxy_client/package.json b/packages/gridproxy_client/package.json index d8b4f436c2..179af24f74 100644 --- a/packages/gridproxy_client/package.json +++ b/packages/gridproxy_client/package.json @@ -1,6 +1,6 @@ { "name": "@threefold/gridproxy_client", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "description": "gridproxy_client help to interact with gridproxy based on network", "main": "dist/public_api.js", "types": "dist/public_api.d.ts", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index b8c3b2320e..a4a2e0973a 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@threefold/monitoring", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "description": "Threefold monitoring package", "license": "Apache-2.0", "main": "dist/index.js", @@ -16,9 +16,9 @@ "access": "public" }, "dependencies": { - "@threefold/rmb_direct_client": "^2.5.0-rc1", - "@threefold/tfchain_client": "^2.5.0-rc1", - "@threefold/types": "^2.5.0-rc1", + "@threefold/rmb_direct_client": "^2.5.0-rc2", + "@threefold/tfchain_client": "^2.5.0-rc2", + "@threefold/types": "^2.5.0-rc2", "axios": "^0.27.2", "chalk": "4.1.2", "ts-node": "^10.9.1", diff --git a/packages/playground/package.json b/packages/playground/package.json index 25127fe339..74698bd507 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -1,6 +1,6 @@ { "name": "@threefold/playground", - "version": "2.5.0-rc1", + "version": "2.5.0-rc2", "private": true, "scripts": { "dev": "vite", @@ -12,10 +12,10 @@ }, "dependencies": { "@mdi/font": "^7.2.96", - "@threefold/graphql_client": "^2.5.0-rc1", - "@threefold/grid_client": "^2.5.0-rc1", - "@threefold/gridproxy_client": "^2.5.0-rc1", - "@threefold/types": "^2.5.0-rc1", + "@threefold/graphql_client": "^2.5.0-rc2", + "@threefold/grid_client": "^2.5.0-rc2", + "@threefold/gridproxy_client": "^2.5.0-rc2", + "@threefold/types": "^2.5.0-rc2", "@types/ip": "^1.1.3", "@types/md5": "^2.3.5", "await-lock": "^2.2.2", diff --git a/packages/playground/playground-charts/Chart.yaml b/packages/playground/playground-charts/Chart.yaml index 9f1105de9b..38a2e93113 100644 --- a/packages/playground/playground-charts/Chart.yaml +++ b/packages/playground/playground-charts/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v2.5.0-rc1" +appVersion: "v2.5.0-rc2" diff --git a/packages/playground/playground-charts/values.yaml b/packages/playground/playground-charts/values.yaml index ba41c8bd9c..153992d8a2 100644 --- a/packages/playground/playground-charts/values.yaml +++ b/packages/playground/playground-charts/values.yaml @@ -8,7 +8,7 @@ image: repository: ghcr.io/threefoldtech/playground pullPolicy: Always # Overrides the image tag whose default is the chart appVersion. - tag: "2.5.0-rc1" + tag: "2.5.0-rc2" env: - name: "MODE" diff --git a/packages/playground/src/calculator/pricing_calculator.vue b/packages/playground/src/calculator/pricing_calculator.vue index 3d1c3d2314..be9d58b705 100644 --- a/packages/playground/src/calculator/pricing_calculator.vue +++ b/packages/playground/src/calculator/pricing_calculator.vue @@ -171,7 +171,11 @@

-
+ +

Too expensive? can upgrade to Gold package to get discount up to 60% when you fund your wallet with {{ dedicatedUpgradePrice }} TFT @@ -198,7 +202,10 @@

-
+

Too expensive? can upgrade to Gold package to get discount up to 60% when you fund your wallet with {{ sharedUpgradePrice }} TFT diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue index c319801afe..b672823eb0 100644 --- a/packages/playground/src/components/contracts_list/contracts_table.vue +++ b/packages/playground/src/components/contracts_list/contracts_table.vue @@ -25,6 +25,7 @@ show-select @update:page="updatePage" @update:items-per-page="updateSize" + @update:sort-by="updateSortBy" > -