Reinstate Mint supply (solana-labs#342)

* Reinstate Mint supply, and adjust with Minto & Burn

* C headers

* Patch token-cli

* Patch token-swap

token-swap/program/src/processor.rs

@@ -89,13 +89,20 @@ impl State {
         token_program_id: &Pubkey,
         swap: &Pubkey,
         burn_account: &Pubkey,
+        mint: &Pubkey,
         authority: &Pubkey,
         amount: u64,
     ) -> Result<(), ProgramError> {
         let swap_bytes = swap.to_bytes();
         let signers = &[&[&swap_bytes[..32]][..]];
-        let ix =
-            spl_token::instruction::burn(token_program_id, burn_account, authority, &[], amount)?;
+        let ix = spl_token::instruction::burn(
+            token_program_id,
+            burn_account,
+            mint,
+            authority,
+            &[],
+            amount,
+        )?;
         invoke_signed(&ix, accounts, signers)
     }
 
@@ -414,6 +421,7 @@ impl State {
             token_program_info.key,
             swap_info.key,
             source_info.key,
+            &token_swap.pool_mint,
             authority_info.key,
             amount,
         )?;

token/cli/src/main.rs

@@ -20,7 +20,7 @@ use spl_token::{
     self,
     instruction::*,
     native_mint,
-    state::{Account, Mint},
+    state::{self, Account, Mint},
 };
 use std::{mem::size_of, process::exit};
 
@@ -213,12 +213,20 @@ fn command_burn(config: &Config, source: Pubkey, ui_amount: f64) -> CommmandResu
         .rpc_client
         .get_token_account_balance_with_commitment(&source, config.commitment_config)?
         .value;
+    let source_account = config
+        .rpc_client
+        .get_account_with_commitment(&source, config.commitment_config)?
+        .value
+        .unwrap_or_default();
+    let mut data = source_account.data.to_vec();
+    let mint_pubkey = state::unpack::<Account>(&mut data)?.mint;
 
     let amount = spl_token::ui_amount_to_amount(ui_amount, source_token_balance.decimals);
     let mut transaction = Transaction::new_with_payer(
         &[burn(
             &spl_token::id(),
             &source,
+            &mint_pubkey,
             &config.owner.pubkey(),
             &[],
             amount,

token/program/inc/token.h

@@ -152,8 +152,8 @@ typedef enum Token_TokenInstruction_Tag {
      * Accounts expected by this instruction:
      *
      *   0. `[writable]` The multisignature account to initialize.
-     *   2. `[]` Rent sysvar
-     *   3. ..2+N. `[]` The signer accounts, must equal to N where 1 <= N <= 11.
+     *   1. `[]` Rent sysvar
+     *   2. ..2+N. `[]` The signer accounts, must equal to N where 1 <= N <= 11.
      */
     Token_TokenInstruction_InitializeMultisig,
     /**
@@ -219,7 +219,7 @@ typedef enum Token_TokenInstruction_Tag {
      *   * Multisignature authority
      *   0. `[writable]` The mint or account to change the authority of.
      *   1. `[]` The mint's or account's multisignature authority.
-     *   3. ..3+M '[signer]' M signer accounts
+     *   2. ..2+M '[signer]' M signer accounts
      */
     Token_TokenInstruction_SetAuthority,
     /**
@@ -247,12 +247,14 @@ typedef enum Token_TokenInstruction_Tag {
      *
      *   * Single owner/delegate
      *   0. `[writable]` The account to burn from.
-     *   1. `[signer]` The account's owner/delegate.
+     *   1. '[writable]' The token mint.
+     *   2. `[signer]` The account's owner/delegate.
      *
      *   * Multisignature owner/delegate
      *   0. `[writable]` The account to burn from.
-     *   1. `[]` The account's multisignature owner/delegate.
-     *   2. ..2+M '[signer]' M signer accounts.
+     *   1. '[writable]' The token mint.
+     *   2. `[]` The account's multisignature owner/delegate.
+     *   3. ..3+M '[signer]' M signer accounts.
      */
     Token_TokenInstruction_Burn,
     /**
@@ -393,6 +395,10 @@ typedef struct Token_Mint {
      * further tokens may be minted.
      */
     Token_COption_Pubkey mint_authority;
+    /**
+     * Total supply of tokens.
+     */
+    uint64_t supply;
     /**
      * Number of base 10 digits to the right of the decimal place.
      */

token/program/src/instruction.rs

@@ -64,8 +64,8 @@ pub enum TokenInstruction {
     /// Accounts expected by this instruction:
     ///
     ///   0. `[writable]` The multisignature account to initialize.
-    ///   2. `[]` Rent sysvar
-    ///   3. ..2+N. `[]` The signer accounts, must equal to N where 1 <= N <= 11.
+    ///   1. `[]` Rent sysvar
+    ///   2. ..2+N. `[]` The signer accounts, must equal to N where 1 <= N <= 11.
     InitializeMultisig {
         /// The number of signers (M) required to validate this multisignature account.
         m: u8,
@@ -133,7 +133,7 @@ pub enum TokenInstruction {
     ///   * Multisignature authority
     ///   0. `[writable]` The mint or account to change the authority of.
     ///   1. `[]` The mint's or account's multisignature authority.
-    ///   3. ..3+M '[signer]' M signer accounts
+    ///   2. ..2+M '[signer]' M signer accounts
     SetAuthority {
         /// The type of authority to update.
         authority_type: AuthorityType,
@@ -165,12 +165,14 @@ pub enum TokenInstruction {
     ///
     ///   * Single owner/delegate
     ///   0. `[writable]` The account to burn from.
-    ///   1. `[signer]` The account's owner/delegate.
+    ///   1. '[writable]' The token mint.
+    ///   2. `[signer]` The account's owner/delegate.
     ///
     ///   * Multisignature owner/delegate
     ///   0. `[writable]` The account to burn from.
-    ///   1. `[]` The account's multisignature owner/delegate.
-    ///   2. ..2+M '[signer]' M signer accounts.
+    ///   1. '[writable]' The token mint.
+    ///   2. `[]` The account's multisignature owner/delegate.
+    ///   3. ..3+M '[signer]' M signer accounts.
     Burn {
         /// The amount of tokens to burn.
         amount: u64,
@@ -696,14 +698,16 @@ pub fn mint_to(
 pub fn burn(
     token_program_id: &Pubkey,
     account_pubkey: &Pubkey,
+    mint_pubkey: &Pubkey,
     authority_pubkey: &Pubkey,
     signer_pubkeys: &[&Pubkey],
     amount: u64,
 ) -> Result<Instruction, ProgramError> {
     let data = TokenInstruction::Burn { amount }.pack()?;
 
-    let mut accounts = Vec::with_capacity(2 + signer_pubkeys.len());
+    let mut accounts = Vec::with_capacity(3 + signer_pubkeys.len());
     accounts.push(AccountMeta::new(*account_pubkey, false));
+    accounts.push(AccountMeta::new(*mint_pubkey, false));
     accounts.push(AccountMeta::new_readonly(
         *authority_pubkey,
         signer_pubkeys.is_empty(),