Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/sdk 3.0.47 #356

Merged
merged 8 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/testing-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ jobs:
nvm-tools copy-circuits ./circuits
ls -l circuits
- name: Run node
env:
IPFS_PROJECT_ID: ${{ secrets.IPFS_PROJECT_ID }}
IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
run: |
yarn setup:dev
yarn start &
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v3.0.14-rc0](https://github.com/nevermined-io/node/compare/v3.0.13...v3.0.14-rc0)

> 17 January 2025

- feat: prepare update to sdk v3.0.47 [`6e6452f`](https://github.com/nevermined-io/node/commit/6e6452f038f1fd59b37dc7a96592f3853fae6950)
- feat: bump sdk [`45765fb`](https://github.com/nevermined-io/node/commit/45765fbb827809ee513adfbf8a75379875fb177e)
- feat: update sdk v3.0.47-rc1 [`6cebcd3`](https://github.com/nevermined-io/node/commit/6cebcd3c1386518b495209d17dbde46e80d7519c)

#### [v3.0.13](https://github.com/nevermined-io/node/compare/v3.0.13-rc3...v3.0.13)

> 9 January 2025
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "node-ts",
"version": "3.0.13",
"version": "3.0.14",
"description": "Nevermined Node",
"main": "main.ts",
"scripts": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"@nestjs/typeorm": "^10.0.2",
"@nevermined-io/argo-workflows-api": "^0.1.3",
"@nevermined-io/passport-nevermined": "^0.3.0",
"@nevermined-io/sdk": "3.0.46",
"@nevermined-io/sdk": "3.0.47",
"@sideway/address": "^5.0.0",
"@sideway/formula": "^3.0.1",
"@sideway/pinpoint": "^2.0.0",
Expand Down Expand Up @@ -80,7 +80,7 @@
"typescript": "^5.4.5"
},
"peerDependencies": {
"viem": "2.9.31"
"viem": "^2.22.40"
},
"devDependencies": {
"@commitlint/cli": "^19.3.0",
Expand Down
6 changes: 4 additions & 2 deletions src/access/access.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,11 @@ export class AccessController {
const result = await plugin.process(params, this.nvmService.nodeAccount)
Logger.debug(`Result of processing: ${result}`)
Logger.debug(`Result of stringify: ${JSON.stringify(result)}`)

const processedResult = {
TransferNFTCondition: result!.TransferNFTCondition.transactionHash,
EscrowPaymentCondition: result!.EscrowPaymentCondition.transactionHash,
TransferNFTCondition: result?.TransferNFTCondition?.transactionHash || '0x',
TransferNFT721Condition: result?.TransferNFT721Condition?.transactionHash || '0x',
EscrowPaymentCondition: result?.EscrowPaymentCondition?.transactionHash || '0x',
}

txs = processedResult
Expand Down
2 changes: 1 addition & 1 deletion src/info/info.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class InfoController {
'external-contracts': [],
'keeper-version': nevermined.keeper.didRegistry.version,
'provider-address': this.nvmService.providerAddress,
'ecdsa-public-key': viemAccount.publicKey,
'ecdsa-public-key': viemAccount?.publicKey,
'rsa-public-key': key.exportKey('public'),
'babyjub-public-key': {
x: baby.x,
Expand Down
Loading
Loading