diff --git a/.github/release-please/config.json b/.github/release-please/config.json index 93787a8a..4091172e 100644 --- a/.github/release-please/config.json +++ b/.github/release-please/config.json @@ -13,7 +13,6 @@ "packages/core/marine-worker": {}, "packages/core/aqua-to-js": {}, "packages/core/interfaces": {}, - "packages/core/npm-aqua-compiler": {}, - "packages/core/fluence-network-environment": {} + "packages/core/npm-aqua-compiler": {} } } diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json index d42b427e..9d20d83e 100644 --- a/.github/release-please/manifest.json +++ b/.github/release-please/manifest.json @@ -4,6 +4,5 @@ "packages/core/aqua-to-js": "0.3.13", "packages/core/js-client-isomorphic": "0.6.0", "packages/core/interfaces": "0.12.0", - "packages/core/npm-aqua-compiler": "0.0.3", - "packages/core/fluence-network-environment": "1.1.2" + "packages/core/npm-aqua-compiler": "0.0.3" } diff --git a/packages/core/fluence-network-environment/.gitignore b/packages/core/fluence-network-environment/.gitignore deleted file mode 100644 index 99246bb7..00000000 --- a/packages/core/fluence-network-environment/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release -bundle/ -dist/ - -# Dependency directories -node_modules/ -jspm_packages/ \ No newline at end of file diff --git a/packages/core/fluence-network-environment/CHANGELOG.md b/packages/core/fluence-network-environment/CHANGELOG.md deleted file mode 100644 index 7377325e..00000000 --- a/packages/core/fluence-network-environment/CHANGELOG.md +++ /dev/null @@ -1,28 +0,0 @@ -# Changelog - -## [1.1.2](https://github.com/fluencelabs/fluence-network-environment/compare/fluence-network-environment-v1.1.1...fluence-network-environment-v1.1.2) (2023-07-05) - - -### Bug Fixes - -* Update DNS records after kras migration to Nomad ([#11](https://github.com/fluencelabs/fluence-network-environment/issues/11)) ([446df4f](https://github.com/fluencelabs/fluence-network-environment/commit/446df4f5eaa64d8d5b803e23f73b8cf8e4331d2e)) - -## [1.1.1](https://github.com/fluencelabs/fluence-network-environment/compare/fluence-network-environment-v1.1.0...fluence-network-environment-v1.1.1) (2023-07-03) - - -### Bug Fixes - -* Actually build package ([#9](https://github.com/fluencelabs/fluence-network-environment/issues/9)) ([25ef57e](https://github.com/fluencelabs/fluence-network-environment/commit/25ef57e061d75abaa08d58a4fef89e71d9cfb4da)) - -## [1.1.0](https://github.com/fluencelabs/fluence-network-environment/compare/fluence-network-environment-v1.0.14...fluence-network-environment-v1.1.0) (2023-06-19) - - -### Features - -* Rename krasnodar to kras. Add functions to pick random nodes ([#4](https://github.com/fluencelabs/fluence-network-environment/issues/4)) ([a65217f](https://github.com/fluencelabs/fluence-network-environment/commit/a65217fd2e0d3c65f4ae54105b54018af778e92d)) -* Update stage multiaddr ([#7](https://github.com/fluencelabs/fluence-network-environment/issues/7)) ([3c0f1f8](https://github.com/fluencelabs/fluence-network-environment/commit/3c0f1f89a5f713e94ee0104bcf0fa9b66f8a5cca)) - - -### Bug Fixes - -* Update testnet DNS records ([#8](https://github.com/fluencelabs/fluence-network-environment/issues/8)) ([2ed6209](https://github.com/fluencelabs/fluence-network-environment/commit/2ed6209c9c122fe2cd2b7811379c97163c64db88)) diff --git a/packages/core/fluence-network-environment/README.md b/packages/core/fluence-network-environment/README.md deleted file mode 100644 index b00f9f64..00000000 --- a/packages/core/fluence-network-environment/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Fluence network environment - -[![npm](https://img.shields.io/npm/v/@fluencelabs/fluence-network-environment)](https://www.npmjs.com/package/@fluencelabs/fluence-network-environment) - -Maintained list of well-known Fluence network nodes. The package is meant to be used in combination with [Fluence JS SDK](https://github.com/fluencelabs/fluence-js). - -## Installation - -With npm - -```bash -npm install @fluencelabs/fluence-network-environment -``` - -With yarn - -```bash -yarn add @fluencelabs/fluence-network-environment -``` - -## Usage - -Pick a node to connect to the Fluence network. - -```typescript -import { testNet } from "@fluencelabs/fluence-network-environment"; - -export const relayNode = testNet[0]; -``` - -Which can be used to initialize the Fluence client (see [Fluence JS SDK](https://github.com/fluencelabs/fluence-js).) - -```typescript -import { FluencePeer } from "@fluencelabs/fluence"; - -const peer = new FluencePeer(); -await peer.start({ connectTo: relayNode }); -``` - -## Known networks - -- stage - unstable network for development tests; low capacity -- TestNet - more stable network, used for QA of new releases; higher capacity -- Kras - stable network, has the highest load capacity - -All 3 networks are connected, i.e. any node can be discovered from every other. They're open and permissionless, meaning that anyone can use any node for bootstrapping. - -## Fluence Stack - -| Layer | Tech | Scale | State | Based on | -| :-------------------: | :-------------------------------------------------------------------------------------------------------------------------------: | :------------------------------: | :-------------------------------: | :-----------------------------------------------------------------------------------------------------------: | -| 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 -

