Skip to content

Commit 5858c0c

Browse files
author
Rodolphe Marques
authored
Merge pull request #269 from nevermined-io/develop
Finalize Contracts 2.0
2 parents bf85db6 + f1bc064 commit 5858c0c

File tree

144 files changed

+4906
-1748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+4906
-1748
lines changed

.github/workflows/build.yml

-104
This file was deleted.

.github/workflows/release-github.yml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: GitHub Release
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*.*'
7+
8+
jobs:
9+
release:
10+
name: "Tagged Release"
11+
runs-on: "ubuntu-latest"
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0
17+
token: ${{ secrets.API_TOKEN_GITHUB }}
18+
19+
# Build process
20+
- uses: actions/setup-node@v3
21+
with:
22+
node-version: '12.x'
23+
cache: yarn
24+
25+
- name: Set version to env
26+
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
27+
28+
- name: Build package
29+
run: |
30+
npm pack
31+
32+
- name: Update CHANGELOG.md
33+
id: changelog
34+
run: |
35+
yarn add --dev auto-changelog
36+
npx auto-changelog
37+
38+
- name: Commit CHANGELOG.md
39+
uses: stefanzweifel/git-auto-commit-action@v4
40+
with:
41+
commit_message: Automated CHANGELOG.md update
42+
commit_options: '--no-verify --signoff'
43+
file_pattern: CHANGELOG.md
44+
branch: master
45+
46+
- name: Publish Github relase
47+
uses: "marvinpinto/action-automatic-releases@latest"
48+
with:
49+
repo_token: "${{ secrets.GITHUB_TOKEN }}"
50+
prerelease: false
51+
files: |
52+
CHANGELOG.md
53+
nevermined-io-nevermined-sdk-js-${{ env.RELEASE_VERSION }}.tgz

