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/node 18 #580

Merged
merged 6 commits into from
Sep 28, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# Build process
- uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: 18

- name: Set version to env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: 18
registry-url: https://registry.npmjs.org/
- run: yarn install --frozen-lockfile --ignore-engines
- run: npm publish --access public
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/testing-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Install dependencies
run: |
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- uses: nevermined-io/[email protected]
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- uses: nevermined-io/[email protected]
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- uses: nevermined-io/[email protected]
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- uses: actions/checkout@v3
with:
repository: nevermined-io/node
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- uses: nevermined-io/[email protected]
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
Expand Down Expand Up @@ -48,6 +48,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Reclaim some disk space
run: docker system prune --all --volumes -f
- uses: actions/checkout@v3
- uses: actions/checkout@v3
with:
Expand All @@ -57,7 +59,7 @@ jobs:
token: ${{ secrets.API_TOKEN_GITHUB }}
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Deploy contracts
run: |
Expand All @@ -79,7 +81,7 @@ jobs:
- name: Start ganache
env:
SEED_WORDS: ${{ secrets.seedWords }}
run: yarn ganache --port 18545 --chain.chainId 8998 --wallet.mnemonic "$SEED_WORDS" --detach
run: yarn ganache --server.port 18545 --chain.chainId 8998 --wallet.mnemonic "$SEED_WORDS" --detach

- name: Run unit tests
env:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12
18
1 change: 0 additions & 1 deletion integration/nevermined/Assets.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ describe('Assets', () => {
console.debug(`It should fail with error: ${err}`)
assert.isDefined(err)
})

})
})

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-tsdoc": "^0.2.16",
"express": "^4.18.2",
"ganache": "^7.9.0",
"ganache": "^7.9.1",
"http-proxy": "^1.18.1",
"husky": "^8.0.3",
"lint-staged": "^13.0.4",
Expand Down
4 changes: 2 additions & 2 deletions src/services/node/NeverminedNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,10 @@ export class NeverminedNode extends Instantiable {
nftType: ercType,
serviceIndex: serviceIndex && serviceIndex >= 0 ? serviceIndex : -1,
})

this.logger.log(`Claiming NFT using endpoint: ${claimNFTEndpoint}`)
const response = await this.nevermined.utils.fetch.post(claimNFTEndpoint, claimBody)

if (!response.ok) {
throw new HttpError(`${response.statusText} ${response.url}`, response.status)
}
Expand Down
3 changes: 1 addition & 2 deletions test/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ import { LoggerInstance } from '../src/utils'

LoggerInstance.setLevel(LogLevel.Error)


const config = {
marketplaceUri: 'http://localhost:3100',
neverminedNodeUri: 'http://localhost:8030',
neverminedNodeAddress: '0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0',
web3ProviderUri: `http://localhost:${process.env.ETH_PORT || 8545}`,
web3ProviderUri: `http://127.0.0.1:${process.env.ETH_PORT || 8545}`,
verbose: LogLevel.Error,
artifactsFolder: './artifacts',
circuitsFolder: './circuits',
Expand Down