- -## License - -[Apache 2.0](https://github.com/fluencelabs/fluence/blob/trustless_computing/LICENSE.md) diff --git a/packages/core/fluence-network-environment/doc/image.png b/packages/core/fluence-network-environment/doc/image.png deleted file mode 100644 index ecaa8431..00000000 Binary files a/packages/core/fluence-network-environment/doc/image.png and /dev/null differ diff --git a/packages/core/fluence-network-environment/package.json b/packages/core/fluence-network-environment/package.json deleted file mode 100644 index c3af0724..00000000 --- a/packages/core/fluence-network-environment/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "module", - "name": "@fluencelabs/fluence-network-environment", - "version": "1.1.2", - "description": "Fluence network environments addresses", - "files": [ - "dist" - ], - "main": "./dist/index.js", - "typings": "./dist/index.d.ts", - "scripts": { - "build": "tsc" - }, - "repository": "https://github.com/fluencelabs/fluence-network-environment", - "author": "Fluence DAO", - "license": "Apache-2.0" -} diff --git a/packages/core/fluence-network-environment/src/index.ts b/packages/core/fluence-network-environment/src/index.ts deleted file mode 100644 index e8db5aa7..00000000 --- a/packages/core/fluence-network-environment/src/index.ts +++ /dev/null @@ -1,190 +0,0 @@ -/** - * Copyright 2024 Fluence DAO - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export type Relay = { peerId: string; multiaddr: string }; - -export const stage: Relay[] = [ - { - multiaddr: - "/dns4/0-stage.fluence.dev/tcp/9000/wss/p2p/12D3KooWDcpWuyrMTDinqNgmXAuRdfd2mTdY9VoXZSAet2pDzh6r", - peerId: "12D3KooWDcpWuyrMTDinqNgmXAuRdfd2mTdY9VoXZSAet2pDzh6r", - }, - { - multiaddr: - "/dns4/1-stage.fluence.dev/tcp/9000/wss/p2p/12D3KooWHCJbJKGDfCgHSoCuK9q4STyRnVveqLoXAPBbXHTZx9Cv", - peerId: "12D3KooWHCJbJKGDfCgHSoCuK9q4STyRnVveqLoXAPBbXHTZx9Cv", - }, - { - multiaddr: - "/dns4/2-stage.fluence.dev/tcp/9000/wss/p2p/12D3KooWMigkP4jkVyufq5JnDJL6nXvyjeaDNpRfEZqQhsG3sYCU", - peerId: "12D3KooWMigkP4jkVyufq5JnDJL6nXvyjeaDNpRfEZqQhsG3sYCU", - }, - { - multiaddr: - "/dns4/3-stage.fluence.dev/tcp/9000/wss/p2p/12D3KooWMMGdfVEJ1rWe1nH1nehYDzNEHhg5ogdfiGk88AupCMnf", - peerId: "12D3KooWMMGdfVEJ1rWe1nH1nehYDzNEHhg5ogdfiGk88AupCMnf", - }, - { - multiaddr: - "/dns4/4-stage.fluence.dev/tcp/9000/wss/p2p/12D3KooWJ4bTHirdTFNZpCS72TAzwtdmavTBkkEXtzo6wHL25CtE", - peerId: "12D3KooWJ4bTHirdTFNZpCS72TAzwtdmavTBkkEXtzo6wHL25CtE", - }, - { - multiaddr: - "/dns4/5-stage.fluence.dev/tcp/9000/wss/p2p/12D3KooWAKNos2KogexTXhrkMZzFYpLHuWJ4PgoAhurSAv7o5CWA", - peerId: "12D3KooWAKNos2KogexTXhrkMZzFYpLHuWJ4PgoAhurSAv7o5CWA", - }, -]; - -export const testNet: Relay[] = [ - { - multiaddr: - "/dns4/0-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz", - peerId: "12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz", - }, - { - multiaddr: - "/dns4/1-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWEXNUbCXooUwHrHBbrmjsrpHXoEphPwbjQXEGyzbqKnE9", - peerId: "12D3KooWEXNUbCXooUwHrHBbrmjsrpHXoEphPwbjQXEGyzbqKnE9", - }, - { - multiaddr: - "/dns4/2-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er", - peerId: "12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er", - }, - { - multiaddr: - "/dns4/3-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWBUJifCTgaxAUrcM9JysqCcS4CS8tiYH5hExbdWCAoNwb", - peerId: "12D3KooWBUJifCTgaxAUrcM9JysqCcS4CS8tiYH5hExbdWCAoNwb", - }, - { - multiaddr: - "/dns4/4-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWJbJFaZ3k5sNd8DjQgg3aERoKtBAnirEvPV8yp76kEXHB", - peerId: "12D3KooWJbJFaZ3k5sNd8DjQgg3aERoKtBAnirEvPV8yp76kEXHB", - }, - { - multiaddr: - "/dns4/5-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWCKCeqLPSgMnDjyFsJuWqREDtKNHx1JEBiwaMXhCLNTRb", - peerId: "12D3KooWCKCeqLPSgMnDjyFsJuWqREDtKNHx1JEBiwaMXhCLNTRb", - }, - { - multiaddr: - "/dns4/6-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWKnRcsTpYx9axkJ6d69LPfpPXrkVLe96skuPTAo76LLVH", - peerId: "12D3KooWKnRcsTpYx9axkJ6d69LPfpPXrkVLe96skuPTAo76LLVH", - }, - { - multiaddr: - "/dns4/7-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWBSdm6TkqnEFrgBuSkpVE3dR1kr6952DsWQRNwJZjFZBv", - peerId: "12D3KooWBSdm6TkqnEFrgBuSkpVE3dR1kr6952DsWQRNwJZjFZBv", - }, - { - multiaddr: - "/dns4/8-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWGzNvhSDsgFoHwpWHAyPf1kcTYCGeRBPfznL8J6qdyu2H", - peerId: "12D3KooWGzNvhSDsgFoHwpWHAyPf1kcTYCGeRBPfznL8J6qdyu2H", - }, - { - multiaddr: - "/dns4/9-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWF7gjXhQ4LaKj6j7ntxsPpGk34psdQicN2KNfBi9bFKXg", - peerId: "12D3KooWF7gjXhQ4LaKj6j7ntxsPpGk34psdQicN2KNfBi9bFKXg", - }, - { - multiaddr: - "/dns4/10-dar.fluence.dev/tcp/9000/wss/p2p/12D3KooWB9P1xmV3c7ZPpBemovbwCiRRTKd3Kq2jsVPQN4ZukDfy", - peerId: "12D3KooWB9P1xmV3c7ZPpBemovbwCiRRTKd3Kq2jsVPQN4ZukDfy", - }, -]; - -export const kras: Relay[] = [ - { - multiaddr: - "/dns4/0-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e", - peerId: "12D3KooWSD5PToNiLQwKDXsu8JSysCwUt8BVUJEqCHcDe7P5h45e", - }, - { - multiaddr: - "/dns4/1-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWR4cv1a8tv7pps4HH6wePNaK6gf1Hww5wcCMzeWxyNw51", - peerId: "12D3KooWR4cv1a8tv7pps4HH6wePNaK6gf1Hww5wcCMzeWxyNw51", - }, - { - multiaddr: - "/dns4/2-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWKnEqMfYo9zvfHmqTLpLdiHXPe4SVqUWcWHDJdFGrSmcA", - peerId: "12D3KooWKnEqMfYo9zvfHmqTLpLdiHXPe4SVqUWcWHDJdFGrSmcA", - }, - { - multiaddr: - "/dns4/3-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWHLxVhUQyAuZe6AHMB29P7wkvTNMn7eDMcsqimJYLKREf", - peerId: "12D3KooWHLxVhUQyAuZe6AHMB29P7wkvTNMn7eDMcsqimJYLKREf", - }, - { - multiaddr: - "/dns4/4-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", - peerId: "12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", - }, - { - multiaddr: - "/dns4/5-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi", - peerId: "12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi", - }, - { - multiaddr: - "/dns4/6-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS", - peerId: "12D3KooWCMr9mU894i8JXAFqpgoFtx6qnV1LFPSfVc3Y34N4h4LS", - }, - { - multiaddr: - "/dns4/7-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWDUszU2NeWyUVjCXhGEt1MoZrhvdmaQQwtZUriuGN1jTr", - peerId: "12D3KooWDUszU2NeWyUVjCXhGEt1MoZrhvdmaQQwtZUriuGN1jTr", - }, - { - multiaddr: - "/dns4/8-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWEFFCZnar1cUJQ3rMWjvPQg6yMV2aXWs2DkJNSRbduBWn", - peerId: "12D3KooWEFFCZnar1cUJQ3rMWjvPQg6yMV2aXWs2DkJNSRbduBWn", - }, - { - multiaddr: - "/dns4/9-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - peerId: "12D3KooWFtf3rfCDAfWwt6oLZYZbDfn9Vn7bv7g6QjjQxUUEFVBt", - }, - { - multiaddr: - "/dns4/10-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWD7CvsYcpF9HE9CCV9aY3SJ317tkXVykjtZnht2EbzDPm", - peerId: "12D3KooWD7CvsYcpF9HE9CCV9aY3SJ317tkXVykjtZnht2EbzDPm", - }, -]; - -// for backward compatibility -export const krasnodar = kras; - -export const randomKras = () => { - return randomItem(kras); -}; - -export const randomTestNet = () => { - return randomItem(testNet); -}; - -export const randomStage = () => { - return randomItem(stage); -}; - -function randomItem(arr: Relay[]) { - const index = randomInt(0, arr.length); - return arr[index]; -} - -function randomInt(min: number, max: number) { - return Math.floor(Math.random() * (max - min)) + min; -} diff --git a/packages/core/fluence-network-environment/tsconfig.json b/packages/core/fluence-network-environment/tsconfig.json deleted file mode 100644 index a04ef1f8..00000000 --- a/packages/core/fluence-network-environment/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../../tsconfig.json", - "compilerOptions": { - "outDir": "./dist" - }, - "include": ["src/**/*"], - "exclude": ["node_modules", "dist"] -} diff --git a/packages/core/js-client/package.json b/packages/core/js-client/package.json index dc2a9f97..3792d258 100644 --- a/packages/core/js-client/package.json +++ b/packages/core/js-client/package.json @@ -35,7 +35,7 @@ "@fluencelabs/avm": "0.62.0", "@fluencelabs/interfaces": "workspace:*", "@fluencelabs/js-client-isomorphic": "workspace:*", - "@fluencelabs/fluence-network-environment": "workspace:*", + "@fluencelabs/fluence-network-environment": "1.2.2", "@fluencelabs/marine-worker": "0.6.0", "@fluencelabs/threads": "^2.0.0", "@libp2p/crypto": "4.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3bcc21d..a18c289b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -194,8 +194,6 @@ importers: specifier: 0.34.6 version: 0.34.6 - packages/core/fluence-network-environment: {} - packages/core/interfaces: devDependencies: hotscript: @@ -214,8 +212,8 @@ importers: specifier: 0.62.0 version: 0.62.0 '@fluencelabs/fluence-network-environment': - specifier: workspace:* - version: link:../fluence-network-environment + specifier: 1.2.2 + version: 1.2.2 '@fluencelabs/interfaces': specifier: workspace:* version: link:../interfaces @@ -2751,6 +2749,10 @@ packages: multicodec: 3.2.1 dev: false + /@fluencelabs/fluence-network-environment@1.2.2: + resolution: {integrity: sha512-cshtU9W5bQLJ4W2Plr2yEfG/8wDmF0HcRHm05YYFRI94nT4hXXA8X8WjzEKEfVa1ulvW9J1usyEFIY3QWw1yWQ==} + dev: false + /@fluencelabs/marine-js@0.13.0: resolution: {integrity: sha512-/qGc6FkLAwgf4U1P8eSb3ECY6cNm77FjfGokva+Pme4VB9EAKDdWxpY/F+AcdUyJ7XUgl/I4eMebTDGpMto5bQ==} dependencies: