update libs

aqua/dht/dht-example.aqua

@@ -5,11 +5,11 @@ import "@fluencelabs/aqua-lib/builtin.aqua"
 export getNeighbours, initTopicAndSubscribe, findSubscribers
 
 func put_value(initial_peer: string, value: string) -> string:
-    initTopicAndSubscribe(initial_peer, "some-const3", value, nil, nil)
+    initTopicAndSubscribe(initial_peer, value, nil, nil)
     <- "OK"
 
 func registerKeyPutValue(node_id: string, key: string, value: string, relay_id: ?string, service_id: ?string) -> []string:
-  nodes <- getNeighbours(key, node_id)
+  nodes <- getNeighbours(key)
   for n <- nodes par:
     on n:
       t <- Peer.timestamp_sec()

package.json

@@ -28,9 +28,9 @@
         "aqua": "aqua"
     },
     "devDependencies": {
-        "@fluencelabs/aqua": "0.4.1-240",
+        "@fluencelabs/aqua": "0.5.0-245",
-        "@fluencelabs/aqua-dht": "0.1.36",
+        "@fluencelabs/aqua-dht": "0.2.4",
-        "@fluencelabs/aqua-lib": "0.1.14",
+        "@fluencelabs/aqua-lib": "0.2.1",
         "@types/jest": "^27.0.2",
         "jest": "^27.2.4",
         "ts-jest": "^27.0.5",
@@ -38,7 +38,7 @@
         "typescript": "^4.2.4"
     },
     "dependencies": {
-        "@fluencelabs/aqua-dht-ts": "0.1.36",
+        "@fluencelabs/aqua-dht-ts": "0.1.38",
         "@fluencelabs/fluence": "0.15.0",
         "@fluencelabs/fluence-network-environment": "^1.0.10",
         "deep-equal": "^2.0.5"

src/compiled/dht/dht-example.ts

@@ -19,12 +19,23 @@ import {
 // Functions
  
 
-export function put_value(initial_peer: string, value: string, config?: {ttl?: number}): Promise<string>;
+export function put_value(
-export function put_value(peer: FluencePeer, initial_peer: string, value: string, config?: {ttl?: number}): Promise<string>;
+    initial_peer: string,
+    value: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function put_value(
+    peer: FluencePeer,
+    initial_peer: string,
+    value: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function put_value(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -34,41 +45,35 @@ export function put_value(...args: any) {
                         )
                         (call %init_peer_id% ("getDataSrv" "value") [] value)
                        )
-                       (par
+                       (xor
-                        (seq
+                        (par
                          (seq
-                          (call -relay- ("op" "noop") [])
+                          (seq
-                          (xor
+                           (call -relay- ("op" "string_to_b58") [initial_peer] k)
-                           (seq
+                           (call -relay- ("kad" "neighborhood") [k [] []] nodes)
-                            (call initial_peer ("op" "string_to_b58") ["some-const3"] k)
+                          )
-                            (call initial_peer ("kad" "neighborhood") [k [] []] nodes)
+                          (call %init_peer_id% ("op" "noop") [])
-                           )
+                         )
+                         (fold nodes n
+                          (par
                            (seq
                             (call -relay- ("op" "noop") [])
-                            (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+                            (xor
-                           )
-                          )
-                         )
-                         (call %init_peer_id% ("op" "noop") [])
-                        )
-                        (fold nodes n
-                         (par
-                          (seq
-                           (call -relay- ("op" "noop") [])
-                           (xor
-                            (seq
                              (seq
-                              (call n ("peer" "timestamp_sec") [] t)
+                              (seq
-                              (call n ("aqua-dht" "register_key") ["some-const3" t false 0])
+                               (call n ("peer" "timestamp_sec") [] t)
+                               (call n ("aqua-dht" "register_key") [initial_peer t false 0])
+                              )
+                              (call n ("aqua-dht" "put_value") [initial_peer value t [] [] 0])
                              )
-                             (call n ("aqua-dht" "put_value") ["some-const3" value t [] [] 0])
+                             (null)
                             )
-                            (null)
                            )
+                           (next n)
                           )
-                          (next n)
                          )
                         )
+                        (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
                        )
                       )
                       (xor
@@ -116,12 +121,29 @@ export function put_value(...args: any) {
 
  
 
-export function registerKeyPutValue(node_id: string, key: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise<string[]>;
+export function registerKeyPutValue(
-export function registerKeyPutValue(peer: FluencePeer, node_id: string, key: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise<string[]>;
+    node_id: string,
+    key: string,
+    value: string,
+    relay_id: string | null,
+    service_id: string | null,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function registerKeyPutValue(
+    peer: FluencePeer,
+    node_id: string,
+    key: string,
+    value: string,
+    relay_id: string | null,
+    service_id: string | null,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function registerKeyPutValue(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -143,17 +165,8 @@ export function registerKeyPutValue(...args: any) {
                        (par
                         (seq
                          (seq
-                          (call -relay- ("op" "noop") [])
+                          (call %init_peer_id% ("op" "string_to_b58") [key] k)
-                          (xor
+                          (call %init_peer_id% ("kad" "neighborhood") [k [] []] nodes)
-                           (seq
-                            (call key ("op" "string_to_b58") [node_id] k)
-                            (call key ("kad" "neighborhood") [k [] []] nodes)
-                           )
-                           (seq
-                            (call -relay- ("op" "noop") [])
-                            (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-                           )
-                          )
                          )
                          (call %init_peer_id% ("op" "noop") [])
                         )
@@ -165,7 +178,7 @@ export function registerKeyPutValue(...args: any) {
                             (call n ("peer" "timestamp_sec") [] t)
                             (seq
                              (call -relay- ("op" "noop") [])
-                             (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+                             (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
                             )
                            )
                           )
@@ -176,10 +189,10 @@ export function registerKeyPutValue(...args: any) {
                       )
                       (xor
                        (call %init_peer_id% ("callbackSrv" "response") [nodes])
-                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
+                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
                       )
                      )
-                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
+                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
                     )
     `
     return callFunction(
@@ -237,44 +250,38 @@ export function registerKeyPutValue(...args: any) {
 
  
 
-export function getNeighbours(node_id: string, topic: string, config?: {ttl?: number}): Promise<string[]>;
+export function getNeighbours(
-export function getNeighbours(peer: FluencePeer, node_id: string, topic: string, config?: {ttl?: number}): Promise<string[]>;
+    topic: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function getNeighbours(
+    peer: FluencePeer,
+    topic: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function getNeighbours(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
                         (seq
-                         (seq
+                         (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-                          (seq
+                         (call %init_peer_id% ("getDataSrv" "topic") [] topic)
-                           (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-                           (call %init_peer_id% ("getDataSrv" "node_id") [] node_id)
-                          )
-                          (call %init_peer_id% ("getDataSrv" "topic") [] topic)
-                         )
-                         (call -relay- ("op" "noop") [])
-                        )
-                        (xor
-                         (seq
-                          (call node_id ("op" "string_to_b58") [topic] k)
-                          (call node_id ("kad" "neighborhood") [k [] []] nodes)
-                         )
-                         (seq
-                          (call -relay- ("op" "noop") [])
-                          (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-                         )
                         )
+                        (call %init_peer_id% ("op" "string_to_b58") [topic] k)
                        )
-                       (call -relay- ("op" "noop") [])
+                       (call %init_peer_id% ("kad" "neighborhood") [k [] []] nodes)
                       )
                       (xor
                        (call %init_peer_id% ("callbackSrv" "response") [nodes])
-                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
                       )
                      )
-                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
+                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
                     )
     `
     return callFunction(
@@ -285,12 +292,6 @@ export function getNeighbours(...args: any) {
         "tag" : "primitive"
     },
     "argDefs" : [
-        {
-            "name" : "node_id",
-            "argType" : {
-                "tag" : "primitive"
-            }
-        },
         {
             "name" : "topic",
             "argType" : {
@@ -314,90 +315,69 @@ export function getNeighbours(...args: any) {
 
  
 
-export function findSubscribers(node_id: string, topic: string, config?: {ttl?: number}): Promise<{ peer_id: string; relay_id: string[]; service_id: string[]; set_by: string; timestamp_created: number; value: string; weight: number; }[]>;
+export function findSubscribers(
-export function findSubscribers(peer: FluencePeer, node_id: string, topic: string, config?: {ttl?: number}): Promise<{ peer_id: string; relay_id: string[]; service_id: string[]; set_by: string; timestamp_created: number; value: string; weight: number; }[]>;
+    topic: string,
+    config?: {ttl?: number}
+): Promise<{ peer_id: string; relay_id: string[]; service_id: string[]; set_by: string; timestamp_created: number; value: string; weight: number; }[]>;
+
+export function findSubscribers(
+    peer: FluencePeer,
+    topic: string,
+    config?: {ttl?: number}
+): Promise<{ peer_id: string; relay_id: string[]; service_id: string[]; set_by: string; timestamp_created: number; value: string; weight: number; }[]>;
+
 export function findSubscribers(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
-                        (seq
+                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-                         (seq
+                        (call %init_peer_id% ("getDataSrv" "topic") [] topic)
-                          (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+                       )
-                          (call %init_peer_id% ("getDataSrv" "node_id") [] node_id)
+                       (new $res
-                         )
+                        (xor
-                         (call %init_peer_id% ("getDataSrv" "topic") [] topic)
-                        )
-                        (new $res
                          (seq
                           (seq
                            (seq
-                            (seq
+                            (call -relay- ("op" "string_to_b58") [topic] k)
-                             (call -relay- ("op" "noop") [])
+                            (call -relay- ("kad" "neighborhood") [k [] []] nodes)
-                             (xor
-                              (seq
-                               (call node_id ("op" "string_to_b58") [topic] k)
-                               (call node_id ("kad" "neighborhood") [k [] []] nodes)
-                              )
-                              (seq
-                               (seq
-                                (call -relay- ("op" "noop") [])
-                                (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-                               )
-                               (call -relay- ("op" "noop") [])
-                              )
-                             )
-                            )
-                            (call -relay- ("op" "noop") [])
                            )
                            (par
                             (seq
-                             (seq
+                             (fold nodes n
-                              (call -relay- ("op" "noop") [])
+                              (par
-                              (fold nodes n
+                               (seq
-                               (par
+                                (xor
-                                (seq
+                                 (seq
-                                 (xor
+                                  (call n ("peer" "timestamp_sec") [] t)
-                                  (seq
+                                  (call n ("aqua-dht" "get_values") [topic t] $res)
-                                   (call n ("peer" "timestamp_sec") [] t)
-                                   (call n ("aqua-dht" "get_values") [topic t] $res)
-                                  )
-                                  (null)
                                  )
-                                 (call node_id ("op" "noop") [])
+                                 (null)
-                                )
-                                (seq
-                                 (call -relay- ("op" "noop") [])
-                                 (next n)
                                 )
+                                (call -relay- ("op" "noop") [])
                                )
+                               (next n)
                               )
                              )
-                             (call node_id ("op" "noop") [])
+                             (call -relay- ("op" "noop") [])
                             )
                             (null)
                            )
                           )
-                          (xor
+                          (call -relay- ("aqua-dht" "merge_two") [$res.$.[0].result! $res.$.[1].result!] v)
-                           (call node_id ("aqua-dht" "merge_two") [$res.$.[0].result! $res.$.[1].result!] v)
-                           (seq
-                            (call -relay- ("op" "noop") [])
-                            (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
-                           )
-                          )
                          )
+                         (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
                         )
                        )
-                       (call -relay- ("op" "noop") [])
                       )
                       (xor
                        (call %init_peer_id% ("callbackSrv" "response") [v.$.result!])
-                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
+                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
                       )
                      )
-                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
+                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
                     )
     `
     return callFunction(
@@ -408,12 +388,6 @@ export function findSubscribers(...args: any) {
         "tag" : "primitive"
     },
     "argDefs" : [
-        {
-            "name" : "node_id",
-            "argType" : {
-                "tag" : "primitive"
-            }
-        },
         {
             "name" : "topic",
             "argType" : {
@@ -437,21 +411,33 @@ export function findSubscribers(...args: any) {
 
  
 
-export function initTopicAndSubscribe(node_id: string, topic: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise<void>;
+export function initTopicAndSubscribe(
-export function initTopicAndSubscribe(peer: FluencePeer, node_id: string, topic: string, value: string, relay_id: string | null, service_id: string | null, config?: {ttl?: number}): Promise<void>;
+    topic: string,
+    value: string,
+    relay_id: string | null,
+    service_id: string | null,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function initTopicAndSubscribe(
+    peer: FluencePeer,
+    topic: string,
+    value: string,
+    relay_id: string | null,
+    service_id: string | null,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function initTopicAndSubscribe(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
                         (seq
                          (seq
-                          (seq
+                          (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-                           (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-                           (call %init_peer_id% ("getDataSrv" "node_id") [] node_id)
-                          )
                           (call %init_peer_id% ("getDataSrv" "topic") [] topic)
                          )
                          (call %init_peer_id% ("getDataSrv" "value") [] value)
@@ -460,41 +446,35 @@ export function initTopicAndSubscribe(...args: any) {
                        )
                        (call %init_peer_id% ("getDataSrv" "service_id") [] service_id)
                       )
-                      (par
+                      (xor
-                       (seq
+                       (par
                         (seq
-                         (call -relay- ("op" "noop") [])
+                         (seq
-                         (xor
+                          (call -relay- ("op" "string_to_b58") [topic] k)
-                          (seq
+                          (call -relay- ("kad" "neighborhood") [k [] []] nodes)
-                           (call node_id ("op" "string_to_b58") [topic] k)
+                         )
-                           (call node_id ("kad" "neighborhood") [k [] []] nodes)
+                         (call %init_peer_id% ("op" "noop") [])
-                          )
+                        )
+                        (fold nodes n
+                         (par
                           (seq
                            (call -relay- ("op" "noop") [])
-                           (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+                           (xor
-                          )
-                         )
-                        )
-                        (call %init_peer_id% ("op" "noop") [])
-                       )
-                       (fold nodes n
-                        (par
-                         (seq
-                          (call -relay- ("op" "noop") [])
-                          (xor
-                           (seq
                             (seq
-                             (call n ("peer" "timestamp_sec") [] t)
+                             (seq
-                             (call n ("aqua-dht" "register_key") [topic t false 0])
+                              (call n ("peer" "timestamp_sec") [] t)
+                              (call n ("aqua-dht" "register_key") [topic t false 0])
+                             )
+                             (call n ("aqua-dht" "put_value") [topic value t relay_id service_id 0])
                             )
-                            (call n ("aqua-dht" "put_value") [topic value t relay_id service_id 0])
+                            (null)
                            )
-                           (null)
                           )
+                          (next n)
                          )
-                         (next n)
                         )
                        )
+                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
                       )
                      )
                      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
@@ -508,12 +488,6 @@ export function initTopicAndSubscribe(...args: any) {
         "tag" : "void"
     },
     "argDefs" : [
-        {
-            "name" : "node_id",
-            "argType" : {
-                "tag" : "primitive"
-            }
-        },
         {
             "name" : "topic",
             "argType" : {

src/compiled/examples/aliases.ts

@@ -70,12 +70,27 @@ export type DoSmthArgD = { otherValue: number; value: string; }
 export type DoSmthArgD2 = { otherValue: number; value: string; }
 export type DoSmthArgSd = { complex: { someNum: number; someStr: string; }; value: string; } 
 export type DoSmthResult = { complex: { otherValue: number; value: string; }; value: string; }
-export function doSmth(d: DoSmthArgD, d2: DoSmthArgD2, sd: DoSmthArgSd, c: (arg0: { someNum: number; someStr: string; }, arg1: { complex: { someNum: number; someStr: string; }; value: string; }, callParams: CallParams<'arg0' | 'arg1'>) => { complex: { otherValue: number; value: string; }; value: string; } | Promise<{ complex: { otherValue: number; value: string; }; value: string; }>, config?: {ttl?: number}): Promise<DoSmthResult>;
+export function doSmth(
-export function doSmth(peer: FluencePeer, d: DoSmthArgD, d2: DoSmthArgD2, sd: DoSmthArgSd, c: (arg0: { someNum: number; someStr: string; }, arg1: { complex: { someNum: number; someStr: string; }; value: string; }, callParams: CallParams<'arg0' | 'arg1'>) => { complex: { otherValue: number; value: string; }; value: string; } | Promise<{ complex: { otherValue: number; value: string; }; value: string; }>, config?: {ttl?: number}): Promise<DoSmthResult>;
+    d: DoSmthArgD,
+    d2: DoSmthArgD2,
+    sd: DoSmthArgSd,
+    c: (arg0: { someNum: number; someStr: string; }, arg1: { complex: { someNum: number; someStr: string; }; value: string; }, callParams: CallParams<'arg0' | 'arg1'>) => { complex: { otherValue: number; value: string; }; value: string; } | Promise<{ complex: { otherValue: number; value: string; }; value: string; }>,
+    config?: {ttl?: number}
+): Promise<DoSmthResult>;
+
+export function doSmth(
+    peer: FluencePeer,
+    d: DoSmthArgD,
+    d2: DoSmthArgD2,
+    sd: DoSmthArgSd,
+    c: (arg0: { someNum: number; someStr: string; }, arg1: { complex: { someNum: number; someStr: string; }; value: string; }, callParams: CallParams<'arg0' | 'arg1'>) => { complex: { otherValue: number; value: string; }; value: string; } | Promise<{ complex: { otherValue: number; value: string; }; value: string; }>,
+    config?: {ttl?: number}
+): Promise<DoSmthResult>;
+
 export function doSmth(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/assignment.ts

@@ -74,12 +74,21 @@ export function registerOpHa(...args: any) {
 // Functions
 export type DoSmthArgArg = { value: string; } 
 
-export function doSmth(arg: DoSmthArgArg, config?: {ttl?: number}): Promise<string[]>;
+export function doSmth(
-export function doSmth(peer: FluencePeer, arg: DoSmthArgArg, config?: {ttl?: number}): Promise<string[]>;
+    arg: DoSmthArgArg,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function doSmth(
+    peer: FluencePeer,
+    arg: DoSmthArgArg,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function doSmth(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/callArrow.ts

@@ -19,12 +19,25 @@ import {
 // Functions
  
 
-export function passFunctionAsArg(node: string, str: string, c: (arg0: string, callParams: CallParams<'arg0'>) => string | Promise<string>, config?: {ttl?: number}): Promise<void>;
+export function passFunctionAsArg(
-export function passFunctionAsArg(peer: FluencePeer, node: string, str: string, c: (arg0: string, callParams: CallParams<'arg0'>) => string | Promise<string>, config?: {ttl?: number}): Promise<void>;
+    node: string,
+    str: string,
+    c: (arg0: string, callParams: CallParams<'arg0'>) => string | Promise<string>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function passFunctionAsArg(
+    peer: FluencePeer,
+    node: string,
+    str: string,
+    c: (arg0: string, callParams: CallParams<'arg0'>) => string | Promise<string>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function passFunctionAsArg(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/closures.ts

@@ -47,12 +47,21 @@ export function registerLocalSrv(...args: any) {
 // Functions
  
 
-export function closureIn(peer1: string, config?: {ttl?: number}): Promise<string>;
+export function closureIn(
-export function closureIn(peer: FluencePeer, peer1: string, config?: {ttl?: number}): Promise<string>;
+    peer1: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function closureIn(
+    peer: FluencePeer,
+    peer1: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function closureIn(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -126,12 +135,21 @@ export function closureIn(...args: any) {
 
  
 export type ClosureOutResult = { external_addresses: string[]; }
-export function closureOut(peer2: string, config?: {ttl?: number}): Promise<ClosureOutResult>;
+export function closureOut(
-export function closureOut(peer: FluencePeer, peer2: string, config?: {ttl?: number}): Promise<ClosureOutResult>;
+    peer2: string,
+    config?: {ttl?: number}
+): Promise<ClosureOutResult>;
+
+export function closureOut(
+    peer: FluencePeer,
+    peer2: string,
+    config?: {ttl?: number}
+): Promise<ClosureOutResult>;
+
 export function closureOut(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -208,12 +226,23 @@ export function closureOut(...args: any) {
 
  
 export type ClosureBigResult = [string, string]
-export function closureBig(peer1: string, peer2: string, config?: {ttl?: number}): Promise<ClosureBigResult>;
+export function closureBig(
-export function closureBig(peer: FluencePeer, peer1: string, peer2: string, config?: {ttl?: number}): Promise<ClosureBigResult>;
+    peer1: string,
+    peer2: string,
+    config?: {ttl?: number}
+): Promise<ClosureBigResult>;
+
+export function closureBig(
+    peer: FluencePeer,
+    peer1: string,
+    peer2: string,
+    config?: {ttl?: number}
+): Promise<ClosureBigResult>;
+
 export function closureBig(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/co.ts

@@ -47,12 +47,23 @@ export function registerCoService(...args: any) {
 // Functions
  
 
-export function coFunc(node: string, c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function coFunc(
-export function coFunc(peer: FluencePeer, node: string, c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    node: string,
+    c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function coFunc(
+    peer: FluencePeer,
+    node: string,
+    c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function coFunc(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/complex.ts

@@ -80,12 +80,33 @@ export function registerTestS(...args: any) {
 // Functions
  
 
-export function doStuff(a: string, b: string, c: boolean, d: boolean, e: string[], g: string[], str: string, config?: {ttl?: number}): Promise<string[]>;
+export function doStuff(
-export function doStuff(peer: FluencePeer, a: string, b: string, c: boolean, d: boolean, e: string[], g: string[], str: string, config?: {ttl?: number}): Promise<string[]>;
+    a: string,
+    b: string,
+    c: boolean,
+    d: boolean,
+    e: string[],
+    g: string[],
+    str: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function doStuff(
+    peer: FluencePeer,
+    a: string,
+    b: string,
+    c: boolean,
+    d: boolean,
+    e: string[],
+    g: string[],
+    str: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function doStuff(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/constants.ts

@@ -89,12 +89,19 @@ export function registerOpO(...args: any) {
 // Functions
  
 
-export function callConstant(config?: {ttl?: number}): Promise<string[]>;
+export function callConstant(
-export function callConstant(peer: FluencePeer, config?: {ttl?: number}): Promise<string[]>;
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function callConstant(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function callConstant(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/dataAlias.ts

@@ -47,12 +47,19 @@ export function registerNodeIdGetter(...args: any) {
 // Functions
  
 
-export function getAliasedData(config?: {ttl?: number}): Promise<string>;
+export function getAliasedData(
-export function getAliasedData(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function getAliasedData(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function getAliasedData(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/example.ts

@@ -122,12 +122,21 @@ export function registerTest(...args: any) {
 // Functions
  
 
-export function betterMessage(relay: string, config?: {ttl?: number}): Promise<void>;
+export function betterMessage(
-export function betterMessage(peer: FluencePeer, relay: string, config?: {ttl?: number}): Promise<void>;
+    relay: string,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function betterMessage(
+    peer: FluencePeer,
+    relay: string,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function betterMessage(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/fldist-sample.ts

@@ -53,12 +53,21 @@ export function registerReturn(...args: any) {
 // Functions
  
 
-export function test(node: string, config?: {ttl?: number}): Promise<void>;
+export function test(
-export function test(peer: FluencePeer, node: string, config?: {ttl?: number}): Promise<void>;
+    node: string,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function test(
+    peer: FluencePeer,
+    node: string,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function test(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/fold.ts

@@ -19,12 +19,21 @@ import {
 // Functions
  
 
-export function iterateAndPrint(strings: string[], config?: {ttl?: number}): Promise<void>;
+export function iterateAndPrint(
-export function iterateAndPrint(peer: FluencePeer, strings: string[], config?: {ttl?: number}): Promise<void>;
+    strings: string[],
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function iterateAndPrint(
+    peer: FluencePeer,
+    strings: string[],
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function iterateAndPrint(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -71,12 +80,23 @@ export function iterateAndPrint(...args: any) {
 
  
 
-export function iterateAndPrintParallel(nodes: string[], c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function iterateAndPrintParallel(
-export function iterateAndPrintParallel(peer: FluencePeer, nodes: string[], c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    nodes: string[],
+    c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function iterateAndPrintParallel(
+    peer: FluencePeer,
+    nodes: string[],
+    c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function iterateAndPrintParallel(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/foldJoin.ts

@@ -53,12 +53,21 @@ export function registerOp2(...args: any) {
 // Functions
  
 
-export function getTwoResults(relay: string, config?: {ttl?: number}): Promise<number[]>;
+export function getTwoResults(
-export function getTwoResults(peer: FluencePeer, relay: string, config?: {ttl?: number}): Promise<number[]>;
+    relay: string,
+    config?: {ttl?: number}
+): Promise<number[]>;
+
+export function getTwoResults(
+    peer: FluencePeer,
+    relay: string,
+    config?: {ttl?: number}
+): Promise<number[]>;
+
 export function getTwoResults(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/func.ts

@@ -47,12 +47,19 @@ export function registerTestSrv(...args: any) {
 // Functions
  
 
-export function testFunc(config?: {ttl?: number}): Promise<string>;
+export function testFunc(
-export function testFunc(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function testFunc(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function testFunc(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/helloWorld.ts

@@ -53,12 +53,21 @@ export function registerStringExtra(...args: any) {
 // Functions
  
 
-export function helloWorld(name: string, config?: {ttl?: number}): Promise<string>;
+export function helloWorld(
-export function helloWorld(peer: FluencePeer, name: string, config?: {ttl?: number}): Promise<string>;
+    name: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function helloWorld(
+    peer: FluencePeer,
+    name: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function helloWorld(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/if.ts

@@ -19,12 +19,21 @@ import {
 // Functions
  
 
-export function ifElseCall(condition: boolean, config?: {ttl?: number}): Promise<void>;
+export function ifElseCall(
-export function ifElseCall(peer: FluencePeer, condition: boolean, config?: {ttl?: number}): Promise<void>;
+    condition: boolean,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function ifElseCall(
+    peer: FluencePeer,
+    condition: boolean,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function ifElseCall(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -74,12 +83,21 @@ export function ifElseCall(...args: any) {
 
  
 
-export function ifElseNumCall(condition: number, config?: {ttl?: number}): Promise<void>;
+export function ifElseNumCall(
-export function ifElseNumCall(peer: FluencePeer, condition: number, config?: {ttl?: number}): Promise<void>;
+    condition: number,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function ifElseNumCall(
+    peer: FluencePeer,
+    condition: number,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function ifElseNumCall(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/imports_exports/exports.ts

@@ -47,12 +47,19 @@ export function registerMyExportSrv(...args: any) {
 // Functions
  
 
-export function string_from_lib(config?: {ttl?: number}): Promise<string>;
+export function string_from_lib(
-export function string_from_lib(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function string_from_lib(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function string_from_lib(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor

src/compiled/examples/imports_exports/import2.ts

@@ -19,12 +19,19 @@ import {
 // Functions
  
 
-export function wrap(config?: {ttl?: number}): Promise<string>;
+export function wrap(
-export function wrap(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function wrap(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function wrap(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -66,12 +73,19 @@ export function wrap(...args: any) {
 
  
 
-export function barfoo(config?: {ttl?: number}): Promise<string[]>;
+export function barfoo(
-export function barfoo(peer: FluencePeer, config?: {ttl?: number}): Promise<string[]>;
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function barfoo(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function barfoo(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/imports_exports/import3.ts

@@ -19,12 +19,19 @@ import {
 // Functions
  
 
-export function foo_wrapper(config?: {ttl?: number}): Promise<string>;
+export function foo_wrapper(
-export function foo_wrapper(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function foo_wrapper(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function foo_wrapper(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor

src/compiled/examples/imports_exports/imports-empty.ts

@@ -17,11 +17,11 @@ import {
 // Services
 
 export interface NoopDef {
-    array: (a: string, b: string | null, c: string | null, d: string | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[] | Promise<string[]>;
+    array: (a: string, b: string, c: string, d: string, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[] | Promise<string[]>;
     array_length: (array: string[], callParams: CallParams<'array'>) => number | Promise<number>;
     bytes_from_b58: (b: string, callParams: CallParams<'b'>) => number[] | Promise<number[]>;
     bytes_to_b58: (bs: number[], callParams: CallParams<'bs'>) => string | Promise<string>;
-    concat: (a: string[], b: string[] | null, c: string[] | null, d: string[] | null, callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[] | Promise<string[]>;
+    concat: (a: string[], b: string[], c: string[], d: string[], callParams: CallParams<'a' | 'b' | 'c' | 'd'>) => string[] | Promise<string[]>;
     concat_strings: (a: string, b: string, callParams: CallParams<'a' | 'b'>) => string | Promise<string>;
     identity: (s: string | null, callParams: CallParams<'s'>) => string | null | Promise<string | null>;
     noop: (callParams: CallParams<null>) => void | Promise<void>;
@@ -53,19 +53,19 @@ export function registerNoop(...args: any) {
                 {
                     "name" : "b",
                     "argType" : {
-                        "tag" : "optional"
+                        "tag" : "primitive"
                     }
                 },
                 {
                     "name" : "c",
                     "argType" : {
-                        "tag" : "optional"
+                        "tag" : "primitive"
                     }
                 },
                 {
                     "name" : "d",
                     "argType" : {
-                        "tag" : "optional"
+                        "tag" : "primitive"
                     }
                 }
             ],
@@ -127,19 +127,19 @@ export function registerNoop(...args: any) {
                 {
                     "name" : "b",
                     "argType" : {
-                        "tag" : "optional"
+                        "tag" : "primitive"
                     }
                 },
                 {
                     "name" : "c",
                     "argType" : {
-                        "tag" : "optional"
+                        "tag" : "primitive"
                     }
                 },
                 {
                     "name" : "d",
                     "argType" : {
-                        "tag" : "optional"
+                        "tag" : "primitive"
                     }
                 }
             ],
@@ -269,12 +269,19 @@ export function registerMyExportSrv(...args: any) {
 // Functions
  
 
-export function some_str(config?: {ttl?: number}): Promise<string>;
+export function some_str(
-export function some_str(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function some_str(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function some_str(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor
@@ -310,12 +317,19 @@ export function some_str(...args: any) {
 
  
 
-export function some_string(config?: {ttl?: number}): Promise<string>;
+export function some_string(
-export function some_string(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function some_string(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function some_string(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor
@@ -351,12 +365,19 @@ export function some_string(...args: any) {
 
  
 
-export function decl_foo(config?: {ttl?: number}): Promise<string>;
+export function decl_foo(
-export function decl_foo(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function decl_foo(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function decl_foo(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -395,12 +416,19 @@ export function decl_foo(...args: any) {
 
  
 
-export function decl_bar(config?: {ttl?: number}): Promise<string>;
+export function decl_bar(
-export function decl_bar(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function decl_bar(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function decl_bar(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor
@@ -436,12 +464,19 @@ export function decl_bar(...args: any) {
 
  
 
-export function some_random_func(config?: {ttl?: number}): Promise<string>;
+export function some_random_func(
-export function some_random_func(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function some_random_func(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function some_random_func(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor

src/compiled/examples/imports_exports/imports.ts

@@ -59,12 +59,19 @@ export function registerStringService(...args: any) {
 // Functions
  
 
-export function concat_foobars(config?: {ttl?: number}): Promise<string>;
+export function concat_foobars(
-export function concat_foobars(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function concat_foobars(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function concat_foobars(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/imports_exports/subImport.ts

@@ -53,12 +53,19 @@ export function registerSubService(...args: any) {
 // Functions
  
 export type SubImportResult = { one: string; two: number; }
-export function subImport(config?: {ttl?: number}): Promise<SubImportResult>;
+export function subImport(
-export function subImport(peer: FluencePeer, config?: {ttl?: number}): Promise<SubImportResult>;
+    config?: {ttl?: number}
+): Promise<SubImportResult>;
+
+export function subImport(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<SubImportResult>;
+
 export function subImport(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/multiReturn.ts

@@ -83,12 +83,19 @@ export function registerGetNum(...args: any) {
 // Functions
  
 export type TupleFuncResult = [string, number]
-export function tupleFunc(config?: {ttl?: number}): Promise<TupleFuncResult>;
+export function tupleFunc(
-export function tupleFunc(peer: FluencePeer, config?: {ttl?: number}): Promise<TupleFuncResult>;
+    config?: {ttl?: number}
+): Promise<TupleFuncResult>;
+
+export function tupleFunc(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<TupleFuncResult>;
+
 export function tupleFunc(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -138,12 +145,23 @@ export function tupleFunc(...args: any) {
 
  
 export type MultiReturnFuncResult = [string[], number, string, number[], string | null, number]
-export function multiReturnFunc(somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}): Promise<MultiReturnFuncResult>;
+export function multiReturnFunc(
-export function multiReturnFunc(peer: FluencePeer, somethingToReturn: number[], smthOption: string | null, config?: {ttl?: number}): Promise<MultiReturnFuncResult>;
+    somethingToReturn: number[],
+    smthOption: string | null,
+    config?: {ttl?: number}
+): Promise<MultiReturnFuncResult>;
+
+export function multiReturnFunc(
+    peer: FluencePeer,
+    somethingToReturn: number[],
+    smthOption: string | null,
+    config?: {ttl?: number}
+): Promise<MultiReturnFuncResult>;
+
 export function multiReturnFunc(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -234,94 +252,3 @@ export function multiReturnFunc(...args: any) {
         script
     )
 }
-
- 
-export type CallResult = [string, string | null, string]
-export function call(a: string | null, node: string, config?: {ttl?: number}): Promise<CallResult>;
-export function call(peer: FluencePeer, a: string | null, node: string, config?: {ttl?: number}): Promise<CallResult>;
-export function call(...args: any) {
-
-    let script = `
-                        (xor
-                     (seq
-                      (seq
-                       (seq
-                        (seq
-                         (seq
-                          (seq
-                           (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-                           (call %init_peer_id% ("getDataSrv" "a") [] a)
-                          )
-                          (call %init_peer_id% ("getDataSrv" "node") [] node)
-                         )
-                         (call -relay- ("op" "noop") [])
-                        )
-                        (xor
-                         (seq
-                          (seq
-                           (call -relay- ("op" "noop") [])
-                           (call node ("op" "identity") [a] res2)
-                          )
-                          (call node ("peer" "identify") [] info)
-                         )
-                         (seq
-                          (call -relay- ("op" "noop") [])
-                          (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-                         )
-                        )
-                       )
-                       (call -relay- ("op" "noop") [])
-                      )
-                      (xor
-                       (call %init_peer_id% ("callbackSrv" "response") ["aaa" res2 "aaa"])
-                       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
-                      )
-                     )
-                     (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
-                    )
-    `
-    return callFunction(
-        args,
-        {
-    "functionName" : "call",
-    "returnType" : {
-        "tag" : "multiReturn",
-        "returnItems" : [
-            {
-                "tag" : "primitive"
-            },
-            {
-                "tag" : "optional"
-            },
-            {
-                "tag" : "primitive"
-            }
-        ]
-    },
-    "argDefs" : [
-        {
-            "name" : "a",
-            "argType" : {
-                "tag" : "optional"
-            }
-        },
-        {
-            "name" : "node",
-            "argType" : {
-                "tag" : "primitive"
-            }
-        }
-    ],
-    "names" : {
-        "relay" : "-relay-",
-        "getDataSrv" : "getDataSrv",
-        "callbackSrv" : "callbackSrv",
-        "responseSrv" : "callbackSrv",
-        "responseFnName" : "response",
-        "errorHandlingSrv" : "errorHandlingSrv",
-        "errorFnName" : "error"
-    }
-},
-        script
-    )
-}

src/compiled/examples/nestedFuncs.ts

@@ -53,12 +53,21 @@ export function registerOpH(...args: any) {
 // Functions
  
 
-export function a(b: string, config?: {ttl?: number}): Promise<string>;
+export function a(
-export function a(peer: FluencePeer, b: string, config?: {ttl?: number}): Promise<string>;
+    b: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function a(
+    peer: FluencePeer,
+    b: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function a(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -106,12 +115,21 @@ export function a(...args: any) {
 
  
 
-export function d(e: string, config?: {ttl?: number}): Promise<string>;
+export function d(
-export function d(peer: FluencePeer, e: string, config?: {ttl?: number}): Promise<string>;
+    e: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function d(
+    peer: FluencePeer,
+    e: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function d(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/new-api-full.ts

@@ -203,12 +203,21 @@ export function registerMoreMembers(...args: any) {
 // Functions
  
 
-export function f1(callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function f1(
-export function f1(peer: FluencePeer, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function f1(
+    peer: FluencePeer,
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function f1(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor
@@ -269,12 +278,23 @@ export function f1(...args: any) {
 
  
 
-export function f2(num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function f2(
-export function f2(peer: FluencePeer, num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    num: number,
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function f2(
+    peer: FluencePeer,
+    num: number,
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function f2(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -344,12 +364,23 @@ export function f2(...args: any) {
 
  
 
-export function f3(num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<string>;
+export function f3(
-export function f3(peer: FluencePeer, num: number, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<string>;
+    num: number,
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function f3(
+    peer: FluencePeer,
+    num: number,
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function f3(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -425,12 +456,21 @@ export function f3(...args: any) {
 
  
 
-export function callBackZeroArgs(callback: (callParams: CallParams<null>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function callBackZeroArgs(
-export function callBackZeroArgs(peer: FluencePeer, callback: (callParams: CallParams<null>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    callback: (callParams: CallParams<null>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function callBackZeroArgs(
+    peer: FluencePeer,
+    callback: (callParams: CallParams<null>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function callBackZeroArgs(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor

src/compiled/examples/new-api.ts

@@ -62,12 +62,21 @@ export function registerHelloWorld(...args: any) {
 // Functions
  
 
-export function callMeBack(callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function callMeBack(
-export function callMeBack(peer: FluencePeer, callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function callMeBack(
+    peer: FluencePeer,
+    callback: (arg0: string, arg1: number, callParams: CallParams<'arg0' | 'arg1'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function callMeBack(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor

src/compiled/examples/on.ts

@@ -19,12 +19,21 @@ import {
 // Functions
  
 
-export function getPeerExternalAddresses(otherNodePeerId: string, config?: {ttl?: number}): Promise<string[]>;
+export function getPeerExternalAddresses(
-export function getPeerExternalAddresses(peer: FluencePeer, otherNodePeerId: string, config?: {ttl?: number}): Promise<string[]>;
+    otherNodePeerId: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function getPeerExternalAddresses(
+    peer: FluencePeer,
+    otherNodePeerId: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function getPeerExternalAddresses(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -84,12 +93,23 @@ export function getPeerExternalAddresses(...args: any) {
 
  
 
-export function getDistantAddresses(target: string, viaNode: string, config?: {ttl?: number}): Promise<string[]>;
+export function getDistantAddresses(
-export function getDistantAddresses(peer: FluencePeer, target: string, viaNode: string, config?: {ttl?: number}): Promise<string[]>;
+    target: string,
+    viaNode: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function getDistantAddresses(
+    peer: FluencePeer,
+    target: string,
+    viaNode: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function getDistantAddresses(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/option.ts

@@ -92,12 +92,21 @@ export function registerSomeS(...args: any) {
 // Functions
  
 
-export function checkU32AndU8(a: number | null, config?: {ttl?: number}): Promise<void>;
+export function checkU32AndU8(
-export function checkU32AndU8(peer: FluencePeer, a: number | null, config?: {ttl?: number}): Promise<void>;
+    a: number | null,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function checkU32AndU8(
+    peer: FluencePeer,
+    a: number | null,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function checkU32AndU8(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -139,12 +148,21 @@ export function checkU32AndU8(...args: any) {
 
  
 
-export function useOptional(opt: string | null, config?: {ttl?: number}): Promise<string>;
+export function useOptional(
-export function useOptional(peer: FluencePeer, opt: string | null, config?: {ttl?: number}): Promise<string>;
+    opt: string | null,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function useOptional(
+    peer: FluencePeer,
+    opt: string | null,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function useOptional(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -200,12 +218,19 @@ export function useOptional(...args: any) {
 
  
 
-export function returnOptional(config?: {ttl?: number}): Promise<string | null>;
+export function returnOptional(
-export function returnOptional(peer: FluencePeer, config?: {ttl?: number}): Promise<string | null>;
+    config?: {ttl?: number}
+): Promise<string | null>;
+
+export function returnOptional(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
 export function returnOptional(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -244,12 +269,19 @@ export function returnOptional(...args: any) {
 
  
 
-export function returnNone(config?: {ttl?: number}): Promise<string | null>;
+export function returnNone(
-export function returnNone(peer: FluencePeer, config?: {ttl?: number}): Promise<string | null>;
+    config?: {ttl?: number}
+): Promise<string | null>;
+
+export function returnNone(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
 export function returnNone(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/options/option_gen.ts

@@ -53,12 +53,19 @@ export function registerOptionString(...args: any) {
 // Functions
  
 
-export function emptyString(config?: {ttl?: number}): Promise<string | null>;
+export function emptyString(
-export function emptyString(peer: FluencePeer, config?: {ttl?: number}): Promise<string | null>;
+    config?: {ttl?: number}
+): Promise<string | null>;
+
+export function emptyString(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
 export function emptyString(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -99,12 +106,19 @@ export function emptyString(...args: any) {
 
  
 
-export function checkEmpty(config?: {ttl?: number}): Promise<string>;
+export function checkEmpty(
-export function checkEmpty(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function checkEmpty(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function checkEmpty(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -148,12 +162,21 @@ export function checkEmpty(...args: any) {
 
  
 
-export function stringAsOption(str: string, config?: {ttl?: number}): Promise<string | null>;
+export function stringAsOption(
-export function stringAsOption(peer: FluencePeer, str: string, config?: {ttl?: number}): Promise<string | null>;
+    str: string,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
+export function stringAsOption(
+    peer: FluencePeer,
+    str: string,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
 export function stringAsOption(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -206,12 +229,21 @@ export function stringAsOption(...args: any) {
 
  
 
-export function checkNoneEmpty(str: string, config?: {ttl?: number}): Promise<string>;
+export function checkNoneEmpty(
-export function checkNoneEmpty(peer: FluencePeer, str: string, config?: {ttl?: number}): Promise<string>;
+    str: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function checkNoneEmpty(
+    peer: FluencePeer,
+    str: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function checkNoneEmpty(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/par.ts

@@ -47,12 +47,23 @@ export function registerParService(...args: any) {
 // Functions
  
 
-export function parFunc(node: string, c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function parFunc(
-export function parFunc(peer: FluencePeer, node: string, c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    node: string,
+    c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function parFunc(
+    peer: FluencePeer,
+    node: string,
+    c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function parFunc(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/passArgs.ts

@@ -65,12 +65,25 @@ export function registerAquaDHT(...args: any) {
 // Functions
  
 
-export function putHostValue(key: string, value: string, service_id: string | null, config?: {ttl?: number}): Promise<string>;
+export function putHostValue(
-export function putHostValue(peer: FluencePeer, key: string, value: string, service_id: string | null, config?: {ttl?: number}): Promise<string>;
+    key: string,
+    value: string,
+    service_id: string | null,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function putHostValue(
+    peer: FluencePeer,
+    key: string,
+    value: string,
+    service_id: string | null,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function putHostValue(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -136,12 +149,21 @@ export function putHostValue(...args: any) {
 
  
 
-export function create_client_util(service_id: string, config?: {ttl?: number}): Promise<string>;
+export function create_client_util(
-export function create_client_util(peer: FluencePeer, service_id: string, config?: {ttl?: number}): Promise<string>;
+    service_id: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function create_client_util(
+    peer: FluencePeer,
+    service_id: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function create_client_util(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/println.ts

@@ -53,12 +53,21 @@ export function registerPrintln(...args: any) {
 // Functions
  
 
-export function print(str: string, config?: {ttl?: number}): Promise<void>;
+export function print(
-export function print(peer: FluencePeer, str: string, config?: {ttl?: number}): Promise<void>;
+    str: string,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function print(
+    peer: FluencePeer,
+    str: string,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function print(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/pushToStream.ts

@@ -47,12 +47,19 @@ export function registerOpA(...args: any) {
 // Functions
  
 
-export function get_results(config?: {ttl?: number}): Promise<string[]>;
+export function get_results(
-export function get_results(peer: FluencePeer, config?: {ttl?: number}): Promise<string[]>;
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function get_results(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function get_results(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)

src/compiled/examples/returnLiteral.ts

@@ -19,12 +19,19 @@ import {
 // Functions
  
 
-export function returnLiteral(config?: {ttl?: number}): Promise<string>;
+export function returnLiteral(
-export function returnLiteral(peer: FluencePeer, config?: {ttl?: number}): Promise<string>;
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function returnLiteral(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function returnLiteral(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor

src/compiled/examples/stream.ts

@@ -53,12 +53,19 @@ export function registerStringer(...args: any) {
 // Functions
  
 
-export function returnNone(config?: {ttl?: number}): Promise<string | null>;
+export function returnNone(
-export function returnNone(peer: FluencePeer, config?: {ttl?: number}): Promise<string | null>;
+    config?: {ttl?: number}
+): Promise<string | null>;
+
+export function returnNone(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
 export function returnNone(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -99,12 +106,19 @@ export function returnNone(...args: any) {
 
  
 
-export function stringNone(config?: {ttl?: number}): Promise<string | null>;
+export function stringNone(
-export function stringNone(peer: FluencePeer, config?: {ttl?: number}): Promise<string | null>;
+    config?: {ttl?: number}
+): Promise<string | null>;
+
+export function stringNone(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
 export function stringNone(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -145,12 +159,19 @@ export function stringNone(...args: any) {
 
  
 
-export function returnNil(config?: {ttl?: number}): Promise<string[]>;
+export function returnNil(
-export function returnNil(peer: FluencePeer, config?: {ttl?: number}): Promise<string[]>;
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function returnNil(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function returnNil(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -192,12 +213,19 @@ export function returnNil(...args: any) {
 
  
 
-export function stringNil(config?: {ttl?: number}): Promise<string[]>;
+export function stringNil(
-export function stringNil(peer: FluencePeer, config?: {ttl?: number}): Promise<string[]>;
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function stringNil(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function stringNil(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (xor
@@ -233,12 +261,21 @@ export function stringNil(...args: any) {
 
  
 
-export function checkStreams(ch: string[], config?: {ttl?: number}): Promise<string[]>;
+export function checkStreams(
-export function checkStreams(peer: FluencePeer, ch: string[], config?: {ttl?: number}): Promise<string[]>;
+    ch: string[],
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function checkStreams(
+    peer: FluencePeer,
+    ch: string[],
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function checkStreams(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/streamArgs.ts

@@ -53,12 +53,23 @@ export function registerTestService(...args: any) {
 // Functions
  
 
-export function append_records(peer_: string, srum: string[][], config?: {ttl?: number}): Promise<void>;
+export function append_records(
-export function append_records(peer: FluencePeer, peer_: string, srum: string[][], config?: {ttl?: number}): Promise<void>;
+    peer_: string,
+    srum: string[][],
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function append_records(
+    peer: FluencePeer,
+    peer_: string,
+    srum: string[][],
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function append_records(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -117,12 +128,21 @@ export function append_records(...args: any) {
 
  
 
-export function retrieve_records(peer_: string, config?: {ttl?: number}): Promise<string[][]>;
+export function retrieve_records(
-export function retrieve_records(peer: FluencePeer, peer_: string, config?: {ttl?: number}): Promise<string[][]>;
+    peer_: string,
+    config?: {ttl?: number}
+): Promise<string[][]>;
+
+export function retrieve_records(
+    peer: FluencePeer,
+    peer_: string,
+    config?: {ttl?: number}
+): Promise<string[][]>;
+
 export function retrieve_records(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/streamCallback.ts

@@ -19,12 +19,21 @@ import {
 // Functions
  
 
-export function someFunc(cb: (arg0: string[], callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+export function someFunc(
-export function someFunc(peer: FluencePeer, cb: (arg0: string[], callParams: CallParams<'arg0'>) => void | Promise<void>, config?: {ttl?: number}): Promise<void>;
+    cb: (arg0: string[], callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
+export function someFunc(
+    peer: FluencePeer,
+    cb: (arg0: string[], callParams: CallParams<'arg0'>) => void | Promise<void>,
+    config?: {ttl?: number}
+): Promise<void>;
+
 export function someFunc(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
                       (new $ifaces

src/compiled/examples/streamCan.ts

@@ -19,12 +19,21 @@ import {
 // Functions
  
 
-export function toOpt(s: string, config?: {ttl?: number}): Promise<string | null>;
+export function toOpt(
-export function toOpt(peer: FluencePeer, s: string, config?: {ttl?: number}): Promise<string | null>;
+    s: string,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
+export function toOpt(
+    peer: FluencePeer,
+    s: string,
+    config?: {ttl?: number}
+): Promise<string | null>;
+
 export function toOpt(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -77,12 +86,19 @@ export function toOpt(...args: any) {
 
  
 
-export function accumRes(config?: {ttl?: number}): Promise<string | null[]>;
+export function accumRes(
-export function accumRes(peer: FluencePeer, config?: {ttl?: number}): Promise<string | null[]>;
+    config?: {ttl?: number}
+): Promise<string | null[]>;
+
+export function accumRes(
+    peer: FluencePeer,
+    config?: {ttl?: number}
+): Promise<string | null[]>;
+
 export function accumRes(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/streamResults.ts

@@ -53,12 +53,21 @@ export function registerDTGetter(...args: any) {
 // Functions
  
 
-export function use_name1(name: string, config?: {ttl?: number}): Promise<string>;
+export function use_name1(
-export function use_name1(peer: FluencePeer, name: string, config?: {ttl?: number}): Promise<string>;
+    name: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function use_name1(
+    peer: FluencePeer,
+    name: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function use_name1(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -106,12 +115,21 @@ export function use_name1(...args: any) {
 
  
 
-export function use_name2(name: string, config?: {ttl?: number}): Promise<string[]>;
+export function use_name2(
-export function use_name2(peer: FluencePeer, name: string, config?: {ttl?: number}): Promise<string[]>;
+    name: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function use_name2(
+    peer: FluencePeer,
+    name: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function use_name2(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/subImportUsage.ts

@@ -59,12 +59,21 @@ export function registerConcatSubs(...args: any) {
 // Functions
  
 export type SubImportUsageResult = { one: string; two: number; }
-export function subImportUsage(s: string, config?: {ttl?: number}): Promise<SubImportUsageResult>;
+export function subImportUsage(
-export function subImportUsage(peer: FluencePeer, s: string, config?: {ttl?: number}): Promise<SubImportUsageResult>;
+    s: string,
+    config?: {ttl?: number}
+): Promise<SubImportUsageResult>;
+
+export function subImportUsage(
+    peer: FluencePeer,
+    s: string,
+    config?: {ttl?: number}
+): Promise<SubImportUsageResult>;
+
 export function subImportUsage(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/topology.ts

@@ -89,12 +89,27 @@ export function registerLocalPrint(...args: any) {
 // Functions
  
 
-export function topologyTest(me: string, myRelay: string, friend: string, friendRelay: string, config?: {ttl?: number}): Promise<string>;
+export function topologyTest(
-export function topologyTest(peer: FluencePeer, me: string, myRelay: string, friend: string, friendRelay: string, config?: {ttl?: number}): Promise<string>;
+    me: string,
+    myRelay: string,
+    friend: string,
+    friendRelay: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function topologyTest(
+    peer: FluencePeer,
+    me: string,
+    myRelay: string,
+    friend: string,
+    friendRelay: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function topologyTest(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -199,12 +214,23 @@ export function topologyTest(...args: any) {
 
  
 
-export function topologyBug205(node_id: string, n2: string | null, config?: {ttl?: number}): Promise<string[]>;
+export function topologyBug205(
-export function topologyBug205(peer: FluencePeer, node_id: string, n2: string | null, config?: {ttl?: number}): Promise<string[]>;
+    node_id: string,
+    n2: string | null,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function topologyBug205(
+    peer: FluencePeer,
+    node_id: string,
+    n2: string | null,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function topologyBug205(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/tryCatch.ts

@@ -83,12 +83,21 @@ export function registerOpA(...args: any) {
 // Functions
  
 
-export function tryCatchTest(node_id: string, config?: {ttl?: number}): Promise<string[]>;
+export function tryCatchTest(
-export function tryCatchTest(peer: FluencePeer, node_id: string, config?: {ttl?: number}): Promise<string[]>;
+    node_id: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
+export function tryCatchTest(
+    peer: FluencePeer,
+    node_id: string,
+    config?: {ttl?: number}
+): Promise<string[]>;
+
 export function tryCatchTest(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/tryOtherwise.ts

@@ -83,12 +83,21 @@ export function registerOpE(...args: any) {
 // Functions
  
 
-export function tryOtherwiseTest(node_id: string, config?: {ttl?: number}): Promise<string>;
+export function tryOtherwiseTest(
-export function tryOtherwiseTest(peer: FluencePeer, node_id: string, config?: {ttl?: number}): Promise<string>;
+    node_id: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
+export function tryOtherwiseTest(
+    peer: FluencePeer,
+    node_id: string,
+    config?: {ttl?: number}
+): Promise<string>;
+
 export function tryOtherwiseTest(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq

src/compiled/examples/via.ts

@@ -53,12 +53,23 @@ export function registerCustomId(...args: any) {
 // Functions
  
 export type ViaArrResult = { external_addresses: string[]; }
-export function viaArr(node_id: string, viaAr: string[], config?: {ttl?: number}): Promise<ViaArrResult>;
+export function viaArr(
-export function viaArr(peer: FluencePeer, node_id: string, viaAr: string[], config?: {ttl?: number}): Promise<ViaArrResult>;
+    node_id: string,
+    viaAr: string[],
+    config?: {ttl?: number}
+): Promise<ViaArrResult>;
+
+export function viaArr(
+    peer: FluencePeer,
+    node_id: string,
+    viaAr: string[],
+    config?: {ttl?: number}
+): Promise<ViaArrResult>;
+
 export function viaArr(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -154,12 +165,23 @@ export function viaArr(...args: any) {
 
  
 export type ViaStreamResult = { external_addresses: string[]; }
-export function viaStream(node_id: string, viaStr: string[], config?: {ttl?: number}): Promise<ViaStreamResult>;
+export function viaStream(
-export function viaStream(peer: FluencePeer, node_id: string, viaStr: string[], config?: {ttl?: number}): Promise<ViaStreamResult>;
+    node_id: string,
+    viaStr: string[],
+    config?: {ttl?: number}
+): Promise<ViaStreamResult>;
+
+export function viaStream(
+    peer: FluencePeer,
+    node_id: string,
+    viaStr: string[],
+    config?: {ttl?: number}
+): Promise<ViaStreamResult>;
+
 export function viaStream(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq
@@ -263,12 +285,25 @@ export function viaStream(...args: any) {
 
  
 export type ViaOptResult = { external_addresses: string[]; }
-export function viaOpt(relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}): Promise<ViaOptResult>;
+export function viaOpt(
-export function viaOpt(peer: FluencePeer, relay: string, node_id: string, viaOpt: string | null, config?: {ttl?: number}): Promise<ViaOptResult>;
+    relay: string,
+    node_id: string,
+    viaOpt: string | null,
+    config?: {ttl?: number}
+): Promise<ViaOptResult>;
+
+export function viaOpt(
+    peer: FluencePeer,
+    relay: string,
+    node_id: string,
+    viaOpt: string | null,
+    config?: {ttl?: number}
+): Promise<ViaOptResult>;
+
 export function viaOpt(...args: any) {
 
     let script = `
-                        (xor
+                    (xor
                      (seq
                       (seq
                        (seq