feat: add kras env back + bump deal-ts-clients 0.12.0 (#860)

fluencelabs · Mar 18, 2024 · 6ba7a12 · 6ba7a12
1 parent 9c56555
commit 6ba7a12
Show file tree

Hide file tree

Showing 15 changed files with 446 additions and 370 deletions.
diff --git a/docs/commands/README.md b/docs/commands/README.md
diff --git a/docs/configs/env.md b/docs/configs/env.md
@@ -4,8 +4,8 @@ Defines user project preferences
 
 ## Properties
 
-| Property | Type | Required | Description |
-|--------------|---------|----------|-------------------------------------------------------------------------------------------|
-| `version` | integer | **Yes** | |
-| `fluenceEnv` | string | No | Fluence environment to connect to Possible values are: `dar`, `stage`, `local`, `custom`. |
+| Property | Type | Required | Description  |
+|--------------|---------|----------|---------------------------------------------------------------------------------------------------|
+| `version` | integer | **Yes** |  |
+| `fluenceEnv` | string | No | Fluence environment to connect to Possible values are: `dar`, `kras`, `stage`, `local`, `custom`. |
 
diff --git a/docs/configs/fluence.md b/docs/configs/fluence.md
@@ -75,10 +75,10 @@ Custom Fluence environment to use when connecting to Fluence network
 
 ### Properties
 
-| Property | Type | Required | Description |
-|----------------|----------|----------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| `contractsEnv` | string | **Yes** | Contracts environment to use for this fluence network to sign contracts on the blockchain Possible values are: `dar`, `stage`, `local`. |
-| `relays` | string[] | **Yes** | List of custom relay multiaddresses to use when connecting to Fluence network |
+| Property | Type | Required | Description  |
+|----------------|----------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------|
+| `contractsEnv` | string | **Yes** | Contracts environment to use for this fluence network to sign contracts on the blockchain Possible values are: `dar`, `kras`, `stage`, `local`. |
+| `relays` | string[] | **Yes** | List of custom relay multiaddresses to use when connecting to Fluence network  |
 
 ## deployments
 

diff --git a/docs/configs/workers.md b/docs/configs/workers.md
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
  "@fluencelabs/air-beautify-wasm": "0.3.6",
  "@fluencelabs/aqua-api": "0.14.2",
  "@fluencelabs/aqua-to-js": "0.3.5",
- "@fluencelabs/deal-ts-clients": "0.11.5-audit-fixes-7b556c1-3135-1.0",
+ "@fluencelabs/deal-ts-clients": "0.12.0",
  "@fluencelabs/fluence-network-environment": "1.1.2",
  "@fluencelabs/js-client": "0.9.0",
  "@fluencelabs/npm-aqua-compiler": "0.0.3",

diff --git a/src/lib/configs/project/fluence.ts b/src/lib/configs/project/fluence.ts
@@ -59,6 +59,7 @@ import {
  type AquaLogLevel,
  PT_SYMBOL,
  COMPILE_AQUA_PROPERTY_NAME,
+ DEFAULT_PUBLIC_FLUENCE_ENV,
 } from "../../const.js";
 import { splitErrorsAndResults } from "../../helpers/utils.js";
 import {
@@ -498,7 +499,7 @@ const configSchemaV2Obj = {
  type: "string",
  description: "The network in which the transactions will be carried out",
  enum: CHAIN_ENV,
- default: "dar",
+ default: DEFAULT_PUBLIC_FLUENCE_ENV,
  nullable: true,
  },
  spells: {

diff --git a/src/lib/configs/project/workers.ts b/src/lib/configs/project/workers.ts
@@ -31,6 +31,7 @@ import {
  DEFAULT_WORKER_NAME,
  type FluenceEnv,
  FLUENCE_ENVS,
+ DEFAULT_PUBLIC_FLUENCE_ENV,
 } from "../../const.js";
 import { getFluenceDir } from "../../paths.js";
 import { fluenceEnvPrompt } from "../../resolveFluenceEnv.js";
@@ -69,8 +70,8 @@ const workerInfoSchema = {
 export type Deal = WorkerInfo & {
  dealId: string;
  dealIdOriginal: string;
- chainNetwork: ChainENV;
  chainNetworkId: number;
+ chainNetwork?: ChainENV;
 };
 
 export type Host = WorkerInfo & {
@@ -159,7 +160,8 @@ const dealSchema: JSONSchemaType<Deal> = {
  type: "string",
  enum: CHAIN_ENV,
  description:
- "Blockchain network name that was used when deploying workers",
+ "DEPRECATED. Blockchain network name that was used when deploying workers",
+ nullable: true,
  },
  chainNetworkId: {
  type: "integer",
@@ -170,7 +172,6 @@ const dealSchema: JSONSchemaType<Deal> = {
  ...workerInfoSchema.required,
  "dealId",
  "dealIdOriginal",
- "chainNetwork",
  "chainNetworkId",
  ],
 } as const;
@@ -236,7 +237,7 @@ const configSchemaV1: JSONSchemaType<ConfigV1> = {
  properties: {
  custom: mapOfDealsSchema,
  dar: mapOfDealsSchema,
- // kras: mapOfDealsSchema,
+ kras: mapOfDealsSchema,
  local: mapOfDealsSchema,
  stage: mapOfDealsSchema,
  },
@@ -251,7 +252,7 @@ const configSchemaV1: JSONSchemaType<ConfigV1> = {
  properties: {
  custom: mapOfHostsSchema,
  dar: mapOfHostsSchema,
- // kras: mapOfHostsSchema,
+ kras: mapOfHostsSchema,
  local: mapOfHostsSchema,
  stage: mapOfHostsSchema,
  },
@@ -285,7 +286,7 @@ const migrations: Migrations<Config> = [
 
  if (dealsForEnv === undefined) {
  dealsForEnv = {};
- deals[deal.chainNetwork] = dealsForEnv;
+ deals[deal.chainNetwork ?? DEFAULT_PUBLIC_FLUENCE_ENV] = dealsForEnv;
  }
 
  dealsForEnv[workerName] = deal;
@@ -339,7 +340,7 @@ version: 0
 
 # deals:
 # # A map of created deals
-# ${FLUENCE_ENVS[0]}:
+# ${DEFAULT_PUBLIC_FLUENCE_ENV}:
 # ${DEFAULT_DEPLOYMENT_NAME}:
 # # worker CID
 # definition: bafkreigvy3k4racm6i6vvavtr5mdkllmfi2lfkmdk72gnzwk7zdnhajw4y
@@ -349,8 +350,6 @@ version: 0
 # dealId: 799c4beb18ae084d57a90582c2cb8bb19098139e
 # # original deal ID that you get after signing the contract
 # dealIdOriginal: "0x799C4BEB18Ae084D57a90582c2Cb8Bb19098139E"
-# # network name that was used when deploying worker
-# chainNetwork: dar
 # # network ID that was used when deploying worker
 # chainNetworkId: 1313161555
 

diff --git a/src/lib/const.ts b/src/lib/const.ts
@@ -94,10 +94,11 @@ export const U32_MAX = 4_294_967_295;
 
 export const DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX = 32;
 
+export const DEFAULT_PUBLIC_FLUENCE_ENV = "dar";
 export const PUBLIC_FLUENCE_ENV = [
- "dar",
+ DEFAULT_PUBLIC_FLUENCE_ENV,
+ "kras",
  "stage",
- // "kras"
 ] as const;
 export type PublicFluenceEnv = (typeof PUBLIC_FLUENCE_ENV)[number];
 export const isPublicFluenceEnv = getIsStringUnion(PUBLIC_FLUENCE_ENV);
@@ -140,7 +141,7 @@ export const HTTP_PORT_START = 18080;
 export const DEFAULT_AQUAVM_POOL_SIZE = 2;
 
 const CHAIN_URLS_WITHOUT_LOCAL: Record<Exclude<ChainENV, "local">, string> = {
- // kras: "https://ipc-kras.fluence.dev",
+ kras: "https://ipc-kras.fluence.dev",
  dar: "https://ipc-dar.fluence.dev",
  stage: "https://ipc-stage.fluence.dev",
 };
@@ -156,7 +157,7 @@ export const CHAIN_URLS_FOR_CONTAINERS: Record<ChainENV, string> = {
 };
 
 export const WS_CHAIN_URLS: Record<ChainENV, string> = {
- // kras: "wss://ipc-kras.fluence.dev",
+ kras: "wss://ipc.kras.fluence.dev",
  dar: "wss://ipc-dar.fluence.dev",
  stage: "wss://ipc-stage.fluence.dev",
  local: `wss://${CHAIN_RPC_CONTAINER_NAME}:${CHAIN_RPC_PORT}`,

diff --git a/src/lib/deploy.ts b/src/lib/deploy.ts
@@ -221,7 +221,6 @@ export async function deployImpl(this: Deploy, cl: typeof Deploy) {
  dealsPerEnv[workerName] = {
  timestamp: new Date().toISOString(),
  definition: appCID,
- chainNetwork: chainEnv,
  chainNetworkId,
  dealIdOriginal: previouslyDeployedDeal.dealIdOriginal,
  dealId: previouslyDeployedDeal.dealId,
@@ -281,7 +280,6 @@ export async function deployImpl(this: Deploy, cl: typeof Deploy) {
  timestamp,
  dealIdOriginal,
  dealId: dealIdOriginal.slice(2).toLowerCase(),
- chainNetwork: chainEnv,
  chainNetworkId,
  };
 
@@ -333,8 +331,8 @@ export async function deployImpl(this: Deploy, cl: typeof Deploy) {
 }
 
 const blockScoutUrls: Record<Exclude<ChainENV, "local">, string> = {
+ kras: "https://blockscout.kras.fluence.dev/address/",
  dar: "https://blockscout-dar.fluence.dev/address/",
- // kras: "https://blockscout-kras.fluence.dev/address/",
  stage: "https://blockscout-stage.fluence.dev/address/",
 };
 

diff --git a/src/lib/deployWorkers.ts b/src/lib/deployWorkers.ts
@@ -69,6 +69,7 @@ import {
  MIN_MEMORY_PER_MODULE_STR,
  DEPLOYMENT_NAMES_ARG_NAME,
  MODULE_CONFIG_FULL_FILE_NAME,
+ DEFAULT_PUBLIC_FLUENCE_ENV,
 } from "./const.js";
 import { getAquaImports } from "./helpers/aquaImports.js";
 import {
@@ -589,7 +590,7 @@ async function getDeploymentNames(
 
 const emptyDeal: Deal = {
  dealId: "",
- chainNetwork: "dar",
+ chainNetwork: DEFAULT_PUBLIC_FLUENCE_ENV,
  chainNetworkId: 0,
  dealIdOriginal: "",
  definition: "",

diff --git a/src/lib/multiaddresWithoutLocal.ts b/src/lib/multiaddresWithoutLocal.ts
@@ -18,6 +18,7 @@ import {
  type Node as AddrAndPeerId,
  stage,
  testNet,
+ kras,
 } from "@fluencelabs/fluence-network-environment";
 import { multiaddr } from "@multiformats/multiaddr";
 import { color } from "@oclif/color";
@@ -112,7 +113,7 @@ export async function ensureCustomAddrsAndPeerIds() {
 }
 
 const ADDR_MAP: Record<PublicFluenceEnv, Array<AddrAndPeerId>> = {
- // kras: krasnodar,
+ kras,
  dar: testNet,
  stage,
 };

diff --git a/src/lib/resolveFluenceEnv.ts b/src/lib/resolveFluenceEnv.ts
@@ -24,6 +24,7 @@ import {
  FLUENCE_ENVS,
  isFluenceEnv,
  type FluenceEnv,
+ DEFAULT_PUBLIC_FLUENCE_ENV,
 } from "./const.js";
 import { list } from "./prompt.js";
 
@@ -61,7 +62,7 @@ export async function ensureFluenceEnv(): Promise<FluenceEnv> {
 
 export async function fluenceEnvPrompt(
  message = "Select Fluence Environment to use by default with this project",
- defaultVal: FluenceEnv = "dar",
+ defaultVal: FluenceEnv = DEFAULT_PUBLIC_FLUENCE_ENV,
 ): Promise<FluenceEnv> {
  return list({
  message,

diff --git a/src/versions.json b/src/versions.json
@@ -1,9 +1,9 @@
 {
  "protocolVersion": 1,
  "nox": "fluencelabs/nox:0.23.5",
- "chain-rpc": "docker.fluence.dev/chain-rpc:audit-fixes-7b556c1-3135-1",
- "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:audit-fixes-7b556c1-3135-1",
- "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:audit-fixes-7b556c1-3135-1",
+ "chain-rpc": "docker.fluence.dev/chain-rpc:0.12.0",
+ "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:0.12.0",
+ "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:0.12.0",
  "rust-toolchain": "nightly-2023-08-27-x86_64",
  "npm": {
  "@fluencelabs/aqua-lib": "0.9.1",

diff --git a/test/helpers/sharedSteps.ts b/test/helpers/sharedSteps.ts
@@ -22,6 +22,7 @@ import {
  type Node,
  stage,
  testNet,
+ kras,
 } from "@fluencelabs/fluence-network-environment";
 import sortBy from "lodash-es/sortBy.js";
 
@@ -89,8 +90,8 @@ export async function getMultiaddrs(cwd: string): Promise<Node[]> {
 
  multiaddrs = sortBy(
  {
- // kras: krasnodar,
- stage: stage,
+ kras,
+ stage,
  dar: testNet,
  local,
  }[fluenceEnv],

diff --git a/yarn.lock b/yarn.lock
@@ -790,7 +790,7 @@ __metadata:
  "@fluencelabs/air-beautify-wasm": 0.3.6
  "@fluencelabs/aqua-api": 0.14.2
  "@fluencelabs/aqua-to-js": 0.3.5
- "@fluencelabs/deal-ts-clients": 0.11.5-audit-fixes-7b556c1-3135-1.0
+ "@fluencelabs/deal-ts-clients": 0.12.0
  "@fluencelabs/fluence-network-environment": 1.1.2
  "@fluencelabs/js-client": 0.9.0
  "@fluencelabs/npm-aqua-compiler": 0.0.3
@@ -866,9 +866,9 @@ __metadata:
  languageName: unknown
  linkType: soft
 
-"@fluencelabs/deal-ts-clients@npm:0.11.5-audit-fixes-7b556c1-3135-1.0":
- version: 0.11.5-audit-fixes-7b556c1-3135-1.0
- resolution: "@fluencelabs/deal-ts-clients@npm:0.11.5-audit-fixes-7b556c1-3135-1.0"
+"@fluencelabs/deal-ts-clients@npm:0.12.0":
+ version: 0.12.0
+ resolution: "@fluencelabs/deal-ts-clients@npm:0.12.0"
  dependencies:
  "@graphql-typed-document-node/core": ^3.2.0
  debug: ^4.3.4
@@ -878,7 +878,7 @@ __metadata:
  graphql-request: ^6.1.0
  graphql-scalars: ^1.22.4
  graphql-tag: ^2.12.6
- checksum: 348dc6dd007aa777ad81595ef966aca9350634a05c1c56f6dd796c32e60a0198fac826fccc42bfa5bb79825789b4cdb8517e4d4ec1ec4398d1b9bfc7f5e3756b
+ checksum: 506ceac4137405ee501f8d7dd777a2959bbcd758e823205e5a0411f01e0935f1ed7685f4e708a8cbab5771532769a39c11ff5aa4c7591d363ed9fa5c6a3786f8
  languageName: node
  linkType: hard