From fa3b616f32b4e220c58de7896029eab060efbc9b Mon Sep 17 00:00:00 2001 From: boneyard93501 <4523011+boneyard93501@users.noreply.github.com.> Date: Mon, 4 Dec 2023 18:48:13 -0600 Subject: [PATCH 1/4] update cli files, network to kras, relay to kras, deploy new deal --- .fluence/aqua/deals.aqua | 10 +++++----- .fluence/aqua/hosts.aqua | 21 ++------------------- .fluence/workers.yaml | 12 ++++++------ fluence.yaml | 10 +++------- gateway/configs/quickstart_config.json | 6 ++---- 5 files changed, 18 insertions(+), 41 deletions(-) diff --git a/.fluence/aqua/deals.aqua b/.fluence/aqua/deals.aqua index 72f0262..a272402 100644 --- a/.fluence/aqua/deals.aqua +++ b/.fluence/aqua/deals.aqua @@ -14,11 +14,11 @@ data Deals: func get() -> Deals: <- Deals( defaultWorker=?[Deal( - definition="bafkreifncwgw7vgktf7j7qectsinrkhbhxjwfdvemmrshdsgi2ydelpvs4", - timestamp="2023-09-27T12:11:50.777Z", - dealIdOriginal="0x8d9C53312f0A4ad1Ba280ac197D371a33627E3bE", - dealId="8d9c53312f0a4ad1ba280ac197d371a33627e3be", - chainNetwork="testnet", + definition="bafkreihqcu7uilen6fu4a7sprhyhtk2xvd3z6lxicqric7iscorwlz7nce", + timestamp="2023-12-05T00:36:14.752Z", + dealIdOriginal="0xC175aE3B7A475076495b2FEEeb06B5150Af727EA", + dealId="c175ae3b7a475076495b2feeeb06b5150af727ea", + chainNetwork="kras", chainNetworkId=80001 )] ) diff --git a/.fluence/aqua/hosts.aqua b/.fluence/aqua/hosts.aqua index ce4f0a1..03fa233 100644 --- a/.fluence/aqua/hosts.aqua +++ b/.fluence/aqua/hosts.aqua @@ -1,21 +1,4 @@ aqua Hosts declares * -data SpellLocation: - hostId: string - spellId: string - workerId: string - -data Host: - definition: string - installationSpells: []SpellLocation - relayId: string - timestamp: string - dummyDealId: string - -data Hosts: - defaultWorker: ?Host - -func get() -> Hosts: - <- Hosts( - defaultWorker=nil - ) +func get() -> ?u8: + <- nil diff --git a/.fluence/workers.yaml b/.fluence/workers.yaml index 5cac0f0..decaa7b 100644 --- a/.fluence/workers.yaml +++ b/.fluence/workers.yaml @@ -8,9 +8,9 @@ version: 0 deals: defaultWorker: - definition: "bafkreifncwgw7vgktf7j7qectsinrkhbhxjwfdvemmrshdsgi2ydelpvs4" - timestamp: "2023-09-27T12:11:50.777Z" - dealIdOriginal: "0x8d9C53312f0A4ad1Ba280ac197D371a33627E3bE" - dealId: "8d9c53312f0a4ad1ba280ac197d371a33627e3be" - chainNetwork: "testnet" - chainNetworkId: 8000 + definition: bafkreihqcu7uilen6fu4a7sprhyhtk2xvd3z6lxicqric7iscorwlz7nce + timestamp: 2023-12-05T00:36:14.752Z + dealIdOriginal: "0xC175aE3B7A475076495b2FEEeb06B5150Af727EA" + dealId: c175ae3b7a475076495b2feeeb06b5150af727ea + chainNetwork: kras + chainNetworkId: 80001 diff --git a/fluence.yaml b/fluence.yaml index 17d08de..14683d5 100644 --- a/fluence.yaml +++ b/fluence.yaml @@ -4,20 +4,16 @@ # Documentation: https://github.com/fluencelabs/fluence-cli/tree/main/docs/configs/fluence.md -version: 4 +version: 5 aquaInputPath: src/aqua/main.aqua -workers: - defaultWorker: - services: [ eth_rpc ] - deals: defaultWorker: minWorkers: 3 targetWorkers: 3 - -relays: stage + services: [ eth_rpc ] + spells: [] services: eth_rpc: diff --git a/gateway/configs/quickstart_config.json b/gateway/configs/quickstart_config.json index 5a54708..d020c74 100644 --- a/gateway/configs/quickstart_config.json +++ b/gateway/configs/quickstart_config.json @@ -1,11 +1,9 @@ { "providers": [ - "", - "", - "" + , ], "mode": "round-robin", - "relay": "/dns4/0-stage.fluence.dev/tcp/9000/wss/p2p/12D3KooWDcpWuyrMTDinqNgmXAuRdfd2mTdY9VoXZSAet2pDzh6r", + "relay": "/dns4/4-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", "port": 3000, "counterServiceId": null, "counterPeerId": null, From 4dc0b21aecf0668f3e96a95ee779bf175a1ea2ff Mon Sep 17 00:00:00 2001 From: boneyard93501 <4523011+boneyard93501@users.noreply.github.com.> Date: Tue, 5 Dec 2023 07:00:50 -0600 Subject: [PATCH 2/4] add env file --- .fluence/env.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .fluence/env.yaml diff --git a/.fluence/env.yaml b/.fluence/env.yaml new file mode 100644 index 0000000..649b042 --- /dev/null +++ b/.fluence/env.yaml @@ -0,0 +1,9 @@ +# yaml-language-server: $schema=schemas/env.json + +# Defines user project preferences + +# Documentation: https://github.com/fluencelabs/cli/tree/main/docs/configs/env.md + +version: 0 + +fluenceEnv: kras From 11afc4f2691de106424bb6e186b4fa6d0e97dcfc Mon Sep 17 00:00:00 2001 From: InversionSpaces Date: Tue, 6 Feb 2024 17:42:55 +0100 Subject: [PATCH 3/4] Update quickstart_config.json --- gateway/configs/quickstart_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gateway/configs/quickstart_config.json b/gateway/configs/quickstart_config.json index d020c74..71273bf 100644 --- a/gateway/configs/quickstart_config.json +++ b/gateway/configs/quickstart_config.json @@ -1,6 +1,6 @@ { "providers": [ - , + "", ], "mode": "round-robin", "relay": "/dns4/4-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE", From 3f3ff3ea3bd93bee194ea858d8c43cc98abcea5f Mon Sep 17 00:00:00 2001 From: InversionSpaces Date: Tue, 6 Feb 2024 17:49:22 +0100 Subject: [PATCH 4/4] Update quickstart_config.json --- gateway/configs/quickstart_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gateway/configs/quickstart_config.json b/gateway/configs/quickstart_config.json index 71273bf..55ac501 100644 --- a/gateway/configs/quickstart_config.json +++ b/gateway/configs/quickstart_config.json @@ -1,6 +1,6 @@ { "providers": [ - "", + "" ], "mode": "round-robin", "relay": "/dns4/4-kras.fluence.dev/tcp/9000/wss/p2p/12D3KooWJd3HaMJ1rpLY1kQvcjRPEvnDwcXrH8mJvk7ypcZXqXGE",