.github/workflows/testing.yml

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
name: Testing
2+
3+
on:
4+
push:
5+
branches: [master, develop]
6+
pull_request:
7+
branches: [master, develop]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
network: ["--spree-embedded-contracts", "--polygon"]
16+
node: ["14"]
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
- uses: actions/setup-node@v2
21+
with:
22+
node-version: ${{ matrix.node }}
23+
- name: Install dependencies
24+
run: |
25+
yarn
26+
- name: Run linters
27+
run: npm run lint
28+
- name: Run tools (network)
29+
run: |
30+
docker login -u ${{ secrets.NEVERMINED_DOCKER_USERNAME }} -p ${{ secrets.NEVERMINED_DOCKER_TOKEN}}
31+
yarn ganache --port 18545 > ganache-cli.log &
32+
sudo chmod go+r /etc/hosts
33+
sudo echo "127.0.0.1 nevermined-metadata" | sudo tee -a /etc/hosts
34+
git clone https://github.com/nevermined-io/tools
35+
cd tools
36+
37+
export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
38+
export KEEPER_VERSION=latest
39+
export GATEWAY_VERSION=develop
40+
export SUBGRAPH_VERSION=v0.3.0-rc5
41+
rm -rf "${HOME}/.nevermined/nevermined-contracts/artifacts"
42+
43+
# Disabling the compute api for now
44+
# Check https://github.com/nevermined-io/sdk-js/issues/33
45+
46+
./start_nevermined.sh --no-marketplace ${{ matrix.network }} 2>&1 | tee nevermined_tools.txt &
47+
cd ..
48+
./scripts/wait-nevermined.sh
49+
./scripts/wait-subgraphs.sh
50+
51+
- name: Run unit tests
52+
run: export ETH_PORT=18545; npm run test:cover
53+
- name: Run integration tests
54+
env:
55+
SEED_WORDS: ${{ secrets.seedWords }}
56+
INFURA_TOKEN: ${{ secrets.INFURA_TOKEN }}
57+
run: |
58+
npm run integration:cover
59+
- name: Upload logs
60+
uses: actions/upload-artifact@v2
61+
if: failure()
62+
with:
63+
name: nevermined-tools-output
64+
path: tools/nevermined_tools.txt
65+
66+
aave-integration:
67+
runs-on: ubuntu-latest
68+
steps:
69+
- uses: actions/checkout@v2
70+
- uses: actions/setup-node@v1
71+
with:
72+
node-version: "14.x"
73+
- name: Install dependencies
74+
run: |
75+
yarn
76+
sudo apt-get install mmv
77+
- name: Run tools (network)
78+
run: |
79+
docker login -u ${{ secrets.NEVERMINED_DOCKER_USERNAME }} -p ${{ secrets.NEVERMINED_DOCKER_TOKEN}}
80+
sudo chmod go+r /etc/hosts
81+
sudo echo "127.0.0.1 nevermined-metadata" | sudo tee -a /etc/hosts
82+
git clone https://github.com/nevermined-io/tools
83+
cd tools
84+
git checkout set-rpc-port
85+
export KEEPER_RPC_PORT="18545"
86+
export KEEPER_NETWORK_NAME="spree"
87+
export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
88+
export KEEPER_VERSION=latest
89+
export GATEWAY_VERSION=develop
90+
export MARKETPLACE_API_VERSION=latest
91+
export GANACHE_COMMAND_OPTIONS="-d -p 18545 -m 'taxi music thumb unique chat sand crew more leg another off lamp' -u 0xAFD49D613467c0DaBf47B8f5C841089d96Cf7167 -f https://eth-kovan.alchemyapi.io/v2/UaH4LeYR7hHlx00yQZanF1B5AUSmDsTA@28000000"
92+
./start_nevermined.sh --marketplace-api --no-marketplace --no-faucet --no-graph --local-ganache-node 2>&1 | tee nevermined_tools.txt &
93+
cd ..
94+
./scripts/wait-nevermined-external.sh
95+
- name: Run aave integration test
96+
run: |
97+
export ETH_PORT=18545
98+
npm run integration:aave
99+
- name: Upload logs
100+
uses: actions/upload-artifact@v2
101+
if: failure()
102+
with:
103+
name: nevermined-tools-output
104+
path: tools/nevermined_tools.txt

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ test/**/*.js
77
src/**/*.js
88
package-lock.json
99
yarn.lock
10+
.vscode
1011

1112
src/metadata\.json
1213
.idea

CHANGELOG.md

+87
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,93 @@ All notable changes to this project will be documented in this file. Dates are d
44

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

