diff --git a/.circleci/config.yml b/.circleci/config.yml index 15032c2326..614a5adea8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ jobs: -H "Accept: application/vnd.github.v3+json" \ https://api.github.com/repos/fluencelabs/node-distro/actions/workflows/container.yml/dispatches \ -d '{ - "ref":"container_branch", + "ref":"main", "inputs": { "container_tag":"'${BRANCH}'", "version": "'${CIRCLE_BRANCH}_${CIRCLE_SHA1}'", diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae4aa77e77..4553a69c18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,7 +111,7 @@ jobs: with: workflow: update_fluence repo: fluencelabs/node-distro - ref: 'services_json' + ref: 'main' token: ${{ secrets.PERSONAL_TOKEN }} inputs: '{ "version": "${{ env.RELEASE_VERSION }}", diff --git a/README.md b/README.md index fd26659059..54c9f0a715 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,15 @@ For documentation, go [here](https://fluence.dev/) | Layer | Tech | Scale | State | Based on | | :-------------------: | :------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------: | :-------------------------------: | :--------------------------------------------------------: | -| Execution | [FCE](https://github.com/fluencelabs/fce) | Single peer | Disk, network, external processes | Wasm, [IT](https://github.com/fluencelabs/interface-types), [Wasmer*](https://github.com/fluencelabs/wasmer) | -| Composition | [Aquamarine](https://github.com/fluencelabs/aquamarine) | Involved peers | Results and signatures | ⇅, π-calculus | +| Execution | [Marine](https://github.com/fluencelabs/marine) | Single peer | Disk, network, external processes | Wasm, [IT](https://github.com/fluencelabs/interface-types), [Wasmer*](https://github.com/fluencelabs/wasmer) | +| Composition | [Aqua](https://github.com/fluencelabs/aqua) | Involved peers | Results and signatures | ⇅, π-calculus | | Topology | [TrustGraph](https://github.com/fluencelabs/fluence/tree/master/trust-graph), [DHT*](https://github.com/fluencelabs/rust-libp2p) | Distributed with Kademlia* algo | Actual state of the network | [libp2p](https://github.com/libp2p/rust-libp2p) | | Security & Accounting | Blockchain | Whole network | Licenses & payments | substrate? |

-aquamarine scheme +aquamarine scheme

## Quick summary diff --git a/images/aqua_marine_stack.png b/images/aqua_marine_stack.png new file mode 100644 index 0000000000..ecaa8431c9 Binary files /dev/null and b/images/aqua_marine_stack.png differ diff --git a/images/stack.png b/images/stack.png deleted file mode 100644 index 7557c5e8c2..0000000000 Binary files a/images/stack.png and /dev/null differ