Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update cli to unstable, use new effectors #156

Open
wants to merge 49 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1e56d41
Remove relays
nahsi Feb 15, 2024
64973f4
Update fluence yaml
nahsi Feb 15, 2024
39638f6
cleanup
nahsi Feb 15, 2024
458860f
Revert "Update fluence yaml"
nahsi Feb 15, 2024
89acd61
Update
nahsi Feb 15, 2024
054a7c4
This?
nahsi Feb 15, 2024
0e84dc6
this
nahsi Feb 15, 2024
68a9e01
Update .fluence/workers.yaml
shamsartem Feb 15, 2024
2dc64b9
Remove configs
InversionSpaces Feb 21, 2024
54b2bca
Ignore configs
InversionSpaces Feb 21, 2024
4ee15b8
Ignore dist
InversionSpaces Feb 21, 2024
65015c6
Choose offer
InversionSpaces Feb 21, 2024
2800277
Remove add-peer
InversionSpaces Feb 21, 2024
b56ae56
Add label to actionlint
InversionSpaces Feb 21, 2024
dbcd6b8
Remove multiaddr dep
InversionSpaces Feb 21, 2024
1add3a5
Remove provider registration
InversionSpaces Feb 21, 2024
7c2a242
Install aqua deps
InversionSpaces Feb 21, 2024
4661de0
Fix aqua
InversionSpaces Feb 21, 2024
8216196
Add logging, decrease timeout
InversionSpaces Feb 21, 2024
1969296
Parse stderr
InversionSpaces Feb 21, 2024
fc67a13
Do not fail
InversionSpaces Feb 21, 2024
309e0bd
Add logs
InversionSpaces Feb 21, 2024
1b1d374
Remove logs
InversionSpaces Feb 21, 2024
4818ce7
Update fluence.yaml
InversionSpaces Feb 21, 2024
aad2013
Update fluence to unstable, update aqua
InversionSpaces Feb 21, 2024
7998154
Remove workers info
InversionSpaces Feb 21, 2024
6113212
Use fCLI main
InversionSpaces Feb 21, 2024
c9ea6ef
Fix workflow
InversionSpaces Feb 21, 2024
6350b4c
Rename offer
InversionSpaces Feb 21, 2024
09c0d3c
Update offer and deployment
InversionSpaces Feb 21, 2024
4e5481a
Add log
InversionSpaces Feb 21, 2024
7f638ea
Add wasi target
InversionSpaces Feb 21, 2024
747c570
Update configs
InversionSpaces Feb 28, 2024
5d630fc
Update workflow
InversionSpaces Feb 28, 2024
29b8c5d
Increase intial balance
InversionSpaces Feb 28, 2024
4c117c9
Remove private key
InversionSpaces Feb 28, 2024
0df43e5
Rewrite service
InversionSpaces Mar 7, 2024
9f9bfa9
Update services.aqua
InversionSpaces Mar 7, 2024
d7a57f7
Update wasm
InversionSpaces Mar 8, 2024
fbf7ec0
Update gateway deps
InversionSpaces Mar 8, 2024
4fc0409
Increase timeout
InversionSpaces Mar 8, 2024
aa9957e
Refactor
InversionSpaces Mar 8, 2024
412f792
Format
InversionSpaces Mar 8, 2024
ddf15bd
Remove release, changelog
InversionSpaces Mar 8, 2024
880fcc0
Move npm i step
InversionSpaces Mar 8, 2024
38efa57
Remove fluence-lock.yaml
InversionSpaces Mar 8, 2024
05e8226
Move aqua source
InversionSpaces Mar 8, 2024
63278cd
Add workspace
InversionSpaces Mar 8, 2024
ec6f3b7
Return build
InversionSpaces Mar 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions .fluence/aqua/deals.aqua
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
aqua Deals declares *

data Deal:
definition: string
timestamp: string
dealIdOriginal: string
dealId: string
chainNetwork: string
chainNetworkId: u64
dealId: string
dealIdOriginal: string
definition: string
timestamp: string

data Deals:
defaultWorker: ?Deal
fRpcDeployment: ?Deal

func get() -> Deals:
<- Deals(
defaultWorker=?[Deal(

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why all this stuff got removed. Probably it shouldn't have. I don't know if this needs to be deployed on stage all the time or not, maybe ask Mike

definition="bafkreifncwgw7vgktf7j7qectsinrkhbhxjwfdvemmrshdsgi2ydelpvs4",
timestamp="2023-09-27T12:11:50.777Z",
dealIdOriginal="0x8d9C53312f0A4ad1Ba280ac197D371a33627E3bE",
dealId="8d9c53312f0a4ad1ba280ac197d371a33627e3be",
chainNetwork="testnet",
chainNetworkId=80001
)]
fRpcDeployment=nil
)
21 changes: 2 additions & 19 deletions .fluence/aqua/hosts.aqua
Original file line number Diff line number Diff line change
@@ -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
15 changes: 2 additions & 13 deletions .fluence/aqua/services.aqua
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
data BytesValue:
value: []u8
success: bool
error: string
aqua Services declares *


