switch js sdk dep (#10)

package.json

@@ -25,14 +25,14 @@
     "compile-aqua:air": "aqua-cli -i ./aqua/ -o ./compiled-air -a"
   },
   "devDependencies": {
-    "@fluencelabs/aqua-cli": "0.1.13-202",
+    "@fluencelabs/aqua-cli": "0.1.14-207",
     "@fluencelabs/aqua-lib": "0.1.14",
-    "@fluencelabs/aqua-dht": "0.1.36",
+    "@fluencelabs/aqua-dht": "0.1.37",
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@fluencelabs/fluence": "0.9.53",
+    "@fluencelabs/fluence": "0.10.0",
     "@fluencelabs/fluence-network-environment": "^1.0.10",
     "@fluencelabs/aqua-dht-ts": "0.1.36",
     "deep-equal": "^2.0.5"

src/compiled/examples/foldJoin.ts

@@ -133,7 +133,7 @@ export async function getTwoResults(client: FluenceClient, relay: string, config
         (seq
          (seq
           (call relay ("op" "string_to_b58") [%init_peer_id%] k)
-          (call relay ("kad" "neighborhood") [k $nil $nil] nodes)
+          (call relay ("kad" "neighborhood") [k [] []] nodes)
          )
          (fold nodes n
           (par

src/compiled/examples/multiReturn.ts

@@ -119,7 +119,7 @@ export async function multiReturnFunc(client: FluenceClient, somethingToReturn:
     )
     (call %init_peer_id% ("multiret-num" "retNum") [] n)
    )
-   (call %init_peer_id% ("op" "identity") [str] $res)
+   (ap str $res)
   )
   (xor
    (call %init_peer_id% ("callbackSrv" "response") [$res 5 "some-str" somethingToReturn smthOption n])

src/compiled/examples/passArgs.ts

@@ -102,7 +102,7 @@ export async function create_client_util(client: FluenceClient, service_id: stri
     (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
     (call %init_peer_id% ("getDataSrv" "service_id") [] service_id)
    )
-   (call %init_peer_id% ("test-dht" "put_host_value") ["client-util" service_id $nil] res)
+   (call %init_peer_id% ("test-dht" "put_host_value") ["client-util" service_id []] res)
   )
   (xor
    (call %init_peer_id% ("callbackSrv" "response") [res])

src/compiled/examples/pushToStream.ts

@@ -36,11 +36,11 @@ export async function get_results(client: FluenceClient, config?: {ttl?: number}
    (seq
     (seq
      (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-     (call %init_peer_id% ("op" "identity") ["hello"] $results)
+     (ap "hello" $results)
     )
     (call %init_peer_id% ("pop" "get_str") [] str)
    )
-   (call %init_peer_id% ("op" "identity") [str] $results)
+   (ap str $results)
   )
   (xor
    (call %init_peer_id% ("callbackSrv" "response") [$results])

src/compiled/examples/streamArgs.ts

@@ -42,7 +42,7 @@ export async function append_records(client: FluenceClient, peer: string, srum:
    )
    (fold srum-iter srum-item
     (seq
-     (call %init_peer_id% ("op" "identity") [srum-item] $srum)
+     (ap srum-item $srum)
      (next srum-item)
     )
    )

src/compiled/examples/streamResults.ts

@@ -101,15 +101,15 @@ export async function use_name2(client: FluenceClient, name: string, config?: {t
         )
         (call %init_peer_id% ("get-dt" "get_dt") [name] results0)
        )
-       (call %init_peer_id% ("op" "identity") [results0.$.field!] $results)
+       (ap results0.$.field! $results)
       )
       (call %init_peer_id% ("get-dt" "get_dt") [name] results1)
      )
-     (call %init_peer_id% ("op" "identity") [results1.$.field!] $results)
+     (ap results1.$.field! $results)
     )
     (call %init_peer_id% ("get-dt" "get_dt") [name] results2)
    )
-   (call %init_peer_id% ("op" "identity") [results2.$.field!] $results)
+   (ap results2.$.field! $results)
   )
   (xor
    (call %init_peer_id% ("callbackSrv" "response") [$results])

src/compiled/examples/via.ts

@@ -232,7 +232,7 @@ export async function viaStream(client: FluenceClient, node_id: string, viaStr:
         )
         (fold viaStr-iter viaStr-item
          (seq
-          (call %init_peer_id% ("op" "identity") [viaStr-item] $viaStr)
+          (ap viaStr-item $viaStr)
           (next viaStr-item)
          )
         )

src/examples/foldJoinCall.ts

@@ -2,5 +2,5 @@ import {FluenceClient} from "@fluencelabs/fluence";
 import {getTwoResults} from "../compiled/examples/foldJoin";
 
 export async function foldJoinCall(client: FluenceClient): Promise<number[]> {
-    return await getTwoResults(client, client.relayPeerId!)
+    return await getTwoResults(client, client.relayPeerId!, {ttl: 10000})
 }

src/examples/viaCall.ts

@@ -1,5 +1,5 @@
 import {FluenceClient, registerServiceFunction} from "@fluencelabs/fluence";
-import {krasnodar} from "@fluencelabs/fluence-network-environment";
+import {krasnodar, stage} from "@fluencelabs/fluence-network-environment";
 import {viaArr, viaOpt, viaStream} from "../compiled/examples/via";
 
 export async function viaCall(client: FluenceClient): Promise<string[][]> {
@@ -8,10 +8,10 @@ export async function viaCall(client: FluenceClient): Promise<string[][]> {
         return args[0]
     })
 
-    let res = await viaArr(client, krasnodar[3].peerId, [krasnodar[2].peerId, krasnodar[1].peerId])
+    let res = await viaArr(client, stage[3].peerId, [stage[2].peerId, stage[1].peerId])
-    let res2 = await viaOpt(client, client.relayPeerId!, krasnodar[3].peerId, krasnodar[2].peerId)
+    let res2 = await viaOpt(client, client.relayPeerId!, stage[3].peerId, stage[2].peerId)
-    let res3 = await viaOpt(client, client.relayPeerId!, krasnodar[3].peerId, krasnodar[2].peerId || null)
+    let res3 = await viaOpt(client, client.relayPeerId!, stage[3].peerId, stage[2].peerId || null)
-    let res4 = await viaStream(client, krasnodar[3].peerId, [krasnodar[2].peerId, krasnodar[1].peerId])
+    let res4 = await viaStream(client, stage[3].peerId, [stage[2].peerId, stage[1].peerId])
 
     return [res.external_addresses, res2.external_addresses, res3.external_addresses, res4.external_addresses]
 }

src/run-examples.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import {createClient, registerServiceFunction, setLogLevel} from "@fluencelabs/fluence";
-import {krasnodar, testNet} from "@fluencelabs/fluence-network-environment";
+import {krasnodar, testNet, stage} from "@fluencelabs/fluence-network-environment";
 import {callArrowCall} from "./examples/callArrowCall";
 import {dataAliasCall} from "./examples/dataAliasCall";
 import {onCall} from "./examples/onCall";
@@ -52,8 +52,8 @@ function checkCallBy(name: string, actual: any, by: (res: any) => boolean, callB
 
 const main = async () => {
   // setLogLevel("trace")
-  const client = await createClient(krasnodar[0]);
+  const client = await createClient(stage[0]);
-  const client2 = await createClient(krasnodar[1]);
+  const client2 = await createClient(stage[1]);
 
   // this could be called from `println.aqua`
   registerServiceFunction(client, "println-service-id", "print", (args: any[], _) => {
@@ -159,9 +159,9 @@ const main = async () => {
 
   checkCall("callArrow", callArrowResult, "Hello, callArrow call!", cb)
 
-  checkCall("foldCall", foldCallResult, ['/ip4/164.90.171.139/tcp/7770', '/ip4/164.90.171.139/tcp/9990/ws'], cb)
+  checkCall("foldCall", foldCallResult, ['/ip4/134.209.186.43/tcp/7001', '/ip4/134.209.186.43/tcp/9001/ws'], cb)
 
-  checkCall("onCall", onCallResult, ['/ip4/164.90.171.139/tcp/7770', '/ip4/164.90.171.139/tcp/9990/ws'], cb)
+  checkCall("onCall", onCallResult, ['/ip4/134.209.186.43/tcp/7001', '/ip4/134.209.186.43/tcp/9001/ws'], cb)
 
   checkCall("parArrow", parCallResult, "hello", cb)
 
@@ -193,7 +193,7 @@ const main = async () => {
 
   checkCall("tryOtherwiseCall", tryOtherwiseResult, "error", cb)
 
-  checkCall("coCall", coCallResult, [ '/ip4/164.90.171.139/tcp/7770', '/ip4/164.90.171.139/tcp/9990/ws' ], cb)
+  checkCall("coCall", coCallResult, [ '/ip4/134.209.186.43/tcp/7001', '/ip4/134.209.186.43/tcp/9001/ws' ], cb)
 
   checkCall("passArgsCall", passArgsResult, "client-utilsid", cb)
 
@@ -210,7 +210,7 @@ const main = async () => {
   checkCall("declareResult", declareResult, 'declare all foodeclare all barsmall_foo', cb)
 
   checkCallBy("tryCatchCall", tryCatchResult, (res) => {
-    return (res[0] as string).includes("Error: Service with id 'unex' not found") && res[1] === '/ip4/164.90.171.139/tcp/7770'
+    return (res[0] as string).includes("Error: Service with id 'unex' not found") && res[1] === '/ip4/134.209.186.43/tcp/7001'
   }, cb)
 
   if (success) {