7+
#### [v0.20.0-rc6](https://github.com/nevermined-io/sdk-js/compare/v0.20.0-rc5...v0.20.0-rc6)
8+
9+
> 10 June 2022
10+
11+
- add address endpoint [`#277`](https://github.com/nevermined-io/sdk-js/pull/277)
12+
- feature/latest contracts [`#275`](https://github.com/nevermined-io/sdk-js/pull/275)
13+
- Several fixes related to subgraph events [`#272`](https://github.com/nevermined-io/sdk-js/pull/272)
14+
- works on my machine [`e2dd271`](https://github.com/nevermined-io/sdk-js/commit/e2dd2718c0e033a5a4e4ccb9786a3b4eeb6ccae4)
15+
- Upgraded to latest contracts [`b96b7fb`](https://github.com/nevermined-io/sdk-js/commit/b96b7fb2f017fa62df15159d1415c78b2f59aa71)
16+
- Adding v0.20.0-rc5 Changelog updates [`d3f9aa5`](https://github.com/nevermined-io/sdk-js/commit/d3f9aa53a46e823d272a92af8bac6d8d8aeb85bc)
17+
18+
#### [v0.20.0-rc5](https://github.com/nevermined-io/sdk-js/compare/v0.20.0-rc4...v0.20.0-rc5)
19+
20+
> 7 June 2022
21+
22+
- return token in order to be saved in local storage [`#271`](https://github.com/nevermined-io/sdk-js/pull/271)
23+
- Feature/sync develop [`#268`](https://github.com/nevermined-io/sdk-js/pull/268)
24+
- fixing artifacts tests [`8454603`](https://github.com/nevermined-io/sdk-js/commit/8454603c62749c4aa7bfe93f8f3f334007ee5ddf)
25+
- Adding v0.20.0-rc4 Changelog updates [`0960714`](https://github.com/nevermined-io/sdk-js/commit/0960714cfc176b12fd2dc81ce3969e200c30f1c9)
26+
- bump version [`3f8774a`](https://github.com/nevermined-io/sdk-js/commit/3f8774ada7ad539b56b6cc1be40cc93181c4258b)
27+
28+
#### [v0.20.0-rc4](https://github.com/nevermined-io/sdk-js/compare/v0.20.0-rc3...v0.20.0-rc4)
29+
30+
> 3 June 2022
31+
32+
- Quick fix for non-eip1559 networks [`#266`](https://github.com/nevermined-io/sdk-js/pull/266)
33+
- integrate Permissions and refactor search query [`#264`](https://github.com/nevermined-io/sdk-js/pull/264)
34+
- re-enable polygon tests [`695492f`](https://github.com/nevermined-io/sdk-js/commit/695492ffc48f8bdb611e7d0e95d5f3fb944bd48c)
35+
- bumped version to rc4 [`639dbcc`](https://github.com/nevermined-io/sdk-js/commit/639dbcce616629b666e3fda9a729e98deae153c6)
36+
- fix typo [`c6b4fbf`](https://github.com/nevermined-io/sdk-js/commit/c6b4fbf07b1c1e6e6ff91f6c055bae22e7c81a56)
37+
38+
#### [v0.20.0-rc3](https://github.com/nevermined-io/sdk-js/compare/v0.20.0-rc2...v0.20.0-rc3)
39+
40+
> 30 May 2022
41+
42+
- use fetch instead of fs [`8a7f5c9`](https://github.com/nevermined-io/sdk-js/commit/8a7f5c97471a5048718cc86c9bd4cd785a5f4e69)
43+
- Adding v0.20.0-rc3 Changelog updates [`0aac299`](https://github.com/nevermined-io/sdk-js/commit/0aac2996ed1cfe73d0c866ce4ad72d68fa2ecbfa)
44+
- Adding v0.20.0-rc2 Changelog updates [`757ffbe`](https://github.com/nevermined-io/sdk-js/commit/757ffbe61dd9d74b06febd8e036bd869676bc982)
45+
46+
#### [v0.20.0-rc2](https://github.com/nevermined-io/sdk-js/compare/v0.20.0-rc1...v0.20.0-rc2)
47+
48+
> 30 May 2022
49+
50+
- avoid infinite loop when events are not returned [`5134a66`](https://github.com/nevermined-io/sdk-js/commit/5134a66efa570a272ffcb85ad34fb850283a0095)
51+
- read file instead of import if artifactsFolder is not undefined [`b5e8ef5`](https://github.com/nevermined-io/sdk-js/commit/b5e8ef52ab2a07cf2814bef5f557d3a4e36207a5)
52+
- latest versions [`de33d7e`](https://github.com/nevermined-io/sdk-js/commit/de33d7ebb39966f5ac9a905daaab62e2674e51e0)
53+
54+
#### [v0.20.0-rc1](https://github.com/nevermined-io/sdk-js/compare/v0.20.0-rc0...v0.20.0-rc1)
55+
56+
> 26 May 2022
57+
58+
- Unify errors management and code errors [`4a3a1b7`](https://github.com/nevermined-io/sdk-js/commit/4a3a1b7c065a64bd2c6f89a608c730793d987ebe)
59+
- integrate bookmark in sdk [`b021a49`](https://github.com/nevermined-io/sdk-js/commit/b021a4913319aea1eb33e9939b033709a70722f5)
60+
- fix profiles [`87ed6c1`](https://github.com/nevermined-io/sdk-js/commit/87ed6c13e9efd93722867f87f198f99809fb8011)
61+
62+
#### [v0.20.0-rc0](https://github.com/nevermined-io/sdk-js/compare/v0.19.24...v0.20.0-rc0)
63+
64+
> 13 May 2022
65+
66+
- replace `metadata-api` url by `marketplace-api` and sort type [`#243`](https://github.com/nevermined-io/sdk-js/pull/243)
67+
- Feat/update deps [`#245`](https://github.com/nevermined-io/sdk-js/pull/245)
68+
- Updating to work on version 2.0 of contracts [`#228`](https://github.com/nevermined-io/sdk-js/pull/228)
69+
- integrate auth in tests [`4bbe1b8`](https://github.com/nevermined-io/sdk-js/commit/4bbe1b816174e2c6ed0ee6bac02548970470e14c)
70+
- integrate marketplace auth [`24354d1`](https://github.com/nevermined-io/sdk-js/commit/24354d13e9898bb191ffdf5a7865a0ff39428e33)
71+
- Replace circom and circomlib with circomlibjs [`e025b82`](https://github.com/nevermined-io/sdk-js/commit/e025b822849f92c3a8f90a1c7e56fae37edc6e09)
72+
73+
#### [v0.19.24](https://github.com/nevermined-io/sdk-js/compare/v0.19.23...v0.19.24)
74+
75+
> 2 May 2022
76+
77+
- Adding v0.19.23 Changelog updates [`aae2956`](https://github.com/nevermined-io/sdk-js/commit/aae29562f5790b5d138ef63b4ef8f6916c2f26db)
78+
- bump version [`295644c`](https://github.com/nevermined-io/sdk-js/commit/295644c290d085b874863c2bac0bf8145dabaa23)
79+
- bump version [`01015ec`](https://github.com/nevermined-io/sdk-js/commit/01015ec918ac090563464d19920a1f292393e033)
80+
81+
#### [v0.19.23](https://github.com/nevermined-io/sdk-js/compare/0.19.22...v0.19.23)
82+
83+
> 2 May 2022
84+
85+
- Adding 0.19.22 Changelog updates [`bd49424`](https://github.com/nevermined-io/sdk-js/commit/bd494245568dad673131d678821a901e485cea56)
86+
87+
#### [0.19.22](https://github.com/nevermined-io/sdk-js/compare/v0.19.21...0.19.22)
88+
89+
> 2 May 2022
90+
91+
- add aave service agreement to ddo when creating nft721 asset [`#248`](https://github.com/nevermined-io/sdk-js/pull/248)
92+
- Adding v0.19.21 Changelog updates [`c93cdc5`](https://github.com/nevermined-io/sdk-js/commit/c93cdc55f139a43db4130ccb0f80924d2645a931)
93+
794
#### [v0.19.21](https://github.com/nevermined-io/sdk-js/compare/v0.19.20...v0.19.21)
895

996
> 22 April 2022

aave_integration/config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { LoggerInstance } from '../src/utils'
44
LoggerInstance.setLevel(LogLevel.Error)
55

66
export default {
7-
metadataUri: 'http://localhost:5000',
7+
marketplaceUri: 'http://nevermined-metadata:3100',
88
gatewayUri: 'http://localhost:8030',
99
gatewayAddress: '0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0',
1010
faucetUri: 'http://localhost:3001',
1111
nodeUri: `http://localhost:${process.env.ETH_PORT || 8545}`,
12-
graphHttpUri: 'http://localhost:9000/subgraphs/name/neverminedio',
12+
graphHttpUri: undefined,
1313
secretStoreUri: 'http://localhost:12001',
1414
gasMultiplier: 1.1,
1515
verbose: LogLevel.Error,

0 commit comments

Comments
 (0)