Merge

Author: jackcmay

ci/test-stable-perf.sh

@@ -9,6 +9,7 @@ if ! ci/version-check.sh stable; then
   ci/version-check.sh stable
 fi
 export RUST_BACKTRACE=1
+export RUSTFLAGS="-D warnings"
 
 ./fetch-perf-libs.sh
 export LD_LIBRARY_PATH=$PWD/target/perf-libs:/usr/local/cuda/lib64:$LD_LIBRARY_PATH

ci/test-stable.sh

@@ -4,6 +4,7 @@ cd "$(dirname "$0")/.."
 
 ci/version-check.sh stable
 export RUST_BACKTRACE=1
+export RUSTFLAGS="-D warnings"
 
 _() {
   echo "--- $*"

doc/json-rpc.md

@@ -107,7 +107,7 @@ Returns all information associated with the account of provided Pubkey
 The result field will be a JSON object with the following sub fields:
 
 * `tokens`, number of tokens assigned to this account, as a signed 64-bit integer
-* `contract_id`, array of 32 bytes representing the program this account has been assigned to
+* `program_id`, array of 32 bytes representing the program this account has been assigned to
 * `userdata`, array of bytes representing any userdata associated with the account
 
 ##### Example:
@@ -116,7 +116,7 @@ The result field will be a JSON object with the following sub fields:
 curl -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0", "id":1, "method":"getAccountInfo", "params":["FVxxngPx368XvMCoeskdd6U8cZJFsfa1BEtGWqyAxRj4"]}' http://localhost:8899
 
 // Result
-{"jsonrpc":"2.0","result":{"contract_id":[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"tokens":1,"userdata":[3,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,50,48,53,48,45,48,49,45,48,49,84,48,48,58,48,48,58,48,48,90,252,10,7,28,246,140,88,177,98,82,10,227,89,81,18,30,194,101,199,16,11,73,133,20,246,62,114,39,20,113,189,32,50,0,0,0,0,0,0,0,247,15,36,102,167,83,225,42,133,127,82,34,36,224,207,130,109,230,224,188,163,33,213,13,5,117,211,251,65,159,197,51,0,0,0,0,0,0]},"id":1}
+{"jsonrpc":"2.0","result":{"program_id":[1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"tokens":1,"userdata":[3,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,50,48,53,48,45,48,49,45,48,49,84,48,48,58,48,48,58,48,48,90,252,10,7,28,246,140,88,177,98,82,10,227,89,81,18,30,194,101,199,16,11,73,133,20,246,62,114,39,20,113,189,32,50,0,0,0,0,0,0,0,247,15,36,102,167,83,225,42,133,127,82,34,36,224,207,130,109,230,224,188,163,33,213,13,5,117,211,251,65,159,197,51,0,0,0,0,0,0]},"id":1}
 ```
 
 ---

src/bank.rs

@@ -5,7 +5,7 @@
 
 use bincode::deserialize;
 use bincode::serialize;
-use budget_contract::BudgetContract;
+use budget_program::BudgetState;
 use counter::Counter;
 use dynamic_contract::{DynamicContract, KeyedAccount};
 use entry::Entry;
@@ -22,7 +22,7 @@ use std::result;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::RwLock;
 use std::time::Instant;
-use system_contract::SystemContract;
+use system_program::SystemProgram;
 use timing::{duration_as_us, timestamp};
 use transaction::Transaction;
 use window::WINDOW_SIZE;
@@ -36,14 +36,14 @@ pub struct Account {
     /// A transaction can write to its userdata
     pub userdata: Vec<u8>,
     /// contract id this contract belongs to
-    pub contract_id: Pubkey,
+    pub program_id: Pubkey,
 }
 impl Account {
-    pub fn new(tokens: i64, space: usize, contract_id: Pubkey) -> Account {
+    pub fn new(tokens: i64, space: usize, program_id: Pubkey) -> Account {
         Account {
             tokens,
             userdata: vec![0u8; space],
-            contract_id,
+            program_id,
         }
     }
 }
@@ -53,7 +53,7 @@ impl Default for Account {
         Account {
             tokens: 0,
             userdata: vec![],
-            contract_id: SystemContract::id(),
+            program_id: SystemProgram::id(),
         }
     }
 }
@@ -289,7 +289,7 @@ impl Bank {
             } else {
                 error_counters.account_not_found_leader += 1;
             }
-            if BudgetContract::check_id(&tx.contract_id) {
+            if BudgetState::check_id(&tx.program_id) {
                 use instruction::Instruction;
                 if let Some(Instruction::NewVote(_vote)) = tx.instruction() {
                     error_counters.account_not_found_vote += 1;
@@ -325,21 +325,21 @@ impl Bank {
 
     pub fn verify_transaction(
         tx: &Transaction,
-        pre_contract_id: &Pubkey,
+        pre_program_id: &Pubkey,
         pre_tokens: i64,
         account: &Account,
     ) -> Result<()> {
         // Verify the transaction
-        // make sure that contract_id is still the same or this was just assigned by the system call contract
-        if !((*pre_contract_id == account.contract_id)
-            || (SystemContract::check_id(&tx.contract_id)
-                && SystemContract::check_id(&pre_contract_id)))
+        // make sure that program_id is still the same or this was just assigned by the system call contract
+        if !((*pre_program_id == account.program_id)
+            || (SystemProgram::check_id(&tx.program_id)
+                && SystemProgram::check_id(&pre_program_id)))
         {
             //TODO, this maybe redundant bpf should be able to guarantee this property
             return Err(BankError::ModifiedContractId(tx.signature));
         }
         // For accounts unassigned to the contract, the individual balance of each accounts cannot decrease.
-        if tx.contract_id != account.contract_id && pre_tokens > account.tokens {
+        if tx.program_id != account.program_id && pre_tokens > account.tokens {
             return Err(BankError::ExternalAccountTokenSpend(tx.signature));
         }
         if account.tokens < 0 {
@@ -377,24 +377,24 @@ impl Bank {
         let pre_total: i64 = accounts.iter().map(|a| a.tokens).sum();
         let pre_data: Vec<_> = accounts
             .iter_mut()
-            .map(|a| (a.contract_id, a.tokens))
+            .map(|a| (a.program_id, a.tokens))
             .collect();
 
         // Call the contract method
         // It's up to the contract to implement its own rules on moving funds
         if SystemContract::check_id(&tx.contract_id) {
             SystemContract::process_transaction(&tx, accounts, &self.loaded_contracts)
-        } else if BudgetContract::check_id(&tx.contract_id) {
+        } else if BudgetState::check_id(&tx.contract_id) {
             // TODO: the runtime should be checking read/write access to memory
             // we are trusting the hard coded contracts not to clobber or allocate
-            BudgetContract::process_transaction(&tx, accounts)
+            BudgetState::process_transaction(&tx, accounts)
         } else if self.loaded_contract(&tx, accounts) {
         } else {
-            return Err(BankError::UnknownContractId(tx.contract_id));
+            return Err(BankError::UnknownContractId(tx.program_id));
         }
         // Verify the transaction
-        for ((pre_contract_id, pre_tokens), post_account) in pre_data.iter().zip(accounts.iter()) {
-            Self::verify_transaction(&tx, pre_contract_id, *pre_tokens, post_account)?;
+        for ((pre_program_id, pre_tokens), post_account) in pre_data.iter().zip(accounts.iter()) {
+            Self::verify_transaction(&tx, pre_program_id, *pre_tokens, post_account)?;
         }
         // The total sum of all the tokens in all the pages cannot change.
         let post_total: i64 = accounts.iter().map(|a| a.tokens).sum();
@@ -590,9 +590,9 @@ impl Bank {
             .expect("invalid ledger: need at least 2 entries");
         {
             let tx = &entry1.transactions[0];
-            assert!(SystemContract::check_id(&tx.contract_id), "Invalid ledger");
-            let instruction: SystemContract = deserialize(&tx.userdata).unwrap();
-            let deposit = if let SystemContract::Move { tokens } = instruction {
+            assert!(SystemProgram::check_id(&tx.program_id), "Invalid ledger");
+            let instruction: SystemProgram = deserialize(&tx.userdata).unwrap();
+            let deposit = if let SystemProgram::Move { tokens } = instruction {
                 Some(tokens)
             } else {
                 None
@@ -637,10 +637,10 @@ impl Bank {
     }
 
     pub fn read_balance(account: &Account) -> i64 {
-        if SystemContract::check_id(&account.contract_id) {
-            SystemContract::get_balance(account)
-        } else if BudgetContract::check_id(&account.contract_id) {
-            BudgetContract::get_balance(account)
+        if SystemProgram::check_id(&account.program_id) {
+            SystemProgram::get_balance(account)
+        } else if BudgetState::check_id(&account.program_id) {
+            BudgetState::get_balance(account)
         } else {
             account.tokens
         }