Separate the instructions for metadata pointer

Author: mohanson

doc/en/markdown/content/spl_detail_create.md

@@ -23,7 +23,7 @@ def spl_create(self, name: str, symbol: str, uri: str, decimals: int) -> pxsol.c
     r0.data = pxsol.program.System.create_account(mint_lamports, mint_size, pxsol.program.Token.pubkey)
     r1 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
     r1.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
-    r1.data = pxsol.program.Token.metadata_pointer_extension_initialize(self.pubkey, mint_pubkey)
+    r1.data = pxsol.program.TokenExtensionMetadataPointer.initialize(self.pubkey, mint_pubkey)
     r2 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
     r2.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
     r2.account.append(pxsol.core.AccountMeta(pxsol.program.SysvarRent.pubkey, 0))
@@ -62,7 +62,7 @@ This code allocates a rent-exempt account for the new SPL token. The account siz
 ```py
 r1 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
 r1.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
-r1.data = pxsol.program.Token.metadata_pointer_extension_initialize(self.pubkey, mint_pubkey)
+r1.data = pxsol.program.TokenExtensionMetadataPointer.initialize(self.pubkey, mint_pubkey)
 ```
 
 This enables the Token-2022 extension: metadata pointer. It's a Token-2022 feature that allows additional metadata structures to be attached to the mint account. Later instructions will populate this metadata; this one merely declares its existence. Token-2022 actually supports dozens of such extensions, you can learn more [here](https://spl.solana.com/token-2022/extensions).

doc/zh/markdown/content/spl_detail_create.md

@@ -23,7 +23,7 @@ def spl_create(self, name: str, symbol: str, uri: str, decimals: int) -> pxsol.c
     r0.data = pxsol.program.System.create_account(mint_lamports, mint_size, pxsol.program.Token.pubkey)
     r1 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
     r1.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
-    r1.data = pxsol.program.Token.metadata_pointer_extension_initialize(self.pubkey, mint_pubkey)
+    r1.data = pxsol.program.TokenExtensionMetadataPointer.initialize(self.pubkey, mint_pubkey)
     r2 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
     r2.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
     r2.account.append(pxsol.core.AccountMeta(pxsol.program.SysvarRent.pubkey, 0))
@@ -62,7 +62,7 @@ r0.data = pxsol.program.System.create_account(mint_lamports, mint_size, pxsol.pr
 ```py
 r1 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
 r1.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
-r1.data = pxsol.program.Token.metadata_pointer_extension_initialize(self.pubkey, mint_pubkey)
+r1.data = pxsol.program.TokenExtensionMetadataPointer.initialize(self.pubkey, mint_pubkey)
 ```
 
 上述代码启用 token-2022 的扩展字段: metadata pointer. 这是 token-2022 的一个特性, 允许你在铸造账户上挂载额外的元数据结构. 在稍后的指令中, 我们将实际去挂载数据, 该指令当前仅做申明使用. 除此扩展之外, token-2022 实际上还支持另外几十个不同的扩展, 您可以在[此页面](https://spl.solana.com/token-2022/extensions)了解更多.

pxsol/program.py

@@ -738,25 +738,6 @@ def unwrap_lamports(cls, amount: typing.Optional[int]) -> bytearray:
         # 2. sr The source account's owner/delegate.
         return pxsol.borsh.Enum.encode(0x2d) + pxsol.borsh.Option(pxsol.borsh.U64).encode(amount)
 
-    @classmethod
-    def metadata_pointer_extension_initialize(cls, auth: pxsol.core.PubKey, mint: pxsol.core.PubKey) -> bytearray:
-        # Initialize a new mint with a metadata pointer. Account references:
-        # 0. -w the mint to initialize.
-        return pxsol.borsh.Enum.encode(0x27) + pxsol.borsh.Enum.encode(0x00) + pxsol.borsh.Struct([
-            pxsol.borsh.Array(pxsol.borsh.U8, 32),
-            pxsol.borsh.Array(pxsol.borsh.U8, 32),
-        ]).encode([auth.p, mint.p])
-
-    @classmethod
-    def metadata_pointer_extension_update(cls, mint: pxsol.core.PubKey) -> bytearray:
-        # Update the metadata pointer address. Only supported for mints that include the metadata pointer extension.
-        # Account references:
-        # 0. -w the mint.
-        # 1. sr the metadata pointer authority.
-        return pxsol.borsh.Enum.encode(0x27) + pxsol.borsh.Enum.encode(0x01) + pxsol.borsh.Struct([
-            pxsol.borsh.Array(pxsol.borsh.U8, 32),
-        ]).encode([mint.p])
-
     @classmethod
     def metadata_initialize(cls, name: str, symbol: str, uri: str) -> bytearray:
         # Initializes a tlv entry with the basic token-metadata fields. Account references:
@@ -839,3 +820,27 @@ def metadata_emit(cls) -> bytearray:
             pxsol.borsh.Option(pxsol.borsh.U64),
             pxsol.borsh.Option(pxsol.borsh.U64),
         ]).encode([discriminator, None, None])
+
+
+class TokenExtensionMetadataPointer:
+    # Solana spl token metadata pointer extension.
+    # See: https://github.com/solana-program/token-2022/tree/main/interface/src/extension/metadata_pointer
+
+    @classmethod
+    def initialize(cls, auth: pxsol.core.PubKey, mint: pxsol.core.PubKey) -> bytearray:
+        # Initialize a new mint with a metadata pointer. Account references:
+        # 0. -w the mint to initialize.
+        return Token.metadata_pointer_extension() + pxsol.borsh.Enum.encode(0x00) + pxsol.borsh.Struct([
+            pxsol.borsh.Array(pxsol.borsh.U8, 32),
+            pxsol.borsh.Array(pxsol.borsh.U8, 32),
+        ]).encode([auth.p, mint.p])
+
+    @classmethod
+    def update(cls, mint: pxsol.core.PubKey) -> bytearray:
+        # Update the metadata pointer address. Only supported for mints that include the metadata pointer extension.
+        # Account references:
+        # 0. -w the mint.
+        # 1. sr the metadata pointer authority.
+        return Token.metadata_pointer_extension() + pxsol.borsh.Enum.encode(0x01) + pxsol.borsh.Struct([
+            pxsol.borsh.Array(pxsol.borsh.U8, 32),
+        ]).encode([mint.p])

pxsol/wallet.py

@@ -208,7 +208,7 @@ def spl_create(self, name: str, symbol: str, uri: str, decimals: int) -> pxsol.c
         r0.data = pxsol.program.System.create_account(mint_lamports, mint_size, pxsol.program.Token.pubkey)
         r1 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
         r1.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
-        r1.data = pxsol.program.Token.metadata_pointer_extension_initialize(self.pubkey, mint_pubkey)
+        r1.data = pxsol.program.TokenExtensionMetadataPointer.initialize(self.pubkey, mint_pubkey)
         r2 = pxsol.core.Requisition(pxsol.program.Token.pubkey, [], bytearray())
         r2.account.append(pxsol.core.AccountMeta(mint_pubkey, 1))
         r2.account.append(pxsol.core.AccountMeta(pxsol.program.SysvarRent.pubkey, 0))