fix encoding

ChainSafe · Oct 10, 2024 · 21ca8d7 · 21ca8d7
1 parent 5804978
commit 21ca8d7
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 21 deletions.
diff --git a/packages/ui/cypress/fixtures/testAccounts.ts b/packages/ui/cypress/fixtures/testAccounts.ts
@@ -1,4 +1,4 @@
-import { InjectedAccount } from '@polkadot/extension-inject/types'
+import { InjectedAccount } from 'polkadot-api/pjs-signer'
 
 export interface InjectedAccountWitMnemonic extends InjectedAccount {
   mnemonic: string

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -41,7 +41,6 @@
     "@graphql-codegen/client-preset": "4.2.5",
     "@graphql-codegen/typescript-react-query": "^6.1.0",
     "@graphql-eslint/eslint-plugin": "^3.20.1",
-    "@polkadot/extension-inject": "^0.52.3",
     "@polkadot/typegen": "^13.1.1",
     "@types/node": "^20.12.7",
     "@types/react-dom": "^18.2.25",

diff --git a/packages/ui/src/components/modals/ProposalSigning.tsx b/packages/ui/src/components/modals/ProposalSigning.tsx
@@ -208,13 +208,14 @@ const ProposalSigning = ({
       setIsSubmitting(true)
       let tx: Transaction<any, any, any, any> | undefined
 
+      console.log('proposalData', proposalData)
       // if it's a rejection we can send it right away, no need for weight or calldata
       if (!isApproving) {
         tx = api.tx.Multisig.cancel_as_multi({
           threshold,
           other_signatories: otherSigners,
           timepoint: proposalData.info.when,
-          call_hash: FixedSizeBinary.fromText(proposalData.hash)
+          call_hash: FixedSizeBinary.fromHex(proposalData.hash)
         })
 
         // If we can submit the proposal and have the call data
@@ -235,7 +236,7 @@ const ProposalSigning = ({
           threshold,
           other_signatories: otherSigners,
           maybe_timepoint: proposalData.info.when,
-          call_hash: FixedSizeBinary.fromText(proposalData.hash),
+          call_hash: FixedSizeBinary.fromHex(proposalData.hash),
           max_weight: { ref_time: 0n, proof_size: 0n }
         })
       } else {

diff --git a/packages/ui/src/contexts/AccountsContext.tsx b/packages/ui/src/contexts/AccountsContext.tsx
@@ -9,7 +9,9 @@ import React, {
 } from 'react'
 // import { PolkadotSigner } from 'polkadot-api'
 import { useAccounts as useRedotAccounts } from '@reactive-dot/react'
-import { WalletAccount } from '@reactive-dot/core/wallets.js'
+import { useApi } from './ApiContext'
+import { encodeAccounts } from '../utils/encodeAccounts'
+import { InjectedPolkadotAccount } from 'polkadot-api/pjs-signer'
 
 const LOCALSTORAGE_SELECTED_ACCOUNT_KEY = 'multix.selectedAccount'
 // const LOCALSTORAGE_ALLOWED_CONNECTION_KEY = 'multix.canConnectToExtension'
@@ -19,11 +21,11 @@ type AccountContextProps = {
 }
 
 export interface IAccountContext {
-  selectedAccount?: WalletAccount
-  ownAccountList: WalletAccount[]
+  selectedAccount?: InjectedPolkadotAccount
+  ownAccountList: InjectedPolkadotAccount[]
   ownAddressList: string[]
-  selectAccount: (account: WalletAccount) => void
-  getAccountByAddress: (address: string) => WalletAccount | undefined
+  selectAccount: (account: InjectedPolkadotAccount) => void
+  getAccountByAddress: (address: string) => InjectedPolkadotAccount | undefined
   // isAccountLoading: boolean
   // isExtensionError: boolean
   // selectedSigner?: PolkadotSigner
@@ -37,16 +39,25 @@ export interface IAccountContext {
 const AccountContext = createContext<IAccountContext | undefined>(undefined)
 
 const AccountContextProvider = ({ children }: AccountContextProps) => {
-  const ownAccountList = useRedotAccounts()
-  const [selectedAccount, setSelected] = useState<WalletAccount>(ownAccountList[0])
+  const redotAccountList = useRedotAccounts()
+  const { chainInfo } = useApi()
+  const ownAccountList = useMemo(
+    () => chainInfo && encodeAccounts(redotAccountList, chainInfo.ss58Format),
+    [chainInfo, redotAccountList]
+  )
+  const [selectedAccount, setSelected] = useState<InjectedPolkadotAccount | undefined>(
+    ownAccountList?.[0]
+  )
   const [isConnectionDialogOpen, setIsConnectionDialogOpen] = useState(false)
   // const [isAccountLoading, setIsAccountLoading] = useState(false)
   // const [isExtensionError, setIsExtensionError] = useState(false)
   // const [selectedSigner, setSelectedSigner] = useState<PolkadotSigner | undefined>()
   // const [isAllowedToConnectToExtension, setIsAllowedToConnectToExtension] = useState(false)
-  const ownAddressList = useMemo(() => ownAccountList.map((a) => a.address), [ownAccountList])
+  const ownAddressList = useMemo(
+    () => (ownAccountList || []).map((a) => a.address),
+    [ownAccountList]
+  )
   // const [accountGotRequested, setAccountGotRequested] = useState(false)
-  // const { chainInfo } = useApi()
   // const [isLocalStorageSetupDone, setIsLocalStorageSetupDone] = useState(false)
   // update the current account list with the right network prefix
   // this will run for every network change
@@ -60,7 +71,7 @@ const AccountContextProvider = ({ children }: AccountContextProps) => {
 
   const getAccountByAddress = useCallback(
     (address: string) => {
-      return ownAccountList.find((account) => account.address === address)
+      return (ownAccountList || []).find((account) => account.address === address)
     },
     [ownAccountList]
   )
@@ -70,7 +81,7 @@ const AccountContextProvider = ({ children }: AccountContextProps) => {
   //   setIsAllowedToConnectToExtension(true)
   // }, [])
 
-  const selectAccount = useCallback((account: WalletAccount) => {
+  const selectAccount = useCallback((account: InjectedPolkadotAccount) => {
     localStorage.setItem(LOCALSTORAGE_SELECTED_ACCOUNT_KEY, account.address)
     setSelected(account)
   }, [])
@@ -178,7 +189,7 @@ const AccountContextProvider = ({ children }: AccountContextProps) => {
     <AccountContext.Provider
       value={{
         selectedAccount,
-        ownAccountList,
+        ownAccountList: ownAccountList || [],
         ownAddressList,
         selectAccount,
         // isAccountLoading,

diff --git a/packages/ui/src/utils/encodeAccounts.ts b/packages/ui/src/utils/encodeAccounts.ts
@@ -1,8 +1,8 @@
-import { InjectedAccountWithMeta } from '@polkadot/extension-inject/types'
 import { encodesubstrateAddress } from './encodeSubstrateAddress'
+import { InjectedPolkadotAccount } from 'polkadot-api/pjs-signer'
 
 export const encodeAccounts = (
-  accounts: InjectedAccountWithMeta[] | string[],
+  accounts: InjectedPolkadotAccount[] | string[],
   ss58Format: number
 ) => {
   return accounts
@@ -16,11 +16,11 @@ export const encodeAccounts = (
       }
 
       return encodedAddress
-        ? ({
+        ? {
             ...account,
             address: encodedAddress
-          } as InjectedAccountWithMeta)
+          }
         : null
     })
-    .filter((acc) => !!acc) as (string | InjectedAccountWithMeta)[]
+    .filter((acc) => !!acc) as InjectedPolkadotAccount[]
 }