Merge branch 'develop' into feat/changelog

Author: lgalabru

benches/block_limits.rs

@@ -2,32 +2,26 @@ extern crate blockstack_lib;
 extern crate rand;
 extern crate serde_json;
 
+use std::fs;
+use std::process;
+use std::{env, time::Instant};
+
+use rand::Rng;
+
+use blockstack_lib::clarity_vm::database::marf::MarfedKV;
+use blockstack_lib::types::chainstate::{StacksAddress, StacksBlockId};
+use blockstack_lib::types::{BlockHeaderHash, BurnchainHeaderHash, VRFSeed};
+use blockstack_lib::util::boot::boot_code_id;
 use blockstack_lib::{
-    burnchains::BurnchainHeaderHash,
-    chainstate::{
-        self,
-        burn::BlockHeaderHash,
-        stacks::{index::MarfTrieId, StacksBlockId},
-    },
+    chainstate::{self, stacks::index::MarfTrieId},
     vm::clarity::ClarityInstance,
     vm::costs::ExecutionCost,
-    vm::database::MarfedKV,
     vm::{
         database::{HeadersDB, NULL_BURN_STATE_DB},
         types::{PrincipalData, QualifiedContractIdentifier, StandardPrincipalData},
         Value,
     },
 };
-use chainstate::{
-    burn::VRFSeed,
-    stacks::{boot::boot_code_id, StacksAddress},
-};
-
-use std::fs;
-use std::process;
-use std::{env, time::Instant};
-
-use rand::Rng;
 
 struct TestHeadersDB;
 

benches/large_contract_bench.rs

@@ -3,14 +3,12 @@ extern crate criterion;
 extern crate blockstack_lib;
 extern crate rand;
 
+use blockstack_lib::clarity_vm::database::marf::MarfedKV;
+use blockstack_lib::types::BlockHeaderHash;
 use blockstack_lib::{
-    chainstate::burn::BlockHeaderHash,
-    chainstate::stacks::index::storage::TrieFileStorage,
-    vm::clarity::ClarityInstance,
-    vm::database::{MarfedKV, NULL_HEADER_DB},
-    vm::types::QualifiedContractIdentifier,
+    chainstate::stacks::index::storage::TrieFileStorage, vm::clarity::ClarityInstance,
+    vm::database::NULL_HEADER_DB, vm::types::QualifiedContractIdentifier,
 };
