@exodus/solana-lib 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -24,6 +24,5 @@
     "create-hash": "^1.1.3",
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
-  },
-  "gitHead": "158aae6b4aeb871b1566b2500456a5f475ef9d5f"
+  }
 }

package/src/helpers/metadata-schema.js

@@ -3,71 +3,71 @@
 import bs58 from 'bs58'
 import { BinaryReader, BinaryWriter } from 'borsh'
 
-BinaryReader.prototype.readPubkeyAsString = function () {
+BinaryReader.prototype.readPubkeyAsString = function() {
   const reader = this
   const array = reader.readFixedArray(32)
   return bs58.encode(array)
 }
 
-BinaryWriter.prototype.writePubkeyAsString = function (value) {
+BinaryWriter.prototype.writePubkeyAsString = function(value) {
   const writer = this
   writer.writeFixedArray(bs58.decode(value))
 }
 
 class Data {
   constructor(args) {
-    this.name = args.name;
-    this.symbol = args.symbol;
-    this.uri = args.uri;
-    this.sellerFeeBasisPoints = args.sellerFeeBasisPoints;
-    this.creators = args.creators;
+    this.name = args.name
+    this.symbol = args.symbol
+    this.uri = args.uri
+    this.sellerFeeBasisPoints = args.sellerFeeBasisPoints
+    this.creators = args.creators
   }
 }
 
 class Creator {
- constructor(args) {
-   this.address = args.address;
-   this.verified = args.verified;
-   this.share = args.share;
- }
+  constructor(args) {
+    this.address = args.address
+    this.verified = args.verified
+    this.share = args.share
+  }
 }
 
 class Metadata {
   constructor(args) {
     this.key = '' // MetadataKey.MetadataV1;
-    this.updateAuthority = args.updateAuthority;
-    this.mint = args.mint;
-    this.data = args.data;
-    this.primarySaleHappened = args.primarySaleHappened;
-    this.isMutable = args.isMutable;
-    this.editionNonce = args.editionNonce || null;
+    this.updateAuthority = args.updateAuthority
+    this.mint = args.mint
+    this.data = args.data
+    this.primarySaleHappened = args.primarySaleHappened
+    this.isMutable = args.isMutable
+    this.editionNonce = args.editionNonce || null
   }
 }
 
 const METADATA_SCHEMA = new Map([
   [
-  Data,
-  {
-    kind: 'struct',
-    fields: [
-      ['name', 'string'],
-      ['symbol', 'string'],
-      ['uri', 'string'],
-      ['sellerFeeBasisPoints', 'u16'],
-      ['creators', { kind: 'option', type: [Creator] }],
-    ],
-  },
+    Data,
+    {
+      kind: 'struct',
+      fields: [
+        ['name', 'string'],
+        ['symbol', 'string'],
+        ['uri', 'string'],
+        ['sellerFeeBasisPoints', 'u16'],
+        ['creators', { kind: 'option', type: [Creator] }],
+      ],
+    },
   ],
   [
-  Creator,
-  {
-    kind: 'struct',
-    fields: [
-      ['address', 'pubkeyAsString'],
-      ['verified', 'u8'],
-      ['share', 'u8'],
-    ],
-  },
+    Creator,
+    {
+      kind: 'struct',
+      fields: [
+        ['address', 'pubkeyAsString'],
+        ['verified', 'u8'],
+        ['share', 'u8'],
+      ],
+    },
   ],
   [
     Metadata,
@@ -84,10 +84,9 @@ const METADATA_SCHEMA = new Map([
       ],
     },
   ],
-]);
-
+])
 
 module.exports = {
   METADATA_SCHEMA,
-  Metadata
+  Metadata,
 }

package/src/index.js

@@ -4,6 +4,10 @@ export * from './constants'
 export * from './encode'
 export * from './keypair'
 export * from './tx'
