Merge pull request #14 from kadena-io/chore/upstream-rebase

Chore/upstream rebase

Author: javadkh2

.github/workflows/checks.yml

@@ -45,6 +45,10 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
+      - name: Generate Chakra types
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: yarn chakra:typegen
+
       - name: Run ESLint
         run: echo "skip lint:eslint for now" 
 
@@ -77,6 +81,10 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
+      - name: Generate Chakra types
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: yarn chakra:typegen
+
       - name: Install package dependencies
         run: |
           cd ./toolkit/package
@@ -136,6 +144,10 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
+      - name: Generate Chakra types
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: yarn chakra:typegen
+
       - name: Install script dependencies
         run: cd ./deploy/tools/envs-validator && yarn --frozen-lockfile
 
@@ -175,6 +187,10 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
+      - name: Generate Chakra types
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: yarn chakra:typegen
+
       - name: Run Jest
         run: yarn test:jest ${{ github.event_name == 'pull_request' && '--changedSince=origin/main' || '' }} --passWithNoTests
 
@@ -207,6 +223,10 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
+      - name: Generate Chakra types
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: yarn chakra:typegen
+
       - name: Install script dependencies 
         run: cd ./deploy/tools/affected-tests && yarn --frozen-lockfile
 
@@ -264,6 +284,10 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn --frozen-lockfile
 
+      - name: Generate Chakra types
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: yarn chakra:typegen
+
       - name: Download affected tests list
         if: ${{ needs.pw_affected_tests.result == 'success' }}
         uses: actions/download-artifact@v4

.github/workflows/deploy-review-l2.yml

@@ -25,6 +25,7 @@ on:
             - neon_devnet
             - optimism
             - optimism_sepolia
+            - optimism_superchain
             - polygon
             - rootstock
             - scroll_sepolia

.github/workflows/deploy-review.yml

@@ -27,12 +27,14 @@ on:
             - neon_devnet
             - optimism
             - optimism_sepolia
+            - optimism_superchain
             - polygon
             - rari_testnet
             - rootstock
             - shibarium
             - scroll_sepolia
             - stability
+            - tac
             - tac_turin
             - zkevm
             - zilliqa_prototestnet

.github/workflows/upload-source-maps.yml

@@ -37,6 +37,10 @@ jobs:
               if: steps.cache-node-modules.outputs.cache-hit != 'true'
               run: yarn --frozen-lockfile
 
+            - name: Generate Chakra types
+              if: steps.cache-node-modules.outputs.cache-hit == 'true'
+              run: yarn chakra:typegen
+
             - name: Make production build with source maps
               run: yarn build
               env:

.gitignore

@@ -14,6 +14,7 @@
 /out/
 /public/assets/envs.js
 /public/assets/configs
+/public/assets/multichain
 /public/icons/sprite.svg
 /public/icons/sprite.*.svg
 /public/icons/registry.json

.vscode/settings.json

@@ -1,11 +1,12 @@
 {
-    "typescript.tsdk": "node_modules/typescript/lib",
-    "javascript.preferences.autoImportFileExcludePatterns": [
-        "./toolkit/package/**",
-        "./toolkit/components/**/index.ts",
-    ],
-    "typescript.preferences.autoImportFileExcludePatterns": [
-        "./toolkit/package/**",
-        "./toolkit/components/**/index.ts",
-    ]
-}
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "javascript.preferences.autoImportFileExcludePatterns": [
+    "./toolkit/package/**",
+    "./toolkit/components/**/index.ts"
+  ],
+  "typescript.preferences.autoImportFileExcludePatterns": [
+    "./toolkit/package/**",
+    "./toolkit/components/**/index.ts"
+  ],
+  "editor.formatOnSave": false
+}

.vscode/tasks.json

@@ -377,12 +377,14 @@
               "optimism",
               "optimism_interop_0",
               "optimism_sepolia",
+              "optimism_superchain",
               "polygon",
               "rari_testnet",
               "rootstock_testnet",
               "scroll_sepolia",
               "shibarium",
               "stability_testnet",
+              "tac",
               "tac_turin",
               "zkevm",
               "zilliqa_prototestnet",

Dockerfile

@@ -45,6 +45,12 @@ WORKDIR /sitemap-generator
 COPY ./deploy/tools/sitemap-generator/package.json ./deploy/tools/sitemap-generator/yarn.lock ./
 RUN yarn --frozen-lockfile --network-timeout 100000
 
