From 4df522b426838fc0bc6cf01d38662a4edcc431a2 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Mon, 14 Feb 2022 19:25:55 +0200 Subject: [PATCH] bump ocean.js to next 18 (#317) * bump ocean.js to next 18 --- .github/workflows/ci.yml | 5 - package-lock.json | 94 +++++---------- package.json | 2 +- scripts/subgraph.yaml | 4 +- src/mappings/erc20Templates.ts | 4 +- subgraph.yaml | 201 --------------------------------- 6 files changed, 34 insertions(+), 276 deletions(-) delete mode 100644 subgraph.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9d5477..6674c66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,3 @@ jobs: restore-keys: ${{ runner.os }}-lint-${{ env.cache-name }}- - run: npm ci - run: npm run lint - # TODO: activate once this issue is solved: - # https://github.com/graphprotocol/graph-ts/issues/113 - # - run: npm run type-check - - run: npm run codegen - - run: npm run build diff --git a/package-lock.json b/package-lock.json index 4a911b6..1b3b566 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.2.0", "license": "Apache-2.0", "dependencies": { - "@oceanprotocol/lib": "^1.0.0-next.15", + "@oceanprotocol/lib": "^1.0.0-next.18", "cross-fetch": "^3.1.4" }, "devDependencies": { @@ -1662,9 +1662,9 @@ } }, "node_modules/@oceanprotocol/contracts": { - "version": "1.0.0-alpha.18", - "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.18.tgz", - "integrity": "sha512-0MFX5n71dke095drRKXoCvF25FrAuraAcNyuUqps0WsVyM7N+jIdiJsF4u26/TrfYzNV/Y/0zRmi6bR4mTA7KA==", + "version": "1.0.0-alpha.19", + "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.19.tgz", + "integrity": "sha512-3E4eMo2lMyWMjiGk5dvSZvs/QNq7GSAPPzfMbxVLCdjfyP7kvVVVgn0pxabQtexkK4NK7tpNdA+IbsJaM0BBdw==", "dependencies": { "@openzeppelin/contracts": "^4.3.3", "@openzeppelin/test-helpers": "^0.5.15", @@ -1676,11 +1676,11 @@ } }, "node_modules/@oceanprotocol/lib": { - "version": "1.0.0-next.15", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.15.tgz", - "integrity": "sha512-ajNsWcsOcyPAZCO7lzq++Gw+QOULjwou53PpwebJefGHrOSDXbc+6jCr17vAiXw7J30zNGCWNrJ2SOpnziRYwg==", + "version": "1.0.0-next.18", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.18.tgz", + "integrity": "sha512-na8qUDshDw6LGQwMaCxtcrwGUsSycGCzabye3c7nmFkWxs78MpaNhldDXCd4A1G1DNO9MgKFv3NUeBzyMaIXlg==", "dependencies": { - "@oceanprotocol/contracts": "1.0.0-alpha.18", + "@oceanprotocol/contracts": "1.0.0-alpha.19", "bignumber.js": "^9.0.2", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", @@ -5378,9 +5378,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001311", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001311.tgz", - "integrity": "sha512-mleTFtFKfykEeW34EyfhGIFjGCqzhh38Y0LhdQ9aWF+HorZTtdgKV/1hEE0NlFkG2ubvisPV6l400tlbPys98A==", + "version": "1.0.30001312", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", + "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==", "funding": { "type": "opencollective", "url": "https://opencollective.com/browserslist" @@ -5699,7 +5699,6 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -5710,7 +5709,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -5719,7 +5717,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -5728,7 +5725,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5742,7 +5738,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.0" }, @@ -19644,7 +19639,6 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "peer": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -23634,7 +23628,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -23651,7 +23644,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -23660,7 +23652,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -23669,7 +23660,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -23683,7 +23673,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.0" }, @@ -23810,7 +23799,6 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, "engines": { "node": ">=10" } @@ -23841,7 +23829,6 @@ "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -23917,7 +23904,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -23926,7 +23912,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -23935,7 +23920,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -23949,7 +23933,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.0" }, @@ -23961,7 +23944,6 @@ "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, "engines": { "node": ">=10" } @@ -25143,9 +25125,9 @@ } }, "@oceanprotocol/contracts": { - "version": "1.0.0-alpha.18", - "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.18.tgz", - "integrity": "sha512-0MFX5n71dke095drRKXoCvF25FrAuraAcNyuUqps0WsVyM7N+jIdiJsF4u26/TrfYzNV/Y/0zRmi6bR4mTA7KA==", + "version": "1.0.0-alpha.19", + "resolved": "https://registry.npmjs.org/@oceanprotocol/contracts/-/contracts-1.0.0-alpha.19.tgz", + "integrity": "sha512-3E4eMo2lMyWMjiGk5dvSZvs/QNq7GSAPPzfMbxVLCdjfyP7kvVVVgn0pxabQtexkK4NK7tpNdA+IbsJaM0BBdw==", "requires": { "@openzeppelin/contracts": "^4.3.3", "@openzeppelin/test-helpers": "^0.5.15", @@ -25157,11 +25139,11 @@ } }, "@oceanprotocol/lib": { - "version": "1.0.0-next.15", - "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.15.tgz", - "integrity": "sha512-ajNsWcsOcyPAZCO7lzq++Gw+QOULjwou53PpwebJefGHrOSDXbc+6jCr17vAiXw7J30zNGCWNrJ2SOpnziRYwg==", + "version": "1.0.0-next.18", + "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.0.0-next.18.tgz", + "integrity": "sha512-na8qUDshDw6LGQwMaCxtcrwGUsSycGCzabye3c7nmFkWxs78MpaNhldDXCd4A1G1DNO9MgKFv3NUeBzyMaIXlg==", "requires": { - "@oceanprotocol/contracts": "1.0.0-alpha.18", + "@oceanprotocol/contracts": "1.0.0-alpha.19", "bignumber.js": "^9.0.2", "cross-fetch": "^3.1.5", "crypto-js": "^4.1.1", @@ -28209,9 +28191,9 @@ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" }, "caniuse-lite": { - "version": "1.0.30001311", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001311.tgz", - "integrity": "sha512-mleTFtFKfykEeW34EyfhGIFjGCqzhh38Y0LhdQ9aWF+HorZTtdgKV/1hEE0NlFkG2ubvisPV6l400tlbPys98A==" + "version": "1.0.30001312", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", + "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==" }, "caseless": { "version": "0.12.0", @@ -28459,7 +28441,6 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -28469,20 +28450,17 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -28493,7 +28471,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "requires": { "ansi-regex": "^5.0.0" } @@ -39548,7 +39525,6 @@ "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "peer": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -42803,7 +42779,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -42813,20 +42788,17 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -42837,7 +42809,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "requires": { "ansi-regex": "^5.0.0" } @@ -42935,8 +42906,7 @@ "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yaeti": { "version": "0.0.6", @@ -42958,7 +42928,6 @@ "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -42972,20 +42941,17 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -42996,7 +42962,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "requires": { "ansi-regex": "^5.0.0" } @@ -43004,8 +42969,7 @@ "yargs-parser": { "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" } } }, diff --git a/package.json b/package.json index 3289765..1e350bc 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "typescript": "^4.4.3" }, "dependencies": { - "@oceanprotocol/lib": "^1.0.0-next.15", + "@oceanprotocol/lib": "^1.0.0-next.18", "cross-fetch": "^3.1.4" }, "repository": { diff --git a/scripts/subgraph.yaml b/scripts/subgraph.yaml index a5e46a9..790ffc6 100644 --- a/scripts/subgraph.yaml +++ b/scripts/subgraph.yaml @@ -139,8 +139,8 @@ templates: handler: handleOrderStarted - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256) handler: handleNewPaymentCollector - - event: PublishMarketFees(indexed address,indexed address,uint256) - handler: handlePublishMarketFees + - event: PublishMarketFee(indexed address,indexed address,uint256) + handler: handlePublishMarketFee - name: BPool kind: ethereum/contract diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts index 28b821e..860b9bf 100644 --- a/src/mappings/erc20Templates.ts +++ b/src/mappings/erc20Templates.ts @@ -2,7 +2,7 @@ import { Order } from '../@types/schema' import { NewPaymentCollector, OrderStarted, - PublishMarketFees + PublishMarketFee } from '../@types/templates/ERC20Template/ERC20Template' import { integer } from './utils/constants' @@ -64,7 +64,7 @@ export function handleOrderStarted(event: OrderStarted): void { } export function handleNewPaymentCollector(event: NewPaymentCollector): void {} -export function handlePublishMarketFees(event: PublishMarketFees): void {} +export function handlePublishMarketFee(event: PublishMarketFee): void {} // export function handlePublishMarketFees(event: PublishMarketFees): void { // const order = Order.load( diff --git a/subgraph.yaml b/subgraph.yaml deleted file mode 100644 index b746ef9..0000000 --- a/subgraph.yaml +++ /dev/null @@ -1,201 +0,0 @@ -specVersion: 0.0.3 -description: Ocean provides data sharing through IDOs -repository: https://github.com/oceanprotocol/ocean-subgraph -schema: - file: ./schema.graphql -dataSources: - - kind: ethereum/contract - name: ERC721Factory - network: development - source: - address: '0xFF3a12191A703939b1466eC1Fc7679AbbFf88545' - abi: ERC721Factory - startBlock: 243 - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - file: ./src/mappings/erc721Factory.ts - entities: - - ERC721Factory - abis: - - name: ERC721Factory - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json - eventHandlers: - - event: NFTCreated(indexed address,indexed address,string,address,string,string) - handler: handleNftCreated - - event: TokenCreated(indexed address,indexed address,string,string,uint256,address) - handler: handleNewToken - - kind: ethereum/contract - name: FixedRateExchange - network: development - source: - address: '0x7256EdE4Bd3D79a8Cc03a2A74849506F5C90c614' - abi: FixedRateExchange - startBlock: 243 - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - file: ./src/mappings/fixedRateExchange.ts - entities: - - FixedRateExchange - abis: - - name: FixedRateExchange - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json - - name: ERC20 - file: ./abis/ERC20.json - eventHandlers: - - event: ExchangeCreated(indexed bytes32,indexed address,indexed address,address,uint256) - handler: handleExchangeCreated - - event: ExchangeRateChanged(indexed bytes32,indexed address,uint256) - handler: handleRateChange - - event: ExchangeMintStateChanged(indexed bytes32,indexed address,bool) - handler: handleMintStateChanged - - event: ExchangeActivated(indexed bytes32,indexed address) - handler: handleActivated - - event: ExchangeDeactivated(indexed bytes32,indexed address) - handler: handleDeactivated - - event: ExchangeAllowedSwapperChanged(indexed bytes32,indexed address) - handler: handleAllowedSwapperChanged - - event: Swapped(indexed bytes32,indexed address,uint256,uint256,address,uint256,uint256) - handler: handleSwap - - kind: ethereum/contract - name: Dispenser - network: development - source: - address: '0x7256EdE4Bd3D79a8Cc03a2A74849506F5C90c614' - abi: Dispenser - startBlock: 243 - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - file: ./src/mappings/dispenser.ts - entities: - - Dispenser - abis: - - name: Dispenser - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json - eventHandlers: - - event: DispenserCreated(indexed address,indexed address,uint256,uint256,address) - handler: handleNewDispenser - - event: DispenserActivated(indexed address) - handler: handleActivate - - event: DispenserDeactivated(indexed address) - handler: handleDeactivate - - event: DispenserAllowedSwapperChanged(indexed address,indexed address) - handler: handleAllowedSwapperChanged - - event: TokensDispensed(indexed address,indexed address,uint256) - handler: handleTokensDispensed - - event: OwnerWithdrawed(indexed address,indexed address,uint256) - handler: handleOwnerWinthdraw - - - kind: ethereum/contract - name: FactoryRouter - network: development - source: - address: '0x053dc56D2C6A87FB6CEb1063E4c1629B8Cc67F82' - abi: FactoryRouter - startBlock: 243 - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - file: ./src/mappings/factoryRouter.ts - entities: - - FactoryRouter - abis: - - name: FactoryRouter - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json - eventHandlers: - - event: NewPool(indexed address,bool) - handler: handleNewPool - -templates: - - name: ERC20Template - kind: ethereum/contract - network: development - source: - abi: ERC20Template - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - file: ./src/mappings/erc20Templates.ts - entities: - - ERC20Template - abis: - - name: ERC20Template - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json - - name: ERC20TemplateEnterprise - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json - - name: ERC20 - file: ./abis/ERC20.json - - name: ERC20Roles - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/utils/ERC20Roles.sol/ERC20Roles.json - eventHandlers: - - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256) - handler: handleOrderStarted - - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256) - handler: handleNewPaymentCollector - - event: PublishMarketFees(indexed address,indexed address,uint256) - handler: handlePublishMarketFees - - - name: BPool - kind: ethereum/contract - network: development - source: - abi: BPool - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - file: ./src/mappings/pool.ts - entities: - - BPool - abis: - - name: BPool - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json - - name: BToken - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BToken.sol/BToken.json - - name: BMath - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BMath.sol/BMath.json - - name: ERC20 - file: ./abis/ERC20.json - eventHandlers: - - event: LOG_SWAP(indexed address,indexed address,indexed address,uint256,uint256,uint256) - handler: handleSwap - - event: LOG_JOIN(indexed address,indexed address,uint256,uint256) - handler: handleJoin - - event: LOG_EXIT(indexed address,indexed address,uint256,uint256) - handler: handleExit - - event: LOG_SETUP(indexed address,indexed address,uint256,uint256,indexed address,uint256,uint256) - handler: handleSetup - - event: Transfer(indexed address,indexed address,uint256) - handler: handlerBptTransfer - - - name: ERC721Template - kind: ethereum/contract - network: development - source: - abi: ERC721Template - mapping: - kind: ethereum/events - apiVersion: 0.0.6 - language: wasm/assemblyscript - file: ./src/mappings/nftUpdate.ts - entities: - - ERC721Template - abis: - - name: ERC721Template - file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json - eventHandlers: - - event: MetadataCreated(indexed address,uint8,string,bytes,bytes,bytes32,uint256,uint256) - handler: handleCreated - - event: MetadataUpdated(indexed address,uint8,string,bytes,bytes,bytes32,uint256,uint256) - handler: handleUpdated - - event: MetadataState(indexed address,uint8,uint256,uint256) - handler: handleState - - event: TokenURIUpdate(indexed address,string,uint256,uint256,uint256) - handler: handleTokenUriUpdate \ No newline at end of file