fully switch to @solana/buffer-layout (#2634)

etodanik · Danny Povolotski · jordaaash · web-flow · commit 29d424e59703 · 2022-03-26T22:00:59.000-06:00
* remove unused buffer-layout

* change to solana implementation of buffer-layout

* use latest buffer-layout and utils

* update buffer-layout-utils

* update buffer-layout-utils

* info.data is already Uint8Array

* update deps, fix lint

* remove node engine requirements

Co-authored-by: Danny Povolotski &lt;danny@192.168.1.34&gt;
Co-authored-by: Jordan Sexton &lt;jordan@jordansexton.com&gt;
diff --git a/name-service/js/package-lock.json b/name-service/js/package-lock.json
diff --git a/name-service/js/package.json b/name-service/js/package.json
@@ -57,7 +57,6 @@
     "bn.js": "^5.1.3",
     "borsh": "^0.4.0",
     "bs58": "4.0.1",
-    "buffer-layout": "^1.2.0",
     "core-util-is": "^1.0.2",
     "crypto": "^1.0.1",
     "crypto-ts": "^1.0.2",
diff --git a/name-service/js/yarn.lock b/name-service/js/yarn.lock
diff --git a/token-lending/js/package.json b/token-lending/js/package.json
@@ -29,38 +29,36 @@
         "lint:fix": "eslint . --ext .ts --fix && prettier --write '**/*.{ts,js,json}'"
     },
     "dependencies": {
+        "@solana/buffer-layout": "^4.0.0",
+        "@solana/buffer-layout-utils": "^0.2.0",
         "bigint-buffer": "^1.1.5",
-        "bignumber.js": "^9.0.1",
-        "buffer-layout": "^1.2.1"
+        "bignumber.js": "^9.0.1"
     },
     "peerDependencies": {
         "@solana/spl-token": "^0.1.6",
         "@solana/web3.js": "^1.20.0"
     },
     "devDependencies": {
-        "@rollup/plugin-commonjs": "^21.0.0",
-        "@rollup/plugin-node-resolve": "^13.0.0",
-        "@rollup/plugin-typescript": "^8.2.1",
-        "@solana/spl-token": "^0.1.6",
-        "@solana/web3.js": "^1.20.0",
-        "@types/eslint": "^7.2.13",
+        "@rollup/plugin-commonjs": "^21.0.2",
+        "@rollup/plugin-node-resolve": "^13.1.3",
+        "@rollup/plugin-typescript": "^8.3.1",
+        "@solana/spl-token": "^0.2.0",
+        "@solana/web3.js": "^1.36.0",
+        "@types/eslint": "^8.4.1",
         "@types/eslint-plugin-prettier": "^3.1.0",
         "@types/node": "^16.0.0",
-        "@types/prettier": "^2.3.1",
-        "@typescript-eslint/eslint-plugin": "^4.28.0",
-        "@typescript-eslint/parser": "^4.28.1",
-        "eslint": "^7.29.0",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-prettier": "^3.4.0",
+        "@types/prettier": "^2.4.4",
+        "@typescript-eslint/eslint-plugin": "^5.16.0",
+        "@typescript-eslint/parser": "^5.16.0",
+        "eslint": "^8.12.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-prettier": "^4.0.0",
         "gh-pages": "^3.2.3",
-        "prettier": "^2.2.1",
-        "rollup": "^2.52.3",
-        "ts-node": "^10.0.0",
+        "prettier": "^2.6.1",
+        "rollup": "^2.70.1",
+        "ts-node": "^10.7.0",
         "tslib": "^2.3.0",
-        "typedoc": "^0.22.3",
-        "typescript": "^4.3.5"
-    },
-    "engines": {
-        "node": ">= 10"
+        "typedoc": "^0.22.13",
+        "typescript": "^4.6.3"
     }
 }
diff --git a/token-lending/js/src/index.ts b/token-lending/js/src/index.ts
@@ -1,4 +1,3 @@
 export * from './constants';
 export * from './instructions';
 export * from './state';
