[wip]: Add account meta

febo · febo · commit 02b86d578eaa · 2025-09-05T20:01:47.000+01:00
diff --git a/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction1.rs b/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction1.rs
@@ -18,6 +18,9 @@ impl Instruction1 {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction2.rs b/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction2.rs
@@ -18,6 +18,9 @@ impl Instruction2 {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction3.rs b/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction3.rs
@@ -18,6 +18,9 @@ impl Instruction3 {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction4.rs b/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction4.rs
@@ -20,6 +20,9 @@ impl Instruction4 {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction5.rs b/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction5.rs
@@ -20,6 +20,9 @@ impl Instruction5 {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction6.rs b/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction6.rs
@@ -20,6 +20,14 @@ impl<'a> Instruction6<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 1] =
+            [pinocchio::instruction::AccountMeta::new(
+                self.my_account.key(),
+                true,
+                false,
+            )];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction7.rs b/packages/renderers-pinocchio/e2e/dummy/src/generated/instructions/instruction7.rs
@@ -20,6 +20,14 @@ impl<'a> Instruction7<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 1] =
+            [pinocchio::instruction::AccountMeta::new(
+                self.my_account.key(),
+                true,
+                false,
+            )];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/memo/src/generated/instructions/add_memo.rs b/packages/renderers-pinocchio/e2e/memo/src/generated/instructions/add_memo.rs
@@ -20,6 +20,9 @@ impl AddMemo {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/advance_nonce_account.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/advance_nonce_account.rs
@@ -24,6 +24,17 @@ impl<'a> AdvanceNonceAccount<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 3] = [
+            pinocchio::instruction::AccountMeta::new(self.nonce_account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(
+                self.recent_blockhashes_sysvar.key(),
+                false,
+                false,
+            ),
+            pinocchio::instruction::AccountMeta::new(self.nonce_authority.key(), false, true),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/allocate.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/allocate.rs
@@ -21,6 +21,14 @@ impl<'a> Allocate<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 1] =
+            [pinocchio::instruction::AccountMeta::new(
+                self.new_account.key(),
+                true,
+                true,
+            )];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/allocate_with_seed.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/allocate_with_seed.rs
@@ -28,6 +28,12 @@ impl<'a> AllocateWithSeed<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 2] = [
+            pinocchio::instruction::AccountMeta::new(self.new_account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(self.base_account.key(), false, true),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/assign.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/assign.rs
@@ -23,6 +23,14 @@ impl<'a> Assign<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 1] =
+            [pinocchio::instruction::AccountMeta::new(
+                self.account.key(),
+                true,
+                true,
+            )];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/assign_with_seed.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/assign_with_seed.rs
@@ -27,6 +27,12 @@ impl<'a> AssignWithSeed<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 2] = [
+            pinocchio::instruction::AccountMeta::new(self.account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(self.base_account.key(), false, true),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/authorize_nonce_account.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/authorize_nonce_account.rs
@@ -25,6 +25,12 @@ impl<'a> AuthorizeNonceAccount<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 2] = [
+            pinocchio::instruction::AccountMeta::new(self.nonce_account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(self.nonce_authority.key(), false, true),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/create_account.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/create_account.rs
@@ -27,6 +27,12 @@ impl<'a> CreateAccount<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 2] = [
+            pinocchio::instruction::AccountMeta::new(self.payer.key(), true, true),
+            pinocchio::instruction::AccountMeta::new(self.new_account.key(), true, true),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/create_account_with_seed.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/create_account_with_seed.rs
@@ -31,6 +31,13 @@ impl<'a> CreateAccountWithSeed<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 3] = [
+            pinocchio::instruction::AccountMeta::new(self.payer.key(), true, true),
+            pinocchio::instruction::AccountMeta::new(self.new_account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(self.base_account.key(), false, true),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/initialize_nonce_account.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/initialize_nonce_account.rs
@@ -27,6 +27,17 @@ impl<'a> InitializeNonceAccount<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 3] = [
+            pinocchio::instruction::AccountMeta::new(self.nonce_account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(
+                self.recent_blockhashes_sysvar.key(),
+                false,
+                false,
+            ),
+            pinocchio::instruction::AccountMeta::new(self.rent_sysvar.key(), false, false),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/transfer_sol.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/transfer_sol.rs
@@ -23,6 +23,12 @@ impl<'a> TransferSol<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 2] = [
+            pinocchio::instruction::AccountMeta::new(self.source.key(), true, true),
+            pinocchio::instruction::AccountMeta::new(self.destination.key(), true, false),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/transfer_sol_with_seed.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/transfer_sol_with_seed.rs
@@ -29,6 +29,13 @@ impl<'a> TransferSolWithSeed<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 3] = [
+            pinocchio::instruction::AccountMeta::new(self.source.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(self.base_account.key(), false, true),
+            pinocchio::instruction::AccountMeta::new(self.destination.key(), true, false),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/upgrade_nonce_account.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/upgrade_nonce_account.rs
@@ -20,6 +20,14 @@ impl<'a> UpgradeNonceAccount<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 1] =
+            [pinocchio::instruction::AccountMeta::new(
+                self.nonce_account.key(),
+                true,
+                false,
+            )];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/e2e/system/src/generated/instructions/withdraw_nonce_account.rs b/packages/renderers-pinocchio/e2e/system/src/generated/instructions/withdraw_nonce_account.rs
@@ -29,6 +29,19 @@ impl<'a> WithdrawNonceAccount<'a> {
         &self,
         _signers: &[pinocchio::instruction::Signer],
     ) -> pinocchio::ProgramResult {
+        // account metadata
+        let account_metas: [pinocchio::instruction::AccountMeta; 5] = [
+            pinocchio::instruction::AccountMeta::new(self.nonce_account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(self.recipient_account.key(), true, false),
+            pinocchio::instruction::AccountMeta::new(
+                self.recent_blockhashes_sysvar.key(),
+                false,
+                false,
+            ),
+            pinocchio::instruction::AccountMeta::new(self.rent_sysvar.key(), false, false),
+            pinocchio::instruction::AccountMeta::new(self.nonce_authority.key(), false, true),
+        ];
+
         Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/public/templates/instructionPage.njk b/packages/renderers-pinocchio/public/templates/instructionPage.njk
@@ -39,6 +39,18 @@ impl{{ '<\'a>' if instruction.accounts.length > 0 }} {{ instruction.name | pasca
     }
 
     pub fn invoke_signed(&self, _signers: &[pinocchio::instruction::Signer]) -> pinocchio::ProgramResult {
+
+      // account metadata
+      let account_metas: [pinocchio::instruction::AccountMeta; {{ instruction.accounts.length }}] = [
+        {% for account in instruction.accounts %}
+          {% if account.isSigner === 'either' %}
+            pinocchio::instruction::AccountMeta::new(self.{{ account.name | snakeCase }}.0.key(), {{ account.isWritable }}, self.{{ account.name | snakeCase }}.1),
+          {% else %}
+            pinocchio::instruction::AccountMeta::new(self.{{ account.name | snakeCase }}.key(), {{ account.isWritable }}, {{ account.isSigner }}),
+          {% endif %}
+        {% endfor %}
+      ];
+
       Ok(())
     }
 }
diff --git a/packages/renderers-pinocchio/src/getRenderMapVisitor.ts b/packages/renderers-pinocchio/src/getRenderMapVisitor.ts
diff --git a/packages/renderers-pinocchio/src/getTypeManifestVisitor.ts b/packages/renderers-pinocchio/src/getTypeManifestVisitor.ts
diff --git a/packages/renderers-pinocchio/test/definedTypesPage.test.ts b/packages/renderers-pinocchio/test/definedTypesPage.test.ts
diff --git a/packages/renderers-pinocchio/test/instructionsPage.test.ts b/packages/renderers-pinocchio/test/instructionsPage.test.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ impl Instruction1 {`
`18`	`18`	`&self,`
`19`	`19`	`_signers: &[pinocchio::instruction::Signer],`
`20`	`20`	`) -> pinocchio::ProgramResult {`
	`21`	`+ // account metadata`
	`22`	`+ let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];`
	`23`	`+`
`21`	`24`	`Ok(())`
`22`	`25`	`}`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ impl Instruction2 {`
`18`	`18`	`&self,`
`19`	`19`	`_signers: &[pinocchio::instruction::Signer],`
`20`	`20`	`) -> pinocchio::ProgramResult {`
	`21`	`+ // account metadata`
	`22`	`+ let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];`
	`23`	`+`
`21`	`24`	`Ok(())`
`22`	`25`	`}`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@ impl Instruction3 {`
`18`	`18`	`&self,`
`19`	`19`	`_signers: &[pinocchio::instruction::Signer],`
`20`	`20`	`) -> pinocchio::ProgramResult {`
	`21`	`+ // account metadata`
	`22`	`+ let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];`
	`23`	`+`
`21`	`24`	`Ok(())`
`22`	`25`	`}`
`23`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ impl Instruction4 {`
`20`	`20`	`&self,`
`21`	`21`	`_signers: &[pinocchio::instruction::Signer],`
`22`	`22`	`) -> pinocchio::ProgramResult {`
	`23`	`+ // account metadata`
	`24`	`+ let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];`
	`25`	`+`
`23`	`26`	`Ok(())`
`24`	`27`	`}`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ impl Instruction5 {`
`20`	`20`	`&self,`
`21`	`21`	`_signers: &[pinocchio::instruction::Signer],`
`22`	`22`	`) -> pinocchio::ProgramResult {`
	`23`	`+ // account metadata`
	`24`	`+ let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];`
	`25`	`+`
`23`	`26`	`Ok(())`
`24`	`27`	`}`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ impl AddMemo {`
`20`	`20`	`&self,`
`21`	`21`	`_signers: &[pinocchio::instruction::Signer],`
`22`	`22`	`) -> pinocchio::ProgramResult {`
	`23`	`+ // account metadata`
	`24`	`+ let account_metas: [pinocchio::instruction::AccountMeta; 0] = [];`
	`25`	`+`
`23`	`26`	`Ok(())`
`24`	`27`	`}`
`25`	`28`	`}`