data JsonString:
value: string
success: bool
error: string

data U64Value:
value: u64
success: bool
error: string

service EthRpc("eth_rpc"):
accounts(uri: string) -> []JsonString
block_number(uri: string) -> U64Value
call(uri: string, req: string, block: u64) -> BytesValue
call_get_accounts(uri: string) -> [][]u8
eth_call(uri: string, method: string, json_args: []string) -> JsonString
9 changes: 9 additions & 0 deletions .fluence/env.yaml
Original file line number Diff line number Diff line change
@@ -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: local
18 changes: 18 additions & 0 deletions .fluence/provider-secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# yaml-language-server: $schema=schemas/provider-secrets.json

# Defines secrets config used for provider set up

# Documentation: https://github.com/fluencelabs/cli/tree/main/docs/configs/provider-secrets.md

version: 0

noxes:
nox-0:
networkKey: aUV7wRPmxv5qhjpgklVNKDcGQK5jL9UAADEA0No0Cac=
signingWallet: "0x3cc23e0227bd17ea5d6ea9d42b5eaa53ad41b1974de4755c79fe236d361a6fd5"
nox-1:
networkKey: 52KeoXtzen0MQuIc5zli5sbpyPZuLeKNKuvuBCZwurs=
signingWallet: "0x089162470bcfc93192b95bff0a1860d063266875c782af9d882fcca125323b41"
nox-2:
networkKey: iAHTLBzVsGEz3M0chJyTExr4vTP56R2QqrDWHHuymAo=
signingWallet: "0xdacd4b197ee7e9efdd5db1921c6c558d88e2c8b69902b8bafc812fb226a6b5e0"
11 changes: 1 addition & 10 deletions .fluence/workers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,4 @@

# Documentation: https://github.com/fluencelabs/cli/tree/main/docs/configs/workers.md

version: 0

deals:
defaultWorker:
definition: "bafkreifncwgw7vgktf7j7qectsinrkhbhxjwfdvemmrshdsgi2ydelpvs4"
timestamp: "2023-09-27T12:11:50.777Z"
dealIdOriginal: "0x8d9C53312f0A4ad1Ba280ac197D371a33627E3bE"
dealId: "8d9c53312f0a4ad1ba280ac197d371a33627e3be"
chainNetwork: "testnet"
chainNetworkId: 8000
version: 1
1 change: 1 addition & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
self-hosted-runner:
labels:
- builder
- linux-amd64-m-xlarge
9 changes: 0 additions & 9 deletions .github/release-please/config.json

This file was deleted.

3 changes: 0 additions & 3 deletions .github/release-please/manifest.json

This file was deleted.

168 changes: 0 additions & 168 deletions .github/workflows/release.yml

This file was deleted.

32 changes: 15 additions & 17 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ on:
fcli-version:
description: "fcli version to use"
type: string
# default: "unstable"
default: "stage"
default: "unstable"
js-client-version:
description: "@fluencelabs/js-client version"
type: string
Expand All @@ -28,7 +27,7 @@ on:
jobs:
tests:
name: "Run tests"
runs-on: builder
runs-on: linux-amd64-m-xlarge

env:
FLUENCE_USER_DIR: "${{ github.workspace }}/tmp/.fluence"
Expand Down Expand Up @@ -80,12 +79,21 @@ jobs:
- name: Setup Rust toolchain
uses: dsherret/rust-toolchain-file@v1

- name: Add wasi target
run: rustup target add wasm32-wasi

- name: Setup fcli
uses: fluencelabs/setup-fluence@v1
with:
artifact: fcli
version: ${{ inputs.fcli-version }}

- name: Install aqua deps
run: fluence dep i --no-input

- name: Build fluence project
run: fluence build --no-input

- name: Init local env with fcli
run: fluence local init --no-input

Expand All @@ -96,7 +104,7 @@ jobs:
sed -i'' -e '/nox-/!b;n;s|image: fluencelabs/nox:.*$|image: ${{ inputs.nox-image }}|' docker-compose.yaml

- name: Run local env
run: fluence local up
run: fluence local up --no-input

- name: Setup node with self-hosted registry
uses: actions/setup-node@v4
Expand All @@ -105,13 +113,6 @@ jobs:
registry-url: "https://npm.fluence.dev"
cache: "npm"

- name: Run npm i
run: npm i

- name: Run npm i in gateway
working-directory: gateway
run: npm i

- name: Set js-client version
if: inputs.js-client-version != 'null'
uses: fluencelabs/github-actions/npm-set-dependency@main
Expand All @@ -120,6 +121,9 @@ jobs:
version: "${{ inputs.js-client-version }}"
working-directory: gateway

- name: Run npm i
run: npm i

- name: Run npm run build
run: npm run build

Expand All @@ -131,9 +135,3 @@ jobs:
- name: Dump container logs
if: always()
uses: jwalton/gh-docker-logs@v2

- name: Cleanup
if: always()
run: |
fluence local down
rm -rf tmp ${{ env.FLUENCE_USER_DIR }}
Loading
Loading