oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

Merge branch 'issue-1474-refactoring-restructure-imports' into issue-1474-refactoring-move-types-to-types-folder

Browse Source
This commit is contained in:
Miquel A. Cabot 2022-06-15 10:10:08 +02:00
commit aba454cf9d
6 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/dependabot.yml vendored
View File

@ -2,8 +2,7 @@ version: 2
updates: updates:
- package-ecosystem: npm - package-ecosystem: npm
directory: '/' directory: '/'
versioning-strategy: increase
schedule: schedule:
interval: daily interval: monthly
time: '03:00' time: '03:00'
timezone: Europe/Berlin timezone: Europe/Berlin

26
.github/workflows/ci.yml vendored
View File

@ -4,7 +4,7 @@ on:
push: push:
branches: branches:
- main - main
- v4main - v3
tags: tags:
- '**' - '**'
pull_request: pull_request:
@ -15,7 +15,7 @@ jobs:
lint: lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: '16' node-version: '16'
@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: '16' node-version: '16'
@ -48,11 +48,10 @@ jobs:
restore-keys: ${{ runner.os }}-test-unit-${{ env.cache-name }}- restore-keys: ${{ runner.os }}-test-unit-${{ env.cache-name }}-
- name: Checkout Barge - name: Checkout Barge
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: 'oceanprotocol/barge' repository: 'oceanprotocol/barge'
path: 'barge' path: 'barge'
ref: v4
- name: Run Ganache with Barge - name: Run Ganache with Barge
working-directory: ${{ github.workspace }}/barge working-directory: ${{ github.workspace }}/barge
@ -78,7 +77,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: '16' node-version: '16'
@ -97,11 +96,10 @@ jobs:
run: echo "ADDRESS_FILE=${HOME}/.ocean/ocean-contracts/artifacts/address.json" >> $GITHUB_ENV run: echo "ADDRESS_FILE=${HOME}/.ocean/ocean-contracts/artifacts/address.json" >> $GITHUB_ENV
- name: Checkout Barge - name: Checkout Barge
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: 'oceanprotocol/barge' repository: 'oceanprotocol/barge'
path: 'barge' path: 'barge'
ref: v4
- name: Login to Docker Hub - name: Login to Docker Hub
if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }} if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }}
@ -126,7 +124,6 @@ jobs:
[ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" -a -f "$HOME/.ocean/ocean-c2d/ready" ] && break [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" -a -f "$HOME/.ocean/ocean-c2d/ready" ] && break
done done
- name: integration - name: integration
run: npm run test:integration:cover run: npm run test:integration:cover
env: env:
@ -150,7 +147,7 @@ jobs:
node: ['15', '16'] node: ['15', '16']
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: ${{ matrix.node }} node-version: ${{ matrix.node }}
@ -171,7 +168,7 @@ jobs:
needs: [test_unit, test_integration] needs: [test_unit, test_integration]
if: ${{ success() && github.actor != 'dependabot[bot]' }} if: ${{ success() && github.actor != 'dependabot[bot]' }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
name: coverage name: coverage
@ -188,13 +185,13 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [test_unit, test_integration] needs: [test_unit, test_integration]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: '16' node-version: '16'
- name: checkout ocean.js repo - name: checkout ocean.js repo
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
repository: 'oceanprotocol/ocean.js' repository: 'oceanprotocol/ocean.js'
path: 'ocean.js' path: 'ocean.js'
@ -208,6 +205,3 @@ jobs:
- name: Create Guide & Commit if there are changes - name: Create Guide & Commit if there are changes
run: npm run commit:guide run: npm run commit:guide

2
.github/workflows/publish.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
env: env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: '16' node-version: '16'

28
CHANGELOG.md
View File

@ -4,14 +4,40 @@ 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). Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### [v1.0.0](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.45...v1.0.0)
#### [v1.0.0-next.45](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.44...v1.0.0-next.45)
> 5 June 2022
- contracts_1.0.0 [`#1494`](https://github.com/oceanprotocol/ocean.js/pull/1494)
- Creating code examples file + updates to readme [`#1438`](https://github.com/oceanprotocol/ocean.js/pull/1438)
- Issue-#1342: Rewrite publish flow test [`#1460`](https://github.com/oceanprotocol/ocean.js/pull/1460)
- Issue-#1349 Rewrite Pool test [`#1398`](https://github.com/oceanprotocol/ocean.js/pull/1398)
- Issue-#1351: Rewrite FixedRateExchange test [`#1393`](https://github.com/oceanprotocol/ocean.js/pull/1393)
- Issue-#1352: Rewrite SideStaking test [`#1399`](https://github.com/oceanprotocol/ocean.js/pull/1399)
- Issue-#1346: Rewrite Datatoken test [`#1377`](https://github.com/oceanprotocol/ocean.js/pull/1377)
- Issue-#1350: Rewrite Dispenser test [`#1412`](https://github.com/oceanprotocol/ocean.js/pull/1412)
- Issue-#1347: Rewrite Nft test [`#1369`](https://github.com/oceanprotocol/ocean.js/pull/1369)
- Bump @types/node from 17.0.34 to 17.0.35 [`#1477`](https://github.com/oceanprotocol/ocean.js/pull/1477)
- Bump ts-node from 10.7.0 to 10.8.0 [`#1478`](https://github.com/oceanprotocol/ocean.js/pull/1478)
- Fixing all FixedRateExchange gas estimates [`#1467`](https://github.com/oceanprotocol/ocean.js/pull/1467)
- Creating set publishing market fee function [`#1428`](https://github.com/oceanprotocol/ocean.js/pull/1428)
- Issue-#1348 rewrite NftFactory test [`#1362`](https://github.com/oceanprotocol/ocean.js/pull/1362)
- Updating CodeExamples.md [`546e509`](https://github.com/oceanprotocol/ocean.js/commit/546e509820d1d745d608825554c5fdaf3292acc5)
- use transfer() approve() and balance() functions [`e42e031`](https://github.com/oceanprotocol/ocean.js/commit/e42e031c1e1492a51ec6b88e31c828b702fde083)
- use balance() and transfer() functions [`b44f1f8`](https://github.com/oceanprotocol/ocean.js/commit/b44f1f802aa63f61f80b7428f1d24750814d9d1d)
#### [v1.0.0-next.44](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.43...v1.0.0-next.44) #### [v1.0.0-next.44](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.43...v1.0.0-next.44)
> 17 May 2022
- bump to contracts 34 [`#1476`](https://github.com/oceanprotocol/ocean.js/pull/1476) - bump to contracts 34 [`#1476`](https://github.com/oceanprotocol/ocean.js/pull/1476)
- update max out [`#1475`](https://github.com/oceanprotocol/ocean.js/pull/1475) - update max out [`#1475`](https://github.com/oceanprotocol/ocean.js/pull/1475)
- Issue-#1343: Rewrite simple publish consume flow test [`#1454`](https://github.com/oceanprotocol/ocean.js/pull/1454) - Issue-#1343: Rewrite simple publish consume flow test [`#1454`](https://github.com/oceanprotocol/ocean.js/pull/1454)
- refactor SimplePublishConsumeFlow.test.ts file [`c97f750`](https://github.com/oceanprotocol/ocean.js/commit/c97f7503133986c4a6165c4ddcb7f54e5afdc2fe) - refactor SimplePublishConsumeFlow.test.ts file [`c97f750`](https://github.com/oceanprotocol/ocean.js/commit/c97f7503133986c4a6165c4ddcb7f54e5afdc2fe)
- Release 1.0.0-next.44 [`620b5d3`](https://github.com/oceanprotocol/ocean.js/commit/620b5d3a24e3d76a7b9ac1fc78a370add76f549a)
- don't deploy smart contracts [`a75ca34`](https://github.com/oceanprotocol/ocean.js/commit/a75ca34e9e5245cfdbb670f1c23c91d96c57ec30) - don't deploy smart contracts [`a75ca34`](https://github.com/oceanprotocol/ocean.js/commit/a75ca34e9e5245cfdbb670f1c23c91d96c57ec30)
- add DDO type [`11508b7`](https://github.com/oceanprotocol/ocean.js/commit/11508b7794048dc5f81fc4aba4c3a5b551c9e18c)
#### [v1.0.0-next.43](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.42...v1.0.0-next.43) #### [v1.0.0-next.43](https://github.com/oceanprotocol/ocean.js/compare/v1.0.0-next.42...v1.0.0-next.43)

18
package-lock.json generated
View File

@ -1,15 +1,15 @@
{ {
"name": "@oceanprotocol/lib", "name": "@oceanprotocol/lib",
"version": "1.0.0-next.44", "version": "1.0.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@oceanprotocol/lib", "name": "@oceanprotocol/lib",
"version": "1.0.0-next.44", "version": "1.0.0",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"@oceanprotocol/contracts": "^1.0.0-alpha.34", "@oceanprotocol/contracts": "^1.0.0",
"bignumber.js": "^9.0.2", "bignumber.js": "^9.0.2",
"cross-fetch": "^3.1.5", "cross-fetch": "^3.1.5",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
@ -2487,9 +2487,9 @@
} }
}, },
"node_modules/@oceanprotocol/contracts": { "node_modules/@oceanprotocol/contracts": {
"version": "1.0.0-alpha.34", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.34.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0.tgz",
"integrity": "sha512-ZhNCakYbUpXrffpS98Hj0r5K70IzzTXNoYKBX4Ks3Qqc2T7mhXIxtakzygkM0lEk038ImWuzS2PAZKTATz+X2w==" "integrity": "sha512-rDCIooe1WHipLejuGhx2Wv/88SB7bWrN3+XHCWxXyPKTmmSQsgxKZPPzbIVBQ0ESChQZqGSBBJyqErqwwW4eBw=="
}, },
"node_modules/@octokit/auth-token": { "node_modules/@octokit/auth-token": {
"version": "2.5.0", "version": "2.5.0",
@ -19642,9 +19642,9 @@
} }
}, },
"@oceanprotocol/contracts": { "@oceanprotocol/contracts": {
"version": "1.0.0-alpha.34", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.34.tgz", "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0.tgz",
"integrity": "sha512-ZhNCakYbUpXrffpS98Hj0r5K70IzzTXNoYKBX4Ks3Qqc2T7mhXIxtakzygkM0lEk038ImWuzS2PAZKTATz+X2w==" "integrity": "sha512-rDCIooe1WHipLejuGhx2Wv/88SB7bWrN3+XHCWxXyPKTmmSQsgxKZPPzbIVBQ0ESChQZqGSBBJyqErqwwW4eBw=="
}, },
"@octokit/auth-token": { "@octokit/auth-token": {
"version": "2.5.0", "version": "2.5.0",

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@oceanprotocol/lib", "name": "@oceanprotocol/lib",
"source": "./src/index.ts", "source": "./src/index.ts",
"version": "1.0.0-next.44", "version": "1.0.0",
"description": "JavaScript client library for Ocean Protocol", "description": "JavaScript client library for Ocean Protocol",
"main": "./dist/lib.js", "main": "./dist/lib.js",
"umd:main": "dist/lib.umd.js", "umd:main": "dist/lib.umd.js",
@ -62,7 +62,7 @@
"web3": "^1.7.3" "web3": "^1.7.3"
}, },
"dependencies": { "dependencies": {
"@oceanprotocol/contracts": "^1.0.0-alpha.34", "@oceanprotocol/contracts": "^1.0.0",
"bignumber.js": "^9.0.2", "bignumber.js": "^9.0.2",
"cross-fetch": "^3.1.5", "cross-fetch": "^3.1.5",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",