From 3983c83eb9c47a5b276b3eb228a7e4307e5a8311 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Wed, 14 Nov 2018 09:36:37 +0100 Subject: [PATCH] added support for POA network --- package-lock.json | 6 +++--- package.json | 2 +- src/keeper/Keeper.ts | 7 +++++-- src/ocean/Ocean.ts | 3 +-- test/keeper/Keeper.test.ts | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31f3550..29c546a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -120,9 +120,9 @@ } }, "@oceanprotocol/keeper-contracts": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.3.19.tgz", - "integrity": "sha512-5pfcJ07v2UH3XwFPYTzPOm1UpArh1KvyDU45i+3YDMnW4LasuPDkf6yfBKOrjTxTEuwmIi8SGYdBrqFmzfPwFQ==" + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.3.21.tgz", + "integrity": "sha512-Tmeg2O1f92cj8yK2QSCBfqeHakaaALxEd7aOXVOPRBBkgyMZY2/LROH28oz2xLc7ui1hImFhGKjfL19gkktFdA==" }, "@oceanprotocol/secret-store-client": { "version": "0.0.9", diff --git a/package.json b/package.json index fe9c585..ea9b16a 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ }, "homepage": "https://github.com/oceanprotocol/squid-js#readme", "dependencies": { - "@oceanprotocol/keeper-contracts": "0.3.19", + "@oceanprotocol/keeper-contracts": "0.3.21", "@oceanprotocol/secret-store-client": "0.0.9", "bignumber.js": "^8.0.1", "eth-crypto": "^1.2.5", diff --git a/src/keeper/Keeper.ts b/src/keeper/Keeper.ts index 27e436c..7891652 100644 --- a/src/keeper/Keeper.ts +++ b/src/keeper/Keeper.ts @@ -35,7 +35,7 @@ export default class Keeper { public async getNetworkName(): Promise { return Web3Provider.getWeb3().eth.net.getId() .then((networkId) => { - let network: string = "unknown" + let network: string = "Unknown" switch (networkId) { case 1: @@ -53,8 +53,11 @@ export default class Keeper { case 42: network = "Kovan" break + case 8995: + network = "Ocean_POA_AWS" + break default: - network = "development" + network = "Development" } return network }) diff --git a/src/ocean/Ocean.ts b/src/ocean/Ocean.ts index 6dfa3df..b1c1295 100644 --- a/src/ocean/Ocean.ts +++ b/src/ocean/Ocean.ts @@ -135,8 +135,7 @@ export default class Ocean { const storedDdo = await aquarius.storeDDO(ddo) - await didRegistry.registerAttribute(id, ValueType.DID, "Metadata", serviceEndpoint, - publisher.getId()) + await didRegistry.registerAttribute(id, ValueType.DID, "Metadata", serviceEndpoint, publisher.getId()) return storedDdo } diff --git a/test/keeper/Keeper.test.ts b/test/keeper/Keeper.test.ts index 5d282ce..00027a5 100644 --- a/test/keeper/Keeper.test.ts +++ b/test/keeper/Keeper.test.ts @@ -33,7 +33,7 @@ describe("Keeper", () => { it("should get development as default", async () => { const networkName: string = await keeper.getNetworkName() - assert(networkName === "development") + assert(networkName === "Development") }) })