cleanup

Author: rustopian

scripts/generate-clients.mts

@@ -11,16 +11,16 @@ const idl = JSON.parse(
 );
 const codama = c.createFromRoot(idl);
 
-// Rename the program from solanaStakeInterface to stake
+// Rename the program.
 codama.update(
   c.updateProgramsVisitor({
     solanaStakeInterface: { name: 'stake' },
   })
 );
 
-// Delete deprecated/disabled instructions
 codama.update(
   c.updateInstructionsVisitor({
+    // Deprecated instruction.
     redelegate: { delete: true },
   })
 );
@@ -89,24 +89,19 @@ codama.update(
       },
     },
     {
-      // instruction: use omitted optional accounts + fix discriminator u8 -> u32
-      select: '[instructionNode]',
+      // enum discriminator -> u32
+      select: '[definedTypeNode]stakeState.[enumTypeNode]',
       transform: (node) => {
-        c.assertIsNode(node, 'instructionNode');
+        c.assertIsNode(node, 'enumTypeNode');
         return {
           ...node,
-          optionalAccountStrategy: 'omitted',
-          arguments: node.arguments.map((arg) =>
-            arg.name === 'discriminator'
-              ? { ...arg, type: c.numberTypeNode('u32') }
-              : arg
-          ),
+          size: c.numberTypeNode('u32'),
         };
       },
     },
     {
       // enum discriminator -> u32
-      select: '[definedTypeNode]stakeState.[enumTypeNode]',
+      select: '[definedTypeNode]stakeStateV2.[enumTypeNode]',
       transform: (node) => {
         c.assertIsNode(node, 'enumTypeNode');
         return {
@@ -116,20 +111,26 @@ codama.update(
       },
     },
     {
-      // enum discriminator -> u32
-      select: '[definedTypeNode]stakeStateV2.[enumTypeNode]',
+      // Use omitted optional account strategy for all instructions.
+      // + fix discriminator u8 -> u32.
+      select: '[instructionNode]',
       transform: (node) => {
-        c.assertIsNode(node, 'enumTypeNode');
+        c.assertIsNode(node, 'instructionNode');
         return {
           ...node,
-          size: c.numberTypeNode('u32'),
+          optionalAccountStrategy: 'omitted',
+          arguments: node.arguments.map((arg) =>
+            arg.name === 'discriminator'
+              ? { ...arg, type: c.numberTypeNode('u32') }
+              : arg
+          ),
         };
       },
     },
   ])
 );
 
-// Render JavaScript client
+// Render JavaScript.
 const jsClient = path.join(workingDirectory, 'clients', 'js');
 codama.accept(
   renderJavaScriptVisitor(path.join(jsClient, 'src', 'generated'), {
@@ -140,14 +141,14 @@ codama.accept(
 );
 
 // Remove the stake account from the accounts since the Rust client
-// provides its own implementation in the hooked module
+// provides its own implementation.
 codama.update(
   c.updateAccountsVisitor({
     stakeStateAccount: { delete: true },
   })
 );
 
-// Render Rust client
+// Render Rust.
 const rustClient = path.join(workingDirectory, 'clients', 'rust');
 codama.accept(
   renderRustVisitor(path.join(rustClient, 'src', 'generated'), {
@@ -163,6 +164,7 @@ codama.accept(
         'serde::Deserialize',
         'Clone',
         'Debug',
+        // 'Eq', <- Remove 'Eq' from the default traits.
         'PartialEq',
       ],
     },