token-metadata-js: Upgrade to tp3 (#6666)

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-metadata/js/package.json

@@ -1,5 +1,12 @@
 import type { Codec } from '@solana/codecs';
-import { getStringCodec, getStructCodec, getTupleCodec, getUnitCodec } from '@solana/codecs';
+import {
+    addCodecSizePrefix,
+    getU32Codec,
+    getUtf8Codec,
+    getStructCodec,
+    getTupleCodec,
+    getUnitCodec,
+} from '@solana/codecs';
 
 export enum Field {
     Name,
@@ -14,7 +21,7 @@ export const getFieldCodec = () =>
         ['Name', getUnitCodec()],
         ['Symbol', getUnitCodec()],
         ['Uri', getUnitCodec()],
-        ['Key', getStructCodec([['value', getTupleCodec([getStringCodec()])]])],
+        ['Key', getStructCodec([['value', getTupleCodec([addCodecSizePrefix(getUtf8Codec(), getU32Codec())])]])],
     ] as const;
 
 export function getFieldConfig(field: Field | string): FieldLayout {

token-metadata/js/src/field.ts

@@ -1,15 +1,19 @@
 import type { Encoder } from '@solana/codecs';
 import {
+    addEncoderSizePrefix,
+    fixEncoderSize,
     getBooleanEncoder,
     getBytesEncoder,
     getDataEnumCodec,
     getOptionEncoder,
-    getStringEncoder,
+    getUtf8Encoder,
     getStructEncoder,
     getTupleEncoder,
+    getU32Encoder,
     getU64Encoder,
-    mapEncoder,
+    transformEncoder,
 } from '@solana/codecs';
+import type { VariableSizeEncoder } from '@solana/codecs';
 import { splDiscriminate } from '@solana/spl-type-length-value';
 import type { PublicKey } from '@solana/web3.js';
 import { SystemProgram, TransactionInstruction } from '@solana/web3.js';
@@ -18,14 +22,18 @@ import type { Field } from './field.js';
 import { getFieldCodec, getFieldConfig } from './field.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());
+}
+
+function getStringEncoder(): VariableSizeEncoder<string> {
+    return addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder());
 }
 
 /**

token-metadata/js/src/instruction.ts

@@ -1,11 +1,25 @@
 import { PublicKey } from '@solana/web3.js';
-import { getArrayCodec, getBytesCodec, getStringCodec, getStructCodec, getTupleCodec } from '@solana/codecs';
+import {
+    addCodecSizePrefix,
+    fixCodecSize,
+    getArrayCodec,
+    getBytesCodec,
+    getUtf8Codec,
+    getU32Codec,
+    getStructCodec,
+    getTupleCodec,
+} from '@solana/codecs';
+import type { ReadonlyUint8Array, VariableSizeCodec } from '@solana/codecs';
 
 export const TOKEN_METADATA_DISCRIMINATOR = Buffer.from([112, 132, 90, 90, 11, 88, 157, 87]);
 
+function getStringCodec(): VariableSizeCodec<string> {
+    return addCodecSizePrefix(getUtf8Codec(), getU32Codec());
+}
+
 const tokenMetadataCodec = getStructCodec([
-    ['updateAuthority', getBytesCodec({ size: 32 })],
-    ['mint', getBytesCodec({ size: 32 })],
+    ['updateAuthority', fixCodecSize(getBytesCodec(), 32)],
+    ['mint', fixCodecSize(getBytesCodec(), 32)],
     ['name', getStringCodec()],
     ['symbol', getStringCodec()],
     ['uri', getStringCodec()],
@@ -24,11 +38,11 @@ export interface TokenMetadata {
     // The URI pointing to richer metadata
     uri: string;
     // Any additional metadata about the token as key-value pairs
-    additionalMetadata: [string, string][];
+    additionalMetadata: (readonly [string, string])[];
 }
 
 // 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;
@@ -38,7 +52,7 @@ function isNonePubkey(buffer: Uint8Array): boolean {
 }
 
 // Pack TokenMetadata into byte slab
-export function pack(meta: TokenMetadata): Uint8Array {
+export function pack(meta: TokenMetadata): ReadonlyUint8Array {
     // If no updateAuthority given, set it to the None/Zero PublicKey for encoding
     const updateAuthority = meta.updateAuthority ?? PublicKey.default;
     return tokenMetadataCodec.encode({
@@ -49,7 +63,7 @@ export function pack(meta: TokenMetadata): Uint8Array {
 }
 
 // unpack byte slab into TokenMetadata
-export function unpack(buffer: Buffer | Uint8Array): TokenMetadata {
+export function unpack(buffer: Buffer | Uint8Array | ReadonlyUint8Array): TokenMetadata {
     const data = tokenMetadataCodec.decode(buffer);
 
     return isNonePubkey(data.updateAuthority)

token-metadata/js/src/state.ts

@@ -10,17 +10,20 @@ import {
     getFieldConfig,
 } from '../src';
 import {
+    addDecoderSizePrefix,
+    fixDecoderSize,
     getBooleanDecoder,
     getBytesDecoder,
     getDataEnumCodec,
     getOptionDecoder,
-    getStringDecoder,
+    getUtf8Decoder,
+    getU32Decoder,
     getU64Decoder,
     getStructDecoder,
     some,
 } from '@solana/codecs';
 import { splDiscriminate } from '@solana/spl-type-length-value';
-import type { Decoder, Option } from '@solana/codecs';
+import type { Decoder, Option, VariableSizeDecoder } from '@solana/codecs';
 import { PublicKey, type TransactionInstruction } from '@solana/web3.js';
 
 function checkPackUnpack<T extends object>(
@@ -34,6 +37,10 @@ function checkPackUnpack<T extends object>(
     expect(unpacked).to.deep.equal(values);
 }
 
+function getStringDecoder(): VariableSizeDecoder<string> {
+    return addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder());
+}
+
 describe('Token Metadata Instructions', () => {
     const programId = new PublicKey('22222222222222222222222222222222222222222222');
     const metadata = new PublicKey('33333333333333333333333333333333333333333333');
@@ -134,7 +141,7 @@ describe('Token Metadata Instructions', () => {
                 newAuthority,
             }),
             splDiscriminate('spl_token_metadata_interface:update_the_authority'),
-            getStructDecoder([['newAuthority', getBytesDecoder({ size: 32 })]]),
+            getStructDecoder([['newAuthority', fixDecoderSize(getBytesDecoder(), 32)]]),
             { newAuthority: Uint8Array.from(newAuthority.toBuffer()) }
         );
     });