Revive payments via Budget

programs/budget/src/budget_program.rs

@@ -1,9 +1,9 @@
 //! budget program
-use crate::budget_state::{BudgetError, BudgetState};
 use bincode::deserialize;
 use chrono::prelude::{DateTime, Utc};
 use log::*;
 use solana_budget_api::budget_instruction::BudgetInstruction;
+use solana_budget_api::budget_state::{BudgetError, BudgetState};
 use solana_budget_api::payment_plan::Witness;
 use solana_sdk::account::KeyedAccount;
 
@@ -86,7 +86,8 @@ fn apply_debits(
         BudgetInstruction::InitializeAccount(expr) => {
             let expr = expr.clone();
             if let Some(payment) = expr.final_payment() {
-                keyed_accounts[1].account.tokens += payment.tokens;
+                keyed_accounts[1].account.tokens = 0;
+                keyed_accounts[0].account.tokens += payment.tokens;
                 Ok(())
             } else {
                 let existing = BudgetState::deserialize(&keyed_accounts[1].account.userdata).ok();

programs/budget/src/budget_state.rs

@@ -1,67 +0,0 @@
-//! budget state
-use bincode::{self, deserialize, serialize_into};
-use serde_derive::{Deserialize, Serialize};
-use solana_budget_api::budget_expr::BudgetExpr;
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub enum BudgetError {
-    InsufficientFunds,
-    ContractAlreadyExists,
-    ContractNotPending,
-    SourceIsPendingContract,
-    UninitializedContract,
-    NegativeTokens,
-    DestinationMissing,
-    FailedWitness,
-    UserdataTooSmall,
-    UserdataDeserializeFailure,
-    UnsignedKey,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq)]
-pub struct BudgetState {
-    pub initialized: bool,
-    pub pending_budget: Option<BudgetExpr>,
-}
-
-impl BudgetState {
-    pub fn is_pending(&self) -> bool {
-        self.pending_budget.is_some()
-    }
-
-    pub fn serialize(&self, output: &mut [u8]) -> Result<(), BudgetError> {
-        serialize_into(output, self).map_err(|err| match *err {
-            _ => BudgetError::UserdataTooSmall,
-        })
-    }
-
-    pub fn deserialize(input: &[u8]) -> bincode::Result<Self> {
-        deserialize(input)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use solana_budget_api::id;
-    use solana_sdk::account::Account;
-
-    #[test]
-    fn test_serializer() {
-        let mut a = Account::new(0, 512, id());
-        let b = BudgetState::default();
-        b.serialize(&mut a.userdata).unwrap();
-        let c = BudgetState::deserialize(&a.userdata).unwrap();
-        assert_eq!(b, c);
-    }
-
-    #[test]
-    fn test_serializer_userdata_too_small() {
-        let mut a = Account::new(0, 1, id());
-        let b = BudgetState::default();
-        assert_eq!(
-            b.serialize(&mut a.userdata),
-            Err(BudgetError::UserdataTooSmall)
-        );
-    }
-}

programs/budget/src/lib.rs

@@ -1,5 +1,4 @@
 mod budget_program;
-mod budget_state;
 
 use crate::budget_program::process_instruction;
 use log::*;