-export * from './util';
diff --git a/token-lending/js/src/instructions/borrowObligationLiquidity.ts b/token-lending/js/src/instructions/borrowObligationLiquidity.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/depositObligationCollateral.ts b/token-lending/js/src/instructions/depositObligationCollateral.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/depositReserveLiquidity.ts b/token-lending/js/src/instructions/depositReserveLiquidity.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/flashLoan.ts b/token-lending/js/src/instructions/flashLoan.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/initLendingMarket.ts b/token-lending/js/src/instructions/initLendingMarket.ts
@@ -1,21 +1,21 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { blob, struct, u8 } from 'buffer-layout';
+import { blob, struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID, ORACLE_PROGRAM_ID } from '../constants';
-import { publicKey } from '../util';
+import { publicKey } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
     instruction: number;
     owner: PublicKey;
-    quoteCurrency: Buffer;
+    quoteCurrency: Uint8Array;
 }
 
 const DataLayout = struct<Data>([u8('instruction'), publicKey('owner'), blob(32, 'quoteCurrency')]);
 
 export const initLendingMarketInstruction = (
     owner: PublicKey,
-    quoteCurrency: Buffer,
+    quoteCurrency: Uint8Array,
     lendingMarket: PublicKey
 ): TransactionInstruction => {
     const data = Buffer.alloc(DataLayout.span);
diff --git a/token-lending/js/src/instructions/initObligation.ts b/token-lending/js/src/instructions/initObligation.ts
@@ -1,6 +1,6 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
 import { LendingInstruction } from './instruction';
 
diff --git a/token-lending/js/src/instructions/initReserve.ts b/token-lending/js/src/instructions/initReserve.ts
@@ -1,9 +1,9 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
 import { ReserveConfig, ReserveConfigLayout } from '../state';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/liquidateObligation.ts b/token-lending/js/src/instructions/liquidateObligation.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/redeemReserveCollateral.ts b/token-lending/js/src/instructions/redeemReserveCollateral.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/refreshObligation.ts b/token-lending/js/src/instructions/refreshObligation.ts
@@ -1,5 +1,5 @@
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
 import { LendingInstruction } from './instruction';
 
diff --git a/token-lending/js/src/instructions/refreshReserve.ts b/token-lending/js/src/instructions/refreshReserve.ts
@@ -1,5 +1,5 @@
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
 import { LendingInstruction } from './instruction';
 
diff --git a/token-lending/js/src/instructions/repayObligationLiquidity.ts b/token-lending/js/src/instructions/repayObligationLiquidity.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/setLendingMarketOwner.ts b/token-lending/js/src/instructions/setLendingMarketOwner.ts
@@ -1,7 +1,7 @@
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { publicKey } from '../util';
+import { publicKey } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/instructions/withdrawObligationCollateral.ts b/token-lending/js/src/instructions/withdrawObligationCollateral.ts
@@ -1,8 +1,8 @@
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
-import { struct, u8 } from 'buffer-layout';
+import { struct, u8 } from '@solana/buffer-layout';
 import { LENDING_PROGRAM_ID } from '../constants';
-import { u64 } from '../util';
+import { u64 } from '@solana/buffer-layout-utils';
 import { LendingInstruction } from './instruction';
 
 interface Data {
diff --git a/token-lending/js/src/state/lastUpdate.ts b/token-lending/js/src/state/lastUpdate.ts
@@ -1,5 +1,5 @@
-import { struct } from 'buffer-layout';
-import { bool, u64 } from '../util';
+import { struct } from '@solana/buffer-layout';
+import { bool, u64 } from '@solana/buffer-layout-utils';
 
 export interface LastUpdate {
     slot: bigint;
diff --git a/token-lending/js/src/state/lendingMarket.ts b/token-lending/js/src/state/lendingMarket.ts
@@ -1,12 +1,13 @@
 import { AccountInfo, PublicKey } from '@solana/web3.js';
-import { blob, struct, u8 } from 'buffer-layout';
-import { Parser, publicKey } from '../util';
+import { blob, struct, u8 } from '@solana/buffer-layout';
+import { publicKey } from '@solana/buffer-layout-utils';
+import { Parser } from '../util';
 
 export interface LendingMarket {
     version: number;
     bumpSeed: number;
     owner: PublicKey;
-    quoteCurrency: Buffer;
+    quoteCurrency: Uint8Array;
     tokenProgramId: PublicKey;
     oracleProgramId: PublicKey;
 }
diff --git a/token-lending/js/src/state/obligation.ts b/token-lending/js/src/state/obligation.ts
@@ -1,8 +1,9 @@
 import { AccountInfo, PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
-import { blob, seq, struct, u8 } from 'buffer-layout';
-import { decimal, Parser, publicKey, u64 } from '../util';
+import { blob, seq, struct, u8 } from '@solana/buffer-layout';
+import { decimal, publicKey, u64 } from '@solana/buffer-layout-utils';
 import { LastUpdate, LastUpdateLayout } from './lastUpdate';
+import { Parser } from '../util';
 
 export interface Obligation {
     version: number;
@@ -42,7 +43,7 @@ export interface ObligationDataFlat {
     unhealthyBorrowValue: BigNumber;
     depositsLen: number;
     borrowsLen: number;
-    dataFlat: Buffer;
+    dataFlat: Uint8Array;
 }
 
 /** @internal */
diff --git a/token-lending/js/src/state/reserve.ts b/token-lending/js/src/state/reserve.ts
@@ -1,8 +1,9 @@
 import { AccountInfo, PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
-import { blob, struct, u8 } from 'buffer-layout';
-import { decimal, Parser, publicKey, u64 } from '../util';
+import { blob, struct, u8 } from '@solana/buffer-layout';
+import { decimal, publicKey, u64 } from '@solana/buffer-layout-utils';
 import { LastUpdate, LastUpdateLayout } from './lastUpdate';
+import { Parser } from '../util';
 
 export interface Reserve {
     version: number;
@@ -11,6 +12,7 @@ export interface Reserve {
     liquidity: ReserveLiquidity;
     collateral: ReserveCollateral;
     config: ReserveConfig;
+    padding: Uint8Array;
 }
 
 export interface ReserveLiquidity {
@@ -104,16 +106,14 @@ export const ReserveLayout = struct<Reserve>([
 
 export const RESERVE_SIZE = ReserveLayout.span;
 
-export const isReserve = (info: AccountInfo<Buffer>): boolean => {
+export const isReserve = (info: AccountInfo<Uint8Array>): boolean => {
     return info.data.length === RESERVE_SIZE;
 };
 
-export const parseReserve: Parser<Reserve> = (pubkey: PublicKey, info: AccountInfo<Buffer>) => {
+export const parseReserve: Parser<Reserve> = (pubkey: PublicKey, info: AccountInfo<Uint8Array>) => {
     if (!isReserve(info)) return;
 
-    const buffer = Buffer.from(info.data);
-    const reserve = ReserveLayout.decode(buffer);
-
+    const reserve = ReserveLayout.decode(info.data);
     if (!reserve.version) return;
 
     return {
diff --git a/token-lending/js/src/util/layout.ts b/token-lending/js/src/util/layout.ts
diff --git a/token-lending/js/tsconfig.json b/token-lending/js/tsconfig.json
diff --git a/token-lending/js/types/buffer-layout.d.ts b/token-lending/js/types/buffer-layout.d.ts
diff --git a/token-lending/js/yarn.lock b/token-lending/js/yarn.lock
diff --git a/token-swap/js/package.json b/token-swap/js/package.json
diff --git a/token/js/package.json b/token/js/package.json
diff --git a/token/js/yarn.lock b/token/js/yarn.lock
diff --git a/token/ts/package.json b/token/ts/package.json
