fix: buffer issue, updating bip39 to use scure/bip32 - canary

Author: ThomasRalee

.husky/pre-push

@@ -1,4 +1,76 @@
 set -e
 
+# Check if local branch is behind remote and block push if so
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+REMOTE="origin"
+
+# Fetch latest from remote (only refs, no objects - much faster)
+git fetch --depth=1 --no-tags $REMOTE $BRANCH 2>/dev/null || true
+
+# Check if remote branch exists
+if git rev-parse --verify $REMOTE/$BRANCH >/dev/null 2>&1; then
+  LOCAL=$(git rev-parse HEAD)
+  REMOTE_HEAD=$(git rev-parse $REMOTE/$BRANCH)
+  BASE=$(git merge-base HEAD $REMOTE/$BRANCH)
+
+  if [ "$LOCAL" != "$REMOTE_HEAD" ] && [ "$BASE" = "$LOCAL" ]; then
+    echo ""
+    echo "ERROR: Your branch '$BRANCH' is behind '$REMOTE/$BRANCH'."
+    echo ""
+    echo "Please run: git pull --rebase"
+    echo ""
+    echo "This will replay your commits on top of the latest remote commits."
+    echo "If there are conflicts, resolve them and run: git rebase --continue"
+    echo ""
+    exit 1
+  fi
+
+  if [ "$LOCAL" != "$REMOTE_HEAD" ] && [ "$BASE" = "$REMOTE_HEAD" ]; then
+    # Local is ahead, this is fine - we're pushing new commits
+    :
+  elif [ "$LOCAL" != "$REMOTE_HEAD" ] && [ "$BASE" != "$LOCAL" ] && [ "$BASE" != "$REMOTE_HEAD" ]; then
+    echo ""
+    echo "ERROR: Your branch '$BRANCH' has diverged from '$REMOTE/$BRANCH'."
+    echo ""
+    echo "Please run: git pull --rebase"
+    echo ""
+    echo "This will replay your commits on top of the latest remote commits."
+    echo "If there are conflicts, resolve them and run: git rebase --continue"
+    echo ""
+    exit 1
+  fi
+fi
+
+# --- UNCOMMENT BELOW FOR AUTO-REBASE (instead of manual check above) ---
+# # Automatically run git pull --rebase if behind remote
+# BRANCH=$(git rev-parse --abbrev-ref HEAD)
+# REMOTE="origin"
+#
+# git fetch --depth=1 --no-tags $REMOTE $BRANCH 2>/dev/null || true
+#
+# if git rev-parse --verify $REMOTE/$BRANCH >/dev/null 2>&1; then
+#   LOCAL=$(git rev-parse HEAD)
+#   REMOTE_HEAD=$(git rev-parse $REMOTE/$BRANCH)
+#   BASE=$(git merge-base HEAD $REMOTE/$BRANCH)
+#
+#   if [ "$LOCAL" != "$REMOTE_HEAD" ] && [ "$BASE" != "$REMOTE_HEAD" ]; then
+#     echo ""
+#     echo "Your branch is behind or has diverged. Running git pull --rebase..."
+#     echo ""
+#     if ! git pull --rebase $REMOTE $BRANCH; then
+#       echo ""
+#       echo "ERROR: Rebase failed due to conflicts."
+#       echo "Please resolve conflicts and run: git rebase --continue"
+#       echo "Then try pushing again."
+#       echo ""
+#       exit 1
+#     fi
+#     echo ""
+#     echo "Rebase successful. Continuing with push..."
+#     echo ""
+#   fi
+# fi
+# --- END AUTO-REBASE ---
+
 pnpm lint
 pnpm build

packages/sdk-ts/package.json

@@ -340,8 +340,8 @@
     "@protobuf-ts/runtime": "^2.11.1",
     "@protobuf-ts/runtime-rpc": "^2.11.1",
     "@scure/base": "catalog:",
+    "@scure/bip39": "catalog:",
     "axios": "catalog:",
-    "bip39": "^3.1.0",
     "cosmjs-types": "0.9.0",
     "ethers": "catalog:",
     "http-status-codes": "catalog:",

packages/sdk-ts/src/core/accounts/PrivateKey.ts

@@ -1,6 +1,7 @@
-import { generateMnemonic } from 'bip39'
+import { generateMnemonic } from '@scure/bip39'
 import { secp256k1 } from '@noble/curves/secp256k1'
 import { toBytes, keccak256, hashTypedData } from 'viem'
+import { wordlist } from '@scure/bip39/wordlists/english'
 import { GeneralException } from '@injectivelabs/exceptions'
 import { ChainId, EvmChainId } from '@injectivelabs/ts-types'
 import { Wallet, concat, getBytes, Signature, HDNodeWallet } from 'ethers'
@@ -39,7 +40,7 @@ export class PrivateKey {
    * @returns { privateKey: PrivateKey, mnemonic: string }
    */
   static generate(): { privateKey: PrivateKey; mnemonic: string } {
-    const mnemonic = generateMnemonic()
+    const mnemonic = generateMnemonic(wordlist)
     const privateKey = PrivateKey.fromMnemonic(mnemonic)
 
     return {