@exodus/solana-lib 1.4.2 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -13,13 +13,11 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^3.6.2",
-    "@exodus/assets": "^8.0.68",
-    "@exodus/assets-base": "^8.0.139",
+    "@exodus/asset-lib": "^3.7.1",
+    "@exodus/assets": "^8.0.74",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
-    "@exodus/models": "^8.7.2",
+    "@exodus/models": "^8.10.4",
     "@exodus/solana-spl-token": "0.1.8-exodus.1",
-    "@exodus/web3-solana-utils": "^0.14.0",
     "@project-serum/serum": "0.13.64",
     "@solana/web3.js": "1.31.0",
     "bn.js": "^4.11.0",
@@ -29,5 +27,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "1da3192650571fda10b61596dbc2eaf7cc8f439d"
+  "gitHead": "fe989a47ba9278f5fe797f9b01d8bc93fb53467a"
 }

package/src/fee-data/solana.js

@@ -1,10 +1,11 @@
 import { FeeData } from '@exodus/asset-lib'
+import assets from '@exodus/assets'
 
-export default new FeeData(
-  {
+export default new FeeData({
+  config: {
     fee: '0.000005 SOL',
     fuelThreshold: '0.000015 SOL',
   },
-  'fee',
-  'solana'
-)
+  mainKey: 'fee',
+  currency: assets.solana.currency,
+})

package/src/index.js

@@ -1,6 +1,5 @@
 // @flow
 
-export { buildRawTransaction } from '@exodus/web3-solana-utils'
 export * from './constants'
 export * from './encode'
 export * from './keypair'

package/src/tx/build-raw-transaction.js

@@ -0,0 +1,62 @@
+import * as nacl from 'tweetnacl'
+import { PACKET_DATA_SIZE } from '@solana/web3.js'
+
+// Copied from:
+// https://github.com/solana-labs/solana-web3.js/blob/42612c936d8d4ddbcb09dbb73db9e1aeaf6d8764/src/util/shortvec-encoding.ts#L15-L28.
+function encodeLength(bytes: number[], length: number) {
+  let remainingLength = length
+
+  for (;;) {
+    let element = remainingLength & 0x7f
+
+    remainingLength >>= 7
+    if (remainingLength === 0) {
+      bytes.push(element)
+      break
+    }
+
+    element |= 0x80
+    bytes.push(element)
+  }
+}
+
+// As per:
+// https://github.com/solana-labs/solana-web3.js/blob/61433de0d39686c6ad4f0b3cb5b95a68a058aa04/src/transaction.ts#L682
+const MAX_SIGNATURES = 255
+
+export const SIGNATURE_LENGTH = nacl.sign.signatureLength
+
+export function buildRawTransaction(signData: Buffer, signatures: (Uint8Array | null)[]) {
+  const signatureCount: number[] = []
+  encodeLength(signatureCount, signatures.length)
+
+  const signaturesLength = signatureCount.length + signatures.length * SIGNATURE_LENGTH
+  const rawTransactionLength = signData.length + signaturesLength
+
+  if (signatures.length > MAX_SIGNATURES) {
+    throw Error(`Too many signatures: ${signatures.length} > ${MAX_SIGNATURES}`)
+  }
+
+  if (rawTransactionLength > PACKET_DATA_SIZE) {
+    throw Error(`Transaction too large: ${rawTransactionLength} > ${PACKET_DATA_SIZE}`)
+  }
+
+  const rawTransaction = Buffer.alloc(rawTransactionLength)
+  Buffer.from(signatureCount).copy(rawTransaction)
+
+  signatures.forEach((signature, index) => {
+    if (signature === null) {
+      return
+    }
+
+    if (signature.length !== SIGNATURE_LENGTH) {
+      throw Error('Invalid signature length')
+    }
+
+    Buffer.from(signature).copy(rawTransaction, signatureCount.length + index * SIGNATURE_LENGTH)
+  })
+
+  signData.copy(rawTransaction, signaturesLength)
+
+  return rawTransaction
+}

package/src/tx/index.js

@@ -4,4 +4,5 @@ export * from './create-unsigned-tx'
 export * from './create-and-sign-tx'
 export * from './simulate-and-sign-tx'
 export * from './decode-tx-instructions'
+export * from './build-raw-transaction'
 export { default as signMessage } from './sign-message'