From 8c4813b9089acfc6c3bd8c2a2968458e9513be06 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Mon, 10 Dec 2018 10:11:36 +0100 Subject: [PATCH] added hdwallet support to examples --- src/examples/BuyAsset.ts | 2 +- src/examples/ExecuteAgreement.ts | 3 ++- src/examples/GetAccounts.ts | 3 ++- src/examples/GetBalance.ts | 2 +- src/examples/GetHDWalletAccounts.ts | 11 +---------- src/examples/GrantAccess.ts | 2 +- src/examples/InitializeAgreement.ts | 4 +++- src/examples/Listener.ts | 2 +- src/examples/RegisterAsset.ts | 3 ++- .../RegisterServiceAgreementTemplates.ts | 7 ++++--- src/examples/Search.ts | 2 +- src/examples/SignAgreement.ts | 2 +- src/examples/config.json | 10 ---------- src/examples/config.ts | 16 ++++++++++++++++ src/examples/config/config.json | 10 ++++++++++ 15 files changed, 46 insertions(+), 33 deletions(-) delete mode 100644 src/examples/config.json create mode 100644 src/examples/config.ts create mode 100644 src/examples/config/config.json diff --git a/src/examples/BuyAsset.ts b/src/examples/BuyAsset.ts index 3c591d9..53b1376 100644 --- a/src/examples/BuyAsset.ts +++ b/src/examples/BuyAsset.ts @@ -3,7 +3,7 @@ import MetaData from "../ddo/MetaData" import MetaDataBase from "../ddo/MetaDataBase" import Service from "../ddo/Service" import {Account, Logger, Ocean, ServiceAgreement} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { const ocean: Ocean = await Ocean.getInstance(config) diff --git a/src/examples/ExecuteAgreement.ts b/src/examples/ExecuteAgreement.ts index 84e928f..c48e783 100644 --- a/src/examples/ExecuteAgreement.ts +++ b/src/examples/ExecuteAgreement.ts @@ -3,9 +3,10 @@ import MetaData from "../ddo/MetaData" import MetaDataBase from "../ddo/MetaDataBase" import Service from "../ddo/Service" import {Account, Logger, Ocean, ServiceAgreement} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { + const ocean: Ocean = await Ocean.getInstance(config) const publisher: Account = (await ocean.getAccounts())[0] diff --git a/src/examples/GetAccounts.ts b/src/examples/GetAccounts.ts index 8497c91..d895761 100644 --- a/src/examples/GetAccounts.ts +++ b/src/examples/GetAccounts.ts @@ -1,7 +1,8 @@ import {Logger, Ocean} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { + const ocean: Ocean = await Ocean.getInstance(config) const accounts = await ocean.getAccounts() diff --git a/src/examples/GetBalance.ts b/src/examples/GetBalance.ts index 85f7811..1961943 100644 --- a/src/examples/GetBalance.ts +++ b/src/examples/GetBalance.ts @@ -1,5 +1,5 @@ import {Logger, Ocean} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { const ocean: Ocean = await Ocean.getInstance(config) diff --git a/src/examples/GetHDWalletAccounts.ts b/src/examples/GetHDWalletAccounts.ts index ebb7b63..e285e2e 100644 --- a/src/examples/GetHDWalletAccounts.ts +++ b/src/examples/GetHDWalletAccounts.ts @@ -1,16 +1,7 @@ -import * as HDWalletProvider from "truffle-hdwallet-provider" import {Logger, Ocean} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { - const seedphrase = "genuine oyster tonight funny fat chimney initial answer potato myself doll enable" - - // @ts-ignore - config.web3Provider = new HDWalletProvider( - seedphrase, - config.nodeUri, - 0, 100, - ) const ocean: Ocean = await Ocean.getInstance(config) const accounts = await ocean.getAccounts() diff --git a/src/examples/GrantAccess.ts b/src/examples/GrantAccess.ts index 57ece2b..5da474a 100644 --- a/src/examples/GrantAccess.ts +++ b/src/examples/GrantAccess.ts @@ -3,7 +3,7 @@ import MetaData from "../ddo/MetaData" import MetaDataBase from "../ddo/MetaDataBase" import Service from "../ddo/Service" import {Account, Logger, Ocean, ServiceAgreement} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { const ocean: Ocean = await Ocean.getInstance(config) diff --git a/src/examples/InitializeAgreement.ts b/src/examples/InitializeAgreement.ts index ef541e8..8fde379 100644 --- a/src/examples/InitializeAgreement.ts +++ b/src/examples/InitializeAgreement.ts @@ -3,7 +3,7 @@ import MetaData from "../ddo/MetaData" import MetaDataBase from "../ddo/MetaDataBase" import Service from "../ddo/Service" import {Account, Logger, Ocean} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { const ocean: Ocean = await Ocean.getInstance(config) @@ -45,6 +45,8 @@ import * as config from "./config.json" const accessService = ddo.findServiceByType("Access") + await consumer.requestTokens(100) + const serviceAgreementSignatureResult: any = await ocean .signServiceAgreement( ddo.id, diff --git a/src/examples/Listener.ts b/src/examples/Listener.ts index b23cbd3..fb460a4 100644 --- a/src/examples/Listener.ts +++ b/src/examples/Listener.ts @@ -1,7 +1,7 @@ import {Logger, Ocean} from "../squid" // tslint:disable-next-line import EventListener from "../keeper/EventListener" -import * as config from "./config.json" +import config from "./config" (async () => { Ocean.getInstance(config) diff --git a/src/examples/RegisterAsset.ts b/src/examples/RegisterAsset.ts index cdb6b1f..e13a821 100644 --- a/src/examples/RegisterAsset.ts +++ b/src/examples/RegisterAsset.ts @@ -2,9 +2,10 @@ import DDO from "../ddo/DDO" import MetaData from "../ddo/MetaData" import MetaDataBase from "../ddo/MetaDataBase" import {Account, Logger, Ocean} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { + const ocean: Ocean = await Ocean.getInstance(config) const publisher: Account = (await ocean.getAccounts())[0] diff --git a/src/examples/RegisterServiceAgreementTemplates.ts b/src/examples/RegisterServiceAgreementTemplates.ts index 497c828..e0d23af 100644 --- a/src/examples/RegisterServiceAgreementTemplates.ts +++ b/src/examples/RegisterServiceAgreementTemplates.ts @@ -1,14 +1,15 @@ import {Account, Logger, Ocean, ServiceAgreementTemplate, Templates} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { + const ocean: Ocean = await Ocean.getInstance(config) - const templateOwner: Account = (await ocean.getAccounts())[5] + const templateOwner: Account = (await ocean.getAccounts())[0] const serviceAgreementTemplate: ServiceAgreementTemplate = new ServiceAgreementTemplate(new Templates.Access()) const serviceAgreementRegistered: boolean = await serviceAgreementTemplate.register(templateOwner.getId()) - Logger.log("ServiceAgreement registered:", serviceAgreementRegistered, + Logger.log("ServiceAgreementTemplate registered:", serviceAgreementRegistered, "templateId:", serviceAgreementTemplate.getId()) })() diff --git a/src/examples/Search.ts b/src/examples/Search.ts index 8b24ad1..c056291 100644 --- a/src/examples/Search.ts +++ b/src/examples/Search.ts @@ -1,6 +1,6 @@ import DDO from "../ddo/DDO" import {Logger, Ocean} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { const ocean: Ocean = await Ocean.getInstance(config) diff --git a/src/examples/SignAgreement.ts b/src/examples/SignAgreement.ts index 9536f43..80668bc 100644 --- a/src/examples/SignAgreement.ts +++ b/src/examples/SignAgreement.ts @@ -5,7 +5,7 @@ import MetaData from "../ddo/MetaData" import MetaDataBase from "../ddo/MetaDataBase" import Service from "../ddo/Service" import {Account, Logger, Ocean} from "../squid" -import * as config from "./config.json" +import config from "./config" (async () => { const ocean: Ocean = await Ocean.getInstance(config) diff --git a/src/examples/config.json b/src/examples/config.json deleted file mode 100644 index 54d38c4..0000000 --- a/src/examples/config.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "nodeUri": "http://localhost:8545", - "aquariusUri": "http://172.15.0.15:5000", - "brizoUri": "http://172.15.0.17:8030", - "parityUri": "http://localhost:8545", - "secretStoreUri": "http://localhost:12001", - "threshold": 0, - "password": "node0", - "address": "0x00bd138abd70e2f00903268f3db08f2d25677c9e" -} diff --git a/src/examples/config.ts b/src/examples/config.ts new file mode 100644 index 0000000..bddea88 --- /dev/null +++ b/src/examples/config.ts @@ -0,0 +1,16 @@ +import * as HDWalletProvider from "truffle-hdwallet-provider" +import Config from "../models/Config" +import * as config from "./config/config.json" + +if (false) { + const seedphrase = "xxx" + + // @ts-ignore + config.web3Provider = new HDWalletProvider( + seedphrase, + config.nodeUri, + 0, 10, + ) +} + +export default config as Config diff --git a/src/examples/config/config.json b/src/examples/config/config.json new file mode 100644 index 0000000..f760ba1 --- /dev/null +++ b/src/examples/config/config.json @@ -0,0 +1,10 @@ +{ + "nodeUri": "http://localhost:8545", + "aquariusUri": "http://aquarius.dev-ocean.com:5000", + "brizoUri": "http://localhost:8030", + "parityUri": "http://localhost:9545", + "secretStoreUri": "http://localhost:12001", + "threshold": 0, + "password": "secret", + "address": "0xa99d43d86a0758d5632313b8fa3972b6088a21bb" +}