+### MULTICHAIN CONFIG GENERATOR
+# Install dependencies
+WORKDIR /multichain-config-generator
+COPY ./deploy/tools/multichain-config-generator/package.json ./deploy/tools/multichain-config-generator/yarn.lock ./
+RUN yarn --frozen-lockfile --network-timeout 100000
+
 
 # *****************************
 # ****** STAGE 2: Build *******
@@ -106,6 +112,11 @@ COPY --from=deps /favicon-generator/node_modules ./deploy/tools/favicon-generato
 # Copy dependencies and source code
 COPY --from=deps /sitemap-generator/node_modules ./deploy/tools/sitemap-generator/node_modules
 
+### MULTICHAIN CONFIG GENERATOR
+# Copy dependencies and source code, then build 
+COPY --from=deps /multichain-config-generator/node_modules ./deploy/tools/multichain-config-generator/node_modules
+RUN cd ./deploy/tools/multichain-config-generator && yarn build
+
 
 # *****************************
 # ******* STAGE 3: Run ********
@@ -130,8 +141,11 @@ RUN chown nextjs:nodejs .next
 COPY --from=builder /app/next.config.js ./
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/package.json ./package.json
+
+# Copy tools
 COPY --from=builder /app/deploy/tools/envs-validator/index.js ./envs-validator.js
 COPY --from=builder /app/deploy/tools/feature-reporter/index.js ./feature-reporter.js
+COPY --from=builder /app/deploy/tools/multichain-config-generator/dist ./deploy/tools/multichain-config-generator/dist
 
 # Copy scripts
 ## Entripoint

configs/app/apis.ts

@@ -7,6 +7,7 @@ import { getEnvValue } from './utils';
 export interface ApiPropsBase {
   endpoint: string;
   basePath?: string;
+  socketEndpoint?: string;
 }
 
 export interface ApiPropsFull extends ApiPropsBase {
@@ -100,6 +101,25 @@ const rewardsApi = (() => {
   });
 })();
 
+const multichainApi = (() => {
+  const apiHost = getEnvValue('NEXT_PUBLIC_MULTICHAIN_AGGREGATOR_API_HOST');
+  if (!apiHost) {
+    return;
+  }
+
+  try {
+    const url = new URL(apiHost);
+
+    return Object.freeze({
+      endpoint: apiHost,
+      socketEndpoint: `wss://${ url.host }`,
+    });
+  } catch (error) {
+    return;
+  }
+
+})();
+
 const statsApi = (() => {
   const apiHost = getEnvValue('NEXT_PUBLIC_STATS_API_HOST');
   if (!apiHost) {
@@ -135,7 +155,7 @@ const visualizeApi = (() => {
   });
 })();
 
-type Apis = {
+export type Apis = {
   general: ApiPropsFull;
 } & Partial<Record<Exclude<ApiName, 'general'>, ApiPropsBase>>;
 
@@ -145,6 +165,7 @@ const apis: Apis = Object.freeze({
   bens: bensApi,
   contractInfo: contractInfoApi,
   metadata: metadataApi,
+  multichain: multichainApi,
   rewards: rewardsApi,
   stats: statsApi,
   tac: tacApi,

configs/app/features/address3rdPartyWidgets.ts

@@ -0,0 +1,27 @@
+import type { Feature } from './types';
+
+import { getEnvValue, getExternalAssetFilePath, parseEnvJson } from '../utils';
+
+// config file will be downloaded at run-time and saved in the public folder
+const widgets = parseEnvJson<Array<string>>(getEnvValue('NEXT_PUBLIC_ADDRESS_3RD_PARTY_WIDGETS'));
+const configUrl = getExternalAssetFilePath('NEXT_PUBLIC_ADDRESS_3RD_PARTY_WIDGETS_CONFIG_URL');
+
+const title = 'Address 3rd party widgets';
+
+const config: Feature<{ widgets: Array<string>; configUrl: string }> = (() => {
+  if (widgets && widgets.length > 0 && configUrl) {
+    return Object.freeze({
+      title,
+      isEnabled: true,
+      widgets,
+      configUrl,
+    });
+  }
+
+  return Object.freeze({
+    title,
+    isEnabled: false,
+  });
+})();
+
+export default config;