diff --git a/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create.air b/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create.air index 50a251a..ffb9262 100644 --- a/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create.air +++ b/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create.air @@ -1,3 +1,8 @@ +; This file is auto-generated. Do not edit manually: changes may be erased. +; Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. +; If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues +; Aqua version: 0.5.0-247 + (xor (seq (seq diff --git a/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create_obj.air b/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create_obj.air index 90bb958..e81f7f0 100644 --- a/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create_obj.air +++ b/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.create_obj.air @@ -1,3 +1,8 @@ +; This file is auto-generated. Do not edit manually: changes may be erased. +; Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. +; If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues +; Aqua version: 0.5.0-247 + (xor (seq (seq diff --git a/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.roundtrip.air b/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.roundtrip.air index 3aa963d..e426188 100644 --- a/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.roundtrip.air +++ b/aqua-examples/aqua-ceramic-integration/compiled-aqua/ceramic_demo.roundtrip.air @@ -1,3 +1,8 @@ +; This file is auto-generated. Do not edit manually: changes may be erased. +; Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. +; If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues +; Aqua version: 0.5.0-247 + (xor (seq (seq diff --git a/aqua-examples/echo-greeter/Readme.md b/aqua-examples/echo-greeter/Readme.md index 13914ff..a8e539c 100644 --- a/aqua-examples/echo-greeter/Readme.md +++ b/aqua-examples/echo-greeter/Readme.md @@ -241,6 +241,8 @@ In the function body we: Let's run the compiled Aqua code with the `fldist` cli tool: +**Please note that the `fldist run_air` examples below are NOT running. We are in the process of switching to `aqua run`, which should be ready shortly. Please proceed to `client-peer` example, which works as expected.** + ```text fldist run_air \ -p aqua-compiled/echo_greeter.echo_greeting_seq.air \ @@ -497,16 +499,20 @@ cd client-peer npm install ``` -And compile our Aqua file to a Typescript stub: +And compile our Aqua file to a Typescript stub with: ```text npm run compile-aqua +``` -> echo-greeter-example@0.1.0 compile-aqua /Users/bebo/localdev/examples-rework/aqua-examples/echo-greeter/client-peer -> aqua -i ../aqua-scripts -o src/ +resulting in: -[info] Aqua Compiler 0.1.14-207 -[info] Result /Users/bebo/localdev/examples-rework/aqua-examples/echo-greeter/client-peer/src/echo_greeter.ts: compilation OK (6 functions) +```text +> echo-greeter-example@0.1.0 compile-aqua +> aqua -i ../aqua-scripts -o src/_aqua + +2021.12.04 00:21:51 [INFO] Aqua Compiler 0.5.0-248 +2021.12.04 00:21:51 [INFO] Result /Users/.../aqua-examples/echo-greeter/client-peer/src/_aqua/echo_greeter.ts: compilation OK (7 functions, 3 services) ``` The ensuing, auto-generated file is called `echo_greeter.ts` and was copied to the `src` directory. The Aqua compiler auto-generated the Typescript functions corresponding to each of the Aqua functions we implemented. All we have to do is use them! diff --git a/aqua-examples/echo-greeter/aqua-scripts/echo_greeter.aqua b/aqua-examples/echo-greeter/aqua-scripts/echo_greeter.aqua index c0515c0..b26869e 100644 --- a/aqua-examples/echo-greeter/aqua-scripts/echo_greeter.aqua +++ b/aqua-examples/echo-greeter/aqua-scripts/echo_greeter.aqua @@ -32,7 +32,7 @@ func echo_greeting_seq(names: []string, greet: bool, node: string, echo_service_ EchoService echo_service_id GreetingService greeting_service_id echo_names <- EchoService.echo(names) - <- echo_names + -- <- echo_names for result <- echo_names: res <- GreetingService.greeting(result.echo, greet) <- res diff --git a/aqua-examples/echo-greeter/client-peer/package-lock.json b/aqua-examples/echo-greeter/client-peer/package-lock.json index b7672e0..3e8cd1c 100644 --- a/aqua-examples/echo-greeter/client-peer/package-lock.json +++ b/aqua-examples/echo-greeter/client-peer/package-lock.json @@ -9,14 +9,14 @@ "version": "0.1.0", "license": "MIT", "dependencies": { - "@fluencelabs/aqua-lib": "^0.1.14", - "@fluencelabs/fluence": "^0.14.3", + "@fluencelabs/aqua-lib": "^0.2.1", + "@fluencelabs/fluence": "^0.15.1", "@fluencelabs/fluence-network-environment": "^1.0.10", "it-all": "^1.0.5" }, "devDependencies": { - "@fluencelabs/aqua": "^0.4.0-235", - "typescript": "^4.0.0" + "@fluencelabs/aqua": "^0.5.0-247", + "typescript": "^4.5.2" } }, "node_modules/@chainsafe/libp2p-noise": { @@ -51,12 +51,13 @@ } }, "node_modules/@fluencelabs/aqua": { - "version": "0.4.0-235", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", - "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", + "version": "0.5.0-248", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.5.0-248.tgz", + "integrity": "sha512-TgPA8vj0gPSxIlQa8VSgRN0I0jIeGoOeyG7+x3Zq3C+6ibJ9jWPSDmtgE0WWcd1DAoTeX7lCWUA2ZL116k2X5A==", "dev": true, "dependencies": { - "@fluencelabs/fluence": "0.12.1" + "@fluencelabs/aqua-lib": "0.2.1", + "@fluencelabs/fluence": "0.15.2" }, "bin": { "aqua": "index.js", @@ -64,58 +65,25 @@ } }, "node_modules/@fluencelabs/aqua-lib": { - "version": "0.1.14", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.1.14.tgz", - "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" - }, - "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", - "dev": true, - "dependencies": { - "base64-js": "1.5.1" - } - }, - "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", - "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", - "dev": true, - "dependencies": { - "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", - "async": "3.2.0", - "base64-js": "1.5.1", - "bs58": "4.0.1", - "cids": "0.8.1", - "it-length-prefixed": "3.0.1", - "it-pipe": "1.1.0", - "libp2p": "0.32.3", - "libp2p-crypto": "0.19.7", - "libp2p-mplex": "0.10.4", - "libp2p-websockets": "0.16.1", - "loglevel": "1.7.0", - "multiaddr": "10.0.0", - "peer-id": "0.15.3", - "uuid": "8.3.0" - } + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.2.1.tgz", + "integrity": "sha512-uLP9mbgFHR1Q1FYhehasNxNBlTclBsjNI9MvIPF8oXtVJtnvPi+R4rGGTOHtRJukunxhpAV/svWQU9a2BRyDmQ==" }, "node_modules/@fluencelabs/avm": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.16.7.tgz", - "integrity": "sha512-tSbEBRdHTz6PCxLuzEWe3ayZQeDiuJu/Dw0qJmdpYe6eJf0jSwUnAnRaEOv2d0ILnzT1b4us9tCKOhac41YlLg==", + "version": "0.16.0-restriction-operator.9", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.16.0-restriction-operator.9.tgz", + "integrity": "sha512-34vJqo8TIho5H2+WhEAJOa6WxAPiS+c7Z3WKmRZVi+GAsZN3Hv2NiuiCFNFBmPRoD+juzHe4Dmv5cF7HZc6O6w==", "dependencies": { "base64-js": "1.5.1" } }, "node_modules/@fluencelabs/fluence": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.3.tgz", - "integrity": "sha512-JlF/B9Wtz0VMBJIfA+hZYZt44nX5AIJzgkhfbT1fKfwzb1CvS6IYaaH6PE8vLcBm556sJic94yYL++FpQrJUmQ==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.15.2.tgz", + "integrity": "sha512-RWGh70XkqcJusaqB4TR0tVBSVkzlMU9krwALQmgilLTxaSBMPtB6xMt13ceEJ/G6BwsLZWdgY2Wy6GvdSheKaw==", "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.16.7", + "@fluencelabs/avm": "0.16.0-restriction-operator.9", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -2498,9 +2466,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "node_modules/typescript": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", - "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", + "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -2683,69 +2651,35 @@ } }, "@fluencelabs/aqua": { - "version": "0.4.0-235", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.4.0-235.tgz", - "integrity": "sha512-tbbHG3dhlwcSzlHMPoV4/MLW6JE00q3hiyznjLh+aW91ovBAXuWe5C1n9CKeRiJtYz3yIQCn2l3arI/PvzLx9Q==", + "version": "0.5.0-248", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.5.0-248.tgz", + "integrity": "sha512-TgPA8vj0gPSxIlQa8VSgRN0I0jIeGoOeyG7+x3Zq3C+6ibJ9jWPSDmtgE0WWcd1DAoTeX7lCWUA2ZL116k2X5A==", "dev": true, "requires": { - "@fluencelabs/fluence": "0.12.1" - }, - "dependencies": { - "@fluencelabs/avm": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.14.4.tgz", - "integrity": "sha512-XyR+1H5k0CAc+mDHOkl81viX8XeW1Yqbw793xbsfUfju5bUb/hqk+gHv3q8lAFdbrCG5P45gdOT08a5RNODZaQ==", - "dev": true, - "requires": { - "base64-js": "1.5.1" - } - }, - "@fluencelabs/fluence": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.12.1.tgz", - "integrity": "sha512-JrMKMHjYILAHQsLLd5H0fLt/UMZv+/PQYxJYe6h9HFyJlZrN1bUV+EcZnUw1u3DZE5k/RXBx0udfmkahggwrqA==", - "dev": true, - "requires": { - "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.14.4", - "async": "3.2.0", - "base64-js": "1.5.1", - "bs58": "4.0.1", - "cids": "0.8.1", - "it-length-prefixed": "3.0.1", - "it-pipe": "1.1.0", - "libp2p": "0.32.3", - "libp2p-crypto": "0.19.7", - "libp2p-mplex": "0.10.4", - "libp2p-websockets": "0.16.1", - "loglevel": "1.7.0", - "multiaddr": "10.0.0", - "peer-id": "0.15.3", - "uuid": "8.3.0" - } - } + "@fluencelabs/aqua-lib": "0.2.1", + "@fluencelabs/fluence": "0.15.2" } }, "@fluencelabs/aqua-lib": { - "version": "0.1.14", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.1.14.tgz", - "integrity": "sha512-H2Q4gIvociUxc4J2mwmH0D+mrU2N2Z+enKCHgBCanMVEE2wZDsZ80GTbDKsQjEq+gpqbnJIk8lJBYW6lyvLJTg==" + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.2.1.tgz", + "integrity": "sha512-uLP9mbgFHR1Q1FYhehasNxNBlTclBsjNI9MvIPF8oXtVJtnvPi+R4rGGTOHtRJukunxhpAV/svWQU9a2BRyDmQ==" }, "@fluencelabs/avm": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.16.7.tgz", - "integrity": "sha512-tSbEBRdHTz6PCxLuzEWe3ayZQeDiuJu/Dw0qJmdpYe6eJf0jSwUnAnRaEOv2d0ILnzT1b4us9tCKOhac41YlLg==", + "version": "0.16.0-restriction-operator.9", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.16.0-restriction-operator.9.tgz", + "integrity": "sha512-34vJqo8TIho5H2+WhEAJOa6WxAPiS+c7Z3WKmRZVi+GAsZN3Hv2NiuiCFNFBmPRoD+juzHe4Dmv5cF7HZc6O6w==", "requires": { "base64-js": "1.5.1" } }, "@fluencelabs/fluence": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.14.3.tgz", - "integrity": "sha512-JlF/B9Wtz0VMBJIfA+hZYZt44nX5AIJzgkhfbT1fKfwzb1CvS6IYaaH6PE8vLcBm556sJic94yYL++FpQrJUmQ==", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.15.2.tgz", + "integrity": "sha512-RWGh70XkqcJusaqB4TR0tVBSVkzlMU9krwALQmgilLTxaSBMPtB6xMt13ceEJ/G6BwsLZWdgY2Wy6GvdSheKaw==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", - "@fluencelabs/avm": "0.16.7", + "@fluencelabs/avm": "0.16.0-restriction-operator.9", "async": "3.2.0", "base64-js": "1.5.1", "bs58": "4.0.1", @@ -4704,9 +4638,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "typescript": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", - "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", + "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==", "dev": true }, "uint8arrays": { diff --git a/aqua-examples/echo-greeter/client-peer/package.json b/aqua-examples/echo-greeter/client-peer/package.json index bcc9246..63fcac5 100644 --- a/aqua-examples/echo-greeter/client-peer/package.json +++ b/aqua-examples/echo-greeter/client-peer/package.json @@ -13,8 +13,8 @@ "package-lock.json" ], "dependencies": { - "@fluencelabs/aqua-lib": "^0.1.14", - "@fluencelabs/fluence": "^0.14.3", + "@fluencelabs/aqua-lib": "^0.2.1", + "@fluencelabs/fluence": "^0.15.1", "@fluencelabs/fluence-network-environment": "^1.0.10", "it-all": "^1.0.5" }, @@ -43,7 +43,7 @@ }, "homepage": "git+https://github.com/fluencelabs/examples/aqua-examples/echo-greeter#readme", "devDependencies": { - "@fluencelabs/aqua": "^0.4.0-235", - "typescript": "^4.0.0" + "@fluencelabs/aqua": "^0.5.0-247", + "typescript": "^4.5.2" } }