@exodus/solana-lib 3.6.0 → 3.7.0

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.6.0...@exodus/solana-lib@3.7.0) (2024-10-10)
+
+
+### Features
+
+* **solana-lib:** switch to exodus/crypto for hashes ([#3681](https://github.com/ExodusMovement/assets/issues/3681)) ([ad32b3a](https://github.com/ExodusMovement/assets/commit/ad32b3a2b83b23472db5898d2c6cf155a5af12fe))
+
+
+### Bug Fixes
+
+* remove default signature requirement ([#4224](https://github.com/ExodusMovement/assets/issues/4224)) ([53ba3dd](https://github.com/ExodusMovement/assets/commit/53ba3ddd84d796608612ecd064ee7270365bf4bc))
+
+
+
 ## [3.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.5.1...@exodus/solana-lib@3.6.0) (2024-09-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Exodus internal Solana low-level library",
   "type": "module",
   "main": "src/index.js",
@@ -22,20 +22,19 @@
   "dependencies": {
     "@exodus/asset-lib": "^5.0.0",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
+    "@exodus/crypto": "^1.0.0-rc.7",
     "@exodus/currency": "^5.0.2",
-    "@exodus/key-utils": "^3.1.0",
-    "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc2",
+    "@exodus/key-utils": "^3.7.0",
+    "@exodus/solana-web3.js": "^1.63.1-exodus.9-rc4",
     "bn.js": "^5.2.1",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
-    "create-hash": "^1.1.3",
-    "lodash": "^4.17.11",
     "minimalistic-assert": "^1.0.1",
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "@exodus/key-identifier": "^1.2.1",
-    "@exodus/keychain": "^6.7.0",
+    "@exodus/key-identifier": "^1.3.0",
+    "@exodus/keychain": "^7.3.0",
     "@exodus/solana-meta": "^2.0.0",
     "bip39": "^2.6.0"
   },
@@ -47,5 +46,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "b41d4471ed86010b8eed3e22af9503f01e5ff595"
+  "gitHead": "146e3e7f2b0699aa009baddf2b34ea122af2d3fc"
 }

package/src/magiceden/coders.js

@@ -1,5 +1,5 @@
 import * as BufferLayout from '@exodus/buffer-layout'
-import createHash from 'create-hash'
+import { hashSync } from '@exodus/crypto/hash'
 
 import { bnAmountU64, publicKey } from '../vendor/utils/layout.js'
 
@@ -21,7 +21,7 @@ const idl = {
 export function sighash(nameSpace, ixName) {
   const preimage = `${nameSpace}:${ixName}`
 
-  return Buffer.from(createHash('sha256').update(preimage).digest()).slice(0, 8)
+  return hashSync('sha256', preimage).slice(0, 8)
 }
 
 export function encodeData(name, args = {}) {

package/src/transaction.js

@@ -1,6 +1,5 @@
 import BN from 'bn.js'
 import bs58 from 'bs58'
-import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 
 import { MEMO_PROGRAM_ID, SEED, STAKE_PROGRAM_ID, TOKEN_2022_PROGRAM_ID } from './constants.js'
@@ -25,8 +24,6 @@ import {
   TransactionInstruction,
 } from './vendor/index.js'
 
-const { get } = lodash
-
 class Tx {
   constructor({
     from,
@@ -441,19 +438,19 @@ class Tx {
       switch (type) {
         case 'Delegate':
           info.type = 'Delegate'
-          info.stakeAddress = get(ix, 'keys[0].pubkey', '').toString()
-          info.validator = get(ix, 'keys[1].pubkey', '').toString() // pool
+          info.stakeAddress = (ix?.keys?.[0]?.pubkey ?? '').toString()
+          info.validator = (ix?.keys?.[1]?.pubkey ?? '').toString() // pool
           return info
 
         case 'Deactivate': // undelegate
           info.type = 'Deactivate'
-          info.stakeAddress = get(ix, 'keys[0].pubkey', '').toString()
+          info.stakeAddress = (ix?.keys?.[0]?.pubkey ?? '').toString()
           // TODO: could have multiple addresses undelegating
           return info
 
         case 'Withdraw':
           info.type = 'Withdraw'
-          info.stakeAddress = get(ix, 'keys[0].pubkey', '').toString()
+          info.stakeAddress = (ix?.keys?.[0]?.pubkey ?? '').toString()
           const { lamports, toPubkey } = StakeInstruction.decodeWithdraw(ix)
           info.to = toPubkey.toString()
           info.lamports = lamports.toString()

package/src/tx/prepare-for-signing.js

@@ -121,15 +121,6 @@ const createTx = ({ txData, method, from }) => {
     tx.feePayer = publicKey
   }
 
-  if (tx.signatures.length !== tx.compileMessage().header.numRequiredSignatures) {
-    // Some transactions that we construct internally are technically not complete.
-    // They don't contain the empty signature slot for the public key.
-    tx.signatures.push({
-      publicKey,
-      signature: null,
-    })
-  }
-
   return tx
 }
 

package/src/vendor/publickey.js

@@ -1,6 +1,6 @@
+import { hashSync } from '@exodus/crypto/hash'
 import BN from 'bn.js'
 import bs58 from 'bs58'
-import createHash from 'create-hash'
 import nacl from 'tweetnacl'
 
 // $FlowFixMe
@@ -124,8 +124,8 @@ export class PublicKey {
       Buffer.from(seed),
       programId.toBuffer(),
     ])
-    const hash = createHash('sha256').update(buffer).digest('hex')
-    return new PublicKey(Buffer.from(hash, 'hex'))
+    const hash = hashSync('sha256', buffer)
+    return new PublicKey(hash)
   }
 
   /**
@@ -141,7 +141,7 @@ export class PublicKey {
       buffer = Buffer.concat([buffer, Buffer.from(seed)])
     })
     buffer = Buffer.concat([buffer, programId.toBuffer(), Buffer.from('ProgramDerivedAddress')])
-    const hash = createHash('sha256').update(buffer).digest('hex')
+    const hash = hashSync('sha256', buffer, 'hex')
     const publicKeyBytes = new BN(hash, 16).toArray(null, 32)
     if (isOnCurve(publicKeyBytes)) {
       throw new Error('Invalid seeds, address must fall off the curve')