token-group-js: Update to tp3 (#6665)

Author: joncinque

pnpm-lock.yaml

@@ -47,7 +47,7 @@
         "@solana/web3.js": "^1.91.7"
     },
     "dependencies": {
-        "@solana/codecs": "2.0.0-preview.2",
+        "@solana/codecs": "2.0.0-preview.3",
         "@solana/spl-type-length-value": "0.1.0"
     },
     "devDependencies": {

token-group/js/package.json

@@ -1,18 +1,25 @@
 import type { Encoder } from '@solana/codecs';
 import type { PublicKey } from '@solana/web3.js';
-import { getBytesEncoder, getStructEncoder, getTupleEncoder, getU32Encoder, mapEncoder } from '@solana/codecs';
+import {
+    fixEncoderSize,
+    getBytesEncoder,
+    getStructEncoder,
+    getTupleEncoder,
+    getU32Encoder,
+    transformEncoder,
+} from '@solana/codecs';
 import { splDiscriminate } from '@solana/spl-type-length-value';
 import { SystemProgram, TransactionInstruction } from '@solana/web3.js';
 
 function getInstructionEncoder<T extends object>(discriminator: Uint8Array, dataEncoder: Encoder<T>): Encoder<T> {
-    return mapEncoder(getTupleEncoder([getBytesEncoder(), dataEncoder]), (data: T): [Uint8Array, T] => [
+    return transformEncoder(getTupleEncoder([getBytesEncoder(), dataEncoder]), (data: T): [Uint8Array, T] => [
         discriminator,
         data,
     ]);
 }
 
 function getPublicKeyEncoder(): Encoder<PublicKey> {
-    return mapEncoder(getBytesEncoder({ size: 32 }), (publicKey: PublicKey) => publicKey.toBytes());
+    return transformEncoder(fixEncoderSize(getBytesEncoder(), 32), (publicKey: PublicKey) => publicKey.toBytes());
 }
 
 export interface InitializeGroupInstruction {

token-group/js/src/instruction.ts

@@ -1,9 +1,10 @@
 import { PublicKey } from '@solana/web3.js';
-import { getBytesCodec, getStructCodec, getU32Codec } from '@solana/codecs';
+import type { ReadonlyUint8Array } from '@solana/codecs';
+import { fixCodecSize, getBytesCodec, getStructCodec, getU32Codec } from '@solana/codecs';
 
 const tokenGroupCodec = getStructCodec([
-    ['updateAuthority', getBytesCodec({ size: 32 })],
-    ['mint', getBytesCodec({ size: 32 })],
+    ['updateAuthority', fixCodecSize(getBytesCodec(), 32)],
+    ['mint', fixCodecSize(getBytesCodec(), 32)],
     ['size', getU32Codec()],
     ['maxSize', getU32Codec()],
 ]);
@@ -22,7 +23,7 @@ export interface TokenGroup {
 }
 
 // Checks if all elements in the array are 0
-function isNonePubkey(buffer: Uint8Array): boolean {
+function isNonePubkey(buffer: ReadonlyUint8Array): boolean {
     for (let i = 0; i < buffer.length; i++) {
         if (buffer[i] !== 0) {
             return false;
@@ -32,7 +33,7 @@ function isNonePubkey(buffer: Uint8Array): boolean {
 }
 
 // Pack TokenGroup into byte slab
-export function packTokenGroup(group: TokenGroup): Uint8Array {
+export function packTokenGroup(group: TokenGroup): ReadonlyUint8Array {
     // If no updateAuthority given, set it to the None/Zero PublicKey for encoding
     const updateAuthority = group.updateAuthority ?? PublicKey.default;
     return tokenGroupCodec.encode({
@@ -44,7 +45,7 @@ export function packTokenGroup(group: TokenGroup): Uint8Array {
 }
 
 // unpack byte slab into TokenGroup
-export function unpackTokenGroup(buffer: Buffer | Uint8Array): TokenGroup {
+export function unpackTokenGroup(buffer: Buffer | Uint8Array | ReadonlyUint8Array): TokenGroup {
     const data = tokenGroupCodec.decode(buffer);
 
     return isNonePubkey(data.updateAuthority)

token-group/js/src/state/tokenGroup.ts

@@ -1,9 +1,10 @@
 import { PublicKey } from '@solana/web3.js';
-import { getBytesCodec, getStructCodec, getU32Codec } from '@solana/codecs';
+import type { ReadonlyUint8Array } from '@solana/codecs';
+import { fixCodecSize, getBytesCodec, getStructCodec, getU32Codec } from '@solana/codecs';
 
 const tokenGroupMemberCodec = getStructCodec([
-    ['mint', getBytesCodec({ size: 32 })],
-    ['group', getBytesCodec({ size: 32 })],
+    ['mint', fixCodecSize(getBytesCodec(), 32)],
+    ['group', fixCodecSize(getBytesCodec(), 32)],
     ['memberNumber', getU32Codec()],
 ]);
 
@@ -19,7 +20,7 @@ export interface TokenGroupMember {
 }
 
 // Pack TokenGroupMember into byte slab
-export function packTokenGroupMember(member: TokenGroupMember): Uint8Array {
+export function packTokenGroupMember(member: TokenGroupMember): ReadonlyUint8Array {
     return tokenGroupMemberCodec.encode({
         mint: member.mint.toBuffer(),
         group: member.group.toBuffer(),
@@ -28,7 +29,7 @@ export function packTokenGroupMember(member: TokenGroupMember): Uint8Array {
 }
 
 // unpack byte slab into TokenGroupMember
-export function unpackTokenGroupMember(buffer: Buffer | Uint8Array): TokenGroupMember {
+export function unpackTokenGroupMember(buffer: Buffer | Uint8Array | ReadonlyUint8Array): TokenGroupMember {
     const data = tokenGroupMemberCodec.decode(buffer);
     return {
         mint: new PublicKey(data.mint),

token-group/js/src/state/tokenGroupMember.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import type { Decoder } from '@solana/codecs';
-import { getBytesDecoder, getStructDecoder, getU32Decoder } from '@solana/codecs';
+import { fixDecoderSize, getBytesDecoder, getStructDecoder, getU32Decoder } from '@solana/codecs';
 import { splDiscriminate } from '@solana/spl-type-length-value';
 import { PublicKey, type TransactionInstruction } from '@solana/web3.js';
 
@@ -42,7 +42,7 @@ describe('Token Group Instructions', () => {
             }),
             splDiscriminate('spl_token_group_interface:initialize_token_group'),
             getStructDecoder([
-                ['updateAuthority', getBytesDecoder({ size: 32 })],
+                ['updateAuthority', fixDecoderSize(getBytesDecoder(), 32)],
                 ['maxSize', getU32Decoder()],
             ]),
             { updateAuthority: Uint8Array.from(updateAuthority.toBuffer()), maxSize }
@@ -72,7 +72,7 @@ describe('Token Group Instructions', () => {
                 newAuthority: PublicKey.default,
             }),
             splDiscriminate('spl_token_group_interface:update_authority'),
-            getStructDecoder([['newAuthority', getBytesDecoder({ size: 32 })]]),
+            getStructDecoder([['newAuthority', fixDecoderSize(getBytesDecoder(), 32)]]),
             { newAuthority: Uint8Array.from(PublicKey.default.toBuffer()) }
         );
     });