fix fire lazers

src/examples/BuyAsset.ts

@@ -3,18 +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"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const publisher: Account = (await ocean.getAccounts())[0]
     const consumer: Account = (await ocean.getAccounts())[1]
@@ -55,6 +47,8 @@ import {Account, Logger, Ocean, ServiceAgreement} from "../squid"
 
     const accessService = ddo.findServiceByType("Access")
 
+    await consumer.requestTokens(metaData.base.price)
+
     const serviceAgreementSignatureResult: any = await ocean.signServiceAgreement(ddo.id,
         accessService.serviceDefinitionId, consumer)
     Logger.log("ServiceAgreement Id:", serviceAgreementSignatureResult.serviceAgreementId)
@@ -71,8 +65,6 @@ import {Account, Logger, Ocean, ServiceAgreement} from "../squid"
         publisher)
     Logger.log("ServiceAgreement Id:", serviceAgreement.getId())
 
-    await consumer.requestTokens(metaData.base.price)
-
     const paid = await serviceAgreement.payAsset(assetId, metaData.base.price, consumer)
     Logger.log(`Asset paid: ${paid}`)
 })()

src/examples/ExecuteAgreement.ts

@@ -3,18 +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"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const publisher: Account = (await ocean.getAccounts())[0]
     const consumer: Account = (await ocean.getAccounts())[1]

src/examples/GetAccounts.ts

@@ -0,0 +1,10 @@
+import {Logger, Ocean} from "../squid"
+import * as config from "./config.json"
+
+(async () => {
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const accounts = await ocean.getAccounts()
+
+    Logger.log(JSON.stringify(accounts, null, 2))
+})()

src/examples/GetBalance.ts

@@ -0,0 +1,10 @@
+import {Logger, Ocean} from "../squid"
+import * as config from "./config.json"
+
+(async () => {
+    const ocean: Ocean = await Ocean.getInstance(config)
+
+    const accounts = await ocean.getAccounts()
+
+    Logger.log(await accounts[0].getBalance())
+})()

src/examples/GrantAccess.ts

@@ -3,18 +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"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const publisher: Account = (await ocean.getAccounts())[0]
     const consumer: Account = (await ocean.getAccounts())[1]

src/examples/InitializeAgreement.ts

@@ -3,18 +3,10 @@ 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"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const publisher: Account = (await ocean.getAccounts())[0]
     const consumer: Account = (await ocean.getAccounts())[1]

src/examples/Listener.ts

@@ -1,18 +1,10 @@
 import {Logger, Ocean} from "../squid"
 // tslint:disable-next-line
 import EventListener from "../keeper/EventListener"
+import * as config from "./config.json"
 
 (async () => {
-    Ocean.getInstance({
+    Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 })()
 
 const event = EventListener.subscribe("OceanToken", "Transfer", {})

src/examples/RegisterAsset.ts

@@ -2,18 +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"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const publisher: Account = (await ocean.getAccounts())[0]
 

src/examples/RegisterServiceAgreementTemplates.ts

@@ -1,16 +1,8 @@
 import {Account, Logger, Ocean, ServiceAgreementTemplate, Templates} from "../squid"
+import * as config from "./config.json"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const templateOwner: Account = (await ocean.getAccounts())[5]
 

src/examples/Search.ts

@@ -1,17 +1,9 @@
 import DDO from "../ddo/DDO"
 import {Logger, Ocean} from "../squid"
+import * as config from "./config.json"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const result: DDO[] = await ocean.searchAssetsByText("Office Humidity")
     const names: string[] = result.map((ddo: DDO): string => {

src/examples/SignAgreement.ts

@@ -5,18 +5,10 @@ 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"
 
 (async () => {
-    const ocean: Ocean = await Ocean.getInstance({
+    const ocean: Ocean = await Ocean.getInstance(config)
-        nodeUri: "http://localhost:8545",
-        aquariusUri: "http://localhost:5000",
-        brizoUri: "http://localhost:8030",
-        parityUri: "http://localhost:9545",
-        secretStoreUri: "http://localhost:12001",
-        threshold: 0,
-        password: "unittest",
-        address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
-    })
 
     const publisher: Account = (await ocean.getAccounts())[0]
     const consumer: Account = (await ocean.getAccounts())[1]

src/examples/config.json

@@ -0,0 +1,10 @@
+{
+  "nodeUri": "http://localhost:8545",
+  "aquariusUri": "http://localhost:5000",
+  "brizoUri": "http://localhost:8030",
+  "parityUri": "http://localhost:8545",
+  "secretStoreUri": "http://localhost:12001",
+  "threshold": 0,
+  "password": "secret",
+  "address": "0xa99d43d86a0758d5632313b8fa3972b6088a21bb"
+}

src/examples/fire_lazers.sh

@@ -2,10 +2,13 @@
 
 set -e
 
+# this has to go first
 npm run run src/examples/RegisterServiceAgreementTemplates.ts
+
+npm run run src/examples/BuyAsset.ts
+npm run run src/examples/ExecuteAgreement.ts
+npm run run src/examples/GetAccounts.ts
+npm run run src/examples/GetBalance.ts
+npm run run src/examples/GrantAccess.ts
 npm run run src/examples/RegisterAsset.ts
 npm run run src/examples/Search.ts
-npm run run src/examples/SignAgreement.ts
-npm run run src/examples/ExecuteAgreement.ts
-npm run run src/examples/BuyAsset.ts
-npm run run src/examples/GrantAccess.ts