aleph-im · philogicae · Sep 12, 2024 · Sep 12, 2024 · Sep 12, 2024 · Sep 13, 2024
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/account/package.json b/packages/account/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aleph-sdk/account",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Common interfaces for accounts compatible with aleph.im.",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@aleph-sdk/core": "^1.x.x"
+    "@aleph-sdk/core": "../core"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/packages/avalanche/__tests__/account.test.ts b/packages/avalanche/__tests__/account.test.ts
@@ -33,12 +33,12 @@ describe('Avalanche accounts', () => {
 
   it('should throw Error to get a Keypair', async () => {
     const fakePrivateKey = 'a'
-    const fct = async () => await avalanche.importAccountFromPrivateKey(fakePrivateKey)
+    const fct = async () => await avalanche.importAccountFromPrivateKey(fakePrivateKey, avalanche.ChainType.X_CHAIN)
 
     await expect(fct).rejects.toThrow('Invalid private key')
   })
 
-  it('should import an avalanche accounts using a provider', async () => {
+  it('should import an avalanche account using a provider', async () => {
     const { address, privateKey } = ephemeralAccount
     if (!privateKey) throw Error('Can not retrieve privateKey inside ephemeralAccount.json')
 

diff --git a/packages/avalanche/package.json b/packages/avalanche/package.json
@@ -19,9 +19,9 @@
     "sha.js": "^2.4.11"
   },
   "peerDependencies": {
-    "@aleph-sdk/account": "^1.x.x",
-    "@aleph-sdk/core": "^1.x.x",
-    "@aleph-sdk/evm": "^1.x.x",
+    "@aleph-sdk/account": "../account",
+    "@aleph-sdk/core": "../core",
+    "@aleph-sdk/evm": "../evm",
     "avalanche": "^3.15.3",
     "ethers": "^5.x.x"
   },

diff --git a/packages/avalanche/src/account.ts b/packages/avalanche/src/account.ts
@@ -13,11 +13,10 @@ import { digestMessage, verifyAvalanche } from './verify'
  * It is used to represent an Avalanche account when publishing a message on the Aleph network.
  */
 export class AvalancheAccount extends EVMAccount {
-  public declare readonly wallet?: BaseProviderWallet
   public readonly keyPair?: KeyPair | EVMKeyPair
 
   constructor(
-    signerOrWallet: KeyPair | EVMKeyPair | BaseProviderWallet | ethers.providers.JsonRpcProvider,
+    signerOrWallet: KeyPair | EVMKeyPair | ethers.Wallet | BaseProviderWallet | ethers.providers.JsonRpcProvider,
     address: string,
     publicKey?: string,
   ) {
@@ -45,6 +44,11 @@ export class AvalancheAccount extends EVMAccount {
   override async askPubKey(): Promise<void> {
     if (this.publicKey) return
     if (!this.wallet) throw Error('PublicKey Error: No providers are setup')
+
+    if (this.wallet instanceof ethers.Wallet) {
+      this.publicKey = this.wallet.publicKey
+      return
+    }
     this.publicKey = await this.wallet.getPublicKey()
     return
   }
@@ -91,11 +95,11 @@ export enum ChainType {
  * @param chain Avalanche chain type: c-chain | x-chain
  * @returns key chains
  */
-async function getKeyChain(chain = ChainType.X_CHAIN) {
+async function getKeyChain(chain = ChainType.C_CHAIN) {
   return new KeyChain(new Avalanche().getHRP(), chain)
 }
 
-export async function getKeyPair(privateKey?: string, chain = ChainType.X_CHAIN): Promise<KeyPair> {
+export async function getKeyPair(privateKey?: string, chain = ChainType.C_CHAIN): Promise<KeyPair> {
   const keyChain = await getKeyChain(chain)
   const keyPair = keyChain.makeKey()
 
@@ -123,10 +127,15 @@ export async function getKeyPair(privateKey?: string, chain = ChainType.X_CHAIN)
  */
 export async function importAccountFromPrivateKey(
   privateKey: string,
-  chain = ChainType.X_CHAIN,
+  chain = ChainType.C_CHAIN,
 ): Promise<AvalancheAccount> {
-  const keyPair = await getKeyPair(privateKey, chain)
-  return new AvalancheAccount(keyPair, keyPair.getAddressString(), keyPair.getPublicKey().toString('hex'))
+  if (chain === ChainType.X_CHAIN) {
+    const keyPair = await getKeyPair(privateKey, chain)
+    return new AvalancheAccount(keyPair, keyPair.getAddressString(), keyPair.getPublicKey().toString('hex'))
+  } else {
+    const wallet = new ethers.Wallet(privateKey)
+    return new AvalancheAccount(wallet, wallet.address, wallet.publicKey)
+  }
 }
 
 /**
@@ -141,7 +150,7 @@ export async function importAccountFromPrivateKey(
 export async function importAccountFromMnemonic(
   mnemonic: string,
   derivationPath = "m/44'/60'/0'/0/0",
-  chain = ChainType.X_CHAIN,
+  chain = ChainType.C_CHAIN,
 ): Promise<AvalancheAccount> {
   const wallet = ethers.Wallet.fromMnemonic(mnemonic, derivationPath)
 
@@ -186,14 +195,14 @@ function getEVMAddress(keypair: EVMKeyPair): string {
   const pkHex = keypair.getPrivateKey().toString('hex')
   const pkBuffNative = Buffer.from(pkHex, 'hex')
   const ethAddress = privateToAddress(pkBuffNative).toString('hex')
-  return `0x${ethAddress}`
+  return ethers.utils.getAddress(`0x${ethAddress}`)
 }
 
 /**
  * Creates a new Avalanche account using a randomly generated privateKey
  */
 export async function newAccount(
-  chain = ChainType.X_CHAIN,
+  chain = ChainType.C_CHAIN,
 ): Promise<{ account: AvalancheAccount; privateKey: string }> {
   const keypair = await getKeyPair(undefined, chain)
   const privateKey = keypair.getPrivateKey().toString('hex')

diff --git a/packages/base/package.json b/packages/base/package.json
@@ -19,10 +19,10 @@
     "sha.js": "^2.4.11"
   },
   "peerDependencies": {
-    "@aleph-sdk/account": "^1.x.x",
-    "@aleph-sdk/core": "^1.0.4",
-    "@aleph-sdk/ethereum": "^1.x.x",
-    "@aleph-sdk/evm": "^1.0.4",
+    "@aleph-sdk/account": "../account",
+    "@aleph-sdk/core": "../core",
+    "@aleph-sdk/ethereum": "../ethereum",
+    "@aleph-sdk/evm": "../evm",
     "avalanche": "^3.15.3",
     "ethers": "^5.x.x"
   },

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -15,9 +15,9 @@
     "@types/sha.js": "^2.4.4"
   },
   "peerDependencies": {
-    "@aleph-sdk/account": "^1.x.x",
-    "@aleph-sdk/core": "^1.x.x",
-    "@aleph-sdk/message": "^1.x.x"
+    "@aleph-sdk/account": "../account",
+    "@aleph-sdk/core": "../core",
+    "@aleph-sdk/message": "../message"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

diff --git a/packages/cosmos/package.json b/packages/cosmos/package.json
@@ -15,8 +15,8 @@
     "elliptic": "^6.5.4"
   },
   "peerDependencies": {
-    "@aleph-sdk/account": "^1.x.x",
-    "@aleph-sdk/core": "^1.x.x",
+    "@aleph-sdk/account": "../account",
+    "@aleph-sdk/core": "../core",
     "@cosmjs/amino": "^0.32.2"
   },
   "scripts": {

diff --git a/packages/ethereum-ledger/package.json b/packages/ethereum-ledger/package.json
@@ -16,8 +16,8 @@
     "semver": "^7.3.8"
   },
   "peerDependencies": {
-    "@aleph-sdk/account": "^1.x.x",
-    "@aleph-sdk/core": "^1.x.x",
+    "@aleph-sdk/account": "../account",
+    "@aleph-sdk/core": "../core",
     "@ledgerhq/hw-app-eth": "^6.35.4",
     "@ledgerhq/hw-transport": "^6.30.3",
     "@ledgerhq/hw-transport-node-hid": "^6.28.3",

diff --git a/packages/ethereum/package.json b/packages/ethereum/package.json
@@ -16,9 +16,9 @@
     "eciesjs": "^0.4.6"
   },
   "peerDependencies": {
-    "@aleph-sdk/account": "^1.x.x",
-    "@aleph-sdk/core": "^1.x.x",
-    "@aleph-sdk/evm": "^1.x.x",
+    "@aleph-sdk/account": "../account",
+    "@aleph-sdk/core": "../core",
+    "@aleph-sdk/evm": "../evm",
     "ethers": "^5.x.x"
   },
   "scripts": {

diff --git a/packages/evm/package.json b/packages/evm/package.json
@@ -19,8 +19,8 @@
     "ethers": "^5.x.x"
   },
   "peerDependencies": {
-    "@aleph-sdk/account": "^1.x.x",
-    "@aleph-sdk/core": "^1.x.x",
+    "@aleph-sdk/account": "../account",
+    "@aleph-sdk/core": "../core",
     "ethers": "^5.x.x"
   },
   "scripts": {

diff --git a/packages/evm/src/account.ts b/packages/evm/src/account.ts
@@ -47,9 +47,7 @@ export abstract class EVMAccount extends ECIESAccount {
   public async changeNetwork(chainOrRpc: RpcType | RpcId = RpcId.ETH): Promise<void> {
     if (this.wallet instanceof JsonRPCWallet) {
       await this.wallet.changeNetwork(chainOrRpc)
-    }
-    if (this.wallet instanceof ethers.Wallet) {
-      //await this.wallet.provider.send("wallet_switchEthereumChain", [{ chainId: chainId.toString(16) }]);
+    } else if (this.wallet instanceof ethers.Wallet) {
       throw new Error('Not implemented for ethers.Wallet')
     }
   }

diff --git a/packages/evm/src/provider/constants.ts b/packages/evm/src/provider/constants.ts
@@ -0,0 +1,4 @@
+export const MetamaskErrorCodes: Record<string, number> = {
+  REJECTED: 4001,
+  UNRECOGNIZED: 4902,
+}