fix: Rebase conflicts

Libertai · Oct 27, 2024 · be0d1ea · be0d1ea
1 parent 58ffef3
commit be0d1ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/config/wagmi.ts b/src/config/wagmi.ts
@@ -1,12 +1,13 @@
 import { createConfig, http } from '@wagmi/vue';
 import { base, baseSepolia } from '@wagmi/vue/chains';
 import { walletConnect } from '@wagmi/vue/connectors';
+import env from 'src/config/env';
 
 export const config = createConfig({
   chains: [base, baseSepolia],
   connectors: [
     walletConnect({
-      projectId: process.env.WALLET_CONNECT_PROJECT_ID!,
+      projectId: env.WALLET_CONNECT_PROJECT_ID,
       metadata: {
         name: 'LibertAI',
         description: 'Discover the Freedom of Decentralized AI',

diff --git a/src/utils/aleph-persistent-storage.ts b/src/utils/aleph-persistent-storage.ts
@@ -1,11 +1,14 @@
-import { AuthenticatedAlephHttpClient } from '@aleph-sdk/client';
+import type { Account, Chain, Client, Transport } from 'viem';
+
 import { BaseAccount, getAccountFromProvider, importAccountFromPrivateKey } from '@aleph-sdk/base';
+import { AuthenticatedAlephHttpClient } from '@aleph-sdk/client';
 import { ItemType } from '@aleph-sdk/message';
 import { type Config, getConnectorClient, signMessage } from '@wagmi/core';
+import { base } from '@wagmi/vue/chains';
 import { PrivateKey } from 'eciesjs';
+import { providers } from 'ethers';
+import env from 'src/config/env';
 import { config } from 'src/config/wagmi';
-import type { Account, Chain, Client, Transport } from 'viem';
-import { SignMessageReturnType } from 'viem';
 import {
   KnowledgeBase,
   KnowledgeBaseIdentifier,
@@ -14,10 +17,8 @@ import {
 } from 'src/types/knowledge';
 import { decrypt, encrypt, generateIv, generateKey } from 'src/utils/encryption';
 import { decryptKnowledgeBaseIdentifiers, encryptKnowledgeBaseIdentifiers } from 'src/utils/knowledge/encryption';
+import { SignMessageReturnType } from 'viem';
 import web3 from 'web3';
-import { providers } from 'ethers';
-import { base } from '@wagmi/vue/chains';
-import env from 'src/config/env';
 
 // Aleph keys and channels settings
 const SECURITY_AGGREGATE_KEY = 'security';