Enable Token2022 in the SPL Gov SDK

package.json

@@ -70,7 +70,8 @@
     "rimraf": "^3.0.2",
     "ts-jest": "^24.0.0",
     "ts-node": "^9.0.0",
-    "typescript": "^4.1.3"
+    "typescript": "^4.1.3",
+    "node-gyp": "^10.0.1"
   },
   "resolutions": {
     "react": "16.13.1",

packages/arweave-push/package.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@google-cloud/storage": "^5.0.0",
-    "@solana/web3.js": "^1.22.0",
+    "@solana/web3.js": "^1",
     "arweave": "1.10.13",
     "busboy": "^0.3.0",
     "coingecko-api": "1.0.10",

packages/bridge-sdk/package.json

@@ -19,7 +19,7 @@
     "@oyster/common": "0.0.2",
     "@solana/spl-token": "0.1.3",
     "@solana/spl-token-swap": "0.1.0",
-    "@solana/web3.js": "^1.22.0",
+    "@solana/web3.js": "^1",
     "bignumber.js": "^9.0.1",
     "bn.js": "^5.1.3",
     "bs58": "^4.0.1",

packages/bridge/package.json

@@ -12,7 +12,7 @@
     "@solana/spl-token": "0.1.3",
     "@solana/spl-token-registry": "^0.2.0",
     "@solana/spl-token-swap": "0.1.0",
-    "@solana/web3.js": "^1.22.0",
+    "@solana/web3.js": "^1",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

packages/common/package.json

@@ -31,7 +31,7 @@
     "@solana/wallet-adapter-base": "^0.6.0",
     "@solana/wallet-adapter-react": "^0.12.6",
     "@solana/wallet-adapter-wallets": "^0.10.1",
-    "@solana/web3.js": "^1.22.0",
+    "@solana/web3.js": "^1",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

packages/common/src/models/account.ts

@@ -60,8 +60,8 @@ export function approve(
   // if delegate is not passed ephemeral transfer authority is used
   delegate?: PublicKey,
   existingTransferAuthority?: Account,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ): Account {
-  const tokenProgram = TOKEN_PROGRAM_ID;
 
   const transferAuthority = existingTransferAuthority || new Account();
   const delegateKey = delegate ?? transferAuthority.publicKey;

packages/common/src/utils/ids.ts

@@ -8,6 +8,10 @@ export let TOKEN_PROGRAM_ID = new PublicKey(
   'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
 );
 
+export let TOKEN_2022_PROGRAM_ID = new PublicKey(
+  'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb',
+);
+
 export let LENDING_PROGRAM_ID = new PublicKey(
   'LendZqTs7gn5CTSJU1jWKhKuVpjJGom45nnwPb2AMTi',
 );
@@ -154,6 +158,7 @@ export const setProgramIds = (envName: string) => {
 export const programIds = () => {
   return {
     token: TOKEN_PROGRAM_ID,
+    token_2022: TOKEN_2022_PROGRAM_ID,
     swap: SWAP_PROGRAM_ID,
     swap_legacy: SWAP_PROGRAM_LEGACY_IDS,
     swapLayout: SWAP_PROGRAM_LAYOUT,

packages/governance-sdk/package.json

@@ -28,7 +28,7 @@
     "url": "https://github.com/solana-labs/oyster/issues"
   },
   "dependencies": {
-    "@solana/web3.js": "^1.22.0",
+    "@solana/web3.js": "=1.98.0",
     "bignumber.js": "^9.0.1",
     "bn.js": "^5.1.3",
     "borsh": "^0.3.1",
@@ -41,7 +41,7 @@
     "esbuild-jest": "^0.5.0",
     "jest": "^29.2.0",
     "typescript": "^4.5.4",
-    "@solana/spl-token": "0.1.3",
+    "@solana/spl-token": "*",
     "ts-jest": "29.0.3",
     "@types/jest": "29.2.0"
   },

packages/governance-sdk/src/governance/withCreateMintGovernance.ts

@@ -26,6 +26,7 @@ export const withCreateMintGovernance = async (
   payer: PublicKey,
   governanceAuthority: PublicKey,
   voterWeightRecord?: PublicKey,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ) => {
   const args = new CreateMintGovernanceArgs({
     config,
@@ -73,7 +74,7 @@ export const withCreateMintGovernance = async (
       isSigner: true,
     },
     {
-      pubkey: TOKEN_PROGRAM_ID, // 6
+      pubkey: tokenProgram, // 6
       isWritable: false,
       isSigner: false,
     },

packages/governance-sdk/src/governance/withCreateRealm.ts

@@ -34,6 +34,7 @@ export async function withCreateRealm(
   minCommunityWeightToCreateGovernance: BN,
   communityTokenConfig?: GoverningTokenConfigAccountArgs | undefined,
   councilTokenConfig?: GoverningTokenConfigAccountArgs | undefined,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ) {
   const configArgs = createRealmConfigArgs(
     programVersion,
@@ -95,7 +96,7 @@ export async function withCreateRealm(
       isWritable: false,
     },
     {
-      pubkey: TOKEN_PROGRAM_ID,
+      pubkey: tokenProgram,
       isSigner: false,
       isWritable: false,
     },

packages/governance-sdk/src/governance/withCreateTokenGovernance.ts

@@ -26,6 +26,7 @@ export const withCreateTokenGovernance = async (
   payer: PublicKey,
   governanceAuthority: PublicKey,
   voterWeightRecord?: PublicKey,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ) => {
   const args = new CreateTokenGovernanceArgs({
     config,
@@ -77,7 +78,7 @@ export const withCreateTokenGovernance = async (
       isSigner: true,
     },
     {
-      pubkey: TOKEN_PROGRAM_ID,
+      pubkey: tokenProgram,
       isWritable: false,
       isSigner: false,
     },

packages/governance-sdk/src/governance/withDepositGoverningTokens.ts

@@ -28,6 +28,7 @@ export const withDepositGoverningTokens = async (
   payer: PublicKey,
   amount: BN,
   governingTokenOwnerIsSigner?: boolean,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ) => {
   const args = new DepositGoverningTokensArgs({ amount });
   const data = Buffer.from(
@@ -97,7 +98,7 @@ export const withDepositGoverningTokens = async (
       isSigner: false,
     },
     {
-      pubkey: TOKEN_PROGRAM_ID,
+      pubkey: tokenProgram,
       isWritable: false,
       isSigner: false,
     },

packages/governance-sdk/src/governance/withRevokeGoverningTokens.ts

@@ -19,6 +19,7 @@ export const withRevokeGoverningTokens = async (
   governingTokenMint: PublicKey,
   revokeAuthority: PublicKey,
   amount: BN,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ) => {
   const args = new RevokeGoverningTokensArgs({ amount });
   const data = Buffer.from(
@@ -72,7 +73,7 @@ export const withRevokeGoverningTokens = async (
       isWritable: false,
     },
     {
-      pubkey: TOKEN_PROGRAM_ID,
+      pubkey: tokenProgram,
       isWritable: false,
       isSigner: false,
     },

packages/governance-sdk/src/governance/withWithdrawGoverningTokens.ts

@@ -14,6 +14,7 @@ export const withWithdrawGoverningTokens = async (
   governingTokenDestination: PublicKey,
   governingTokenMint: PublicKey,
   governingTokenOwner: PublicKey,
+  tokenProgram: PublicKey = TOKEN_PROGRAM_ID,
 ) => {
   const args = new WithdrawGoverningTokensArgs();
   const data = Buffer.from(
@@ -62,7 +63,7 @@ export const withWithdrawGoverningTokens = async (
       isSigner: false,
     },
     {
-      pubkey: TOKEN_PROGRAM_ID,
+      pubkey: tokenProgram,
       isWritable: false,
       isSigner: false,
     },