@deserialize/multi-vm-wallet 1.0.372 → 1.1.0

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../utils/types.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAC9B,+BAA8B;AA6CjB,QAAA,YAAY,GAAG;IACxB,KAAK,EAAE,WAAK;IACZ,KAAK,EAAE,WAAK;CACN,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../utils/types.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAC9B,+BAA8B;AA+CjB,QAAA,YAAY,GAAG;IACxB,KAAK,EAAE,WAAK;IACZ,KAAK,EAAE,WAAK;CACN,CAAC"}

package/dist/vm.d.ts

@@ -1,4 +1,4 @@
-import { vmTypes } from "./types";
+import { TokenInfo, vmTypes } from "./types";
 export declare abstract class VM<AddressType, PrivateKeyType, ConnectionType> {
     protected seed: string;
     type: vmTypes;
@@ -20,4 +20,5 @@ export declare abstract class VM<AddressType, PrivateKeyType, ConnectionType> {
         privateKey: PrivateKeyType;
         index: number;
     };
+    abstract getTokenInfo(tokenAddress: AddressType, connection: ConnectionType): Promise<TokenInfo>;
 }

package/dist/vm.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VM = void 0;
-const bip39 = __importStar(require("bip39"));
+const bip39 = __importStar(require("@scure/bip39"));
 const crypto_js_1 = __importDefault(require("crypto-js"));
 // Abstract Base Classes
 class VM {
@@ -84,6 +84,6 @@ class VM {
 }
 exports.VM = VM;
 VM.mnemonicToSeed = (mnemonic) => {
-    return bip39.mnemonicToSeedSync(mnemonic).toString("hex");
+    return Buffer.from(bip39.mnemonicToSeedSync(mnemonic)).toString("hex");
 };
 //# sourceMappingURL=vm.js.map

package/dist/vm.js.map

@@ -1 +1 @@
-{"version":3,"file":"vm.js","sourceRoot":"","sources":["../utils/vm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA+B;AAC/B,0DAAiC;AACjC,wBAAwB;AACxB,MAAsB,EAAE;IAIpB,YAAY,IAAY,EAAE,EAAW;QAmDrC,iBAAY,GAAG,EAAE,CAAC,YAAY,CAAA;QAC9B,cAAS,GAAG,EAAE,CAAC,SAAS,CAAA;QACxB,sBAAiB,GAAG,EAAE,CAAC,iBAAiB,CAAA;QACxC,sBAAiB,GAAG,EAAE,CAAC,iBAAiB,CAAA;QArDpC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;IAKD,MAAM,CAAC,YAAY;QACf,OAAO,mBAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,eAAe;IACxE,CAAC;IACD,MAAM,CAAC,SAAS,CACZ,QAAgB,EAChB,IAAY,EACZ,UAAU,GAAG,KAAK,EAClB,OAAO,GAAG,GAAG,GAAG,EAAE;QAElB,OAAO,mBAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,mBAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC3D,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,UAAU;SACzB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,iBAAiB,CAAC,UAAkB,EAAE,QAAgB;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,6CAA6C;QAC/E,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,4BAA4B;QAExE,yDAAyD;QACzD,MAAM,SAAS,GAAG,mBAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEnE,iEAAiE;QACjE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,iBAAiB,CACpB,mBAA2B,EAC3B,QAAgB,EAChB,IAAY;QAEZ,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,qCAAqC;YACjF,MAAM,KAAK,GAAG,mBAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;YAC7D,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,mBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAErD,qCAAqC;YACrC,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACvD,OAAO,UAAU,CAAC;QACtB,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAChE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;;AAtDL,gBAqEC;AA7DU,iBAAc,GAAG,CAAC,QAAgB,EAAE,EAAE;IACzC,OAAO,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC9D,CAAC,AAFoB,CAEpB"}
+{"version":3,"file":"vm.js","sourceRoot":"","sources":["../utils/vm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,oDAAsC;AACtC,0DAAiC;AACjC,wBAAwB;AACxB,MAAsB,EAAE;IAIpB,YAAY,IAAY,EAAE,EAAW;QAmDrC,iBAAY,GAAG,EAAE,CAAC,YAAY,CAAA;QAC9B,cAAS,GAAG,EAAE,CAAC,SAAS,CAAA;QACxB,sBAAiB,GAAG,EAAE,CAAC,iBAAiB,CAAA;QACxC,sBAAiB,GAAG,EAAE,CAAC,iBAAiB,CAAA;QArDpC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;IAKD,MAAM,CAAC,YAAY;QACf,OAAO,mBAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,eAAe;IACxE,CAAC;IACD,MAAM,CAAC,SAAS,CACZ,QAAgB,EAChB,IAAY,EACZ,UAAU,GAAG,KAAK,EAClB,OAAO,GAAG,GAAG,GAAG,EAAE;QAElB,OAAO,mBAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,mBAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC3D,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,UAAU;SACzB,CAAC,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,iBAAiB,CAAC,UAAkB,EAAE,QAAgB;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,6CAA6C;QAC/E,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,4BAA4B;QAExE,yDAAyD;QACzD,MAAM,SAAS,GAAG,mBAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEnE,iEAAiE;QACjE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,iBAAiB,CACpB,mBAA2B,EAC3B,QAAgB,EAChB,IAAY;QAEZ,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,qCAAqC;YACjF,MAAM,KAAK,GAAG,mBAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;YAC7D,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,mBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAErD,qCAAqC;YACrC,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACvD,OAAO,UAAU,CAAC;QACtB,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAChE,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;;AAtDL,gBAsEC;AA9DU,iBAAc,GAAG,CAAC,QAAgB,EAAE,EAAE;IACzC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC3E,CAAC,AAFoB,CAEpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deserialize/multi-vm-wallet",
-  "version": "1.0.372",
+  "version": "1.1.0",
   "devDependencies": {
     "@types/bn.js": "^5.2.0",
     "@types/crypto-js": "^4.2.2",
@@ -12,15 +12,12 @@
   "dependencies": {
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.4",
-    "bip32": "^4.0.0",
-    "bip39": "^3.1.0",
     "bn.js": "^5.2.2",
     "bs58": "^6.0.0",
     "crypto-js": "^4.2.0",
-    "ed25519-hd-key": "^1.3.0",
     "ethers": "^6.15.0",
     "promise-retry": "^2.0.1",
-    "tiny-secp256k1": "^2.2.4"
+    "tweetnacl": "^1.0.3"
   },
   "description": "Multi VM Wallet",
   "main": "dist/index.js",

package/utils/bip32.ts

@@ -1,66 +1,155 @@
-import * as bip39 from "bip39";
-import BIP32Factory from "bip32";
-import * as ecc from "tiny-secp256k1";
-import { BIP32Interface } from "bip32";
-import * as ed25519 from "ed25519-hd-key";
-import { Keypair } from "@solana/web3.js";
+// import * as bip39 from "bip39";
+// import BIP32Factory from "bip32";
+// import * as ecc from "tiny-secp256k1";
+// import { BIP32Interface } from "bip32";
+// import * as ed25519 from "ed25519-hd-key";
+// import { Keypair } from "@solana/web3.js";
 
-const bip32 = BIP32Factory(ecc);
 
 
-// export function getPublicKeyFromSeed(seed: string, index: number) {
-//     const node = getSeedNode(seed);
-//     const { publicKey } = deriveChildPrivateKey(node, index);
-//     return publicKey;
+// // export function getPublicKeyFromSeed(seed: string, index: number) {
+// //     const node = getSeedNode(seed);
+// //     const { publicKey } = deriveChildPrivateKey(node, index);
+// //     return publicKey;
+// // }
+// // export function getPrivateKeyFromSeed(seed: string, index: number) {
+// //     const node = getSeedNode(seed);
+// //     const keyPair = deriveChildPrivateKey(node, index);
+// //     return keyPair.privateKey;
+// // }
+
+// export function GenerateNewMnemonic() {
+//     const mnemonic = bip39.generateMnemonic();
+//     return mnemonic;
+// }
+// export function ValidateMnemonic(mnemonic: string) {
+//     const isValid = bip39.validateMnemonic(mnemonic);
+//     if (!isValid) {
+//         throw new Error("Invalid mnemonic");
+//     }
+//     return isValid;
 // }
-// export function getPrivateKeyFromSeed(seed: string, index: number) {
+// export function GenerateSeed(_mnemonic?: string) {
+//     const mnemonic = _mnemonic || bip39.generateMnemonic();
+//     const seed = bip39.mnemonicToSeedSync(mnemonic);
+//     const seedString = seed.toString("hex");
+//     return seedString;
+// }
+
+// export function getSeedNode(seed: string) {
+//     const bip32 = BIP32Factory(ecc);
+//     const restoredSeedBuffer = Buffer.from(seed, "hex");
+//     const node: BIP32Interface = bip32.fromSeed(restoredSeedBuffer);
+//     return node;
+// }
+
+// //EVM
+// export function EVMDeriveChildPrivateKey(seed: string, index: number, derivationPath: string) {
 //     const node = getSeedNode(seed);
-//     const keyPair = deriveChildPrivateKey(node, index);
-//     return keyPair.privateKey;
+//     const child = node.derivePath(`${derivationPath}${index}'`);
+//     const privateKey = child.privateKey!.toString("hex");
+//     const publicKey = child.publicKey.toString("hex");
+//     return { privateKey, publicKey };
 // }
 
+// //SVM
+// export function SVMDeriveChildPrivateKey(seed: string, index: number, derivationPath: string) {
+//     const path = `${derivationPath}${index}'`;
+//     // Derive a seed from the given path
+//     const derivedSeed = ed25519.derivePath(path, seed).key;
+//     const derivedKeyPair = Keypair.fromSeed(derivedSeed);
+//     return derivedKeyPair;
+// }
+
+
+
+
+import { Keypair } from "@solana/web3.js";
+import * as bip39 from "@scure/bip39";
+import { HDKey } from "@scure/bip32"
+import { Buffer } from "buffer"; // Import the polyfill
+window.Buffer = Buffer; // Inject Buffer into the global scope
+import { wordlist } from "@scure/bip39/wordlists/english";
+import { hmac } from "../node_modules/@noble/hashes/hmac";
+import { sha512 } from "../node_modules/@noble/hashes/sha512";
+
+
 export function GenerateNewMnemonic() {
-    const mnemonic = bip39.generateMnemonic();
+    const mnemonic = bip39.generateMnemonic(wordlist);
     return mnemonic;
 }
 export function ValidateMnemonic(mnemonic: string) {
-    const isValid = bip39.validateMnemonic(mnemonic);
+    const isValid = bip39.validateMnemonic(mnemonic, wordlist);
     if (!isValid) {
         throw new Error("Invalid mnemonic");
     }
     return isValid;
 }
 export function GenerateSeed(_mnemonic?: string) {
-    const mnemonic = _mnemonic || bip39.generateMnemonic();
-    const seed = bip39.mnemonicToSeedSync(mnemonic);
-    const seedString = seed.toString("hex");
+    const mnemonic = _mnemonic || bip39.generateMnemonic(wordlist);
+    const seedString = bip39.mnemonicToSeedSync(mnemonic);
     return seedString;
 }
-
-export function getSeedNode(seed: string) {
-    const bip32 = BIP32Factory(ecc);
-    const restoredSeedBuffer = Buffer.from(seed, "hex");
-    const node: BIP32Interface = bip32.fromSeed(restoredSeedBuffer);
-    return node;
-}
-
-
 //EVM
 export function EVMDeriveChildPrivateKey(seed: string, index: number, derivationPath: string) {
-    const node = getSeedNode(seed);
-    const child = node.derivePath(`${derivationPath}${index}'`);
-    const privateKey = child.privateKey!.toString("hex");
-    const publicKey = child.publicKey.toString("hex");
+    const path = `${derivationPath}${index}'`
+    const scureNode = HDKey.fromMasterSeed(Buffer.from(seed, "hex"))
+    const child = scureNode.derive(path);
+    const privateKey = Buffer.from(child.privateKey!).toString("hex");
+    const publicKey = Buffer.from(child.publicKey!).toString("hex");
     return { privateKey, publicKey };
 }
 
-
-
 //SVM
 export function SVMDeriveChildPrivateKey(seed: string, index: number, derivationPath: string) {
     const path = `${derivationPath}${index}'`;
     // Derive a seed from the given path
-    const derivedSeed = ed25519.derivePath(path, seed).key;
+    const derivedSeed = derivePathEclipticCurve(path, Buffer.from(seed, "hex")).key;
     const derivedKeyPair = Keypair.fromSeed(derivedSeed);
     return derivedKeyPair;
 }
+
+function derivePathEclipticCurve(path: string, seed: Uint8Array): { key: Uint8Array, chainCode: Uint8Array } {
+    const segments = path
+        .split("/")
+        .slice(1)
+        .map((seg) => {
+            if (!seg.endsWith("'")) {
+                throw new Error("Only hardened derivation is supported");
+            }
+            return parseInt(seg.slice(0, -1), 10) + 0x80000000;
+        });
+
+    // Initialize with master key derivation
+    let hmacResult = hmac(sha512, "ed25519 seed", seed);
+    let key = hmacResult.slice(0, 32);
+    let chainCode = hmacResult.slice(32, 64);
+
+    // Derive each path segment
+    for (const segment of segments) {
+        const result = hardenedDerivation(key, chainCode, segment);
+        key = Buffer.from(result.key);
+        chainCode = Buffer.from(result.chainCode);
+    }
+
+    return { key, chainCode };
+}
+
+function hardenedDerivation(
+    parentKey: Uint8Array,
+    parentChainCode: Uint8Array,
+    index: number
+): { key: Uint8Array, chainCode: Uint8Array } {
+    const indexBuffer = new Uint8Array(4);
+    new DataView(indexBuffer.buffer).setUint32(0, index, false);
+
+    // Proper SLIP-0010 format: 0x00 + parent_key + index
+    const data = new Uint8Array([0x00, ...parentKey, ...indexBuffer]);
+
+    const hmacResult = hmac(sha512, parentChainCode, data);
+
+    return {
+        key: hmacResult.slice(0, 32),      // Left 32 bytes
+        chainCode: hmacResult.slice(32, 64) // Right 32 bytes
+    };
+}