From 1e2c2ab32268db5df648b5d7062f4ea7f48a770d Mon Sep 17 00:00:00 2001
From: Hardhat Chad <hardhatchad@gmail.com>
Date: Mon, 9 Jun 2025 14:28:06 -0700
Subject: [PATCH] permit

---
 ore/program/src/commit.rs   |  2 +-
 ore/program/src/decommit.rs |  2 +-
 ore/program/src/mine.rs     | 27 ++++++++++++++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ore/program/src/commit.rs b/ore/program/src/commit.rs
index ca2d69a..67ebaaf 100644
--- a/ore/program/src/commit.rs
+++ b/ore/program/src/commit.rs
@@ -46,9 +46,9 @@ pub fn process_commit(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResul
             &[PERMIT, &signer_info.key.to_bytes(), &block.id.to_le_bytes()],
         )?;
         let permit = permit_info.as_account_mut::<Permit>(&ore_api::ID)?;
+        permit.amount = 0;
         permit.authority = *signer_info.key;
         permit.block_id = block.id;
-        permit.amount = 0;
         permit
     } else {
         permit_info
diff --git a/ore/program/src/decommit.rs b/ore/program/src/decommit.rs
index 652573a..8d45ed3 100644
--- a/ore/program/src/decommit.rs
+++ b/ore/program/src/decommit.rs
@@ -55,7 +55,7 @@ pub fn process_decommit(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramRes
     // Update block.
     permit.amount -= amount;
 
-    // Close permit, if empty.
+    // Close permit account, if empty.
     if permit.amount == 0 {
         permit_info.close(signer_info)?;
     }
diff --git a/ore/program/src/mine.rs b/ore/program/src/mine.rs
index 3f02cc6..b15c57c 100644
--- a/ore/program/src/mine.rs
+++ b/ore/program/src/mine.rs
@@ -11,7 +11,7 @@ pub fn process_mine(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
 
     // Load accounts.
     let clock = Clock::get()?;
-    let [signer_info, block_info, market_info, miner_info, mint_hash_info, mint_ore_info, permit_info, recipient_info, sender_info, treasury_info, system_program, token_program, slot_hashes_sysvar] =
+    let [signer_info, block_info, commitment_info, market_info, miner_info, mint_hash_info, mint_ore_info, permit_info, recipient_info, sender_info, treasury_info, system_program, token_program, slot_hashes_sysvar] =
         accounts
     else {
         return Err(ProgramError::NotEnoughAccountKeys);
@@ -21,14 +21,18 @@ pub fn process_mine(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
         .as_account_mut::<Block>(&ore_api::ID)?
         .assert_mut(|b| clock.slot >= b.start_slot)?
         .assert_mut(|b| clock.slot < b.start_slot + 1500)?;
+    commitment_info
+        .is_writable()?
+        .as_associated_token_account(block_info.key, mint_hash_info.key)?;
     let market = market_info
         .as_account::<Market>(&ore_api::ID)?
         .assert(|m| m.id == block.id)?;
     mint_hash_info.has_address(&market.base.mint)?.as_mint()?;
     mint_ore_info.has_address(&MINT_ADDRESS)?.as_mint()?;
-    permit_info
-        .as_account::<Permit>(&ore_api::ID)?
-        .assert(|p| p.authority == *signer_info.key)?;
+    let permit = permit_info
+        .as_account_mut::<Permit>(&ore_api::ID)?
+        .assert_mut(|p| p.authority == *signer_info.key)?
+        .assert_mut(|p| p.amount >= amount)?;
     recipient_info
         .is_writable()?
         .as_associated_token_account(signer_info.key, &MINT_ADDRESS)?;
@@ -63,13 +67,22 @@ pub fn process_mine(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
             .assert_mut(|m| m.authority == *signer_info.key)?
     };
 
+    // Reduce permit amount.
+    permit.amount -= amount;
+
+    // Close permit account, if empty.
+    if permit.amount == 0 {
+        permit_info.close(signer_info)?;
+    }
+
     // Burn hash tokens.
-    burn(
-        sender_info,
+    burn_signed(
+        commitment_info,
         mint_hash_info,
-        signer_info,
+        block_info,
         token_program,
         amount,
+        &[BLOCK, &block.id.to_le_bytes()],
     )?;
 
     // Set block slot hash.