From 36846295118282c447bb045467aeeea040a80ad2 Mon Sep 17 00:00:00 2001 From: sadiabbasi Date: Thu, 28 Dec 2023 16:43:06 +0300 Subject: [PATCH 01/19] change demo to testnet --- src/config/config.demo.json | 4 ---- src/config/config.production.json | 4 ++++ src/config/config.testnet.json | 4 ++++ src/settings.ts | 11 +++++++---- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 src/config/config.demo.json create mode 100644 src/config/config.production.json create mode 100644 src/config/config.testnet.json diff --git a/src/config/config.demo.json b/src/config/config.demo.json deleted file mode 100644 index 35d1152..0000000 --- a/src/config/config.demo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "blockchainUrl": "https://blockchain-api-demo.tonomy.foundation", - "loggerLevel": "info" -} diff --git a/src/config/config.production.json b/src/config/config.production.json new file mode 100644 index 0000000..0650560 --- /dev/null +++ b/src/config/config.production.json @@ -0,0 +1,4 @@ +{ + "blockchainUrl": "https://blockchain-api-production.tonomy.network", + "loggerLevel": "info" +} diff --git a/src/config/config.testnet.json b/src/config/config.testnet.json new file mode 100644 index 0000000..0690c11 --- /dev/null +++ b/src/config/config.testnet.json @@ -0,0 +1,4 @@ +{ + "blockchainUrl": "https://blockchain-api-testnet.tonomy.foundation", + "loggerLevel": "info" +} diff --git a/src/settings.ts b/src/settings.ts index 14d9520..9492242 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,6 +1,7 @@ import * as configDefault from './config/config.json'; import * as configStaging from './config/config.staging.json'; -import * as configDemo from './config/config.demo.json'; +import * as configTestnet from './config/config.demo.json'; +import * as configProduction from './config/config.production.json'; import { EosioUtil } from '@tonomy/tonomy-id-sdk'; const env = process.env.NODE_ENV || 'development'; @@ -57,11 +58,13 @@ switch (env) { case 'staging': config = configStaging as FixLoggerLevelEnumType; break; - case 'demo': - config = configDemo as FixLoggerLevelEnumType; + case 'testnet': + config = configTestnet as FixLoggerLevelEnumType; break; case 'production': - throw new Error('Production config not implemented yet'); + config = configProduction as FixLoggerLevelEnumType< + typeof configProduction + >; default: throw new Error('Unknown environment: ' + env); } From f7b8e752c9456364b7bf910edc372b4c67c2886d Mon Sep 17 00:00:00 2001 From: sadiabbasi Date: Thu, 28 Dec 2023 16:43:21 +0300 Subject: [PATCH 02/19] change demo to testnet --- src/settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.ts b/src/settings.ts index 9492242..befef74 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,6 +1,6 @@ import * as configDefault from './config/config.json'; import * as configStaging from './config/config.staging.json'; -import * as configTestnet from './config/config.demo.json'; +import * as configTestnet from './config/config.testnet.json'; import * as configProduction from './config/config.production.json'; import { EosioUtil } from '@tonomy/tonomy-id-sdk'; From c0033eaf4fb8da3965adfa6d0897ab0d62933443 Mon Sep 17 00:00:00 2001 From: sadiabbasi Date: Thu, 28 Dec 2023 22:01:49 +0300 Subject: [PATCH 03/19] update to pangea --- src/config/config.production.json | 2 +- src/config/config.testnet.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/config.production.json b/src/config/config.production.json index 0650560..227bd54 100644 --- a/src/config/config.production.json +++ b/src/config/config.production.json @@ -1,4 +1,4 @@ { - "blockchainUrl": "https://blockchain-api-production.tonomy.network", + "blockchainUrl": "https://blockchain-api-production.pangeavision.org", "loggerLevel": "info" } diff --git a/src/config/config.testnet.json b/src/config/config.testnet.json index 0690c11..a6aaef4 100644 --- a/src/config/config.testnet.json +++ b/src/config/config.testnet.json @@ -1,4 +1,4 @@ { - "blockchainUrl": "https://blockchain-api-testnet.tonomy.foundation", + "blockchainUrl": "https://blockchain-api-testnet.pangeavision.org", "loggerLevel": "info" } From 4efdebb62a17d3524c3cbbad771cde0d67d7fe1a Mon Sep 17 00:00:00 2001 From: sadiabbasi Date: Tue, 9 Jan 2024 14:03:44 +0300 Subject: [PATCH 04/19] change pangea domain --- src/config/config.production.json | 2 +- src/config/config.testnet.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/config.production.json b/src/config/config.production.json index 227bd54..597f6ae 100644 --- a/src/config/config.production.json +++ b/src/config/config.production.json @@ -1,4 +1,4 @@ { - "blockchainUrl": "https://blockchain-api-production.pangeavision.org", + "blockchainUrl": "https://blockchain-api-production.pangea.web4.world", "loggerLevel": "info" } diff --git a/src/config/config.testnet.json b/src/config/config.testnet.json index a6aaef4..cb7ea04 100644 --- a/src/config/config.testnet.json +++ b/src/config/config.testnet.json @@ -1,4 +1,4 @@ { - "blockchainUrl": "https://blockchain-api-testnet.pangeavision.org", + "blockchainUrl": "https://blockchain-api-testnet.pangea.web4.world", "loggerLevel": "info" } From b34390104dcdcb41114a0fffcf7aa8faefe80cc4 Mon Sep 17 00:00:00 2001 From: sadiabbasi Date: Tue, 9 Jan 2024 14:15:37 +0300 Subject: [PATCH 05/19] update sdk --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ff9102b..4e283d9 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@nestjs/platform-socket.io": "^10.2.3", "@nestjs/swagger": "^7.1.10", "@nestjs/websockets": "^10.2.3", - "@tonomy/tonomy-id-sdk": "0.18.0", + "@tonomy/tonomy-id-sdk": "0.18.0-development.4", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "hcaptcha": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 0140265..3e33d25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1576,9 +1576,9 @@ __metadata: languageName: node linkType: hard -"@tonomy/tonomy-id-sdk@npm:0.18.0": - version: 0.18.0 - resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0" +"@tonomy/tonomy-id-sdk@npm:0.18.0-development.4": + version: 0.18.0-development.4 + resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.4" dependencies: "@consento/sync-randombytes": ^1.0.5 "@tonomy/antelope-did": ^0.1.5 @@ -1593,7 +1593,7 @@ __metadata: elliptic: ^6.5.4 socket.io-client: ^4.5.4 universal-base64url: ^1.1.0 - checksum: 7d307eb4c38ba503608f4d15c83488572c52c03030b108a71460ffa0649b8f0bcd34b65b723873393cea177b618320e0c7ca2c0e115bf08dbc86581b1acf3d7e + checksum: cd11d415257981252928d39486747ec43e1e5b47142bab1e06e501b509d8ecf5e89bd59df70b742416539867fb1ad4449bd0faec3a8d4e96e9cf8a5f78761eda languageName: node linkType: hard @@ -7713,7 +7713,7 @@ __metadata: "@nestjs/swagger": ^7.1.10 "@nestjs/testing": ^10.2.3 "@nestjs/websockets": ^10.2.3 - "@tonomy/tonomy-id-sdk": 0.18.0 + "@tonomy/tonomy-id-sdk": 0.18.0-development.4 "@types/express": ^4.17.13 "@types/jest": 29.2.4 "@types/node": 18.11.18 From 9262b631e6ab0704e1a181f1fd0e000ac64f025a Mon Sep 17 00:00:00 2001 From: sadiabbasi Date: Tue, 9 Jan 2024 15:00:29 +0300 Subject: [PATCH 06/19] update sdk --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4e283d9..5e1a917 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@nestjs/platform-socket.io": "^10.2.3", "@nestjs/swagger": "^7.1.10", "@nestjs/websockets": "^10.2.3", - "@tonomy/tonomy-id-sdk": "0.18.0-development.4", + "@tonomy/tonomy-id-sdk": "0.18.0-development.5", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "hcaptcha": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 3e33d25..0448678 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1576,9 +1576,9 @@ __metadata: languageName: node linkType: hard -"@tonomy/tonomy-id-sdk@npm:0.18.0-development.4": - version: 0.18.0-development.4 - resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.4" +"@tonomy/tonomy-id-sdk@npm:0.18.0-development.5": + version: 0.18.0-development.5 + resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.5" dependencies: "@consento/sync-randombytes": ^1.0.5 "@tonomy/antelope-did": ^0.1.5 @@ -1593,7 +1593,7 @@ __metadata: elliptic: ^6.5.4 socket.io-client: ^4.5.4 universal-base64url: ^1.1.0 - checksum: cd11d415257981252928d39486747ec43e1e5b47142bab1e06e501b509d8ecf5e89bd59df70b742416539867fb1ad4449bd0faec3a8d4e96e9cf8a5f78761eda + checksum: 557a1a603f0a2eb1301f7c01e454413a2ac11f0980dfd135bb041630e4d8cd0e5485d73af4f227e09ed0d3ed05ac0ffe6a805f41afb8fcdb1571259ff3f67b1b languageName: node linkType: hard @@ -7713,7 +7713,7 @@ __metadata: "@nestjs/swagger": ^7.1.10 "@nestjs/testing": ^10.2.3 "@nestjs/websockets": ^10.2.3 - "@tonomy/tonomy-id-sdk": 0.18.0-development.4 + "@tonomy/tonomy-id-sdk": 0.18.0-development.5 "@types/express": ^4.17.13 "@types/jest": 29.2.4 "@types/node": 18.11.18 From 0df2afecc2dcc45529d1ae715387e58d12295ae1 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Thu, 11 Jan 2024 16:46:28 +0100 Subject: [PATCH 07/19] feat: Change IDContract to EosioContract --- src/accounts/accounts.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/accounts/accounts.service.ts b/src/accounts/accounts.service.ts index 535305f..ffa0264 100644 --- a/src/accounts/accounts.service.ts +++ b/src/accounts/accounts.service.ts @@ -7,13 +7,13 @@ import { Name, PrivateKey } from '@wharfkit/antelope'; import settings from '../settings'; import { PushTransactionResponse } from '@wharfkit/antelope/src/api/v1/types'; import { - IDContract, + EosioContract, EosioUtil, AntelopePushTransactionError, } from '@tonomy/tonomy-id-sdk'; import { verify } from 'hcaptcha'; -const idContract = IDContract.Instance; +const eosioContract = EosioContract.Instance; @Injectable() export class AccountsService { @@ -69,7 +69,7 @@ export class AccountsService { let res: PushTransactionResponse; try { - res = await idContract.newperson( + res = await eosioContract.newperson( createAccountRequest.usernameHash, createAccountRequest.publicKey, createAccountRequest.salt, From 2f4f833e65bb2f1c8d961952fc1dc14bdf04dcf0 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Fri, 12 Jan 2024 23:08:31 +0100 Subject: [PATCH 08/19] feat: Changed to tonomy contract --- src/accounts/accounts.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/accounts/accounts.service.ts b/src/accounts/accounts.service.ts index ffa0264..c678d51 100644 --- a/src/accounts/accounts.service.ts +++ b/src/accounts/accounts.service.ts @@ -7,13 +7,13 @@ import { Name, PrivateKey } from '@wharfkit/antelope'; import settings from '../settings'; import { PushTransactionResponse } from '@wharfkit/antelope/src/api/v1/types'; import { - EosioContract, + TonomyContract, EosioUtil, AntelopePushTransactionError, } from '@tonomy/tonomy-id-sdk'; import { verify } from 'hcaptcha'; -const eosioContract = EosioContract.Instance; +const tonomyContract = TonomyContract.Instance; @Injectable() export class AccountsService { @@ -69,7 +69,7 @@ export class AccountsService { let res: PushTransactionResponse; try { - res = await eosioContract.newperson( + res = await tonomyContract.newperson( createAccountRequest.usernameHash, createAccountRequest.publicKey, createAccountRequest.salt, From 53a83de53ab31045587c9a7c7b8eafd0209a6b07 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Mon, 15 Jan 2024 18:29:24 +0100 Subject: [PATCH 09/19] feat: Update SDK version --- package.json | 2 +- update_sdk_version.sh | 2 ++ yarn.lock | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5e1a917..e6d5743 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@nestjs/platform-socket.io": "^10.2.3", "@nestjs/swagger": "^7.1.10", "@nestjs/websockets": "^10.2.3", - "@tonomy/tonomy-id-sdk": "0.18.0-development.5", + "@tonomy/tonomy-id-sdk": "0.18.0-development.6", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "hcaptcha": "^0.1.1", diff --git a/update_sdk_version.sh b/update_sdk_version.sh index 6e1ec00..85b5a81 100755 --- a/update_sdk_version.sh +++ b/update_sdk_version.sh @@ -10,6 +10,8 @@ set +e # Get the latest version of the SDK for the correct npmjs tag based on branch if [ "${BRANCH}" == "master" ]; then VERSION=$(npm view @tonomy/tonomy-id-sdk version) +elif [ "${BRANCH}" == "testnet" ]; then + VERSION=$(npm view @tonomy/tonomy-id-sdk@rc version) elif [ "${BRANCH}" == "development" ]; then VERSION=$(npm view @tonomy/tonomy-id-sdk@development version) else diff --git a/yarn.lock b/yarn.lock index 0448678..10c0366 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1576,9 +1576,9 @@ __metadata: languageName: node linkType: hard -"@tonomy/tonomy-id-sdk@npm:0.18.0-development.5": - version: 0.18.0-development.5 - resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.5" +"@tonomy/tonomy-id-sdk@npm:0.18.0-development.6": + version: 0.18.0-development.6 + resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.6" dependencies: "@consento/sync-randombytes": ^1.0.5 "@tonomy/antelope-did": ^0.1.5 @@ -1593,7 +1593,7 @@ __metadata: elliptic: ^6.5.4 socket.io-client: ^4.5.4 universal-base64url: ^1.1.0 - checksum: 557a1a603f0a2eb1301f7c01e454413a2ac11f0980dfd135bb041630e4d8cd0e5485d73af4f227e09ed0d3ed05ac0ffe6a805f41afb8fcdb1571259ff3f67b1b + checksum: 74634a4bf03432b74723881c8bcdbdd90bd9c03b9911eed9062a137b1f5b250c4279d6b01db2ae5863dede8f7652b6b8f5ef78ba758e70323b94cf9efa81706c languageName: node linkType: hard @@ -7713,7 +7713,7 @@ __metadata: "@nestjs/swagger": ^7.1.10 "@nestjs/testing": ^10.2.3 "@nestjs/websockets": ^10.2.3 - "@tonomy/tonomy-id-sdk": 0.18.0-development.5 + "@tonomy/tonomy-id-sdk": 0.18.0-development.6 "@types/express": ^4.17.13 "@types/jest": 29.2.4 "@types/node": 18.11.18 From 76f49e480508ede1b3a0bf4bb6ecfd946f0e83fe Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Mon, 15 Jan 2024 21:14:42 +0100 Subject: [PATCH 10/19] ci: CD --- .github/workflows/check-sdk-version.yaml | 7 +++- .../{deployment.yaml => deploy-staging.yaml} | 0 .github/workflows/deploy-testnet.yaml | 34 +++++++++++++++++++ .github/workflows/test.yaml | 6 ++-- 4 files changed, 43 insertions(+), 4 deletions(-) rename .github/workflows/{deployment.yaml => deploy-staging.yaml} (100%) create mode 100644 .github/workflows/deploy-testnet.yaml diff --git a/.github/workflows/check-sdk-version.yaml b/.github/workflows/check-sdk-version.yaml index 4a64ced..3646146 100644 --- a/.github/workflows/check-sdk-version.yaml +++ b/.github/workflows/check-sdk-version.yaml @@ -1,6 +1,11 @@ name: Test - Check SDK version -on: pull_request +on: + pull_request: + branches: + - master + - testnet + - development jobs: check-sdk-version: diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deploy-staging.yaml similarity index 100% rename from .github/workflows/deployment.yaml rename to .github/workflows/deploy-staging.yaml diff --git a/.github/workflows/deploy-testnet.yaml b/.github/workflows/deploy-testnet.yaml new file mode 100644 index 0000000..94d5306 --- /dev/null +++ b/.github/workflows/deploy-testnet.yaml @@ -0,0 +1,34 @@ +name: Deploy - Testnet + +on: + pull_request: + types: + - closed + branches: + - testnet + +jobs: + build: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build and push + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile + target: tonomy_communication_base + push: true + tags: tonomy/communication:rc diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 02468ca..abe97c3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,9 +1,9 @@ -name: Test - Pull Requests (not to master) +name: Test - Pull Requests on: pull_request: - branches-ignore: - - master + branches: + - development jobs: tests: From 3f21ded7bd46e354f7cab61430961d5c0e46f029 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Tue, 23 Jan 2024 14:42:11 +0100 Subject: [PATCH 11/19] feat: Using Tonomy Ops key for environment variable --- src/settings.ts | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/settings.ts b/src/settings.ts index befef74..cd6de40 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -11,14 +11,14 @@ if (env !== 'test') console.log(`NODE_ENV=${env}`); type ConfigType = { blockchainUrl: string; loggerLevel: - | 'emergency' - | 'alert' - | 'critical' - | 'error' - | 'warning' - | 'notice' - | 'info' - | 'debug'; + | 'emergency' + | 'alert' + | 'critical' + | 'error' + | 'warning' + | 'notice' + | 'info' + | 'debug'; }; type SettingsType = { @@ -39,14 +39,14 @@ const settings: SettingsType = { type FixLoggerLevelEnumType = Omit & { loggerLevel: - | 'emergency' - | 'alert' - | 'critical' - | 'error' - | 'warning' - | 'notice' - | 'info' - | 'debug'; + | 'emergency' + | 'alert' + | 'critical' + | 'error' + | 'warning' + | 'notice' + | 'info' + | 'debug'; }; switch (env) { @@ -80,19 +80,19 @@ if (process.env.BLOCKCHAIN_URL) { if (env !== 'test') console.log('settings', settings); settings.secrets = { - createAccountPrivateKey: EosioUtil.defaultAntelopePrivateKey.toString(), + createAccountPrivateKey: + 'PVT_K1_24kG9VcMk3VkkgY4hh42X262AWV18YcPjBTd2Hox4YWoP8vRTU', hCaptchaSecret: '0x0000000000000000000000000000000000000000', }; -if (process.env.CREATE_ACCOUNT_PRIVATE_KEY) { - console.log('Using CREATE_ACCOUNT_PRIVATE_KEY from env'); - settings.secrets.createAccountPrivateKey = - process.env.CREATE_ACCOUNT_PRIVATE_KEY; -} - if (process.env.HCAPTCHA_SECRET) { console.log('Using HCAPTCHA_SECRET from env'); settings.secrets.hCaptchaSecret = process.env.HCAPTCHA_SECRET; } +if (process.env.TONOMY_OPS_PRIVATE_KEY) { + console.log('Using TONOMY_OPS_PRIVATE_KEY from env'); + settings.secrets.createAccountPrivateKey = process.env.TONOMY_OPS_PRIVATE_KEY; +} + export default settings; From 7371b73560b2fc531ce1bc95f8e77d61e169d8e3 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Wed, 24 Jan 2024 17:24:23 +0100 Subject: [PATCH 12/19] ci: Fixed lint error --- src/settings.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/settings.ts b/src/settings.ts index cd6de40..fb698b4 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -11,14 +11,14 @@ if (env !== 'test') console.log(`NODE_ENV=${env}`); type ConfigType = { blockchainUrl: string; loggerLevel: - | 'emergency' - | 'alert' - | 'critical' - | 'error' - | 'warning' - | 'notice' - | 'info' - | 'debug'; + | 'emergency' + | 'alert' + | 'critical' + | 'error' + | 'warning' + | 'notice' + | 'info' + | 'debug'; }; type SettingsType = { @@ -39,14 +39,14 @@ const settings: SettingsType = { type FixLoggerLevelEnumType = Omit & { loggerLevel: - | 'emergency' - | 'alert' - | 'critical' - | 'error' - | 'warning' - | 'notice' - | 'info' - | 'debug'; + | 'emergency' + | 'alert' + | 'critical' + | 'error' + | 'warning' + | 'notice' + | 'info' + | 'debug'; }; switch (env) { From 4967c85659f5209c36475f24020f5b21a14f115b Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Thu, 25 Jan 2024 12:56:00 +0100 Subject: [PATCH 13/19] build: Update SDK version --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e6d5743..f833039 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@nestjs/platform-socket.io": "^10.2.3", "@nestjs/swagger": "^7.1.10", "@nestjs/websockets": "^10.2.3", - "@tonomy/tonomy-id-sdk": "0.18.0-development.6", + "@tonomy/tonomy-id-sdk": "0.18.0-development.9", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "hcaptcha": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 10c0366..a12d26b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1576,9 +1576,9 @@ __metadata: languageName: node linkType: hard -"@tonomy/tonomy-id-sdk@npm:0.18.0-development.6": - version: 0.18.0-development.6 - resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.6" +"@tonomy/tonomy-id-sdk@npm:0.18.0-development.9": + version: 0.18.0-development.9 + resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.9" dependencies: "@consento/sync-randombytes": ^1.0.5 "@tonomy/antelope-did": ^0.1.5 @@ -1593,7 +1593,7 @@ __metadata: elliptic: ^6.5.4 socket.io-client: ^4.5.4 universal-base64url: ^1.1.0 - checksum: 74634a4bf03432b74723881c8bcdbdd90bd9c03b9911eed9062a137b1f5b250c4279d6b01db2ae5863dede8f7652b6b8f5ef78ba758e70323b94cf9efa81706c + checksum: 0b91872a21c323940ce6037f3b29efcfd1efbb83a522d54370f7b48544ad492352589ebfcb72a61438873d4f79a166ab5552168b117ce4a1e658963559096dd1 languageName: node linkType: hard @@ -7713,7 +7713,7 @@ __metadata: "@nestjs/swagger": ^7.1.10 "@nestjs/testing": ^10.2.3 "@nestjs/websockets": ^10.2.3 - "@tonomy/tonomy-id-sdk": 0.18.0-development.6 + "@tonomy/tonomy-id-sdk": 0.18.0-development.9 "@types/express": ^4.17.13 "@types/jest": 29.2.4 "@types/node": 18.11.18 From de6038248f3f86b9427abcdf7d23f8791b728923 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Tue, 30 Jan 2024 12:59:36 +0100 Subject: [PATCH 14/19] build: update sdk script fix --- update_sdk_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_sdk_version.sh b/update_sdk_version.sh index 85b5a81..4dc78a1 100755 --- a/update_sdk_version.sh +++ b/update_sdk_version.sh @@ -11,7 +11,7 @@ set +e if [ "${BRANCH}" == "master" ]; then VERSION=$(npm view @tonomy/tonomy-id-sdk version) elif [ "${BRANCH}" == "testnet" ]; then - VERSION=$(npm view @tonomy/tonomy-id-sdk@rc version) + VERSION=$(npm view @tonomy/tonomy-id-sdk@testnet version) elif [ "${BRANCH}" == "development" ]; then VERSION=$(npm view @tonomy/tonomy-id-sdk@development version) else From 25f5ebde4211acfe3d0822d3dab26e7092a09c72 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Tue, 30 Jan 2024 13:00:19 +0100 Subject: [PATCH 15/19] build: SDK updated to testnet --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f833039..7e0bc78 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@nestjs/platform-socket.io": "^10.2.3", "@nestjs/swagger": "^7.1.10", "@nestjs/websockets": "^10.2.3", - "@tonomy/tonomy-id-sdk": "0.18.0-development.9", + "@tonomy/tonomy-id-sdk": "0.18.0-rc.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "hcaptcha": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index a12d26b..2598bba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1576,9 +1576,9 @@ __metadata: languageName: node linkType: hard -"@tonomy/tonomy-id-sdk@npm:0.18.0-development.9": - version: 0.18.0-development.9 - resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-development.9" +"@tonomy/tonomy-id-sdk@npm:0.18.0-rc.2": + version: 0.18.0-rc.2 + resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-rc.2" dependencies: "@consento/sync-randombytes": ^1.0.5 "@tonomy/antelope-did": ^0.1.5 @@ -1593,7 +1593,7 @@ __metadata: elliptic: ^6.5.4 socket.io-client: ^4.5.4 universal-base64url: ^1.1.0 - checksum: 0b91872a21c323940ce6037f3b29efcfd1efbb83a522d54370f7b48544ad492352589ebfcb72a61438873d4f79a166ab5552168b117ce4a1e658963559096dd1 + checksum: ae01d1a151f387a3c879bd2c089699b0e4f0f77ce3c5f58840a9848de91b8175dd9fecb759e8ed3118c75ce35644b35d13228602bcbfe4aa4da3fa3db3ec0b14 languageName: node linkType: hard @@ -7713,7 +7713,7 @@ __metadata: "@nestjs/swagger": ^7.1.10 "@nestjs/testing": ^10.2.3 "@nestjs/websockets": ^10.2.3 - "@tonomy/tonomy-id-sdk": 0.18.0-development.9 + "@tonomy/tonomy-id-sdk": 0.18.0-rc.2 "@types/express": ^4.17.13 "@types/jest": 29.2.4 "@types/node": 18.11.18 From 35c32953e9464a4127739856805ad9c383b73520 Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Tue, 2 Apr 2024 20:58:32 +0200 Subject: [PATCH 16/19] docs: Updated env variables --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 6eb03be..fb78a04 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ yarn run updateSdkVersion master ## Environment variables and configuration `NODE_ENV` - Determines which config file in `./src/config` to use -`CREATE_ACCOUNT_PRIVATE_KEY` - The private key used to sign the transaction to create a new account +`TONOMY_OPS_PRIVATE_KEY` - The private key used to sign the transaction to create a new account `HCAPTCHA_SECRET` - The hCaptcha account secret key ## Test @@ -68,9 +68,3 @@ Build command: `yarn -v && yarn install && yarn run build` - NOTE: we need to run `yarn install` again so that we install with `yarn@3.1.1` which we force via`.yarnrc.yml` and `.yarn/releases/yarn-3.1.1.cjs`. See for more details. Run command: `yarn run start:prod` - -Environment variables - -- NODE_ENV -- CREATE_ACCOUNT_PRIVATE_KEY -- HCAPTCHA_SECRET From 4de72215a0863e8ae12995ae29e6898f3923850e Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Tue, 2 Apr 2024 22:04:42 +0200 Subject: [PATCH 17/19] build: Updated SDK to rc release --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7e0bc78..3047523 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@nestjs/platform-socket.io": "^10.2.3", "@nestjs/swagger": "^7.1.10", "@nestjs/websockets": "^10.2.3", - "@tonomy/tonomy-id-sdk": "0.18.0-rc.2", + "@tonomy/tonomy-id-sdk": "0.19.0-rc.2", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "hcaptcha": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 2598bba..4637a2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1576,9 +1576,9 @@ __metadata: languageName: node linkType: hard -"@tonomy/tonomy-id-sdk@npm:0.18.0-rc.2": - version: 0.18.0-rc.2 - resolution: "@tonomy/tonomy-id-sdk@npm:0.18.0-rc.2" +"@tonomy/tonomy-id-sdk@npm:0.19.0-rc.2": + version: 0.19.0-rc.2 + resolution: "@tonomy/tonomy-id-sdk@npm:0.19.0-rc.2" dependencies: "@consento/sync-randombytes": ^1.0.5 "@tonomy/antelope-did": ^0.1.5 @@ -1593,7 +1593,7 @@ __metadata: elliptic: ^6.5.4 socket.io-client: ^4.5.4 universal-base64url: ^1.1.0 - checksum: ae01d1a151f387a3c879bd2c089699b0e4f0f77ce3c5f58840a9848de91b8175dd9fecb759e8ed3118c75ce35644b35d13228602bcbfe4aa4da3fa3db3ec0b14 + checksum: d4463392a7b41bbd2260253454d8c30e96a0b44325715a0a2f43a3c15f88c87159ef4e205fd8bc14a3abf1474846abcbb55cf3a5de1796a777b77fd176c88c70 languageName: node linkType: hard @@ -7713,7 +7713,7 @@ __metadata: "@nestjs/swagger": ^7.1.10 "@nestjs/testing": ^10.2.3 "@nestjs/websockets": ^10.2.3 - "@tonomy/tonomy-id-sdk": 0.18.0-rc.2 + "@tonomy/tonomy-id-sdk": 0.19.0-rc.2 "@types/express": ^4.17.13 "@types/jest": 29.2.4 "@types/node": 18.11.18 From 8d6d58df7074e84abca64dde7077ea69907357ee Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Mon, 22 Apr 2024 09:52:13 +0200 Subject: [PATCH 18/19] feat: changed production API endpoint --- src/config/config.production.json | 4 ++-- src/settings.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/config/config.production.json b/src/config/config.production.json index 597f6ae..c1f092f 100644 --- a/src/config/config.production.json +++ b/src/config/config.production.json @@ -1,4 +1,4 @@ { - "blockchainUrl": "https://blockchain-api-production.pangea.web4.world", + "blockchainUrl": "https://blockchain-api.pangea.web4.world", "loggerLevel": "info" -} +} \ No newline at end of file diff --git a/src/settings.ts b/src/settings.ts index fb698b4..9292ae0 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -2,7 +2,6 @@ import * as configDefault from './config/config.json'; import * as configStaging from './config/config.staging.json'; import * as configTestnet from './config/config.testnet.json'; import * as configProduction from './config/config.production.json'; -import { EosioUtil } from '@tonomy/tonomy-id-sdk'; const env = process.env.NODE_ENV || 'development'; From 5102747fd96605cc3166ce14ab8f2f23a11ad5cc Mon Sep 17 00:00:00 2001 From: Jack Tanner Date: Mon, 22 Apr 2024 09:55:58 +0200 Subject: [PATCH 19/19] build: updated SDK version --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3047523..fb2504d 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@nestjs/platform-socket.io": "^10.2.3", "@nestjs/swagger": "^7.1.10", "@nestjs/websockets": "^10.2.3", - "@tonomy/tonomy-id-sdk": "0.19.0-rc.2", + "@tonomy/tonomy-id-sdk": "0.19.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "hcaptcha": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 4637a2a..b7c9b55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1576,9 +1576,9 @@ __metadata: languageName: node linkType: hard -"@tonomy/tonomy-id-sdk@npm:0.19.0-rc.2": - version: 0.19.0-rc.2 - resolution: "@tonomy/tonomy-id-sdk@npm:0.19.0-rc.2" +"@tonomy/tonomy-id-sdk@npm:0.19.0": + version: 0.19.0 + resolution: "@tonomy/tonomy-id-sdk@npm:0.19.0" dependencies: "@consento/sync-randombytes": ^1.0.5 "@tonomy/antelope-did": ^0.1.5 @@ -1593,7 +1593,7 @@ __metadata: elliptic: ^6.5.4 socket.io-client: ^4.5.4 universal-base64url: ^1.1.0 - checksum: d4463392a7b41bbd2260253454d8c30e96a0b44325715a0a2f43a3c15f88c87159ef4e205fd8bc14a3abf1474846abcbb55cf3a5de1796a777b77fd176c88c70 + checksum: 05bf0812a27d425f136ace2c27ec98f501a84d0004923047dd1c05d21fd5c1ae8068654ce157b4967f34453d5634af88b4d70fafc656659bc15be746a064ecef languageName: node linkType: hard @@ -7713,7 +7713,7 @@ __metadata: "@nestjs/swagger": ^7.1.10 "@nestjs/testing": ^10.2.3 "@nestjs/websockets": ^10.2.3 - "@tonomy/tonomy-id-sdk": 0.19.0-rc.2 + "@tonomy/tonomy-id-sdk": 0.19.0 "@types/express": ^4.17.13 "@types/jest": 29.2.4 "@types/node": 18.11.18