-
 use criterion::Criterion;
 
 pub fn rollback_log_memory_test() {

benches/marf_bench.rs

@@ -3,12 +3,14 @@ extern crate criterion;
 extern crate blockstack_lib;
 extern crate rand;
 
-use blockstack_lib::chainstate::burn::BlockHeaderHash;
-use blockstack_lib::chainstate::stacks::index::{marf::MARF, storage::TrieFileStorage, MARFValue};
+use std::fs;
 
-use criterion::Criterion;
 use rand::prelude::*;
-use std::fs;
+
+use blockstack_lib::chainstate::stacks::index::{marf::MARF, storage::TrieFileStorage};
+use blockstack_lib::types::chainstate::MARFValue;
+use blockstack_lib::types::BlockHeaderHash;
+use criterion::Criterion;
 
 fn benchmark_marf_usage(
     filename: &str,

sample-contracts/tokens-ft-mint.clar

@@ -0,0 +1,5 @@
+(begin
+  (as-contract
+    (contract-call? 'S1G2081040G2081040G2081040G208105NK8PE5.tokens-ft mint! u100)
+  )
+)

sample-contracts/tokens-ft.clar

@@ -0,0 +1,16 @@
+(define-fungible-token tokens)
+(define-private (get-balance (account principal))
+  (ft-get-balance tokens account))
+
+(define-private (token-credit! (account principal) (amount uint))
+  (ft-mint? tokens amount account))
+
+(define-public (token-transfer (to principal) (amount uint))
+  (ft-transfer? tokens amount tx-sender to))
+
+(define-public (mint! (amount uint))
+  (token-credit! tx-sender amount))
+
+(token-credit! tx-sender u10300)
+(token-transfer 'SZ2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQ9H6DPR u10000)
+(token-transfer 'SM2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQVX8X0G u300)

sample-contracts/tokens-mint.clar

@@ -2,4 +2,4 @@
   (as-contract
     (contract-call? 'S1G2081040G2081040G2081040G208105NK8PE5.tokens mint! u100)
   )
-)
+)

src/blockstack_cli.rs

@@ -21,17 +21,28 @@
 
 extern crate blockstack_lib;
 
+use std::convert::TryFrom;
+use std::io::prelude::*;
+use std::io::Read;
+use std::{env, fs, io};
+
+use blockstack_lib::address::b58;
 use blockstack_lib::address::AddressHashMode;
+use blockstack_lib::burnchains::bitcoin::address::{
+    ADDRESS_VERSION_MAINNET_SINGLESIG, ADDRESS_VERSION_TESTNET_SINGLESIG,
+};
 use blockstack_lib::burnchains::Address;
 use blockstack_lib::chainstate::stacks::{
-    StacksAddress, StacksBlock, StacksMicroblock, StacksPrivateKey, StacksPublicKey,
-    StacksTransaction, StacksTransactionSigner, TokenTransferMemo, TransactionAnchorMode,
-    TransactionAuth, TransactionContractCall, TransactionPayload, TransactionSmartContract,
+    StacksBlock, StacksMicroblock, StacksPrivateKey, StacksPublicKey, StacksTransaction,
+    StacksTransactionSigner, TokenTransferMemo, TransactionAnchorMode, TransactionAuth,
+    TransactionContractCall, TransactionPayload, TransactionSmartContract,
     TransactionSpendingCondition, TransactionVersion, C32_ADDRESS_VERSION_MAINNET_SINGLESIG,
     C32_ADDRESS_VERSION_TESTNET_SINGLESIG,
 };
+use blockstack_lib::codec::{Error as CodecError, StacksMessageCodec};
 use blockstack_lib::core::{CHAIN_ID_MAINNET, CHAIN_ID_TESTNET};
-use blockstack_lib::net::{Error as NetError, StacksMessageCodec};
+use blockstack_lib::net::Error as NetError;
+use blockstack_lib::types::chainstate::StacksAddress;
 use blockstack_lib::util::{
     hash::hex_bytes, hash::to_hex, log, retry::LogReader, strings::StacksString,
 };
@@ -41,15 +52,6 @@ use blockstack_lib::vm::{
     types::PrincipalData,
     ClarityName, ContractName, Value,
 };
-use std::convert::TryFrom;
-use std::io::prelude::*;
-use std::io::Read;
-use std::{env, fs, io};
-
-use blockstack_lib::address::b58;
-use blockstack_lib::burnchains::bitcoin::address::{
-    ADDRESS_VERSION_MAINNET_SINGLESIG, ADDRESS_VERSION_TESTNET_SINGLESIG,
-};
 
 const USAGE: &str = "blockstack-cli (options) [method] [args...]
 
@@ -215,6 +217,12 @@ impl From<NetError> for CliError {
     }
 }
 
+impl From<CodecError> for CliError {
+    fn from(value: CodecError) -> Self {
+        CliError::Message(format!("Stacks CodecError: {}", value))
+    }
+}
+
 impl From<std::num::ParseIntError> for CliError {
     fn from(value: std::num::ParseIntError) -> Self {
         CliError::Message(format!("Failed to parse integer: {}", value))
@@ -779,6 +787,7 @@ fn main_handler(mut argv: Vec<String>) -> Result<String, CliError> {
 #[cfg(test)]
 mod test {
     use super::*;
+
     #[test]
     fn generate_should_work() {
         assert!(main_handler(vec!["generate-sk".into(), "--testnet".into()]).is_ok());

src/burnchains/bitcoin/address.rs

@@ -14,20 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use burnchains::bitcoin::BitcoinNetworkType;
-use burnchains::Address;
-
-use burnchains::bitcoin::Error as btc_error;
-
-use util::hash::Hash160;
-use util::log;
-
 use address::b58 as base58;
 use address::c32::c32_address;
-use deps::bitcoin::blockdata::script::Builder as BtcScriptBuilder;
-
+use burnchains::bitcoin::BitcoinNetworkType;
+use burnchains::bitcoin::Error as btc_error;
+use burnchains::Address;
 use deps::bitcoin::blockdata::opcodes::All as BtcOp;
+use deps::bitcoin::blockdata::script::Builder as BtcScriptBuilder;
 use deps::bitcoin::blockdata::transaction::TxOut;
+use util::hash::Hash160;
+use util::log;
 
 use chainstate::stacks::{
     C32_ADDRESS_VERSION_MAINNET_MULTISIG, C32_ADDRESS_VERSION_MAINNET_SINGLESIG,
@@ -281,11 +277,12 @@ impl std::fmt::Display for BitcoinAddress {
 
 #[cfg(test)]
 mod tests {
-    use super::{BitcoinAddress, BitcoinAddressType};
     use burnchains::bitcoin::BitcoinNetworkType;
     use util::hash::{hex_bytes, Hash160};
     use util::log;
 
+    use super::{BitcoinAddress, BitcoinAddressType};
+
     struct AddressFixture {
         addr: String,
         result: Option<BitcoinAddress>,

src/burnchains/bitcoin/bits.rs

@@ -14,37 +14,33 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use deps::bitcoin::blockdata::opcodes::All as btc_opcodes;
-use deps::bitcoin::blockdata::opcodes::Class;
-use deps::bitcoin::blockdata::script::{Builder, Instruction, Script};
-use deps::bitcoin::blockdata::transaction::TxIn as BtcTxIn;
-use deps::bitcoin::blockdata::transaction::TxOut as BtcTxOut;
-use deps::bitcoin::util::hash::Sha256dHash;
-
-use burnchains::bitcoin::{BitcoinInputType, BitcoinTxInput, BitcoinTxOutput};
-
-use burnchains::{BurnchainHeaderHash, PublicKey};
+use sha2::Digest;
+use sha2::Sha256;
 
+use address::public_keys_to_address_hash;
+use address::AddressHashMode;
 use burnchains::bitcoin::address::{BitcoinAddress, BitcoinAddressType};
 use burnchains::bitcoin::keys::BitcoinPublicKey;
 use burnchains::bitcoin::BitcoinNetworkType;
 use burnchains::bitcoin::Error as btc_error;
+use burnchains::bitcoin::{BitcoinInputType, BitcoinTxInput, BitcoinTxOutput};
+use burnchains::PublicKey;
 use burnchains::Txid;
+use deps::bitcoin::blockdata::opcodes::All as btc_opcodes;
+use deps::bitcoin::blockdata::opcodes::Class;
+use deps::bitcoin::blockdata::script::{Builder, Instruction, Script};
+use deps::bitcoin::blockdata::transaction::TxIn as BtcTxIn;
+use deps::bitcoin::blockdata::transaction::TxOut as BtcTxOut;
+use deps::bitcoin::util::hash::Sha256dHash;
+use util::hash::Hash160;
+use util::log;
 
-use address::public_keys_to_address_hash;
-use address::AddressHashMode;
-
+use crate::types::chainstate::BurnchainHeaderHash;
 use chainstate::stacks::{
     C32_ADDRESS_VERSION_MAINNET_MULTISIG, C32_ADDRESS_VERSION_MAINNET_SINGLESIG,
     C32_ADDRESS_VERSION_TESTNET_MULTISIG, C32_ADDRESS_VERSION_TESTNET_SINGLESIG,
 };
 
-use sha2::Digest;
-use sha2::Sha256;
-
-use util::hash::Hash160;
-use util::log;
-
 /// Parse a script into its structured constituant opcodes and data and collect them
 pub fn parse_script<'a>(script: &'a Script) -> Vec<Instruction<'a>> {
     // we will have to accept non-minimial pushdata since there's at least one OP_RETURN
@@ -584,20 +580,19 @@ impl BurnchainHeaderHash {
 
 #[cfg(test)]
 mod tests {
-    use super::parse_script;
-    use super::BitcoinTxInput;
-    use super::BitcoinTxOutput;
-    use util::hash::hex_bytes;
-
     use burnchains::bitcoin::address::{BitcoinAddress, BitcoinAddressType};
     use burnchains::bitcoin::keys::BitcoinPublicKey;
     use burnchains::bitcoin::BitcoinInputType;
     use burnchains::bitcoin::BitcoinNetworkType;
     use burnchains::Txid;
     use deps::bitcoin::blockdata::script::{Builder, Script};
-
+    use util::hash::hex_bytes;
     use util::log;
 
+    use super::parse_script;
+    use super::BitcoinTxInput;
+    use super::BitcoinTxOutput;
+
     struct ScriptFixture<T> {
         script: Script,
         result: T,

src/burnchains/bitcoin/blocks.rs

@@ -16,17 +16,6 @@
 
 use std::ops::Deref;
 
-use deps;
-use deps::bitcoin::blockdata::block::{Block, LoneBlockHeader};
-use deps::bitcoin::blockdata::opcodes::All as btc_opcodes;
-use deps::bitcoin::blockdata::script::{Instruction, Script};
-use deps::bitcoin::blockdata::transaction::Transaction;
-
-use deps::bitcoin::network::message as btc_message;
-use deps::bitcoin::network::serialize::BitcoinHash;
-
-use deps::bitcoin::util::hash::bitcoin_merkle_root;
-
 use burnchains::bitcoin::address::BitcoinAddress;
 use burnchains::bitcoin::bits;
 use burnchains::bitcoin::indexer::BitcoinIndexer;
@@ -36,22 +25,24 @@ use burnchains::bitcoin::BitcoinInputType;
 use burnchains::bitcoin::BitcoinNetworkType;
 use burnchains::bitcoin::Error as btc_error;
 use burnchains::bitcoin::PeerMessage;
-
+use burnchains::bitcoin::{BitcoinBlock, BitcoinTransaction, BitcoinTxInput, BitcoinTxOutput};
 use burnchains::indexer::{
     BurnBlockIPC, BurnHeaderIPC, BurnchainBlockDownloader, BurnchainBlockParser,
 };
-
 use burnchains::Error as burnchain_error;
-
+use burnchains::{BurnchainBlock, BurnchainTransaction, MagicBytes, Txid, MAGIC_BYTES_LENGTH};
+use deps;
+use deps::bitcoin::blockdata::block::{Block, LoneBlockHeader};
+use deps::bitcoin::blockdata::opcodes::All as btc_opcodes;
+use deps::bitcoin::blockdata::script::{Instruction, Script};
+use deps::bitcoin::blockdata::transaction::Transaction;
+use deps::bitcoin::network::message as btc_message;
+use deps::bitcoin::network::serialize::BitcoinHash;
+use deps::bitcoin::util::hash::bitcoin_merkle_root;
+use util::hash::to_hex;
 use util::log;
 
-use burnchains::bitcoin::{BitcoinBlock, BitcoinTransaction, BitcoinTxInput, BitcoinTxOutput};
-
-use burnchains::{
-    BurnchainBlock, BurnchainHeaderHash, BurnchainTransaction, MagicBytes, Txid, MAGIC_BYTES_LENGTH,
-};
-
-use util::hash::to_hex;
+use crate::types::chainstate::BurnchainHeaderHash;
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct BitcoinHeaderIPC {
@@ -477,26 +468,23 @@ impl BurnchainBlockParser for BitcoinBlockParser {
 
 #[cfg(test)]
 mod tests {
-
-    use super::BitcoinBlockParser;
-    use util::hash::hex_bytes;
-
+    use burnchains::bitcoin::address::{BitcoinAddress, BitcoinAddressType};
+    use burnchains::bitcoin::keys::BitcoinPublicKey;
+    use burnchains::bitcoin::BitcoinNetworkType;
+    use burnchains::bitcoin::{
+        BitcoinBlock, BitcoinInputType, BitcoinTransaction, BitcoinTxInput, BitcoinTxOutput,
+    };
+    use burnchains::{BurnchainBlock, BurnchainTransaction, MagicBytes, Txid};
     use deps::bitcoin::blockdata::block::{Block, LoneBlockHeader};
     use deps::bitcoin::blockdata::transaction::Transaction;
     use deps::bitcoin::network::encodable::VarInt;
     use deps::bitcoin::network::serialize::deserialize;
+    use util::hash::hex_bytes;
+    use util::log;
 
-    use burnchains::bitcoin::{
-        BitcoinBlock, BitcoinInputType, BitcoinTransaction, BitcoinTxInput, BitcoinTxOutput,
-    };
-
-    use burnchains::{BurnchainBlock, BurnchainHeaderHash, BurnchainTransaction, MagicBytes, Txid};
-
-    use burnchains::bitcoin::address::{BitcoinAddress, BitcoinAddressType};
-    use burnchains::bitcoin::keys::BitcoinPublicKey;
-    use burnchains::bitcoin::BitcoinNetworkType;
+    use crate::types::chainstate::BurnchainHeaderHash;
 
-    use util::log;
+    use super::BitcoinBlockParser;
 
     struct TxFixture {
         txstr: String,