-export { StakeInstruction, PublicKey, Transaction as SolanaWeb3Transaction, Message as SolanaWeb3Message } from './vendor'
-export { default as tokens } from './tokens'
+export {
+  StakeInstruction,
+  PublicKey,
+  Transaction as SolanaWeb3Transaction,
+  Message as SolanaWeb3Message,
+} from './vendor'
 export { default as Transaction } from './transaction'

package/src/transaction.js

@@ -22,7 +22,6 @@ import {
 } from './vendor'
 import { MagicEdenEscrowProgram } from './magiceden/escrow-program'
 import { SEED, STAKE_PROGRAM_ID } from './constants'
-import TOKENS from './tokens'
 
 class Tx {
   constructor({
@@ -33,7 +32,6 @@ class Tx {
     // fee, // (Fee per Signature: 5000 lamports)
     // Tokens related:
     // pass either name or mintAddress, if both, mintAddress has priority
-    tokenName,
     tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive, // true when recipient balance !== 0
@@ -44,7 +42,7 @@ class Tx {
     assert(amount, 'amount is required')
     assert(typeof amount === 'number', 'amount must be a number')
     assert(recentBlockhash, 'recentBlockhash is required')
-    if (tokenName || tokenMintAddress) {
+    if (tokenMintAddress) {
       assert(
         typeof destinationAddressType !== 'undefined',
         'destinationAddressType is required when sending tokens'
@@ -56,12 +54,6 @@ class Tx {
       assert(Array.isArray(fromTokenAddresses), 'fromTokenAddresses Array is required')
     }
 
-    if (tokenName && !tokenMintAddress) {
-      const token = TOKENS.find(({ name }) => name === tokenName)
-      assert(token, `token with tokenName ${tokenName} not found in tokens list`)
-      tokenMintAddress = token.mintAddress
-    }
-
     this.txObj = {
       from,
       to,

package/src/tx/create-unsigned-tx.js

@@ -8,7 +8,6 @@ export function createUnsignedTx({
   fee,
   recentBlockhash,
   // Tokens related:
-  tokenName,
   tokenMintAddress,
   destinationAddressType,
   isAssociatedTokenAccountActive, // true when recipient balance !== 0
@@ -40,7 +39,6 @@ export function createUnsignedTx({
       fee: fee.toBase().toNumber(),
       recentBlockhash,
       // Tokens related:
-      tokenName,
       tokenMintAddress,
       destinationAddressType,
       isAssociatedTokenAccountActive,

package/src/tx/parse-unsigned-tx.js

@@ -7,7 +7,6 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     from,
     to,
     recentBlockhash,
-    tokenName,
     tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive,
@@ -40,7 +39,6 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     fee,
     recentBlockhash,
     // token related
-    tokenName,
     tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive,

package/src/tx/sign-unsigned-tx.js

@@ -12,7 +12,6 @@ export function signUnsignedTx(
     amount: unitAmount,
     recentBlockhash,
     // tokens related
-    tokenName,
     tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive,
@@ -109,7 +108,6 @@ export function signUnsignedTx(
         to,
         amount,
         recentBlockhash,
-        tokenName,
         tokenMintAddress,
         destinationAddressType,
         isAssociatedTokenAccountActive,

package/src/tx/simulate-and-sign-tx.js

@@ -25,7 +25,7 @@ export function getTransactionSimulationParams(transaction) {
   }
 }
 
-const isSolAccount = (account) => account === '1111111111111111'
+const isSolAccount = (account) => account === '11111111111111111111111111111111'
 
 export function filterAccountsByOwner(futureAccountsState, accountAddresses, publicKey) {
   const solAccounts = []

package/src/tokens.js

@@ -1,12 +0,0 @@
-import assets from '@exodus/assets'
-
-// tokens info: https://github.com/project-serum/spl-token-wallet/blob/master/src/utils/tokens/names.js
-
-const tokens = Object.values(assets)
-  .filter((asset) => asset.assetType === 'SOLANA_TOKEN')
-  .map((token) => ({
-    ...token,
-    tokenName: token.name, // alias
-  }))
-
-export default tokens