Skip to content

Commit 05ab854

Browse files
authored
feat: use indexer directly [JS-842] (#1069)
* feat: refactor configs [JS-831] * fix circular dependency * Apply automatic changes * fix * Apply automatic changes * simplify * import only what's needed from lodash * fix? * just in case * make all aliases hidden from top-level of help * Apply automatic changes * stop managing ocker compose config completely * feat: use indexer directly * fix * don't require build for linting * remove irrelevant dependencies * add docker for on-each-commit * add env * change runs-on * add permissions? * fix and remove stuff from docs.yml * fix * add generated to prettierignore * add config promise to the Map right away to prevent possible problems when using Promise.all that inits and manipulates the same config * fix * remove rest of the clients * get cc statuses from RPC * lowercase dealId * add debug log * try using batch read like before instead of multicall read * try adding timeout * use on-chain info for cc, refactor and fix * Apply automatic changes * take ccId from subgraph if cc from RPC is zeroHash (was removed) * don't convert already converted peerId * rename left-ower Fluence Labs * improve startDate and expirationDate display --------- Co-authored-by: shamsartem <[email protected]>
1 parent f8e2e29 commit 05ab854

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+5237
-1327
lines changed

.github/actions/replace-version/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"build": "ncc build index.js"
88
},
9-
"author": "Fluence Labs",
9+
"author": "Cloudless Labs",
1010
"license": "AGPL-3.0",
1111
"dependencies": {
1212
"@actions/core": "^1.10.0"

packages/cli/package/.prettierignore renamed to .prettierignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ docs
33
node_modules
44
tmp
55
.fluence
6-
src/lib/compiled-aqua
6+
compiled-aqua
7+
gqlSchema.json
8+
gqlGenerated.ts
79
CHANGELOG.md
810
.github/workflows

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ you read and follow some basic [rules](./CONTRIBUTING.md).
9292

9393
## License
9494

95-
All software code is copyright (c) Fluence Labs, Inc. under the
95+
All software code is copyright (c) Fluence DAO. under the
9696
[GNU Affero General Public License version 3](./LICENSE) license.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"build": "turbo run build --cache-dir=.turbo",
1111
"install-yarn-dependencies": "turbo run install-yarn-dependencies --cache-dir=.turbo",
1212
"install-npm-dependencies": "turbo run install-npm-dependencies --cache-dir=.turbo",
13+
"gen-gql-schema": "turbo run gen-gql-schema --cache-dir=.turbo",
14+
"gql-codegen": "turbo run gql-codegen --cache-dir=.turbo",
1315
"pack-ci": "turbo run pack-ci --cache-dir=.turbo && node ./rename-packed.js",
1416
"pack-linux-x64": "turbo run pack-linux-x64 --cache-dir=.turbo && node ./rename-packed.js",
1517
"pack-darwin-x64": "turbo run pack-darwin-x64 --cache-dir=.turbo && node ./rename-packed.js",

packages/cli-connector/src/App.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
// In Firefox: client variable can be undefined - that's why we need to use optional chaining
19-
2018
import { ConnectButton } from "@rainbow-me/rainbowkit";
2119
import {
2220
type CLIToConnectorFullMsg,

packages/cli/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
"scripts": {
99
"install-yarn-dependencies": "yarn ./package install",
1010
"install-npm-dependencies": "npm --prefix ./package/src/cli-aqua-dependencies install",
11+
"gen-gql-schema": "yarn ./package gen-gql-schema",
12+
"gql-codegen": "yarn ./package gql-codegen",
1113
"before-build": "yarn ./package before-build",
1214
"build": "yarn ./package build",
1315
"pack-ci": "yarn ./package pack-ci",

packages/cli/package/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ tmp
1616
/.f
1717
.env
1818
rust-toolchain.toml
19+
docker-compose.yaml
1920

2021
# recommended by Fluence
2122
.idea
@@ -27,6 +28,8 @@ rust-toolchain.toml
2728
# ignore compiled files
2829
src/lib/compiled-aqua
2930
src/lib/compiled-aqua-with-tracing
31+
src/lib/gql/gqlGenerated.ts
32+
src/lib/gql/gqlSchema.json
3033
src/versions
3134
src/aqua-dependencies
3235
src/common.ts

packages/cli/package/docs/commands/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,10 +1359,9 @@ Exit from deal. Alias: fluence provider de
13591359
```
13601360
USAGE
13611361
$ fluence provider deal-exit [--no-input] [--env <testnet | mainnet | stage | local>] [--priv-key <private-key>]
1362-
[--deal-ids <id-1,id-2>] [--all]
1362+
[--deal-ids <id-1,id-2>]
13631363
13641364
FLAGS
1365-
--all To use all deal ids that indexer is aware of for your provider address
13661365
--deal-ids=<id-1,id-2> Comma-separated deal ids
13671366
--env=<testnet | mainnet | stage | local> Fluence Environment to use when running the command
13681367
--no-input Don't interactively ask for any input from the user

packages/cli/package/eslint.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default tseslint.config(
5656
"Please use type-safe to string converter (e.g. numToString)",
5757
},
5858
{
59-
selector: "Identifier[name='String']",
59+
selector: "CallExpression[callee.name='String']",
6060
message:
6161
// cause when the variable changes type you will have no way to learn you possibly have to change it's string representation
6262
"Please use type-safe to string converter (e.g. numToString)",
@@ -186,6 +186,7 @@ export default tseslint.config(
186186
"bin/dev.js",
187187
"resources/*",
188188
".yarn/*",
189+
"src/lib/gql/gqlGenerated.ts",
189190
],
190191
},
191192
);

packages/cli/package/nsis/custom-installer.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Section "@fluencelabs/cli CLI ${VERSION}"
2222
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\fluence" \
2323
"UninstallString" "$\"$INSTDIR\uninstall.exe$\""
2424
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\fluence" \
25-
"Publisher" "Fluence Labs"
25+
"Publisher" "Cloudless Labs"
2626

2727
WriteRegExpandStr ${env_hkcu} "FLUENCE_OCLIF_CLIENT_HOME" "$INSTDIR\client"
2828
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000

0 commit comments

Comments
 (0)