From 62cfec3787c0b0b6f0d20855dd6b79e264aeb57b Mon Sep 17 00:00:00 2001 From: greg Date: Mon, 11 Jun 2018 10:56:46 -0400 Subject: [PATCH 01/24] updates for dustin --- core/blockchain.go | 3 ++- eth/api_tracer.go | 8 +++----- miner/worker.go | 4 +++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index cb72402654..d81f262abc 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -901,7 +901,8 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types. if err := WriteBlock(batch, block); err != nil { return NonStatTy, err } - // @NOTE:SHYFT - Write block data for block explorer + // NOTE:SHYFT - Write block data for block explorer + fmt.Printf("\n\t[BLOCKCHAIN.GO bc.chainConfig] %+v", bc.chainConfig) if err := shyftdb.WriteBlock(block, receipts); err != nil { return NonStatTy, err } diff --git a/eth/api_tracer.go b/eth/api_tracer.go index e639bba33a..fa6af256ad 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -532,11 +532,9 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { - fmt.Println("\n\n\t[API LOG]", api, "\n") - fmt.Printf("%+v\n", api.config) - fmt.Println("\n") - fmt.Printf("%+v\n", api.eth) - fmt.Println("\n") + // NOTE:SHYFT + fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config) + fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth) // Retrieve the transaction and assemble its EVM context tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) if tx == nil { diff --git a/miner/worker.go b/miner/worker.go index 15395ae0b9..cfbc9c5377 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -309,7 +309,9 @@ func (self *worker) wait() { for _, log := range work.state.Logs() { log.BlockHash = block.Hash() } - stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state) + fmt.Printf("\n\t[WORKER.GO self.eth] %+v\n", self.eth) + // NOTE:SHYFT Added eth to writeBlockWithState + stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state, self.eth) if err != nil { log.Error("Failed writing block to chain", "err", err) continue From 6b4eb6abef2020c11c604fdc6bf65f01703309e7 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Thu, 14 Jun 2018 11:42:06 -0400 Subject: [PATCH 02/24] fix parameter --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miner/worker.go b/miner/worker.go index cfbc9c5377..d1880456fc 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -311,7 +311,7 @@ func (self *worker) wait() { } fmt.Printf("\n\t[WORKER.GO self.eth] %+v\n", self.eth) // NOTE:SHYFT Added eth to writeBlockWithState - stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state, self.eth) + stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state) if err != nil { log.Error("Failed writing block to chain", "err", err) continue From 802c1b061ec658c1d39bedfdc9219a785b42c746 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Mon, 18 Jun 2018 11:36:01 -0400 Subject: [PATCH 03/24] compiles --- core/blockchain.go | 3 +- {shyftDb => core}/db.go | 4 +-- core/genesis.go | 5 ++-- {shyftDb => core}/shyft_database_util.go | 35 ++++++++++++------------ core/shyft_tracer.go | 35 ++++++++++++++++++++++++ eth/backend.go | 3 +- eth/chaindb.go | 25 +++++++++++++++++ 7 files changed, 85 insertions(+), 25 deletions(-) rename {shyftDb => core}/db.go (97%) rename {shyftDb => core}/shyft_database_util.go (96%) create mode 100644 core/shyft_tracer.go create mode 100644 eth/chaindb.go diff --git a/core/blockchain.go b/core/blockchain.go index d81f262abc..4216999069 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -33,7 +33,6 @@ import ( "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/consensus" "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/shyftdb" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" @@ -903,7 +902,7 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types. } // NOTE:SHYFT - Write block data for block explorer fmt.Printf("\n\t[BLOCKCHAIN.GO bc.chainConfig] %+v", bc.chainConfig) - if err := shyftdb.WriteBlock(block, receipts); err != nil { + if err := SWriteBlock(block, receipts); err != nil { return NonStatTy, err } diff --git a/shyftDb/db.go b/core/db.go similarity index 97% rename from shyftDb/db.go rename to core/db.go index f95871fd28..3fedb09b18 100644 --- a/shyftDb/db.go +++ b/core/db.go @@ -1,4 +1,4 @@ -package shyftdb +package core import ( "fmt" @@ -34,4 +34,4 @@ func DBConnection() (*sql.DB, error) { } } return blockExplorerDb, nil -} \ No newline at end of file +} diff --git a/core/genesis.go b/core/genesis.go index 26f7a771f1..ade6d3f0de 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -35,7 +35,6 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/shyftdb" "database/sql" "strconv" "time" @@ -145,7 +144,7 @@ func (e *GenesisMismatchError) Error() string { //@NOTE:SHYFT func WriteShyftGen(gen *Genesis, block *types.Block) { - sqldb, _ := shyftdb.DBConnection() + sqldb, _ := DBConnection() for k := range gen.Alloc { addr := k.String() @@ -195,7 +194,7 @@ func WriteShyftGen(gen *Genesis, block *types.Block) { func WriteShyftBlockZero(block *types.Block, gen *Genesis) error { - sqldb, _ := shyftdb.DBConnection() + sqldb, _ := DBConnection() coinbase := block.Header().Coinbase.String() number := block.Header().Number.String() diff --git a/shyftDb/shyft_database_util.go b/core/shyft_database_util.go similarity index 96% rename from shyftDb/shyft_database_util.go rename to core/shyft_database_util.go index 658abe6e07..4e464d211b 100644 --- a/shyftDb/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -1,18 +1,18 @@ -package shyftdb +package core import ( - "encoding/json" - "fmt" - "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "time" - "strconv" - "database/sql" - "log" +"encoding/json" +"fmt" +"math/big" +"github.com/ethereum/go-ethereum/common" +"github.com/ethereum/go-ethereum/core/types" +"time" +"strconv" +"database/sql" +"log" - _ "github.com/lib/pq" - Rewards "github.com/ethereum/go-ethereum/consensus/ethash" +_ "github.com/lib/pq" +Rewards "github.com/ethereum/go-ethereum/consensus/ethash" ) //SBlock type @@ -104,7 +104,7 @@ type SendAndReceive struct { } //WriteBlock writes to block info to sql db -func WriteBlock(block *types.Block, receipts []*types.Receipt) error { +func SWriteBlock(block *types.Block, receipts []*types.Receipt) error { sqldb, err := DBConnection() if (err != nil) { @@ -138,7 +138,7 @@ func WriteBlock(block *types.Block, receipts []*types.Receipt) error { if block.Transactions().Len() > 0 { for _, tx := range block.Transactions() { - writeTransactions(sqldb, tx, block.Header().Hash(), block.Header().Number.String(), receipts, age, gasLimit) + SwriteTransactions(sqldb, tx, block.Header().Hash(), block.Header().Number.String(), receipts, age, gasLimit) if block.Transactions()[0].To() != nil { writeFromBalance(sqldb, tx) } @@ -151,7 +151,7 @@ func WriteBlock(block *types.Block, receipts []*types.Receipt) error { } //writeTransactions writes to sqldb -func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Hash, blockNumber string, receipts []*types.Receipt, age time.Time, gasLimit uint64) error { +func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Hash, blockNumber string, receipts []*types.Receipt, age time.Time, gasLimit uint64) error { txData := ShyftTxEntry{ TxHash: tx.Hash(), From: tx.From(), @@ -165,6 +165,7 @@ func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Ha Data: tx.Data(), } txHash := txData.TxHash.Hex() + MyTraceTransaction(txHash) //.chaindb_global from := txData.From.Hex() blockHasher := txData.BlockHash amount := txData.Amount.String() @@ -545,7 +546,7 @@ func GetAllBlocks(sqldb *sql.DB) string { //GetBlock queries to send single block info //TODO provide blockHash arg passed from handler.go -func GetBlock(sqldb *sql.DB, blockNumber string) string { +func SGetBlock(sqldb *sql.DB, blockNumber string) string { sqlStatement := `SELECT * FROM blocks WHERE number=$1;` row := sqldb.QueryRow(sqlStatement, blockNumber) var hash string @@ -855,7 +856,7 @@ func GetAllTransactions(sqldb *sql.DB) string { } //GetTransaction fn returns single tx -func GetTransaction(sqldb *sql.DB, txHash string) string { +func SGetTransaction(sqldb *sql.DB, txHash string) string { sqlStatement := `SELECT * FROM txs WHERE txhash=$1;` row := sqldb.QueryRow(sqlStatement, txHash) var txhash string diff --git a/core/shyft_tracer.go b/core/shyft_tracer.go new file mode 100644 index 0000000000..aac6bf5db6 --- /dev/null +++ b/core/shyft_tracer.go @@ -0,0 +1,35 @@ +package core + +import ( + "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/common" + "fmt" +) + +var Chaindb_global ethdb.Database + +func SetChainDB(db ethdb.Database){ + Chaindb_global = db +} + + + +func MyTraceTransaction(hash string) (interface{}) { + common_hash := common.StringToHash(hash) + fmt.Println("the hash is") + fmt.Println(common_hash) + + fmt.Println("the chain db is") + fmt.Println(Chaindb_global) + if Chaindb_global == nil { + return nil + } + + tx, blockHash, _, index := GetTransaction(Chaindb_global, common_hash) + + fmt.Println("the tx is ") + fmt.Println(tx) + fmt.Println(blockHash) + fmt.Println(index) + return 42 +} \ No newline at end of file diff --git a/eth/backend.go b/eth/backend.go index 44425ece9a..c78cfa3164 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -107,7 +107,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { if !config.SyncMode.IsValid() { return nil, fmt.Errorf("invalid sync mode %d", config.SyncMode) } - chainDb, err := CreateDB(ctx, config, "chaindata") + chainDb, err := chaindb(ctx, config) if err != nil { return nil, err } @@ -202,6 +202,7 @@ func makeExtraData(extra []byte) []byte { // CreateDB creates the chain database. func CreateDB(ctx *node.ServiceContext, config *Config, name string) (ethdb.Database, error) { + fmt.Println("in create db") db, err := ctx.OpenDatabase(name, config.DatabaseCache, config.DatabaseHandles) if err != nil { return nil, err diff --git a/eth/chaindb.go b/eth/chaindb.go new file mode 100644 index 0000000000..e17cd37771 --- /dev/null +++ b/eth/chaindb.go @@ -0,0 +1,25 @@ +package eth + +import ( + "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/node" + "fmt" + "github.com/ethereum/go-ethereum/core" +) + +func chaindb(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) { + fmt.Println("DO WE GET HERE ++++++++++++++++++++++++++++++++") + fmt.Printf("%+v", ctx) + if core.Chaindb_global != nil { + return core.Chaindb_global, nil + } + fmt.Println("FAR OUT ++++++++++++++++++++++++++++++++") + + chainDb, err := CreateDB(ctx, config, "chaindata") + fmt.Println("CHECK CHECK ++++++++++++++++") + if err == nil { + core.SetChainDB(chainDb) + return core.Chaindb_global, nil + } + return nil, err +} \ No newline at end of file From db82bc9603cf4ad9e944d4807853497335f5abd4 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Mon, 18 Jun 2018 15:53:06 -0400 Subject: [PATCH 04/24] compiles --- core/blockchain.go | 22 +++++++++++++++------ core/database_util.go | 13 ++++++++++++ core/shyft_tracer.go | 34 +++++++++++++++++++++++++------- eth/api.go | 2 +- eth/api_tracer.go | 9 +++++++++ eth/backend.go | 17 ++++++++++++++++ ethObjectInterface/eth_object.go | 9 +++++++++ 7 files changed, 92 insertions(+), 14 deletions(-) create mode 100644 ethObjectInterface/eth_object.go diff --git a/core/blockchain.go b/core/blockchain.go index 4216999069..f40f6019e7 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,7 +28,8 @@ import ( "sync" "sync/atomic" "time" - + + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/consensus" @@ -45,6 +46,7 @@ import ( "github.com/ethereum/go-ethereum/trie" "github.com/hashicorp/golang-lru" "gopkg.in/karalabe/cookiejar.v2/collections/prque" + "runtime" ) var ( @@ -900,16 +902,13 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types. if err := WriteBlock(batch, block); err != nil { return NonStatTy, err } - // NOTE:SHYFT - Write block data for block explorer - fmt.Printf("\n\t[BLOCKCHAIN.GO bc.chainConfig] %+v", bc.chainConfig) - if err := SWriteBlock(block, receipts); err != nil { - return NonStatTy, err - } root, err := state.Commit(bc.chainConfig.IsEIP158(block.Number())) + if err != nil { return NonStatTy, err } + triedb := bc.stateCache.TrieDB() // If we're running an archive node, always flush @@ -1001,6 +1000,12 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types. if status == CanonStatTy { bc.insert(block) } + + // NOTE:SHYFT - Write block data for block explorer + fmt.Printf("\n\t[BLOCKCHAIN.GO bc.chainConfig] %+v", bc.chainConfig) + if err := SWriteBlock(block, receipts); err != nil { + return NonStatTy, err + } bc.futureBlocks.Remove(block.Hash()) return status, nil } @@ -1021,6 +1026,11 @@ func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) { // only reason this method exists as a separate one is to make locking cleaner // with deferred statements. func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*types.Log, error) { + fmt.Println("++++++++++ insertChain +++++++++") + _, file, no, ok := runtime.Caller(1) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } // Do a sanity check that the provided chain is actually ordered and linked for i := 1; i < len(chain); i++ { if chain[i].NumberU64() != chain[i-1].NumberU64()+1 || chain[i].ParentHash() != chain[i-1].Hash() { diff --git a/core/database_util.go b/core/database_util.go index 37f0daf952..8aabd94034 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -266,7 +266,14 @@ func GetBlockReceipts(db DatabaseReader, hash common.Hash, number uint64) types. // hash to allow retrieving the transaction or receipt by hash. func GetTxLookupEntry(db DatabaseReader, hash common.Hash) (common.Hash, uint64, uint64) { // Load the positional metadata from disk and bail if it fails + fmt.Println("INSIDE GetTxLookupEntry ") + fmt.Println("the db is ") + fmt.Println(db) + fmt.Println("the hash is") + fmt.Println(hash) data, _ := db.Get(append(lookupPrefix, hash.Bytes()...)) + fmt.Println("the data is ") + fmt.Println(data) if len(data) == 0 { return common.Hash{}, 0, 0 } @@ -283,7 +290,13 @@ func GetTxLookupEntry(db DatabaseReader, hash common.Hash) (common.Hash, uint64, // its added positional metadata. func GetTransaction(db DatabaseReader, hash common.Hash) (*types.Transaction, common.Hash, uint64, uint64) { // Retrieve the lookup metadata and resolve the transaction from the body + //fmt.Println("INSIDE GET TRANSACTION ++++++++") + //fmt.Println("The hash and db reader are") + //fmt.Println(hash) + //fmt.Println(db) blockHash, blockNumber, txIndex := GetTxLookupEntry(db, hash) + //fmt.Println(blockHash) + //fmt.Println(blockNumber) if blockHash != (common.Hash{}) { body := GetBody(db, blockHash, blockNumber) diff --git a/core/shyft_tracer.go b/core/shyft_tracer.go index aac6bf5db6..391ada4257 100644 --- a/core/shyft_tracer.go +++ b/core/shyft_tracer.go @@ -4,29 +4,49 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/common" "fmt" + ) +const ( + // defaultTraceReexec is the number of blocks the tracer is willing to go back + // and reexecute to produce missing historical state necessary to run a specific + // trace. + defaultTraceReexec = uint64(128) +) + +//var api *eth.PrivateDebugAPI + var Chaindb_global ethdb.Database func SetChainDB(db ethdb.Database){ Chaindb_global = db } - - func MyTraceTransaction(hash string) (interface{}) { - common_hash := common.StringToHash(hash) - fmt.Println("the hash is") - fmt.Println(common_hash) + //fmt.Println("THE stringed hash is in MYTRACETRANSACTION") + //fmt.Println(hash) + //fmt.Println(ethObjectInterface.GetEthObject()) + common_hash := common.HexToHash(hash) - fmt.Println("the chain db is") - fmt.Println(Chaindb_global) + + //fmt.Println("the chain db is in MyTraceTransaction") + //fmt.Println(Chaindb_global) if Chaindb_global == nil { return nil } tx, blockHash, _, index := GetTransaction(Chaindb_global, common_hash) + //reexec := defaultTraceReexec + //if config != nil && config.Reexec != nil { + // reexec = *config.Reexec + //} + //msg, vmctx, statedb, err := eth.api.computeTxEnv(blockHash, int(index), reexec) + + if tx == nil { + fmt.Println("TRANSACTION NOT FOUND IN MyTraceTransaction +++++++++") + } + fmt.Println("the tx is ") fmt.Println(tx) fmt.Println(blockHash) diff --git a/eth/api.go b/eth/api.go index a345b57e49..d2491f7821 100644 --- a/eth/api.go +++ b/eth/api.go @@ -330,7 +330,7 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error // PrivateDebugAPI is the collection of Ethereum full node APIs exposed over // the private debugging endpoint. -type PrivateDebugAPI struct { +type PrivateDebugAPI struct { config *params.ChainConfig eth *Ethereum } diff --git a/eth/api_tracer.go b/eth/api_tracer.go index fa6af256ad..8f2fd54568 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -536,10 +536,19 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Ha fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config) fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth) // Retrieve the transaction and assemble its EVM context + //fmt.Println("IN TRACE TRANSACTION the chaindb is ") + //fmt.Println(chaindb) + //fmt.Println("IN TRACE TRANSACTION the common hash is ") + //fmt.Println(hash) tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) if tx == nil { return nil, fmt.Errorf("transaction %x not found", hash) } + + fmt.Println("the tx is in TraceTransaction") + fmt.Println(tx) + fmt.Println(blockHash) + fmt.Println(index) reexec := defaultTraceReexec if config != nil && config.Reexec != nil { reexec = *config.Reexec diff --git a/eth/backend.go b/eth/backend.go index c78cfa3164..a3fd81d662 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -49,6 +49,10 @@ import ( "github.com/ethereum/go-ethereum/rpc" ) +var EthObject *Ethereum + +var BlockchainObject *core.BlockChain + type LesServer interface { Start(srvr *p2p.Server) Stop() @@ -101,6 +105,13 @@ func (s *Ethereum) AddLesServer(ls LesServer) { // New creates a new Ethereum object (including the // initialisation of the common Ethereum object) func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { + + fmt.Println("++++++++++") + _, file, no, ok := runtime.Caller(1) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + if config.SyncMode == downloader.LightSync { return nil, errors.New("can't run eth.Ethereum in light sync mode, use les.LightEthereum") } @@ -137,6 +148,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { bloomIndexer: NewBloomIndexer(chainDb, params.BloomBitsBlocks), } + EthObject = eth + log.Info("Initialising Ethereum protocol", "versions", ProtocolVersions, "network", config.NetworkId) if !config.SkipBcVersionCheck { @@ -150,7 +163,11 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { vmConfig = vm.Config{EnablePreimageRecording: config.EnablePreimageRecording} cacheConfig = &core.CacheConfig{Disabled: config.NoPruning, TrieNodeLimit: config.TrieCache, TrieTimeLimit: config.TrieTimeout} ) + eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, eth.chainConfig, eth.engine, vmConfig) + + BlockchainObject = eth.blockchain + if err != nil { return nil, err } diff --git a/ethObjectInterface/eth_object.go b/ethObjectInterface/eth_object.go new file mode 100644 index 0000000000..5e999762d3 --- /dev/null +++ b/ethObjectInterface/eth_object.go @@ -0,0 +1,9 @@ +package ethObjectInterface + +import "github.com/ethereum/go-ethereum/eth" + +//var ethObject *eth.Ethereum + +func GetEthObject() (interface{}){ + return eth.EthObject +} \ No newline at end of file From e6fdff486058b473d387f377093f515b9719d4d5 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Mon, 18 Jun 2018 17:55:53 -0400 Subject: [PATCH 05/24] more stuff --- core/shyft_tracer.go | 7 ++++++- eth/backend.go | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/shyft_tracer.go b/core/shyft_tracer.go index 391ada4257..56581b046f 100644 --- a/core/shyft_tracer.go +++ b/core/shyft_tracer.go @@ -4,7 +4,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/common" "fmt" - ) const ( @@ -16,6 +15,8 @@ const ( //var api *eth.PrivateDebugAPI +var EthereumObject interface{} + var Chaindb_global ethdb.Database func SetChainDB(db ethdb.Database){ @@ -52,4 +53,8 @@ func MyTraceTransaction(hash string) (interface{}) { fmt.Println(blockHash) fmt.Println(index) return 42 +} + +func setEthObject(ethobj interface{}){ + EthereumObject = ethobj } \ No newline at end of file diff --git a/eth/backend.go b/eth/backend.go index a3fd81d662..8e2f81bb6e 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -49,10 +49,10 @@ import ( "github.com/ethereum/go-ethereum/rpc" ) -var EthObject *Ethereum - var BlockchainObject *core.BlockChain +var DebugApi *PrivateDebugAPI + type LesServer interface { Start(srvr *p2p.Server) Stop() @@ -148,8 +148,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { bloomIndexer: NewBloomIndexer(chainDb, params.BloomBitsBlocks), } - EthObject = eth - log.Info("Initialising Ethereum protocol", "versions", ProtocolVersions, "network", config.NetworkId) if !config.SkipBcVersionCheck { @@ -197,6 +195,9 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { } eth.ApiBackend.gpo = gasprice.NewOracle(eth.ApiBackend, gpoParams) + DebugApi.eth = eth + DebugApi.config = chainConfig + return eth, nil } From de32947dcf2dbce3486c0facf3f4988c9f29f887 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Thu, 21 Jun 2018 14:36:39 -0400 Subject: [PATCH 06/24] wip --- core/shyft_database_util.go | 9 +- core/shyft_tracer.go | 60 -------- eth/api.go | 2 +- eth/api_tracer.go | 183 +++++++++++++++++++++++ eth/backend.go | 5 +- eth/chaindb.go | 15 +- eth/shyft_tracer.go | 63 ++++++++ internal/jsre/jsre.go | 2 + rpc/http.go | 4 + shyfttracerinterface/tracer_interface.go | 5 + 10 files changed, 280 insertions(+), 68 deletions(-) delete mode 100644 core/shyft_tracer.go create mode 100644 eth/shyft_tracer.go create mode 100644 shyfttracerinterface/tracer_interface.go diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 4e464d211b..2b8fe64b05 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -13,8 +13,15 @@ import ( _ "github.com/lib/pq" Rewards "github.com/ethereum/go-ethereum/consensus/ethash" + "github.com/ethereum/go-ethereum/shyfttracerinterface" ) +var IShyftTracer shyfttracerinterface.IShyftTracer + +func SetIShyftTracer(st shyfttracerinterface.IShyftTracer) { + IShyftTracer = st +} + //SBlock type type SBlock struct { Hash string @@ -165,7 +172,7 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H Data: tx.Data(), } txHash := txData.TxHash.Hex() - MyTraceTransaction(txHash) //.chaindb_global + IShyftTracer.MyTraceTransaction(txHash) //.chaindb_global from := txData.From.Hex() blockHasher := txData.BlockHash amount := txData.Amount.String() diff --git a/core/shyft_tracer.go b/core/shyft_tracer.go deleted file mode 100644 index 56581b046f..0000000000 --- a/core/shyft_tracer.go +++ /dev/null @@ -1,60 +0,0 @@ -package core - -import ( - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/common" - "fmt" -) - -const ( - // defaultTraceReexec is the number of blocks the tracer is willing to go back - // and reexecute to produce missing historical state necessary to run a specific - // trace. - defaultTraceReexec = uint64(128) -) - -//var api *eth.PrivateDebugAPI - -var EthereumObject interface{} - -var Chaindb_global ethdb.Database - -func SetChainDB(db ethdb.Database){ - Chaindb_global = db -} - -func MyTraceTransaction(hash string) (interface{}) { - //fmt.Println("THE stringed hash is in MYTRACETRANSACTION") - //fmt.Println(hash) - //fmt.Println(ethObjectInterface.GetEthObject()) - common_hash := common.HexToHash(hash) - - - //fmt.Println("the chain db is in MyTraceTransaction") - //fmt.Println(Chaindb_global) - if Chaindb_global == nil { - return nil - } - - tx, blockHash, _, index := GetTransaction(Chaindb_global, common_hash) - - //reexec := defaultTraceReexec - //if config != nil && config.Reexec != nil { - // reexec = *config.Reexec - //} - //msg, vmctx, statedb, err := eth.api.computeTxEnv(blockHash, int(index), reexec) - - if tx == nil { - fmt.Println("TRANSACTION NOT FOUND IN MyTraceTransaction +++++++++") - } - - fmt.Println("the tx is ") - fmt.Println(tx) - fmt.Println(blockHash) - fmt.Println(index) - return 42 -} - -func setEthObject(ethobj interface{}){ - EthereumObject = ethobj -} \ No newline at end of file diff --git a/eth/api.go b/eth/api.go index d2491f7821..a345b57e49 100644 --- a/eth/api.go +++ b/eth/api.go @@ -330,7 +330,7 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error // PrivateDebugAPI is the collection of Ethereum full node APIs exposed over // the private debugging endpoint. -type PrivateDebugAPI struct { +type PrivateDebugAPI struct { config *params.ChainConfig eth *Ethereum } diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 8f2fd54568..81622f208e 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -532,6 +532,189 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { + fmt.Println("TRACE TRANSACTION ++++++!+!+!+!+!+!+!+!+!+!+!+!++!") + _, file, no, ok := runtime.Caller(1) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(2) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(3) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(4) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(5) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(6) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(7) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(8) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(9) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(10) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(11) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(12) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(13) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(14) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(15) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(16) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(17) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(18) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(19) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(20) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(21) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(22) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(23) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(24) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(25) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(26) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(27) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(28) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(29) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(30) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(31) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(32) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(33) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(34) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(35) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(36) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(37) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(38) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(39) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(40) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + fmt.Println("////////////// ++++++++++++++++ /////////////////// Phantom *(!*!*!*!*!*!**!*!*") + _, file, no, ok = runtime.Caller(41) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(42) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(43) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(44) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + fmt.Println("////////////// ++++++++++++++++ /////////////////// TraceTransaction *(!*!*!*!*!*!**!*!*") + _, file, no, ok = runtime.Caller(45) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } // NOTE:SHYFT fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config) fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth) diff --git a/eth/backend.go b/eth/backend.go index 8e2f81bb6e..34d847bf2c 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -51,7 +51,7 @@ import ( var BlockchainObject *core.BlockChain -var DebugApi *PrivateDebugAPI +var DebugApi PrivateDebugAPI type LesServer interface { Start(srvr *p2p.Server) @@ -106,6 +106,9 @@ func (s *Ethereum) AddLesServer(ls LesServer) { // initialisation of the common Ethereum object) func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { + shyft_tracer := new(ShyftTracer) + core.SetIShyftTracer(shyft_tracer) + fmt.Println("++++++++++") _, file, no, ok := runtime.Caller(1) if ok { diff --git a/eth/chaindb.go b/eth/chaindb.go index e17cd37771..f4ced9929b 100644 --- a/eth/chaindb.go +++ b/eth/chaindb.go @@ -4,22 +4,27 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/node" "fmt" - "github.com/ethereum/go-ethereum/core" ) +var Chaindb_global ethdb.Database + +func SetChainDB(db ethdb.Database){ + Chaindb_global = db +} + func chaindb(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) { fmt.Println("DO WE GET HERE ++++++++++++++++++++++++++++++++") fmt.Printf("%+v", ctx) - if core.Chaindb_global != nil { - return core.Chaindb_global, nil + if Chaindb_global != nil { + return Chaindb_global, nil } fmt.Println("FAR OUT ++++++++++++++++++++++++++++++++") chainDb, err := CreateDB(ctx, config, "chaindata") fmt.Println("CHECK CHECK ++++++++++++++++") if err == nil { - core.SetChainDB(chainDb) - return core.Chaindb_global, nil + SetChainDB(chainDb) + return Chaindb_global, nil } return nil, err } \ No newline at end of file diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go new file mode 100644 index 0000000000..78fc206d32 --- /dev/null +++ b/eth/shyft_tracer.go @@ -0,0 +1,63 @@ +package eth + +import ( + "github.com/ethereum/go-ethereum/common" + "fmt" + "github.com/ethereum/go-ethereum/core" +) + +//const ( +// // defaultTraceReexec is the number of blocks the tracer is willing to go back +// // and reexecute to produce missing historical state necessary to run a specific +// // trace. +// defaultTraceReexec = uint64(128) +//) + +//var api *eth.PrivateDebugAPI + +var EthereumObject interface{} + +type ShyftTracer struct {} + +func (st ShyftTracer) MyTraceTransaction(hash string) (interface{}) { + //fmt.Println("THE stringed hash is in MYTRACETRANSACTION") + //fmt.Println(hash) + //fmt.Println(ethObjectInterface.GetEthObject()) + common_hash := common.HexToHash(hash) + + + //fmt.Println("the chain db is in MyTraceTransaction") + //fmt.Println(Chaindb_global) + if Chaindb_global == nil { + return nil + } + + tx, blockHash, _, index := core.GetTransaction(Chaindb_global, common_hash) + + if tx == nil { + fmt.Println("TRANSACTION NOT FOUND IN MyTraceTransaction +++++++++") + } + + reexec := defaultTraceReexec + //if config != nil && config.Reexec != nil { + // reexec = *config.Reexec + //} + msg, vmctx, statedb, err := DebugApi.computeTxEnv(blockHash, int(index), reexec) + + fmt.Println("stuff and nonsense") + fmt.Println(msg) + fmt.Println(vmctx) + fmt.Println(statedb) + fmt.Println(err) + + //fmt.Println("the tx is ") + //fmt.Println(tx) + //fmt.Println(blockHash) + //fmt.Println(index) + //DebugApi.traceTx(ctx, msg, vmctx, statedb, config) + return 42 +} + +func setEthObject(ethobj interface{}){ + EthereumObject = ethobj +} \ No newline at end of file diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index f05865eca6..7a7ba2efc9 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -188,6 +188,8 @@ loop: arguments = make([]interface{}, 1) } arguments[0] = timer.call.ArgumentList[0] + fmt.Println("The arguments are") + fmt.Println(arguments) _, err := vm.Call(`Function.call.call`, nil, arguments...) if err != nil { fmt.Println("js error:", err, arguments) diff --git a/rpc/http.go b/rpc/http.go index 9805d69b63..3011222483 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -231,6 +231,10 @@ func (h *virtualHostHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if ipAddr := net.ParseIP(host); ipAddr != nil { // It's an IP address, we can serve that + fmt.Println("THE write is ") + fmt.Println(w) + fmt.Println("The read is ") + fmt.Println(r) h.next.ServeHTTP(w, r) return diff --git a/shyfttracerinterface/tracer_interface.go b/shyfttracerinterface/tracer_interface.go new file mode 100644 index 0000000000..a2f775e570 --- /dev/null +++ b/shyfttracerinterface/tracer_interface.go @@ -0,0 +1,5 @@ +package shyfttracerinterface + +type IShyftTracer interface { + MyTraceTransaction(hash string) (interface{}) +} From bf5b37902508dae761d459a9deceb6ca2e93683c Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 4 Jul 2018 20:31:29 -0400 Subject: [PATCH 07/24] need to resolve dereference issue in node.go --- core/blockchain.go | 3 +- core/shyft_database_util.go | 25 ++++++++-- eth/api_tracer.go | 21 +++++++++ eth/backend.go | 1 - eth/shyft_tracer.go | 60 ++++++------------------ miner/worker.go | 1 - rpc/http.go | 4 -- shyfttracerinterface/tracer_interface.go | 7 ++- 8 files changed, 63 insertions(+), 59 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index f40f6019e7..47a3c65913 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -1002,7 +1002,7 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types. } // NOTE:SHYFT - Write block data for block explorer - fmt.Printf("\n\t[BLOCKCHAIN.GO bc.chainConfig] %+v", bc.chainConfig) + //fmt.Printf("\n\t[BLOCKCHAIN.GO bc.chainConfig] %+v", bc.chainConfig) if err := SWriteBlock(block, receipts); err != nil { return NonStatTy, err } @@ -1026,7 +1026,6 @@ func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) { // only reason this method exists as a separate one is to make locking cleaner // with deferred statements. func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*types.Log, error) { - fmt.Println("++++++++++ insertChain +++++++++") _, file, no, ok := runtime.Caller(1) if ok { fmt.Printf("called from %s#%d\n", file, no) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 2b8fe64b05..5186c8c5a2 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -4,16 +4,19 @@ import ( "encoding/json" "fmt" "math/big" -"github.com/ethereum/go-ethereum/common" -"github.com/ethereum/go-ethereum/core/types" "time" "strconv" "database/sql" "log" - _ "github.com/lib/pq" -Rewards "github.com/ethereum/go-ethereum/consensus/ethash" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + Rewards "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/shyfttracerinterface" + "github.com/ethereum/go-ethereum/node" + "reflect" + ) var IShyftTracer shyfttracerinterface.IShyftTracer @@ -171,8 +174,20 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H Nonce: tx.Nonce(), Data: tx.Data(), } + + hash := txData.TxHash + fmt.Println(reflect.TypeOf(hash)) txHash := txData.TxHash.Hex() - IShyftTracer.MyTraceTransaction(txHash) //.chaindb_global + //IShyftTracer.MyTraceTransaction(txHash) + + // + var stack *node.Node + fmt.Println(reflect.TypeOf(stack)) + + prayer, err := IShyftTracer.GetTracerToRun(hash, stack) + fmt.Println("THIS IS A PRAYER", prayer) + fmt.Println(err) + from := txData.From.Hex() blockHasher := txData.BlockHash amount := txData.Amount.String() diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 81622f208e..47c4fd599c 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -38,6 +38,7 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/trie" + ) const ( @@ -529,6 +530,26 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* return statedb, nil } + +//func GetTracerToRun(hash common.Hash) (interface{}, error) { +// config2 := params.ShyftNetworkChainConfig +// var cfg *Config +// fmt.Println(reflect.TypeOf(cfg)) +// var ctx context.Context +// var config *TraceConfig +// var fullNode *Ethereum +// var stack *node.Node +// fmt.Println(reflect.TypeOf(stack)) +// err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { +// fullNode, err := New(ctx, cfg) +// return fullNode, err +// }) +// fmt.Println(err) +// privateAPI := NewPrivateDebugAPI(config2, fullNode) +// return privateAPI.TraceTransaction(ctx, hash, config) +//} + + // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { diff --git a/eth/backend.go b/eth/backend.go index 34d847bf2c..5737865057 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -109,7 +109,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { shyft_tracer := new(ShyftTracer) core.SetIShyftTracer(shyft_tracer) - fmt.Println("++++++++++") _, file, no, ok := runtime.Caller(1) if ok { fmt.Printf("called from %s#%d\n", file, no) diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index 78fc206d32..24f31019ca 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -3,59 +3,29 @@ package eth import ( "github.com/ethereum/go-ethereum/common" "fmt" - "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/node" + "github.com/ethereum/go-ethereum/params" + "context" ) -//const ( -// // defaultTraceReexec is the number of blocks the tracer is willing to go back -// // and reexecute to produce missing historical state necessary to run a specific -// // trace. -// defaultTraceReexec = uint64(128) -//) - -//var api *eth.PrivateDebugAPI - var EthereumObject interface{} type ShyftTracer struct {} -func (st ShyftTracer) MyTraceTransaction(hash string) (interface{}) { - //fmt.Println("THE stringed hash is in MYTRACETRANSACTION") - //fmt.Println(hash) - //fmt.Println(ethObjectInterface.GetEthObject()) - common_hash := common.HexToHash(hash) +func (st ShyftTracer) GetTracerToRun(hash common.Hash, stack *node.Node) (interface{}, error) { + config2 := params.ShyftNetworkChainConfig + var cfg *Config + var ctx context.Context + var config *TraceConfig + var fullNode *Ethereum - - //fmt.Println("the chain db is in MyTraceTransaction") - //fmt.Println(Chaindb_global) - if Chaindb_global == nil { - return nil - } - - tx, blockHash, _, index := core.GetTransaction(Chaindb_global, common_hash) - - if tx == nil { - fmt.Println("TRANSACTION NOT FOUND IN MyTraceTransaction +++++++++") - } - - reexec := defaultTraceReexec - //if config != nil && config.Reexec != nil { - // reexec = *config.Reexec - //} - msg, vmctx, statedb, err := DebugApi.computeTxEnv(blockHash, int(index), reexec) - - fmt.Println("stuff and nonsense") - fmt.Println(msg) - fmt.Println(vmctx) - fmt.Println(statedb) + err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { + fullNode, err := New(ctx, cfg) + return fullNode, err + }) fmt.Println(err) - - //fmt.Println("the tx is ") - //fmt.Println(tx) - //fmt.Println(blockHash) - //fmt.Println(index) - //DebugApi.traceTx(ctx, msg, vmctx, statedb, config) - return 42 + privateAPI := NewPrivateDebugAPI(config2, fullNode) + return privateAPI.TraceTransaction(ctx, hash, config) } func setEthObject(ethobj interface{}){ diff --git a/miner/worker.go b/miner/worker.go index d1880456fc..fa331b53eb 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -309,7 +309,6 @@ func (self *worker) wait() { for _, log := range work.state.Logs() { log.BlockHash = block.Hash() } - fmt.Printf("\n\t[WORKER.GO self.eth] %+v\n", self.eth) // NOTE:SHYFT Added eth to writeBlockWithState stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state) if err != nil { diff --git a/rpc/http.go b/rpc/http.go index 3011222483..9805d69b63 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -231,10 +231,6 @@ func (h *virtualHostHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } if ipAddr := net.ParseIP(host); ipAddr != nil { // It's an IP address, we can serve that - fmt.Println("THE write is ") - fmt.Println(w) - fmt.Println("The read is ") - fmt.Println(r) h.next.ServeHTTP(w, r) return diff --git a/shyfttracerinterface/tracer_interface.go b/shyfttracerinterface/tracer_interface.go index a2f775e570..40d341b028 100644 --- a/shyfttracerinterface/tracer_interface.go +++ b/shyfttracerinterface/tracer_interface.go @@ -1,5 +1,10 @@ package shyfttracerinterface +import ( + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/node" +) + type IShyftTracer interface { - MyTraceTransaction(hash string) (interface{}) + GetTracerToRun(hash common.Hash, stack *node.Node) (interface{}, error) } From 34b2b9b7b9be801591dc2a728f328dd10d12082c Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 11 Jul 2018 12:10:49 -0400 Subject: [PATCH 08/24] sneding js tracer from golang --- core/database_util.go | 10 +- core/shyft_database_util.go | 16 +- eth/api_tracer.go | 227 +----- eth/backend.go | 40 +- eth/shyft_tracer.go | 38 +- eth/tracers/tracer.go | 12 +- .../build/contracts/Migrations.json | 230 +++--- .../build/contracts/Transfers.json | 686 +++++++++--------- .../build/contracts/Transfers2.json | 16 +- .../contracts/Migrations.sol | 2 +- .../contracts/Transfers.sol | 2 +- .../transfer-through-master/package-lock.json | 487 ++++++++++++- .../web3/transfer-through-master/package.json | 5 +- shyfttracerinterface/tracer_interface.go | 3 +- 14 files changed, 1043 insertions(+), 731 deletions(-) diff --git a/core/database_util.go b/core/database_util.go index 8aabd94034..af88b7733c 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -265,12 +265,12 @@ func GetBlockReceipts(db DatabaseReader, hash common.Hash, number uint64) types. // GetTxLookupEntry retrieves the positional metadata associated with a transaction // hash to allow retrieving the transaction or receipt by hash. func GetTxLookupEntry(db DatabaseReader, hash common.Hash) (common.Hash, uint64, uint64) { + fmt.Println("[GetTxLookupEntry FUNCTION RAN]") // Load the positional metadata from disk and bail if it fails - fmt.Println("INSIDE GetTxLookupEntry ") - fmt.Println("the db is ") - fmt.Println(db) - fmt.Println("the hash is") - fmt.Println(hash) + //fmt.Println("INSIDE GetTxLookupEntry ") + //fmt.Println("the db is ") + //fmt.Println(db) + fmt.Println("the hash is", hash.String()) data, _ := db.Get(append(lookupPrefix, hash.Bytes()...)) fmt.Println("the data is ") fmt.Println(data) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 5186c8c5a2..62673984cf 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -14,9 +14,6 @@ _ "github.com/lib/pq" "github.com/ethereum/go-ethereum/core/types" Rewards "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/shyfttracerinterface" - "github.com/ethereum/go-ethereum/node" - "reflect" - ) var IShyftTracer shyfttracerinterface.IShyftTracer @@ -175,18 +172,11 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H Data: tx.Data(), } - hash := txData.TxHash - fmt.Println(reflect.TypeOf(hash)) + //hash := txData.TxHash txHash := txData.TxHash.Hex() - //IShyftTracer.MyTraceTransaction(txHash) - // - var stack *node.Node - fmt.Println(reflect.TypeOf(stack)) - - prayer, err := IShyftTracer.GetTracerToRun(hash, stack) - fmt.Println("THIS IS A PRAYER", prayer) - fmt.Println(err) + //prayer, _ := IShyftTracer.GetTracerToRun(hash) + //fmt.Printf("%+v\n", prayer) from := txData.From.Hex() blockHasher := txData.BlockHash diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 47c4fd599c..f8740f3b13 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -125,7 +125,7 @@ func (api *PrivateDebugAPI) TraceChain(ctx context.Context, start, end rpc.Block // traceChain configures a new tracer according to the provided configuration, and // executes all the transactions contained within. The return value will be one item // per transaction, dependent on the requestd tracer. -func (api *PrivateDebugAPI) traceChain(ctx context.Context, start, end *types.Block, config *TraceConfig) (*rpc.Subscription, error) { + func (api *PrivateDebugAPI) traceChain(ctx context.Context, start, end *types.Block, config *TraceConfig) (*rpc.Subscription, error) { // Tracing a chain is a **long** operation, only do with subscriptions notifier, supported := rpc.NotifierFromContext(ctx) if !supported { @@ -530,229 +530,16 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* return statedb, nil } - -//func GetTracerToRun(hash common.Hash) (interface{}, error) { -// config2 := params.ShyftNetworkChainConfig -// var cfg *Config -// fmt.Println(reflect.TypeOf(cfg)) -// var ctx context.Context -// var config *TraceConfig -// var fullNode *Ethereum -// var stack *node.Node -// fmt.Println(reflect.TypeOf(stack)) -// err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { -// fullNode, err := New(ctx, cfg) -// return fullNode, err -// }) -// fmt.Println(err) -// privateAPI := NewPrivateDebugAPI(config2, fullNode) -// return privateAPI.TraceTransaction(ctx, hash, config) -//} - - // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { - fmt.Println("TRACE TRANSACTION ++++++!+!+!+!+!+!+!+!+!+!+!+!++!") - _, file, no, ok := runtime.Caller(1) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(2) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(3) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(4) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(5) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(6) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(7) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(8) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(9) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(10) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(11) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(12) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(13) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(14) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(15) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(16) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(17) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(18) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(19) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(20) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(21) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(22) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(23) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(24) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(25) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(26) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(27) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(28) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(29) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(30) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(31) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(32) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(33) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(34) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(35) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(36) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(37) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(38) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(39) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(40) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - fmt.Println("////////////// ++++++++++++++++ /////////////////// Phantom *(!*!*!*!*!*!**!*!*") - _, file, no, ok = runtime.Caller(41) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(42) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(43) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(44) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - fmt.Println("////////////// ++++++++++++++++ /////////////////// TraceTransaction *(!*!*!*!*!*!**!*!*") - _, file, no, ok = runtime.Caller(45) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - // NOTE:SHYFT - fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config) - fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth) - // Retrieve the transaction and assemble its EVM context - //fmt.Println("IN TRACE TRANSACTION the chaindb is ") - //fmt.Println(chaindb) - //fmt.Println("IN TRACE TRANSACTION the common hash is ") - //fmt.Println(hash) + tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) if tx == nil { return nil, fmt.Errorf("transaction %x not found", hash) } - fmt.Println("the tx is in TraceTransaction") - fmt.Println(tx) - fmt.Println(blockHash) - fmt.Println(index) + fmt.Println("TX IN TRACETRANSACTION", tx) reexec := defaultTraceReexec if config != nil && config.Reexec != nil { reexec = *config.Reexec @@ -761,10 +548,6 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Ha if err != nil { return nil, err } - // Trace the transaction and return - //fmt.Println("\n\n\t\tRETURN") - //fmt.Println(api.traceTx(ctx, msg, vmctx, statedb, config)) - //fmt.Println("RETURN FINISHED") return api.traceTx(ctx, msg, vmctx, statedb, config) } @@ -773,6 +556,8 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Ha // be tracer dependent. func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, vmctx vm.Context, statedb *state.StateDB, config *TraceConfig) (interface{}, error) { // Assemble the structured logger or the JavaScript tracer + fmt.Println("\n [API_TRACER.GO traceTX func]") + // fmt.Printf("%+v", config, "THIS IS CONFIG") var ( tracer vm.Tracer err error @@ -787,6 +572,7 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v } } // Constuct the JavaScript tracer to execute with + fmt.Printf("%+v \n", *config.Tracer) if tracer, err = tracers.New(*config.Tracer); err != nil { return nil, err } @@ -822,6 +608,7 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v }, nil case *tracers.Tracer: + fmt.Println("THIS RAN MF") return tracer.GetResult() default: diff --git a/eth/backend.go b/eth/backend.go index 5737865057..7d705ab0e6 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -102,12 +102,47 @@ func (s *Ethereum) AddLesServer(ls LesServer) { ls.SetBloomBitsIndexer(s.bloomIndexer) } +func SNew(config *Config) (*Ethereum, error) { + stopDbUpgrade := upgradeDeduplicateData(Chaindb_global) + chainConfig, _, _ := core.SetupGenesisBlock(Chaindb_global, config.Genesis) + + eth := &Ethereum{ + config: config, + chainDb: Chaindb_global, + chainConfig: chainConfig, + //eventMux: ctx.EventMux, + //accountManager: ctx.AccountManager, + //engine: CreateConsensusEngine(ctx, &config.Ethash, chainConfig, Chaindb_global), + shutdownChan: make(chan bool), + stopDbUpgrade: stopDbUpgrade, + networkId: config.NetworkId, + gasPrice: config.GasPrice, + etherbase: config.Etherbase, + bloomRequests: make(chan chan *bloombits.Retrieval), + bloomIndexer: NewBloomIndexer(Chaindb_global, params.BloomBitsBlocks), + } + + //var ( + // vmConfig = vm.Config{EnablePreimageRecording: config.EnablePreimageRecording} + // cacheConfig = &core.CacheConfig{Disabled: config.NoPruning, TrieNodeLimit: config.TrieCache, TrieTimeLimit: config.TrieTimeout} + //) + // + //eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, eth.chainConfig, eth.engine, vmConfig) + // + //BlockchainObject = eth.blockchain + + eth.blockchain = BlockchainObject + + return eth, nil +} + // New creates a new Ethereum object (including the // initialisation of the common Ethereum object) func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { shyft_tracer := new(ShyftTracer) core.SetIShyftTracer(shyft_tracer) + setGlobalConfig(config) _, file, no, ok := runtime.Caller(1) if ok { @@ -125,8 +160,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { return nil, err } - // @TODO: Create Genesis Block - stopDbUpgrade := upgradeDeduplicateData(chainDb) chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis) if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { @@ -167,7 +200,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, eth.chainConfig, eth.engine, vmConfig) BlockchainObject = eth.blockchain - + if err != nil { return nil, err } @@ -222,7 +255,6 @@ func makeExtraData(extra []byte) []byte { // CreateDB creates the chain database. func CreateDB(ctx *node.ServiceContext, config *Config, name string) (ethdb.Database, error) { - fmt.Println("in create db") db, err := ctx.OpenDatabase(name, config.DatabaseCache, config.DatabaseHandles) if err != nil { return nil, err diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index 24f31019ca..73bacd3b16 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -2,32 +2,42 @@ package eth import ( "github.com/ethereum/go-ethereum/common" - "fmt" - "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/params" "context" + "fmt" ) var EthereumObject interface{} type ShyftTracer struct {} - -func (st ShyftTracer) GetTracerToRun(hash common.Hash, stack *node.Node) (interface{}, error) { +//( +func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { config2 := params.ShyftNetworkChainConfig - var cfg *Config - var ctx context.Context - var config *TraceConfig - var fullNode *Ethereum - err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { - fullNode, err := New(ctx, cfg) - return fullNode, err - }) - fmt.Println(err) + jsTracer := "callTracer" + + // + //var cfg *Config + var ctx2 context.Context + config := &TraceConfig{ + LogConfig: nil, + Tracer: &jsTracer, // needs to be non-nil + Timeout: nil, + Reexec: nil, + } + fmt.Printf("%+v", config, "THIS IS CONFIG IN SHYFT_TRACER") + //var fullNode *Ethereum + fullNode, _ := SNew(Global_config) privateAPI := NewPrivateDebugAPI(config2, fullNode) - return privateAPI.TraceTransaction(ctx, hash, config) + return privateAPI.TraceTransaction(ctx2, hash, config) } func setEthObject(ethobj interface{}){ EthereumObject = ethobj +} + +var Global_config *Config + +func setGlobalConfig(c *Config) { + Global_config = c } \ No newline at end of file diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index f0afeab6cb..8c42b157b3 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -307,10 +307,14 @@ type Tracer struct { // which must evaluate to an expression returning an object with 'step', 'fault' // and 'result' functions. func New(code string) (*Tracer, error) { + fmt.Println("\n [TRACER.GO New func]", code) // Resolve any tracers by name and assemble the tracer object if tracer, ok := tracer(code); ok { code = tracer + fmt.Println("\n [ok]", ok) } + fmt.Println("\n [tracer]", tracer) + tracer := &Tracer{ vm: duktape.New(), ctx: make(map[string]interface{}), @@ -497,7 +501,9 @@ func wrapError(context string, err error) error { // CaptureStart implements the Tracer interface to initialize the tracing operation. func (jst *Tracer) CaptureStart(from common.Address, to common.Address, create bool, input []byte, gas uint64, value *big.Int) error { //fmt.Println("\n\n\t\t type: ", reflect.TypeOf(input)) - fmt.Println("\t\t [TRACER INPUT]:", input) + fmt.Println("\t\t [TRACER TO]:", to.String()) + fmt.Println("\t\t [TRACER FROM]:", from.String()) + fmt.Println("\t\t [TRACER VALUE]:", value.String()) fmt.Println("\t\t [TRACER INPUT STRING]:", string(input[:len(input)]), "\n\n") jst.ctx["type"] = "CALL" if create { @@ -568,8 +574,8 @@ func (jst *Tracer) CaptureFault(env *vm.EVM, pc uint64, op vm.OpCode, gas, cost // CaptureEnd is called after the call finishes to finalize the tracing. func (jst *Tracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, err error) error { //fmt.Println("\n\n\t\t", reflect.TypeOf(output)) - fmt.Println("\t\t [TRACER OUTPUT]:", output[:len(output)]) - fmt.Println("\t\t [TRACER OUTPUT STRING]:", string(output[:len(output)]), "\n\n") + //fmt.Println("\t\t [TRACER OUTPUT]:", output[:len(output)]) + //fmt.Println("\t\t [TRACER OUTPUT STRING]:", string(output[:len(output)]), "\n\n") jst.ctx["output"] = output jst.ctx["gasUsed"] = gasUsed jst.ctx["time"] = t.String() diff --git a/shyft-cli/web3/transfer-through-master/build/contracts/Migrations.json b/shyft-cli/web3/transfer-through-master/build/contracts/Migrations.json index fae58950b1..d0ea3e2b8a 100755 --- a/shyft-cli/web3/transfer-through-master/build/contracts/Migrations.json +++ b/shyft-cli/web3/transfer-through-master/build/contracts/Migrations.json @@ -64,14 +64,14 @@ "type": "function" } ], - "bytecode": "0x608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506102f8806100606000396000f300608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630900f01014610067578063445df0ac146100aa5780638da5cb5b146100d5578063fdacd5761461012c575b600080fd5b34801561007357600080fd5b506100a8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610159565b005b3480156100b657600080fd5b506100bf610241565b6040518082815260200191505060405180910390f35b3480156100e157600080fd5b506100ea610247565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561013857600080fd5b506101576004803603810190808035906020019092919050505061026c565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561023d578190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561022457600080fd5b505af1158015610238573d6000803e3d6000fd5b505050505b5050565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102c957806001819055505b505600a165627a7a7230582081dfbd8174037e45d69fcbe70d6680c7a2138f79ab9ba39bdffaa14fb7854aa50029", - "deployedBytecode": "0x608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630900f01014610067578063445df0ac146100aa5780638da5cb5b146100d5578063fdacd5761461012c575b600080fd5b34801561007357600080fd5b506100a8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610159565b005b3480156100b657600080fd5b506100bf610241565b6040518082815260200191505060405180910390f35b3480156100e157600080fd5b506100ea610247565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561013857600080fd5b506101576004803603810190808035906020019092919050505061026c565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561023d578190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561022457600080fd5b505af1158015610238573d6000803e3d6000fd5b505050505b5050565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102c957806001819055505b505600a165627a7a7230582081dfbd8174037e45d69fcbe70d6680c7a2138f79ab9ba39bdffaa14fb7854aa50029", - "sourceMap": "26:480:0:-;;;115:50;8:9:-1;5:2;;;30:1;27;20:12;5:2;115:50:0;150:10;142:5;;:18;;;;;;;;;;;;;;;;;;26:480;;;;;;", - "deployedSourceMap": "26:480:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;339:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;339:165:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;74:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;74:36:0;;;;;;;;;;;;;;;;;;;;;;;50:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;50:20:0;;;;;;;;;;;;;;;;;;;;;;;;;;;232:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;232:103:0;;;;;;;;;;;;;;;;;;;;;;;;;;339:165;401:19;215:5;;;;;;;;;;;201:19;;:10;:19;;;197:26;;;434:11;401:45;;452:8;:21;;;474:24;;452:47;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;452:47:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;452:47:0;;;;197:26;339:165;;:::o;74:36::-;;;;:::o;50:20::-;;;;;;;;;;;;;:::o;232:103::-;215:5;;;;;;;;;;;201:19;;:10;:19;;;197:26;;;321:9;294:24;:36;;;;197:26;232:103;:::o", - "source": "pragma solidity ^0.4.23;\n\ncontract Migrations {\n address public owner;\n uint public last_completed_migration;\n\n constructor() public {\n owner = msg.sender;\n }\n\n modifier restricted() {\n if (msg.sender == owner) _;\n }\n\n function setCompleted(uint completed) public restricted {\n last_completed_migration = completed;\n }\n\n function upgrade(address new_address) public restricted {\n Migrations upgraded = Migrations(new_address);\n upgraded.setCompleted(last_completed_migration);\n }\n}\n", - "sourcePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol", + "bytecode": "0x608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506102f8806100606000396000f300608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630900f01014610067578063445df0ac146100aa5780638da5cb5b146100d5578063fdacd5761461012c575b600080fd5b34801561007357600080fd5b506100a8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610159565b005b3480156100b657600080fd5b506100bf610241565b6040518082815260200191505060405180910390f35b3480156100e157600080fd5b506100ea610247565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561013857600080fd5b506101576004803603810190808035906020019092919050505061026c565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561023d578190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561022457600080fd5b505af1158015610238573d6000803e3d6000fd5b505050505b5050565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102c957806001819055505b505600a165627a7a723058204322c068e2f4ea0c2c75a1ad943ff4d1badcc839aea20ef91d899284e74d911b0029", + "deployedBytecode": "0x608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630900f01014610067578063445df0ac146100aa5780638da5cb5b146100d5578063fdacd5761461012c575b600080fd5b34801561007357600080fd5b506100a8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610159565b005b3480156100b657600080fd5b506100bf610241565b6040518082815260200191505060405180910390f35b3480156100e157600080fd5b506100ea610247565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561013857600080fd5b506101576004803603810190808035906020019092919050505061026c565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141561023d578190508073ffffffffffffffffffffffffffffffffffffffff1663fdacd5766001546040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561022457600080fd5b505af1158015610238573d6000803e3d6000fd5b505050505b5050565b60015481565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614156102c957806001819055505b505600a165627a7a723058204322c068e2f4ea0c2c75a1ad943ff4d1badcc839aea20ef91d899284e74d911b0029", + "sourceMap": "26:488:0:-;;;115:58;8:9:-1;5:2;;;30:1;27;20:12;5:2;115:58:0;158:10;150:5;;:18;;;;;;;;;;;;;;;;;;26:488;;;;;;", + "deployedSourceMap": "26:488:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;347:165;;8:9:-1;5:2;;;30:1;27;20:12;5:2;347:165:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;74:36;;8:9:-1;5:2;;;30:1;27;20:12;5:2;74:36:0;;;;;;;;;;;;;;;;;;;;;;;50:20;;8:9:-1;5:2;;;30:1;27;20:12;5:2;50:20:0;;;;;;;;;;;;;;;;;;;;;;;;;;;240:103;;8:9:-1;5:2;;;30:1;27;20:12;5:2;240:103:0;;;;;;;;;;;;;;;;;;;;;;;;;;347:165;409:19;223:5;;;;;;;;;;;209:19;;:10;:19;;;205:26;;;442:11;409:45;;460:8;:21;;;482:24;;460:47;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;460:47:0;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;460:47:0;;;;205:26;347:165;;:::o;74:36::-;;;;:::o;50:20::-;;;;;;;;;;;;;:::o;240:103::-;223:5;;;;;;;;;;;209:19;;:10;:19;;;205:26;;;329:9;302:24;:36;;;;205:26;240:103;:::o", + "source": "pragma solidity ^0.4.23;\n\ncontract Migrations {\n address public owner;\n uint public last_completed_migration;\n\n function Migrations() public {\n owner = msg.sender;\n }\n\n modifier restricted() {\n if (msg.sender == owner) _;\n }\n\n function setCompleted(uint completed) public restricted {\n last_completed_migration = completed;\n }\n\n function upgrade(address new_address) public restricted {\n Migrations upgraded = Migrations(new_address);\n upgraded.setCompleted(last_completed_migration);\n }\n}\n", + "sourcePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol", "ast": { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol", "exportedSymbols": { "Migrations": [ 56 @@ -160,7 +160,7 @@ "body": { "id": 13, "nodeType": "Block", - "src": "136:29:0", + "src": "144:29:0", "statements": [ { "expression": { @@ -177,7 +177,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 3, - "src": "142:5:0", + "src": "150:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -194,7 +194,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "150:3:0", + "src": "158:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -208,13 +208,13 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "150:10:0", + "src": "158:10:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "142:18:0", + "src": "150:18:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -222,7 +222,7 @@ }, "id": 12, "nodeType": "ExpressionStatement", - "src": "142:18:0" + "src": "150:18:0" } ] }, @@ -232,23 +232,23 @@ "isConstructor": true, "isDeclaredConst": false, "modifiers": [], - "name": "", + "name": "Migrations", "nodeType": "FunctionDefinition", "parameters": { "id": 6, "nodeType": "ParameterList", "parameters": [], - "src": "126:2:0" + "src": "134:2:0" }, "payable": false, "returnParameters": { "id": 7, "nodeType": "ParameterList", "parameters": [], - "src": "136:0:0" + "src": "144:0:0" }, "scope": 56, - "src": "115:50:0", + "src": "115:58:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -257,7 +257,7 @@ "body": { "id": 22, "nodeType": "Block", - "src": "191:37:0", + "src": "199:37:0", "statements": [ { "condition": { @@ -280,7 +280,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "201:3:0", + "src": "209:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -294,7 +294,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "201:10:0", + "src": "209:10:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -309,13 +309,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 3, - "src": "215:5:0", + "src": "223:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "201:19:0", + "src": "209:19:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -324,11 +324,11 @@ "falseBody": null, "id": 21, "nodeType": "IfStatement", - "src": "197:26:0", + "src": "205:26:0", "trueBody": { "id": 20, "nodeType": "PlaceholderStatement", - "src": "222:1:0" + "src": "230:1:0" } } ] @@ -341,16 +341,16 @@ "id": 15, "nodeType": "ParameterList", "parameters": [], - "src": "188:2:0" + "src": "196:2:0" }, - "src": "169:59:0", + "src": "177:59:0", "visibility": "internal" }, { "body": { "id": 34, "nodeType": "Block", - "src": "288:47:0", + "src": "296:47:0", "statements": [ { "expression": { @@ -367,7 +367,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 5, - "src": "294:24:0", + "src": "302:24:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -382,13 +382,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 25, - "src": "321:9:0", + "src": "329:9:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "294:36:0", + "src": "302:36:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -396,7 +396,7 @@ }, "id": 33, "nodeType": "ExpressionStatement", - "src": "294:36:0" + "src": "302:36:0" } ] }, @@ -416,14 +416,14 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 23, - "src": "277:10:0", + "src": "285:10:0", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "277:10:0" + "src": "285:10:0" } ], "name": "setCompleted", @@ -438,7 +438,7 @@ "name": "completed", "nodeType": "VariableDeclaration", "scope": 35, - "src": "254:14:0", + "src": "262:14:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -449,7 +449,7 @@ "id": 24, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "254:4:0", + "src": "262:4:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -459,17 +459,17 @@ "visibility": "internal" } ], - "src": "253:16:0" + "src": "261:16:0" }, "payable": false, "returnParameters": { "id": 29, "nodeType": "ParameterList", "parameters": [], - "src": "288:0:0" + "src": "296:0:0" }, "scope": 56, - "src": "232:103:0", + "src": "240:103:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -478,7 +478,7 @@ "body": { "id": 54, "nodeType": "Block", - "src": "395:109:0", + "src": "403:109:0", "statements": [ { "assignments": [ @@ -491,7 +491,7 @@ "name": "upgraded", "nodeType": "VariableDeclaration", "scope": 55, - "src": "401:19:0", + "src": "409:19:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -504,7 +504,7 @@ "name": "Migrations", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 56, - "src": "401:10:0", + "src": "409:10:0", "typeDescriptions": { "typeIdentifier": "t_contract$_Migrations_$56", "typeString": "contract Migrations" @@ -525,7 +525,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 37, - "src": "434:11:0", + "src": "442:11:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -544,7 +544,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 56, - "src": "423:10:0", + "src": "431:10:0", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_Migrations_$56_$", "typeString": "type(contract Migrations)" @@ -558,14 +558,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "423:23:0", + "src": "431:23:0", "typeDescriptions": { "typeIdentifier": "t_contract$_Migrations_$56", "typeString": "contract Migrations" } }, "nodeType": "VariableDeclarationStatement", - "src": "401:45:0" + "src": "409:45:0" }, { "expression": { @@ -578,7 +578,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 5, - "src": "474:24:0", + "src": "482:24:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -599,7 +599,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 43, - "src": "452:8:0", + "src": "460:8:0", "typeDescriptions": { "typeIdentifier": "t_contract$_Migrations_$56", "typeString": "contract Migrations" @@ -613,7 +613,7 @@ "memberName": "setCompleted", "nodeType": "MemberAccess", "referencedDeclaration": 35, - "src": "452:21:0", + "src": "460:21:0", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" @@ -627,7 +627,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "452:47:0", + "src": "460:47:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -635,7 +635,7 @@ }, "id": 53, "nodeType": "ExpressionStatement", - "src": "452:47:0" + "src": "460:47:0" } ] }, @@ -655,14 +655,14 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 23, - "src": "384:10:0", + "src": "392:10:0", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "384:10:0" + "src": "392:10:0" } ], "name": "upgrade", @@ -677,7 +677,7 @@ "name": "new_address", "nodeType": "VariableDeclaration", "scope": 55, - "src": "356:19:0", + "src": "364:19:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -688,7 +688,7 @@ "id": 36, "name": "address", "nodeType": "ElementaryTypeName", - "src": "356:7:0", + "src": "364:7:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -698,30 +698,30 @@ "visibility": "internal" } ], - "src": "355:21:0" + "src": "363:21:0" }, "payable": false, "returnParameters": { "id": 41, "nodeType": "ParameterList", "parameters": [], - "src": "395:0:0" + "src": "403:0:0" }, "scope": 56, - "src": "339:165:0", + "src": "347:165:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], "scope": 57, - "src": "26:480:0" + "src": "26:488:0" } ], - "src": "0:507:0" + "src": "0:515:0" }, "legacyAST": { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol", "exportedSymbols": { "Migrations": [ 56 @@ -810,7 +810,7 @@ "body": { "id": 13, "nodeType": "Block", - "src": "136:29:0", + "src": "144:29:0", "statements": [ { "expression": { @@ -827,7 +827,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 3, - "src": "142:5:0", + "src": "150:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -844,7 +844,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "150:3:0", + "src": "158:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -858,13 +858,13 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "150:10:0", + "src": "158:10:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "142:18:0", + "src": "150:18:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -872,7 +872,7 @@ }, "id": 12, "nodeType": "ExpressionStatement", - "src": "142:18:0" + "src": "150:18:0" } ] }, @@ -882,23 +882,23 @@ "isConstructor": true, "isDeclaredConst": false, "modifiers": [], - "name": "", + "name": "Migrations", "nodeType": "FunctionDefinition", "parameters": { "id": 6, "nodeType": "ParameterList", "parameters": [], - "src": "126:2:0" + "src": "134:2:0" }, "payable": false, "returnParameters": { "id": 7, "nodeType": "ParameterList", "parameters": [], - "src": "136:0:0" + "src": "144:0:0" }, "scope": 56, - "src": "115:50:0", + "src": "115:58:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -907,7 +907,7 @@ "body": { "id": 22, "nodeType": "Block", - "src": "191:37:0", + "src": "199:37:0", "statements": [ { "condition": { @@ -930,7 +930,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "201:3:0", + "src": "209:3:0", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -944,7 +944,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "201:10:0", + "src": "209:10:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -959,13 +959,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 3, - "src": "215:5:0", + "src": "223:5:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "201:19:0", + "src": "209:19:0", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -974,11 +974,11 @@ "falseBody": null, "id": 21, "nodeType": "IfStatement", - "src": "197:26:0", + "src": "205:26:0", "trueBody": { "id": 20, "nodeType": "PlaceholderStatement", - "src": "222:1:0" + "src": "230:1:0" } } ] @@ -991,16 +991,16 @@ "id": 15, "nodeType": "ParameterList", "parameters": [], - "src": "188:2:0" + "src": "196:2:0" }, - "src": "169:59:0", + "src": "177:59:0", "visibility": "internal" }, { "body": { "id": 34, "nodeType": "Block", - "src": "288:47:0", + "src": "296:47:0", "statements": [ { "expression": { @@ -1017,7 +1017,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 5, - "src": "294:24:0", + "src": "302:24:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1032,13 +1032,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 25, - "src": "321:9:0", + "src": "329:9:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "294:36:0", + "src": "302:36:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1046,7 +1046,7 @@ }, "id": 33, "nodeType": "ExpressionStatement", - "src": "294:36:0" + "src": "302:36:0" } ] }, @@ -1066,14 +1066,14 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 23, - "src": "277:10:0", + "src": "285:10:0", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "277:10:0" + "src": "285:10:0" } ], "name": "setCompleted", @@ -1088,7 +1088,7 @@ "name": "completed", "nodeType": "VariableDeclaration", "scope": 35, - "src": "254:14:0", + "src": "262:14:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1099,7 +1099,7 @@ "id": 24, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "254:4:0", + "src": "262:4:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1109,17 +1109,17 @@ "visibility": "internal" } ], - "src": "253:16:0" + "src": "261:16:0" }, "payable": false, "returnParameters": { "id": 29, "nodeType": "ParameterList", "parameters": [], - "src": "288:0:0" + "src": "296:0:0" }, "scope": 56, - "src": "232:103:0", + "src": "240:103:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -1128,7 +1128,7 @@ "body": { "id": 54, "nodeType": "Block", - "src": "395:109:0", + "src": "403:109:0", "statements": [ { "assignments": [ @@ -1141,7 +1141,7 @@ "name": "upgraded", "nodeType": "VariableDeclaration", "scope": 55, - "src": "401:19:0", + "src": "409:19:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1154,7 +1154,7 @@ "name": "Migrations", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 56, - "src": "401:10:0", + "src": "409:10:0", "typeDescriptions": { "typeIdentifier": "t_contract$_Migrations_$56", "typeString": "contract Migrations" @@ -1175,7 +1175,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 37, - "src": "434:11:0", + "src": "442:11:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1194,7 +1194,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 56, - "src": "423:10:0", + "src": "431:10:0", "typeDescriptions": { "typeIdentifier": "t_type$_t_contract$_Migrations_$56_$", "typeString": "type(contract Migrations)" @@ -1208,14 +1208,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "423:23:0", + "src": "431:23:0", "typeDescriptions": { "typeIdentifier": "t_contract$_Migrations_$56", "typeString": "contract Migrations" } }, "nodeType": "VariableDeclarationStatement", - "src": "401:45:0" + "src": "409:45:0" }, { "expression": { @@ -1228,7 +1228,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 5, - "src": "474:24:0", + "src": "482:24:0", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1249,7 +1249,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 43, - "src": "452:8:0", + "src": "460:8:0", "typeDescriptions": { "typeIdentifier": "t_contract$_Migrations_$56", "typeString": "contract Migrations" @@ -1263,7 +1263,7 @@ "memberName": "setCompleted", "nodeType": "MemberAccess", "referencedDeclaration": 35, - "src": "452:21:0", + "src": "460:21:0", "typeDescriptions": { "typeIdentifier": "t_function_external_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256) external" @@ -1277,7 +1277,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "452:47:0", + "src": "460:47:0", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -1285,7 +1285,7 @@ }, "id": 53, "nodeType": "ExpressionStatement", - "src": "452:47:0" + "src": "460:47:0" } ] }, @@ -1305,14 +1305,14 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 23, - "src": "384:10:0", + "src": "392:10:0", "typeDescriptions": { "typeIdentifier": "t_modifier$__$", "typeString": "modifier ()" } }, "nodeType": "ModifierInvocation", - "src": "384:10:0" + "src": "392:10:0" } ], "name": "upgrade", @@ -1327,7 +1327,7 @@ "name": "new_address", "nodeType": "VariableDeclaration", "scope": 55, - "src": "356:19:0", + "src": "364:19:0", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1338,7 +1338,7 @@ "id": 36, "name": "address", "nodeType": "ElementaryTypeName", - "src": "356:7:0", + "src": "364:7:0", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1348,27 +1348,27 @@ "visibility": "internal" } ], - "src": "355:21:0" + "src": "363:21:0" }, "payable": false, "returnParameters": { "id": 41, "nodeType": "ParameterList", "parameters": [], - "src": "395:0:0" + "src": "403:0:0" }, "scope": 56, - "src": "339:165:0", + "src": "347:165:0", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], "scope": 57, - "src": "26:480:0" + "src": "26:488:0" } ], - "src": "0:507:0" + "src": "0:515:0" }, "compiler": { "name": "solc", @@ -1379,7 +1379,7 @@ "events": {}, "links": {}, "address": "0xfaeccae8c1af6bdfd71095e1b6a2f61c61c8a7e7", - "transactionHash": "0xeee5c7819e1a662e45a8244d02305b531d2c4e11e67383dace9b458dc76f22dc" + "transactionHash": "0x79d68857d23437507895cbdcd033462f3a799fd1b94d51b7e624f6710cfb6c9a" }, "1528420224459": { "events": {}, @@ -1388,6 +1388,6 @@ "transactionHash": "0x1d1b9f147f05f37206bbfa1143bb5ec43c8a1e193d17513471b6d6f58911779c" } }, - "schemaVersion": "2.0.0", - "updatedAt": "2018-06-08T15:58:27.900Z" + "schemaVersion": "2.0.1", + "updatedAt": "2018-07-06T18:05:39.259Z" } \ No newline at end of file diff --git a/shyft-cli/web3/transfer-through-master/build/contracts/Transfers.json b/shyft-cli/web3/transfer-through-master/build/contracts/Transfers.json index cd9330c614..f47209689a 100755 --- a/shyft-cli/web3/transfer-through-master/build/contracts/Transfers.json +++ b/shyft-cli/web3/transfer-through-master/build/contracts/Transfers.json @@ -109,14 +109,14 @@ "type": "function" } ], - "bytecode": "0x608060405234801561001057600080fd5b506100196100de565b604051809103906000f080158015610035573d6000803e3d6000fd5b50600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506100ee565b60405161010c806107a683390190565b6106a9806100fd6000396000f300608060405260043610610078576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680636b557a221461007d578063a9059cbb146100ed578063c9116b691461013a578063d0e30db014610165578063e3d670d714610183578063f3fef3a3146101da575b600080fd5b34801561008957600080fd5b506100eb6004803603810190808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190929190505050610227565b005b3480156100f957600080fd5b50610138600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610349565b005b34801561014657600080fd5b5061014f6104a9565b6040518082815260200191505060405180910390f35b61016d6104ef565b6040518082815260200191505060405180910390f35b34801561018f57600080fd5b506101c4600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610581565b6040518082815260200191505060405180910390f35b3480156101e657600080fd5b50610225600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610599565b005b600080835191508183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561027d57600080fd5b8183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550600090505b818110156103435783818151811015156102e657fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff166108fc849081150290604051600060405180830381858888f19350505050158015610335573d6000803e3d6000fd5b5080806001019150506102d0565b50505050565b6000816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561039857600080fd5b60405180807f7472616e73666572286164647265737329000000000000000000000000000000815250601101905060405180910390209050600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1682827c0100000000000000000000000000000000000000000000000000000000900490856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060006040518083038185885af1935050505050505050565b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b6000346000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055506000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b60006020528060005260406000206000915090505481565b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156105e657600080fd5b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055508173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610678573d6000803e3d6000fd5b5050505600a165627a7a7230582073b86b0504a0668c11a4b9525431c2c1eb1f06ba1b37ab7b422840967732027c0029608060405234801561001057600080fd5b5060ed8061001f6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631a695230146044575b600080fd5b6076600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506078565b005b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015801560bd573d6000803e3d6000fd5b50505600a165627a7a72305820e95f74106a3328ffadd8b0adb916d92497daab65998ee73cf40afff57dc4b29b0029", - "deployedBytecode": "0x608060405260043610610078576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680636b557a221461007d578063a9059cbb146100ed578063c9116b691461013a578063d0e30db014610165578063e3d670d714610183578063f3fef3a3146101da575b600080fd5b34801561008957600080fd5b506100eb6004803603810190808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190929190505050610227565b005b3480156100f957600080fd5b50610138600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610349565b005b34801561014657600080fd5b5061014f6104a9565b6040518082815260200191505060405180910390f35b61016d6104ef565b6040518082815260200191505060405180910390f35b34801561018f57600080fd5b506101c4600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610581565b6040518082815260200191505060405180910390f35b3480156101e657600080fd5b50610225600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610599565b005b600080835191508183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561027d57600080fd5b8183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550600090505b818110156103435783818151811015156102e657fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff166108fc849081150290604051600060405180830381858888f19350505050158015610335573d6000803e3d6000fd5b5080806001019150506102d0565b50505050565b6000816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561039857600080fd5b60405180807f7472616e73666572286164647265737329000000000000000000000000000000815250601101905060405180910390209050600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1682827c0100000000000000000000000000000000000000000000000000000000900490856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060006040518083038185885af1935050505050505050565b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b6000346000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055506000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b60006020528060005260406000206000915090505481565b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156105e657600080fd5b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055508173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610678573d6000803e3d6000fd5b5050505600a165627a7a7230582073b86b0504a0668c11a4b9525431c2c1eb1f06ba1b37ab7b422840967732027c0029", - "sourceMap": "54:979:1:-;;;152:72;8:9:-1;5:2;;;30:1;27;20:12;5:2;152:72:1;181:16;;:::i;:::-;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;181:16:1;177:1;;:20;;;;;;;;;;;;;;;;;;218:1;;;;;;;;;;;201:6;;:19;;;;;;;;;;;;;;;;;;54:979;;;;;;;;;;;;:::o;:::-;;;;;;;", - "deployedSourceMap": "54:979:1:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;790:241;;8:9:-1;5:2;;;30:1;27;20:12;5:2;790:241:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;227:197;;8:9:-1;5:2;;;30:1;27;20:12;5:2;227:197:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;427:77;;8:9:-1;5:2;;;30:1;27;20:12;5:2;427:77:1;;;;;;;;;;;;;;;;;;;;;;;507:119;;;;;;;;;;;;;;;;;;;;;;;76:40;;8:9:-1;5:2;;;30:1;27;20:12;5:2;76:40:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;629:158;;8:9:-1;5:2;;;30:1;27;20:12;5:2;629:158:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;790:241;855:6;969;864;:13;855:22;;921:1;912:6;:10;889:7;:19;897:10;889:19;;;;;;;;;;;;;;;;:33;;881:42;;;;;;;;959:1;950:6;:10;927:7;:19;935:10;927:19;;;;;;;;;;;;;;;;:33;;;;;;;;;;;978:1;969:10;;964:64;985:1;981;:5;964:64;;;997:6;1004:1;997:9;;;;;;;;;;;;;;;;;;:18;;:26;1016:6;997:26;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;997:26:1;988:3;;;;;;;964:64;;;790:241;;;;:::o;227:197::-;326:10;315:6;292:7;:19;300:10;292:19;;;;;;;;;;;;;;;;:29;;284:38;;;;;;;;346:30;;;;;;;;;;;;;;;;;;;326:51;;381:6;;;;;;;;;;;:11;;399:6;407:3;381:37;;;;412:5;381:37;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;227:197;;;:::o;427:77::-;464:4;481:7;:19;489:10;481:19;;;;;;;;;;;;;;;;474:26;;427:77;:::o;507:119::-;550:4;583:9;560:7;:19;568:10;560:19;;;;;;;;;;;;;;;;:32;;;;;;;;;;;603:7;:19;611:10;603:19;;;;;;;;;;;;;;;;596:26;;507:119;:::o;76:40::-;;;;;;;;;;;;;;;;;:::o;629:158::-;717:6;694:7;:19;702:10;694:19;;;;;;;;;;;;;;;;:29;;686:38;;;;;;;;751:6;728:7;:19;736:10;728:19;;;;;;;;;;;;;;;;:29;;;;;;;;;;;761:5;:14;;:22;776:6;761:22;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;761:22:1;629:158;;:::o", - "source": "pragma solidity ^0.4.19;\n\nimport \"./Transfers2.sol\";\n\ncontract Transfers {\n\tmapping (address => uint) public balance;\n\tTransfers2 t;\n\taddress t_addr;\n\n\tconstructor() public {\n\t\tt = new Transfers2();\n\t\tt_addr = address(t);\n\t}\n\n\tfunction transfer(address _addr, uint _value) public {\n\t\trequire(balance[msg.sender] >= _value);\n\t\tbytes4 sig = bytes4(keccak256(\"transfer(address)\"));\n\t\tt_addr.call.value(_value)(sig, _addr);\t\t\n\t}\n\n\tfunction myBalance() public returns (uint) {\n\t\treturn balance[msg.sender];\n\t}\n\n\tfunction deposit() public payable returns (uint) {\n\t\tbalance[msg.sender] += msg.value;\n\t\treturn balance[msg.sender];\n\t}\n\n\tfunction withdraw(address _addr, uint _value) public {\n\t\trequire(balance[msg.sender] >= _value);\n\t\tbalance[msg.sender] -= _value;\n\t\t_addr.transfer(_value);\n\t}\n\n\tfunction withdrawMulti(address[] _addrs, uint _value) public {\n\t\tuint l = _addrs.length;\n\t\trequire(balance[msg.sender] >= _value * l);\n\t\tbalance[msg.sender] -= _value * l;\n\t\tfor (uint i = 0; i < l; i++){\n\t\t\t_addrs[i].transfer(_value);\n\t\t}\n\t}\n}", - "sourcePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol", + "bytecode": "0x608060405234801561001057600080fd5b506100196100de565b604051809103906000f080158015610035573d6000803e3d6000fd5b50600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506100ee565b60405161010c806107a683390190565b6106a9806100fd6000396000f300608060405260043610610078576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680636b557a221461007d578063a9059cbb146100ed578063c9116b691461013a578063d0e30db014610165578063e3d670d714610183578063f3fef3a3146101da575b600080fd5b34801561008957600080fd5b506100eb6004803603810190808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190929190505050610227565b005b3480156100f957600080fd5b50610138600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610349565b005b34801561014657600080fd5b5061014f6104a9565b6040518082815260200191505060405180910390f35b61016d6104ef565b6040518082815260200191505060405180910390f35b34801561018f57600080fd5b506101c4600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610581565b6040518082815260200191505060405180910390f35b3480156101e657600080fd5b50610225600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610599565b005b600080835191508183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561027d57600080fd5b8183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550600090505b818110156103435783818151811015156102e657fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff166108fc849081150290604051600060405180830381858888f19350505050158015610335573d6000803e3d6000fd5b5080806001019150506102d0565b50505050565b6000816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561039857600080fd5b60405180807f7472616e73666572286164647265737329000000000000000000000000000000815250601101905060405180910390209050600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1682827c0100000000000000000000000000000000000000000000000000000000900490856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060006040518083038185885af1935050505050505050565b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b6000346000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055506000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b60006020528060005260406000206000915090505481565b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156105e657600080fd5b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055508173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610678573d6000803e3d6000fd5b5050505600a165627a7a7230582004c04bcb520b99a14d72a172a70df1ab13d8ab5f02cfd7e82369d4cd33a6d2c20029608060405234801561001057600080fd5b5060ed8061001f6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631a695230146044575b600080fd5b6076600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506078565b005b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015801560bd573d6000803e3d6000fd5b50505600a165627a7a723058206b9724f2a2dbdc5e27a309b647c1d11903393ac90b5e54ab4925de752e5f6e760029", + "deployedBytecode": "0x608060405260043610610078576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680636b557a221461007d578063a9059cbb146100ed578063c9116b691461013a578063d0e30db014610165578063e3d670d714610183578063f3fef3a3146101da575b600080fd5b34801561008957600080fd5b506100eb6004803603810190808035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919291929080359060200190929190505050610227565b005b3480156100f957600080fd5b50610138600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610349565b005b34801561014657600080fd5b5061014f6104a9565b6040518082815260200191505060405180910390f35b61016d6104ef565b6040518082815260200191505060405180910390f35b34801561018f57600080fd5b506101c4600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610581565b6040518082815260200191505060405180910390f35b3480156101e657600080fd5b50610225600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610599565b005b600080835191508183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561027d57600080fd5b8183026000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550600090505b818110156103435783818151811015156102e657fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff166108fc849081150290604051600060405180830381858888f19350505050158015610335573d6000803e3d6000fd5b5080806001019150506102d0565b50505050565b6000816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561039857600080fd5b60405180807f7472616e73666572286164647265737329000000000000000000000000000000815250601101905060405180910390209050600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1682827c0100000000000000000000000000000000000000000000000000000000900490856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060006040518083038185885af1935050505050505050565b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b6000346000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055506000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905090565b60006020528060005260406000206000915090505481565b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156105e657600080fd5b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055508173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610678573d6000803e3d6000fd5b5050505600a165627a7a7230582004c04bcb520b99a14d72a172a70df1ab13d8ab5f02cfd7e82369d4cd33a6d2c20029", + "sourceMap": "54:986:1:-;;;152:79;8:9:-1;5:2;;;30:1;27;20:12;5:2;152:79:1;188:16;;:::i;:::-;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;188:16:1;184:1;;:20;;;;;;;;;;;;;;;;;;225:1;;;;;;;;;;;208:6;;:19;;;;;;;;;;;;;;;;;;54:986;;;;;;;;;;;;:::o;:::-;;;;;;;", + "deployedSourceMap": "54:986:1:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;797:241;;8:9:-1;5:2;;;30:1;27;20:12;5:2;797:241:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;234:197;;8:9:-1;5:2;;;30:1;27;20:12;5:2;234:197:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;434:77;;8:9:-1;5:2;;;30:1;27;20:12;5:2;434:77:1;;;;;;;;;;;;;;;;;;;;;;;514:119;;;;;;;;;;;;;;;;;;;;;;;76:40;;8:9:-1;5:2;;;30:1;27;20:12;5:2;76:40:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;636:158;;8:9:-1;5:2;;;30:1;27;20:12;5:2;636:158:1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;797:241;862:6;976;871;:13;862:22;;928:1;919:6;:10;896:7;:19;904:10;896:19;;;;;;;;;;;;;;;;:33;;888:42;;;;;;;;966:1;957:6;:10;934:7;:19;942:10;934:19;;;;;;;;;;;;;;;;:33;;;;;;;;;;;985:1;976:10;;971:64;992:1;988;:5;971:64;;;1004:6;1011:1;1004:9;;;;;;;;;;;;;;;;;;:18;;:26;1023:6;1004:26;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1004:26:1;995:3;;;;;;;971:64;;;797:241;;;;:::o;234:197::-;333:10;322:6;299:7;:19;307:10;299:19;;;;;;;;;;;;;;;;:29;;291:38;;;;;;;;353:30;;;;;;;;;;;;;;;;;;;333:51;;388:6;;;;;;;;;;;:11;;406:6;414:3;388:37;;;;419:5;388:37;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;234:197;;;:::o;434:77::-;471:4;488:7;:19;496:10;488:19;;;;;;;;;;;;;;;;481:26;;434:77;:::o;514:119::-;557:4;590:9;567:7;:19;575:10;567:19;;;;;;;;;;;;;;;;:32;;;;;;;;;;;610:7;:19;618:10;610:19;;;;;;;;;;;;;;;;603:26;;514:119;:::o;76:40::-;;;;;;;;;;;;;;;;;:::o;636:158::-;724:6;701:7;:19;709:10;701:19;;;;;;;;;;;;;;;;:29;;693:38;;;;;;;;758:6;735:7;:19;743:10;735:19;;;;;;;;;;;;;;;;:29;;;;;;;;;;;768:5;:14;;:22;783:6;768:22;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;768:22:1;636:158;;:::o", + "source": "pragma solidity ^0.4.19;\n\nimport \"./Transfers2.sol\";\n\ncontract Transfers {\n\tmapping (address => uint) public balance;\n\tTransfers2 t;\n\taddress t_addr;\n\n\tfunction Transfers() public {\n\t\tt = new Transfers2();\n\t\tt_addr = address(t);\n\t}\n\n\tfunction transfer(address _addr, uint _value) public {\n\t\trequire(balance[msg.sender] >= _value);\n\t\tbytes4 sig = bytes4(keccak256(\"transfer(address)\"));\n\t\tt_addr.call.value(_value)(sig, _addr);\t\t\n\t}\n\n\tfunction myBalance() public returns (uint) {\n\t\treturn balance[msg.sender];\n\t}\n\n\tfunction deposit() public payable returns (uint) {\n\t\tbalance[msg.sender] += msg.value;\n\t\treturn balance[msg.sender];\n\t}\n\n\tfunction withdraw(address _addr, uint _value) public {\n\t\trequire(balance[msg.sender] >= _value);\n\t\tbalance[msg.sender] -= _value;\n\t\t_addr.transfer(_value);\n\t}\n\n\tfunction withdrawMulti(address[] _addrs, uint _value) public {\n\t\tuint l = _addrs.length;\n\t\trequire(balance[msg.sender] >= _value * l);\n\t\tbalance[msg.sender] -= _value * l;\n\t\tfor (uint i = 0; i < l; i++){\n\t\t\t_addrs[i].transfer(_value);\n\t\t}\n\t}\n}", + "sourcePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol", "ast": { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol", "exportedSymbols": { "Transfers": [ 233 @@ -137,7 +137,7 @@ "src": "0:24:1" }, { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", "file": "./Transfers2.sol", "id": 59, "nodeType": "ImportDirective", @@ -265,7 +265,7 @@ "body": { "id": 82, "nodeType": "Block", - "src": "173:51:1", + "src": "180:51:1", "statements": [ { "expression": { @@ -282,7 +282,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 65, - "src": "177:1:1", + "src": "184:1:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -301,7 +301,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "NewExpression", - "src": "181:14:1", + "src": "188:14:1", "typeDescriptions": { "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_Transfers2_$249_$", "typeString": "function () returns (contract Transfers2)" @@ -312,7 +312,7 @@ "name": "Transfers2", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 249, - "src": "185:10:1", + "src": "192:10:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -327,13 +327,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "181:16:1", + "src": "188:16:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" } }, - "src": "177:20:1", + "src": "184:20:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -341,7 +341,7 @@ }, "id": 75, "nodeType": "ExpressionStatement", - "src": "177:20:1" + "src": "184:20:1" }, { "expression": { @@ -358,7 +358,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 67, - "src": "201:6:1", + "src": "208:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -376,7 +376,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 65, - "src": "218:1:1", + "src": "225:1:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -396,7 +396,7 @@ "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "210:7:1", + "src": "217:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" @@ -411,13 +411,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "210:10:1", + "src": "217:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "201:19:1", + "src": "208:19:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -425,7 +425,7 @@ }, "id": 81, "nodeType": "ExpressionStatement", - "src": "201:19:1" + "src": "208:19:1" } ] }, @@ -435,23 +435,23 @@ "isConstructor": true, "isDeclaredConst": false, "modifiers": [], - "name": "", + "name": "Transfers", "nodeType": "FunctionDefinition", "parameters": { "id": 68, "nodeType": "ParameterList", "parameters": [], - "src": "163:2:1" + "src": "170:2:1" }, "payable": false, "returnParameters": { "id": 69, "nodeType": "ParameterList", "parameters": [], - "src": "173:0:1" + "src": "180:0:1" }, "scope": 233, - "src": "152:72:1", + "src": "152:79:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -460,7 +460,7 @@ "body": { "id": 118, "nodeType": "Block", - "src": "280:144:1", + "src": "287:144:1", "statements": [ { "expression": { @@ -486,7 +486,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "292:7:1", + "src": "299:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -502,7 +502,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "300:3:1", + "src": "307:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -516,7 +516,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "300:10:1", + "src": "307:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -527,7 +527,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "292:19:1", + "src": "299:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -542,13 +542,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 87, - "src": "315:6:1", + "src": "322:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "292:29:1", + "src": "299:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -570,7 +570,7 @@ 268 ], "referencedDeclaration": 267, - "src": "284:7:1", + "src": "291:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" @@ -584,7 +584,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "284:38:1", + "src": "291:38:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -592,7 +592,7 @@ }, "id": 98, "nodeType": "ExpressionStatement", - "src": "284:38:1" + "src": "291:38:1" }, { "assignments": [ @@ -605,7 +605,7 @@ "name": "sig", "nodeType": "VariableDeclaration", "scope": 119, - "src": "326:10:1", + "src": "333:10:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -616,7 +616,7 @@ "id": 99, "name": "bytes4", "nodeType": "ElementaryTypeName", - "src": "326:6:1", + "src": "333:6:1", "typeDescriptions": { "typeIdentifier": "t_bytes4", "typeString": "bytes4" @@ -643,7 +643,7 @@ "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "356:19:1", + "src": "363:19:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1a695230cbbb2b7dfd76397005587fe7ab9ee5f528dbc5a16361e8100dc2c499", @@ -664,7 +664,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 258, - "src": "346:9:1", + "src": "353:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" @@ -678,7 +678,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "346:30:1", + "src": "353:30:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -698,7 +698,7 @@ "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "339:6:1", + "src": "346:6:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes4_$", "typeString": "type(bytes4)" @@ -713,14 +713,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "339:38:1", + "src": "346:38:1", "typeDescriptions": { "typeIdentifier": "t_bytes4", "typeString": "bytes4" } }, "nodeType": "VariableDeclarationStatement", - "src": "326:51:1" + "src": "333:51:1" }, { "expression": { @@ -733,7 +733,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 100, - "src": "407:3:1", + "src": "414:3:1", "typeDescriptions": { "typeIdentifier": "t_bytes4", "typeString": "bytes4" @@ -746,7 +746,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 85, - "src": "412:5:1", + "src": "419:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -772,7 +772,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 87, - "src": "399:6:1", + "src": "406:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -795,7 +795,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 67, - "src": "381:6:1", + "src": "388:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -809,7 +809,7 @@ "memberName": "call", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "381:11:1", + "src": "388:11:1", "typeDescriptions": { "typeIdentifier": "t_function_barecall_payable$__$returns$_t_bool_$", "typeString": "function () payable returns (bool)" @@ -823,7 +823,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "381:17:1", + "src": "388:17:1", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_nonpayable$_t_uint256_$returns$_t_function_barecall_payable$__$returns$_t_bool_$value_$", "typeString": "function (uint256) returns (function () payable returns (bool))" @@ -837,7 +837,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "381:25:1", + "src": "388:25:1", "typeDescriptions": { "typeIdentifier": "t_function_barecall_payable$__$returns$_t_bool_$value", "typeString": "function () payable returns (bool)" @@ -851,7 +851,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "381:37:1", + "src": "388:37:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -859,7 +859,7 @@ }, "id": 117, "nodeType": "ExpressionStatement", - "src": "381:37:1" + "src": "388:37:1" } ] }, @@ -881,7 +881,7 @@ "name": "_addr", "nodeType": "VariableDeclaration", "scope": 119, - "src": "245:13:1", + "src": "252:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -892,7 +892,7 @@ "id": 84, "name": "address", "nodeType": "ElementaryTypeName", - "src": "245:7:1", + "src": "252:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -907,7 +907,7 @@ "name": "_value", "nodeType": "VariableDeclaration", "scope": 119, - "src": "260:11:1", + "src": "267:11:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -918,7 +918,7 @@ "id": 86, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "260:4:1", + "src": "267:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -928,17 +928,17 @@ "visibility": "internal" } ], - "src": "244:28:1" + "src": "251:28:1" }, "payable": false, "returnParameters": { "id": 89, "nodeType": "ParameterList", "parameters": [], - "src": "280:0:1" + "src": "287:0:1" }, "scope": 233, - "src": "227:197:1", + "src": "234:197:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -947,7 +947,7 @@ "body": { "id": 129, "nodeType": "Block", - "src": "470:34:1", + "src": "477:34:1", "statements": [ { "expression": { @@ -959,7 +959,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "481:7:1", + "src": "488:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -975,7 +975,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "489:3:1", + "src": "496:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -989,7 +989,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "489:10:1", + "src": "496:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1000,7 +1000,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "481:19:1", + "src": "488:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1009,7 +1009,7 @@ "functionReturnParameters": 123, "id": 128, "nodeType": "Return", - "src": "474:26:1" + "src": "481:26:1" } ] }, @@ -1025,7 +1025,7 @@ "id": 120, "nodeType": "ParameterList", "parameters": [], - "src": "445:2:1" + "src": "452:2:1" }, "payable": false, "returnParameters": { @@ -1038,7 +1038,7 @@ "name": "", "nodeType": "VariableDeclaration", "scope": 130, - "src": "464:4:1", + "src": "471:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1049,7 +1049,7 @@ "id": 121, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "464:4:1", + "src": "471:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1059,10 +1059,10 @@ "visibility": "internal" } ], - "src": "463:6:1" + "src": "470:6:1" }, "scope": 233, - "src": "427:77:1", + "src": "434:77:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -1071,7 +1071,7 @@ "body": { "id": 148, "nodeType": "Block", - "src": "556:70:1", + "src": "563:70:1", "statements": [ { "expression": { @@ -1090,7 +1090,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "560:7:1", + "src": "567:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -1106,7 +1106,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "568:3:1", + "src": "575:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -1120,7 +1120,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "568:10:1", + "src": "575:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1131,7 +1131,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "560:19:1", + "src": "567:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1148,7 +1148,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "583:3:1", + "src": "590:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -1162,13 +1162,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "583:9:1", + "src": "590:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "560:32:1", + "src": "567:32:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1176,7 +1176,7 @@ }, "id": 142, "nodeType": "ExpressionStatement", - "src": "560:32:1" + "src": "567:32:1" }, { "expression": { @@ -1188,7 +1188,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "603:7:1", + "src": "610:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -1204,7 +1204,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "611:3:1", + "src": "618:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -1218,7 +1218,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "611:10:1", + "src": "618:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1229,7 +1229,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "603:19:1", + "src": "610:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1238,7 +1238,7 @@ "functionReturnParameters": 134, "id": 147, "nodeType": "Return", - "src": "596:26:1" + "src": "603:26:1" } ] }, @@ -1254,7 +1254,7 @@ "id": 131, "nodeType": "ParameterList", "parameters": [], - "src": "523:2:1" + "src": "530:2:1" }, "payable": true, "returnParameters": { @@ -1267,7 +1267,7 @@ "name": "", "nodeType": "VariableDeclaration", "scope": 149, - "src": "550:4:1", + "src": "557:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1278,7 +1278,7 @@ "id": 132, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "550:4:1", + "src": "557:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1288,10 +1288,10 @@ "visibility": "internal" } ], - "src": "549:6:1" + "src": "556:6:1" }, "scope": 233, - "src": "507:119:1", + "src": "514:119:1", "stateMutability": "payable", "superFunction": null, "visibility": "public" @@ -1300,7 +1300,7 @@ "body": { "id": 178, "nodeType": "Block", - "src": "682:105:1", + "src": "689:105:1", "statements": [ { "expression": { @@ -1326,7 +1326,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "694:7:1", + "src": "701:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -1342,7 +1342,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "702:3:1", + "src": "709:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -1356,7 +1356,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "702:10:1", + "src": "709:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1367,7 +1367,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "694:19:1", + "src": "701:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1382,13 +1382,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 153, - "src": "717:6:1", + "src": "724:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "694:29:1", + "src": "701:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1410,7 +1410,7 @@ 268 ], "referencedDeclaration": 267, - "src": "686:7:1", + "src": "693:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" @@ -1424,7 +1424,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "686:38:1", + "src": "693:38:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -1432,7 +1432,7 @@ }, "id": 164, "nodeType": "ExpressionStatement", - "src": "686:38:1" + "src": "693:38:1" }, { "expression": { @@ -1451,7 +1451,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "728:7:1", + "src": "735:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -1467,7 +1467,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "736:3:1", + "src": "743:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -1481,7 +1481,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "736:10:1", + "src": "743:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1492,7 +1492,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "728:19:1", + "src": "735:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1507,13 +1507,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 153, - "src": "751:6:1", + "src": "758:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "728:29:1", + "src": "735:29:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1521,7 +1521,7 @@ }, "id": 171, "nodeType": "ExpressionStatement", - "src": "728:29:1" + "src": "735:29:1" }, { "expression": { @@ -1534,7 +1534,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 153, - "src": "776:6:1", + "src": "783:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1555,7 +1555,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 151, - "src": "761:5:1", + "src": "768:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1569,7 +1569,7 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "761:14:1", + "src": "768:14:1", "typeDescriptions": { "typeIdentifier": "t_function_transfer_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" @@ -1583,7 +1583,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "761:22:1", + "src": "768:22:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -1591,7 +1591,7 @@ }, "id": 177, "nodeType": "ExpressionStatement", - "src": "761:22:1" + "src": "768:22:1" } ] }, @@ -1613,7 +1613,7 @@ "name": "_addr", "nodeType": "VariableDeclaration", "scope": 179, - "src": "647:13:1", + "src": "654:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1624,7 +1624,7 @@ "id": 150, "name": "address", "nodeType": "ElementaryTypeName", - "src": "647:7:1", + "src": "654:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1639,7 +1639,7 @@ "name": "_value", "nodeType": "VariableDeclaration", "scope": 179, - "src": "662:11:1", + "src": "669:11:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1650,7 +1650,7 @@ "id": 152, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "662:4:1", + "src": "669:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1660,17 +1660,17 @@ "visibility": "internal" } ], - "src": "646:28:1" + "src": "653:28:1" }, "payable": false, "returnParameters": { "id": 155, "nodeType": "ParameterList", "parameters": [], - "src": "682:0:1" + "src": "689:0:1" }, "scope": 233, - "src": "629:158:1", + "src": "636:158:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -1679,7 +1679,7 @@ "body": { "id": 231, "nodeType": "Block", - "src": "851:180:1", + "src": "858:180:1", "statements": [ { "assignments": [ @@ -1692,7 +1692,7 @@ "name": "l", "nodeType": "VariableDeclaration", "scope": 232, - "src": "855:6:1", + "src": "862:6:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -1703,7 +1703,7 @@ "id": 187, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "855:4:1", + "src": "862:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1723,7 +1723,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 182, - "src": "864:6:1", + "src": "871:6:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -1737,14 +1737,14 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "864:13:1", + "src": "871:13:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "855:22:1" + "src": "862:22:1" }, { "expression": { @@ -1770,7 +1770,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "889:7:1", + "src": "896:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -1786,7 +1786,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "897:3:1", + "src": "904:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -1800,7 +1800,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "897:10:1", + "src": "904:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1811,7 +1811,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "889:19:1", + "src": "896:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1837,7 +1837,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 184, - "src": "912:6:1", + "src": "919:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1852,19 +1852,19 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 188, - "src": "921:1:1", + "src": "928:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "912:10:1", + "src": "919:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "889:33:1", + "src": "896:33:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -1886,7 +1886,7 @@ 268 ], "referencedDeclaration": 267, - "src": "881:7:1", + "src": "888:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" @@ -1900,7 +1900,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "881:42:1", + "src": "888:42:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -1908,7 +1908,7 @@ }, "id": 202, "nodeType": "ExpressionStatement", - "src": "881:42:1" + "src": "888:42:1" }, { "expression": { @@ -1927,7 +1927,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "927:7:1", + "src": "934:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -1943,7 +1943,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "935:3:1", + "src": "942:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -1957,7 +1957,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "935:10:1", + "src": "942:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -1968,7 +1968,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "927:19:1", + "src": "934:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -1994,7 +1994,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 184, - "src": "950:6:1", + "src": "957:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2009,19 +2009,19 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 188, - "src": "959:1:1", + "src": "966:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "950:10:1", + "src": "957:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "927:33:1", + "src": "934:33:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2029,13 +2029,13 @@ }, "id": 211, "nodeType": "ExpressionStatement", - "src": "927:33:1" + "src": "934:33:1" }, { "body": { "id": 229, "nodeType": "Block", - "src": "992:36:1", + "src": "999:36:1", "statements": [ { "expression": { @@ -2048,7 +2048,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 184, - "src": "1016:6:1", + "src": "1023:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2071,7 +2071,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 182, - "src": "997:6:1", + "src": "1004:6:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -2085,7 +2085,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 213, - "src": "1004:1:1", + "src": "1011:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2096,7 +2096,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "997:9:1", + "src": "1004:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2110,7 +2110,7 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "997:18:1", + "src": "1004:18:1", "typeDescriptions": { "typeIdentifier": "t_function_transfer_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" @@ -2124,7 +2124,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "997:26:1", + "src": "1004:26:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -2132,7 +2132,7 @@ }, "id": 228, "nodeType": "ExpressionStatement", - "src": "997:26:1" + "src": "1004:26:1" } ] }, @@ -2154,7 +2154,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 213, - "src": "981:1:1", + "src": "988:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2169,13 +2169,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 188, - "src": "985:1:1", + "src": "992:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "981:5:1", + "src": "988:5:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2193,7 +2193,7 @@ "name": "i", "nodeType": "VariableDeclaration", "scope": 232, - "src": "969:6:1", + "src": "976:6:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2204,7 +2204,7 @@ "id": 212, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "969:4:1", + "src": "976:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2225,7 +2225,7 @@ "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "978:1:1", + "src": "985:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -2234,7 +2234,7 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "969:10:1" + "src": "976:10:1" }, "loopExpression": { "expression": { @@ -2247,7 +2247,7 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "988:3:1", + "src": "995:3:1", "subExpression": { "argumentTypes": null, "id": 219, @@ -2255,7 +2255,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 213, - "src": "988:1:1", + "src": "995:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2268,10 +2268,10 @@ }, "id": 221, "nodeType": "ExpressionStatement", - "src": "988:3:1" + "src": "995:3:1" }, "nodeType": "ForStatement", - "src": "964:64:1" + "src": "971:64:1" } ] }, @@ -2293,7 +2293,7 @@ "name": "_addrs", "nodeType": "VariableDeclaration", "scope": 232, - "src": "813:16:1", + "src": "820:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2305,7 +2305,7 @@ "id": 180, "name": "address", "nodeType": "ElementaryTypeName", - "src": "813:7:1", + "src": "820:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2314,7 +2314,7 @@ "id": 181, "length": null, "nodeType": "ArrayTypeName", - "src": "813:9:1", + "src": "820:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -2329,7 +2329,7 @@ "name": "_value", "nodeType": "VariableDeclaration", "scope": 232, - "src": "831:11:1", + "src": "838:11:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2340,7 +2340,7 @@ "id": 183, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "831:4:1", + "src": "838:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2350,30 +2350,30 @@ "visibility": "internal" } ], - "src": "812:31:1" + "src": "819:31:1" }, "payable": false, "returnParameters": { "id": 186, "nodeType": "ParameterList", "parameters": [], - "src": "851:0:1" + "src": "858:0:1" }, "scope": 233, - "src": "790:241:1", + "src": "797:241:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], "scope": 234, - "src": "54:979:1" + "src": "54:986:1" } ], - "src": "0:1033:1" + "src": "0:1040:1" }, "legacyAST": { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol", "exportedSymbols": { "Transfers": [ 233 @@ -2394,7 +2394,7 @@ "src": "0:24:1" }, { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", "file": "./Transfers2.sol", "id": 59, "nodeType": "ImportDirective", @@ -2522,7 +2522,7 @@ "body": { "id": 82, "nodeType": "Block", - "src": "173:51:1", + "src": "180:51:1", "statements": [ { "expression": { @@ -2539,7 +2539,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 65, - "src": "177:1:1", + "src": "184:1:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -2558,7 +2558,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "NewExpression", - "src": "181:14:1", + "src": "188:14:1", "typeDescriptions": { "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_Transfers2_$249_$", "typeString": "function () returns (contract Transfers2)" @@ -2569,7 +2569,7 @@ "name": "Transfers2", "nodeType": "UserDefinedTypeName", "referencedDeclaration": 249, - "src": "185:10:1", + "src": "192:10:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -2584,13 +2584,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "181:16:1", + "src": "188:16:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" } }, - "src": "177:20:1", + "src": "184:20:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -2598,7 +2598,7 @@ }, "id": 75, "nodeType": "ExpressionStatement", - "src": "177:20:1" + "src": "184:20:1" }, { "expression": { @@ -2615,7 +2615,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 67, - "src": "201:6:1", + "src": "208:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2633,7 +2633,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 65, - "src": "218:1:1", + "src": "225:1:1", "typeDescriptions": { "typeIdentifier": "t_contract$_Transfers2_$249", "typeString": "contract Transfers2" @@ -2653,7 +2653,7 @@ "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "210:7:1", + "src": "217:7:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_address_$", "typeString": "type(address)" @@ -2668,13 +2668,13 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "210:10:1", + "src": "217:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" } }, - "src": "201:19:1", + "src": "208:19:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2682,7 +2682,7 @@ }, "id": 81, "nodeType": "ExpressionStatement", - "src": "201:19:1" + "src": "208:19:1" } ] }, @@ -2692,23 +2692,23 @@ "isConstructor": true, "isDeclaredConst": false, "modifiers": [], - "name": "", + "name": "Transfers", "nodeType": "FunctionDefinition", "parameters": { "id": 68, "nodeType": "ParameterList", "parameters": [], - "src": "163:2:1" + "src": "170:2:1" }, "payable": false, "returnParameters": { "id": 69, "nodeType": "ParameterList", "parameters": [], - "src": "173:0:1" + "src": "180:0:1" }, "scope": 233, - "src": "152:72:1", + "src": "152:79:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -2717,7 +2717,7 @@ "body": { "id": 118, "nodeType": "Block", - "src": "280:144:1", + "src": "287:144:1", "statements": [ { "expression": { @@ -2743,7 +2743,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "292:7:1", + "src": "299:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -2759,7 +2759,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "300:3:1", + "src": "307:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -2773,7 +2773,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "300:10:1", + "src": "307:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -2784,7 +2784,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "292:19:1", + "src": "299:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -2799,13 +2799,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 87, - "src": "315:6:1", + "src": "322:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "292:29:1", + "src": "299:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -2827,7 +2827,7 @@ 268 ], "referencedDeclaration": 267, - "src": "284:7:1", + "src": "291:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" @@ -2841,7 +2841,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "284:38:1", + "src": "291:38:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -2849,7 +2849,7 @@ }, "id": 98, "nodeType": "ExpressionStatement", - "src": "284:38:1" + "src": "291:38:1" }, { "assignments": [ @@ -2862,7 +2862,7 @@ "name": "sig", "nodeType": "VariableDeclaration", "scope": 119, - "src": "326:10:1", + "src": "333:10:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -2873,7 +2873,7 @@ "id": 99, "name": "bytes4", "nodeType": "ElementaryTypeName", - "src": "326:6:1", + "src": "333:6:1", "typeDescriptions": { "typeIdentifier": "t_bytes4", "typeString": "bytes4" @@ -2900,7 +2900,7 @@ "kind": "string", "lValueRequested": false, "nodeType": "Literal", - "src": "356:19:1", + "src": "363:19:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_stringliteral_1a695230cbbb2b7dfd76397005587fe7ab9ee5f528dbc5a16361e8100dc2c499", @@ -2921,7 +2921,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 258, - "src": "346:9:1", + "src": "353:9:1", "typeDescriptions": { "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$", "typeString": "function () pure returns (bytes32)" @@ -2935,7 +2935,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "346:30:1", + "src": "353:30:1", "typeDescriptions": { "typeIdentifier": "t_bytes32", "typeString": "bytes32" @@ -2955,7 +2955,7 @@ "isPure": true, "lValueRequested": false, "nodeType": "ElementaryTypeNameExpression", - "src": "339:6:1", + "src": "346:6:1", "typeDescriptions": { "typeIdentifier": "t_type$_t_bytes4_$", "typeString": "type(bytes4)" @@ -2970,14 +2970,14 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "339:38:1", + "src": "346:38:1", "typeDescriptions": { "typeIdentifier": "t_bytes4", "typeString": "bytes4" } }, "nodeType": "VariableDeclarationStatement", - "src": "326:51:1" + "src": "333:51:1" }, { "expression": { @@ -2990,7 +2990,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 100, - "src": "407:3:1", + "src": "414:3:1", "typeDescriptions": { "typeIdentifier": "t_bytes4", "typeString": "bytes4" @@ -3003,7 +3003,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 85, - "src": "412:5:1", + "src": "419:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3029,7 +3029,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 87, - "src": "399:6:1", + "src": "406:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3052,7 +3052,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 67, - "src": "381:6:1", + "src": "388:6:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3066,7 +3066,7 @@ "memberName": "call", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "381:11:1", + "src": "388:11:1", "typeDescriptions": { "typeIdentifier": "t_function_barecall_payable$__$returns$_t_bool_$", "typeString": "function () payable returns (bool)" @@ -3080,7 +3080,7 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "381:17:1", + "src": "388:17:1", "typeDescriptions": { "typeIdentifier": "t_function_setvalue_nonpayable$_t_uint256_$returns$_t_function_barecall_payable$__$returns$_t_bool_$value_$", "typeString": "function (uint256) returns (function () payable returns (bool))" @@ -3094,7 +3094,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "381:25:1", + "src": "388:25:1", "typeDescriptions": { "typeIdentifier": "t_function_barecall_payable$__$returns$_t_bool_$value", "typeString": "function () payable returns (bool)" @@ -3108,7 +3108,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "381:37:1", + "src": "388:37:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3116,7 +3116,7 @@ }, "id": 117, "nodeType": "ExpressionStatement", - "src": "381:37:1" + "src": "388:37:1" } ] }, @@ -3138,7 +3138,7 @@ "name": "_addr", "nodeType": "VariableDeclaration", "scope": 119, - "src": "245:13:1", + "src": "252:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3149,7 +3149,7 @@ "id": 84, "name": "address", "nodeType": "ElementaryTypeName", - "src": "245:7:1", + "src": "252:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3164,7 +3164,7 @@ "name": "_value", "nodeType": "VariableDeclaration", "scope": 119, - "src": "260:11:1", + "src": "267:11:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3175,7 +3175,7 @@ "id": 86, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "260:4:1", + "src": "267:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3185,17 +3185,17 @@ "visibility": "internal" } ], - "src": "244:28:1" + "src": "251:28:1" }, "payable": false, "returnParameters": { "id": 89, "nodeType": "ParameterList", "parameters": [], - "src": "280:0:1" + "src": "287:0:1" }, "scope": 233, - "src": "227:197:1", + "src": "234:197:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -3204,7 +3204,7 @@ "body": { "id": 129, "nodeType": "Block", - "src": "470:34:1", + "src": "477:34:1", "statements": [ { "expression": { @@ -3216,7 +3216,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "481:7:1", + "src": "488:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -3232,7 +3232,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "489:3:1", + "src": "496:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -3246,7 +3246,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "489:10:1", + "src": "496:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3257,7 +3257,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "481:19:1", + "src": "488:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3266,7 +3266,7 @@ "functionReturnParameters": 123, "id": 128, "nodeType": "Return", - "src": "474:26:1" + "src": "481:26:1" } ] }, @@ -3282,7 +3282,7 @@ "id": 120, "nodeType": "ParameterList", "parameters": [], - "src": "445:2:1" + "src": "452:2:1" }, "payable": false, "returnParameters": { @@ -3295,7 +3295,7 @@ "name": "", "nodeType": "VariableDeclaration", "scope": 130, - "src": "464:4:1", + "src": "471:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3306,7 +3306,7 @@ "id": 121, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "464:4:1", + "src": "471:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3316,10 +3316,10 @@ "visibility": "internal" } ], - "src": "463:6:1" + "src": "470:6:1" }, "scope": 233, - "src": "427:77:1", + "src": "434:77:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -3328,7 +3328,7 @@ "body": { "id": 148, "nodeType": "Block", - "src": "556:70:1", + "src": "563:70:1", "statements": [ { "expression": { @@ -3347,7 +3347,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "560:7:1", + "src": "567:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -3363,7 +3363,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "568:3:1", + "src": "575:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -3377,7 +3377,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "568:10:1", + "src": "575:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3388,7 +3388,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "560:19:1", + "src": "567:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3405,7 +3405,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "583:3:1", + "src": "590:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -3419,13 +3419,13 @@ "memberName": "value", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "583:9:1", + "src": "590:9:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "560:32:1", + "src": "567:32:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3433,7 +3433,7 @@ }, "id": 142, "nodeType": "ExpressionStatement", - "src": "560:32:1" + "src": "567:32:1" }, { "expression": { @@ -3445,7 +3445,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "603:7:1", + "src": "610:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -3461,7 +3461,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "611:3:1", + "src": "618:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -3475,7 +3475,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "611:10:1", + "src": "618:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3486,7 +3486,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "603:19:1", + "src": "610:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3495,7 +3495,7 @@ "functionReturnParameters": 134, "id": 147, "nodeType": "Return", - "src": "596:26:1" + "src": "603:26:1" } ] }, @@ -3511,7 +3511,7 @@ "id": 131, "nodeType": "ParameterList", "parameters": [], - "src": "523:2:1" + "src": "530:2:1" }, "payable": true, "returnParameters": { @@ -3524,7 +3524,7 @@ "name": "", "nodeType": "VariableDeclaration", "scope": 149, - "src": "550:4:1", + "src": "557:4:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3535,7 +3535,7 @@ "id": 132, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "550:4:1", + "src": "557:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3545,10 +3545,10 @@ "visibility": "internal" } ], - "src": "549:6:1" + "src": "556:6:1" }, "scope": 233, - "src": "507:119:1", + "src": "514:119:1", "stateMutability": "payable", "superFunction": null, "visibility": "public" @@ -3557,7 +3557,7 @@ "body": { "id": 178, "nodeType": "Block", - "src": "682:105:1", + "src": "689:105:1", "statements": [ { "expression": { @@ -3583,7 +3583,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "694:7:1", + "src": "701:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -3599,7 +3599,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "702:3:1", + "src": "709:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -3613,7 +3613,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "702:10:1", + "src": "709:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3624,7 +3624,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "694:19:1", + "src": "701:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3639,13 +3639,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 153, - "src": "717:6:1", + "src": "724:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "694:29:1", + "src": "701:29:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -3667,7 +3667,7 @@ 268 ], "referencedDeclaration": 267, - "src": "686:7:1", + "src": "693:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" @@ -3681,7 +3681,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "686:38:1", + "src": "693:38:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -3689,7 +3689,7 @@ }, "id": 164, "nodeType": "ExpressionStatement", - "src": "686:38:1" + "src": "693:38:1" }, { "expression": { @@ -3708,7 +3708,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "728:7:1", + "src": "735:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -3724,7 +3724,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "736:3:1", + "src": "743:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -3738,7 +3738,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "736:10:1", + "src": "743:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3749,7 +3749,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "728:19:1", + "src": "735:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3764,13 +3764,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 153, - "src": "751:6:1", + "src": "758:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "728:29:1", + "src": "735:29:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3778,7 +3778,7 @@ }, "id": 171, "nodeType": "ExpressionStatement", - "src": "728:29:1" + "src": "735:29:1" }, { "expression": { @@ -3791,7 +3791,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 153, - "src": "776:6:1", + "src": "783:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3812,7 +3812,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 151, - "src": "761:5:1", + "src": "768:5:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3826,7 +3826,7 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "761:14:1", + "src": "768:14:1", "typeDescriptions": { "typeIdentifier": "t_function_transfer_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" @@ -3840,7 +3840,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "761:22:1", + "src": "768:22:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -3848,7 +3848,7 @@ }, "id": 177, "nodeType": "ExpressionStatement", - "src": "761:22:1" + "src": "768:22:1" } ] }, @@ -3870,7 +3870,7 @@ "name": "_addr", "nodeType": "VariableDeclaration", "scope": 179, - "src": "647:13:1", + "src": "654:13:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3881,7 +3881,7 @@ "id": 150, "name": "address", "nodeType": "ElementaryTypeName", - "src": "647:7:1", + "src": "654:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -3896,7 +3896,7 @@ "name": "_value", "nodeType": "VariableDeclaration", "scope": 179, - "src": "662:11:1", + "src": "669:11:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3907,7 +3907,7 @@ "id": 152, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "662:4:1", + "src": "669:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3917,17 +3917,17 @@ "visibility": "internal" } ], - "src": "646:28:1" + "src": "653:28:1" }, "payable": false, "returnParameters": { "id": 155, "nodeType": "ParameterList", "parameters": [], - "src": "682:0:1" + "src": "689:0:1" }, "scope": 233, - "src": "629:158:1", + "src": "636:158:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" @@ -3936,7 +3936,7 @@ "body": { "id": 231, "nodeType": "Block", - "src": "851:180:1", + "src": "858:180:1", "statements": [ { "assignments": [ @@ -3949,7 +3949,7 @@ "name": "l", "nodeType": "VariableDeclaration", "scope": 232, - "src": "855:6:1", + "src": "862:6:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -3960,7 +3960,7 @@ "id": 187, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "855:4:1", + "src": "862:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -3980,7 +3980,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 182, - "src": "864:6:1", + "src": "871:6:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -3994,14 +3994,14 @@ "memberName": "length", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "864:13:1", + "src": "871:13:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, "nodeType": "VariableDeclarationStatement", - "src": "855:22:1" + "src": "862:22:1" }, { "expression": { @@ -4027,7 +4027,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "889:7:1", + "src": "896:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -4043,7 +4043,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "897:3:1", + "src": "904:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -4057,7 +4057,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "897:10:1", + "src": "904:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4068,7 +4068,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "889:19:1", + "src": "896:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4094,7 +4094,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 184, - "src": "912:6:1", + "src": "919:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4109,19 +4109,19 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 188, - "src": "921:1:1", + "src": "928:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "912:10:1", + "src": "919:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "889:33:1", + "src": "896:33:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4143,7 +4143,7 @@ 268 ], "referencedDeclaration": 267, - "src": "881:7:1", + "src": "888:7:1", "typeDescriptions": { "typeIdentifier": "t_function_require_pure$_t_bool_$returns$__$", "typeString": "function (bool) pure" @@ -4157,7 +4157,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "881:42:1", + "src": "888:42:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -4165,7 +4165,7 @@ }, "id": 202, "nodeType": "ExpressionStatement", - "src": "881:42:1" + "src": "888:42:1" }, { "expression": { @@ -4184,7 +4184,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 63, - "src": "927:7:1", + "src": "934:7:1", "typeDescriptions": { "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$", "typeString": "mapping(address => uint256)" @@ -4200,7 +4200,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 264, - "src": "935:3:1", + "src": "942:3:1", "typeDescriptions": { "typeIdentifier": "t_magic_message", "typeString": "msg" @@ -4214,7 +4214,7 @@ "memberName": "sender", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "935:10:1", + "src": "942:10:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4225,7 +4225,7 @@ "isPure": false, "lValueRequested": true, "nodeType": "IndexAccess", - "src": "927:19:1", + "src": "934:19:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4251,7 +4251,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 184, - "src": "950:6:1", + "src": "957:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4266,19 +4266,19 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 188, - "src": "959:1:1", + "src": "966:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "950:10:1", + "src": "957:10:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "927:33:1", + "src": "934:33:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4286,13 +4286,13 @@ }, "id": 211, "nodeType": "ExpressionStatement", - "src": "927:33:1" + "src": "934:33:1" }, { "body": { "id": 229, "nodeType": "Block", - "src": "992:36:1", + "src": "999:36:1", "statements": [ { "expression": { @@ -4305,7 +4305,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 184, - "src": "1016:6:1", + "src": "1023:6:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4328,7 +4328,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 182, - "src": "997:6:1", + "src": "1004:6:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_memory_ptr", "typeString": "address[] memory" @@ -4342,7 +4342,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 213, - "src": "1004:1:1", + "src": "1011:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4353,7 +4353,7 @@ "isPure": false, "lValueRequested": false, "nodeType": "IndexAccess", - "src": "997:9:1", + "src": "1004:9:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4367,7 +4367,7 @@ "memberName": "transfer", "nodeType": "MemberAccess", "referencedDeclaration": null, - "src": "997:18:1", + "src": "1004:18:1", "typeDescriptions": { "typeIdentifier": "t_function_transfer_nonpayable$_t_uint256_$returns$__$", "typeString": "function (uint256)" @@ -4381,7 +4381,7 @@ "lValueRequested": false, "names": [], "nodeType": "FunctionCall", - "src": "997:26:1", + "src": "1004:26:1", "typeDescriptions": { "typeIdentifier": "t_tuple$__$", "typeString": "tuple()" @@ -4389,7 +4389,7 @@ }, "id": 228, "nodeType": "ExpressionStatement", - "src": "997:26:1" + "src": "1004:26:1" } ] }, @@ -4411,7 +4411,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 213, - "src": "981:1:1", + "src": "988:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4426,13 +4426,13 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 188, - "src": "985:1:1", + "src": "992:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" } }, - "src": "981:5:1", + "src": "988:5:1", "typeDescriptions": { "typeIdentifier": "t_bool", "typeString": "bool" @@ -4450,7 +4450,7 @@ "name": "i", "nodeType": "VariableDeclaration", "scope": 232, - "src": "969:6:1", + "src": "976:6:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4461,7 +4461,7 @@ "id": 212, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "969:4:1", + "src": "976:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4482,7 +4482,7 @@ "kind": "number", "lValueRequested": false, "nodeType": "Literal", - "src": "978:1:1", + "src": "985:1:1", "subdenomination": null, "typeDescriptions": { "typeIdentifier": "t_rational_0_by_1", @@ -4491,7 +4491,7 @@ "value": "0" }, "nodeType": "VariableDeclarationStatement", - "src": "969:10:1" + "src": "976:10:1" }, "loopExpression": { "expression": { @@ -4504,7 +4504,7 @@ "nodeType": "UnaryOperation", "operator": "++", "prefix": false, - "src": "988:3:1", + "src": "995:3:1", "subExpression": { "argumentTypes": null, "id": 219, @@ -4512,7 +4512,7 @@ "nodeType": "Identifier", "overloadedDeclarations": [], "referencedDeclaration": 213, - "src": "988:1:1", + "src": "995:1:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4525,10 +4525,10 @@ }, "id": 221, "nodeType": "ExpressionStatement", - "src": "988:3:1" + "src": "995:3:1" }, "nodeType": "ForStatement", - "src": "964:64:1" + "src": "971:64:1" } ] }, @@ -4550,7 +4550,7 @@ "name": "_addrs", "nodeType": "VariableDeclaration", "scope": 232, - "src": "813:16:1", + "src": "820:16:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4562,7 +4562,7 @@ "id": 180, "name": "address", "nodeType": "ElementaryTypeName", - "src": "813:7:1", + "src": "820:7:1", "typeDescriptions": { "typeIdentifier": "t_address", "typeString": "address" @@ -4571,7 +4571,7 @@ "id": 181, "length": null, "nodeType": "ArrayTypeName", - "src": "813:9:1", + "src": "820:9:1", "typeDescriptions": { "typeIdentifier": "t_array$_t_address_$dyn_storage_ptr", "typeString": "address[]" @@ -4586,7 +4586,7 @@ "name": "_value", "nodeType": "VariableDeclaration", "scope": 232, - "src": "831:11:1", + "src": "838:11:1", "stateVariable": false, "storageLocation": "default", "typeDescriptions": { @@ -4597,7 +4597,7 @@ "id": 183, "name": "uint", "nodeType": "ElementaryTypeName", - "src": "831:4:1", + "src": "838:4:1", "typeDescriptions": { "typeIdentifier": "t_uint256", "typeString": "uint256" @@ -4607,27 +4607,27 @@ "visibility": "internal" } ], - "src": "812:31:1" + "src": "819:31:1" }, "payable": false, "returnParameters": { "id": 186, "nodeType": "ParameterList", "parameters": [], - "src": "851:0:1" + "src": "858:0:1" }, "scope": 233, - "src": "790:241:1", + "src": "797:241:1", "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" } ], "scope": 234, - "src": "54:979:1" + "src": "54:986:1" } ], - "src": "0:1033:1" + "src": "0:1040:1" }, "compiler": { "name": "solc", @@ -4638,7 +4638,7 @@ "events": {}, "links": {}, "address": "0x9c2b479e15bbd956237c7ef33d31bfa2a576f007", - "transactionHash": "0x3213d366cc00423edfdf5683a4d26b3e93467c88cbd5f953864ec46edb7673d9" + "transactionHash": "0x760fc6e1793b1cf06fdbaace7aae571c5c0f214c21ceee3c161de90a9f42221e" }, "1528420224459": { "events": {}, @@ -4647,6 +4647,6 @@ "transactionHash": "0x86a60b4cd8a9abab600debe01793dd76d05b65e4aa37c144e51c7f42a9d4d93b" } }, - "schemaVersion": "2.0.0", - "updatedAt": "2018-06-08T15:58:27.902Z" + "schemaVersion": "2.0.1", + "updatedAt": "2018-07-06T18:05:39.257Z" } \ No newline at end of file diff --git a/shyft-cli/web3/transfer-through-master/build/contracts/Transfers2.json b/shyft-cli/web3/transfer-through-master/build/contracts/Transfers2.json index 765962721b..9d96e472a4 100755 --- a/shyft-cli/web3/transfer-through-master/build/contracts/Transfers2.json +++ b/shyft-cli/web3/transfer-through-master/build/contracts/Transfers2.json @@ -16,14 +16,14 @@ "type": "function" } ], - "bytecode": "0x608060405234801561001057600080fd5b5060ed8061001f6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631a695230146044575b600080fd5b6076600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506078565b005b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015801560bd573d6000803e3d6000fd5b50505600a165627a7a72305820e95f74106a3328ffadd8b0adb916d92497daab65998ee73cf40afff57dc4b29b0029", - "deployedBytecode": "0x608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631a695230146044575b600080fd5b6076600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506078565b005b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015801560bd573d6000803e3d6000fd5b50505600a165627a7a72305820e95f74106a3328ffadd8b0adb916d92497daab65998ee73cf40afff57dc4b29b0029", + "bytecode": "0x608060405234801561001057600080fd5b5060ed8061001f6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631a695230146044575b600080fd5b6076600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506078565b005b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015801560bd573d6000803e3d6000fd5b50505600a165627a7a723058206b9724f2a2dbdc5e27a309b647c1d11903393ac90b5e54ab4925de752e5f6e760029", + "deployedBytecode": "0x608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680631a695230146044575b600080fd5b6076600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506078565b005b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015801560bd573d6000803e3d6000fd5b50505600a165627a7a723058206b9724f2a2dbdc5e27a309b647c1d11903393ac90b5e54ab4925de752e5f6e760029", "sourceMap": "26:106:2:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;26:106:2;;;;;;;", "deployedSourceMap": "26:106:2:-;;;;;;;;;;;;;;;;;;;;;;;;49:81;;;;;;;;;;;;;;;;;;;;;;;;;;;;;101:5;:14;;:25;116:9;101:25;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;101:25:2;49:81;:::o", "source": "pragma solidity ^0.4.19;\n\ncontract Transfers2 {\n\tfunction transfer(address _addr) public payable {\n\t\t_addr.transfer(msg.value);\n\t}\n}", - "sourcePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", + "sourcePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", "ast": { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", "exportedSymbols": { "Transfers2": [ 249 @@ -212,7 +212,7 @@ "src": "0:132:2" }, "legacyAST": { - "absolutePath": "/Users/gregmarkou/Jobs/Jobs/ChainSafe/shyftNetwork/shyft_go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", + "absolutePath": "/Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/shyft-cli/web3/transfer-through-master/contracts/Transfers2.sol", "exportedSymbols": { "Transfers2": [ 249 @@ -409,7 +409,7 @@ "events": {}, "links": {}, "address": "0xa863f8203ad95e9078f6300e7857a4cca4fb4c60", - "transactionHash": "0xb836110657221cb8ac728c0345ae03da1cb4313cfa0bb61285f31b780907af50" + "transactionHash": "0x7d4888a4f369e8b635a8418deb115db390b4ef963da86ade26feff951cf25d7c" }, "1528420224459": { "events": {}, @@ -418,6 +418,6 @@ "transactionHash": "0x43f3fed1df72adfe12dd0c2432f0625b4b50b0c151f9583a166722ed74786ce3" } }, - "schemaVersion": "2.0.0", - "updatedAt": "2018-06-08T15:58:27.899Z" + "schemaVersion": "2.0.1", + "updatedAt": "2018-07-06T18:05:39.254Z" } \ No newline at end of file diff --git a/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol b/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol index c4efb65e21..b36e0de869 100755 --- a/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol +++ b/shyft-cli/web3/transfer-through-master/contracts/Migrations.sol @@ -4,7 +4,7 @@ contract Migrations { address public owner; uint public last_completed_migration; - constructor() public { + function Migrations() public { owner = msg.sender; } diff --git a/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol b/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol index 9e7fbeef05..8c2f64cfb4 100755 --- a/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol +++ b/shyft-cli/web3/transfer-through-master/contracts/Transfers.sol @@ -7,7 +7,7 @@ contract Transfers { Transfers2 t; address t_addr; - constructor() public { + function Transfers() public { t = new Transfers2(); t_addr = address(t); } diff --git a/shyft-cli/web3/transfer-through-master/package-lock.json b/shyft-cli/web3/transfer-through-master/package-lock.json index 326563a8c6..6447a9f6bb 100755 --- a/shyft-cli/web3/transfer-through-master/package-lock.json +++ b/shyft-cli/web3/transfer-through-master/package-lock.json @@ -1,5 +1,490 @@ { "name": "transfers", "version": "1.0.0", - "lockfileVersion": 1 + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + }, + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "requires": { + "is-arrayish": "0.2.1" + } + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "fs-extra": { + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", + "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "klaw": "1.3.1", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "hosted-git-info": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz", + "integrity": "sha512-Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "requires": { + "graceful-fs": "4.1.11" + } + }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "requires": { + "graceful-fs": "4.1.11" + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" + }, + "memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.11" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "requires": { + "hosted-git-info": "2.6.1", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "1.0.0" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "1.3.2" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "2.0.4" + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-from-string": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=" + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "requires": { + "glob": "7.1.2" + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "solc": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.24.tgz", + "integrity": "sha512-2xd7Cf1HeVwrIb6Bu1cwY2/TaLRodrppCq3l7rhLimFQgmxptXhTC3+/wesVLpB09F1A2kZgvbMOgH7wvhFnBQ==", + "requires": { + "fs-extra": "0.30.0", + "memorystream": "0.3.1", + "require-from-string": "1.2.1", + "semver": "5.5.0", + "yargs": "4.8.1" + } + }, + "spdx-correct": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", + "requires": { + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==" + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "requires": { + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "0.2.1" + } + }, + "validate-npm-package-license": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", + "requires": { + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "window-size": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yargs": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "lodash.assign": "4.2.0", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "2.4.1" + } + }, + "yargs-parser": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", + "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", + "requires": { + "camelcase": "3.0.0", + "lodash.assign": "4.2.0" + } + } + } } diff --git a/shyft-cli/web3/transfer-through-master/package.json b/shyft-cli/web3/transfer-through-master/package.json index df745f4570..4ffd6d5091 100755 --- a/shyft-cli/web3/transfer-through-master/package.json +++ b/shyft-cli/web3/transfer-through-master/package.json @@ -11,5 +11,8 @@ }, "keywords": [], "author": "", - "license": "ISC" + "license": "ISC", + "dependencies": { + "solc": "^0.4.24" + } } diff --git a/shyfttracerinterface/tracer_interface.go b/shyfttracerinterface/tracer_interface.go index 40d341b028..366b1534d1 100644 --- a/shyfttracerinterface/tracer_interface.go +++ b/shyfttracerinterface/tracer_interface.go @@ -2,9 +2,8 @@ package shyfttracerinterface import ( "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/node" ) type IShyftTracer interface { - GetTracerToRun(hash common.Hash, stack *node.Node) (interface{}, error) + GetTracerToRun(hash common.Hash) (interface{}, error) } From 79f6484d3aeed06b32e5c816a781b0034cce2bf2 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 11 Jul 2018 12:16:07 -0400 Subject: [PATCH 09/24] resolved conflicts --- core/shyft_database_util.go | 9 +- eth/api_tracer.go | 192 +++++++++++++++- eth/shyft_tracer.go | 271 ++++++++++++++++++++++- shyfttracerinterface/tracer_interface.go | 5 + 4 files changed, 472 insertions(+), 5 deletions(-) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 62673984cf..c4232aaf03 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -172,11 +172,14 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H Data: tx.Data(), } - //hash := txData.TxHash + hash := txData.TxHash txHash := txData.TxHash.Hex() - //prayer, _ := IShyftTracer.GetTracerToRun(hash) - //fmt.Printf("%+v\n", prayer) + prayer, _ := IShyftTracer.GetTracerToRun(hash) + fmt.Printf("%+v\n", prayer) + + //var stack *node.Node + //var cfg *eth.Config from := txData.From.Hex() blockHasher := txData.BlockHash diff --git a/eth/api_tracer.go b/eth/api_tracer.go index f8740f3b13..39c5779d9b 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -38,7 +38,6 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/trie" - ) const ( @@ -533,6 +532,197 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { + fmt.Println("TRACE TRANSACTION ++++++!+!+!+!+!+!+!+!+!+!+!+!++!") + _, file, no, ok := runtime.Caller(1) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(2) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(3) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(4) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(5) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(6) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(7) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(8) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(9) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(10) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(11) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(12) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(13) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(14) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(15) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(16) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(17) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(18) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(19) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(20) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(21) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(22) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(23) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(24) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(25) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(26) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(27) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(28) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(29) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(30) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(31) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(32) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(33) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(34) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(35) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(36) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(37) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(38) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(39) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(40) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + fmt.Println("////////////// ++++++++++++++++ /////////////////// Phantom *(!*!*!*!*!*!**!*!*") + _, file, no, ok = runtime.Caller(41) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(42) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(43) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + _, file, no, ok = runtime.Caller(44) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + fmt.Println("////////////// ++++++++++++++++ /////////////////// TraceTransaction *(!*!*!*!*!*!**!*!*") + _, file, no, ok = runtime.Caller(45) + if ok { + fmt.Printf("called from %s#%d\n", file, no) + } + // NOTE:SHYFT + //fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config) + //fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth) + // Retrieve the transaction and assemble its EVM context + //fmt.Println("IN TRACE TRANSACTION the chaindb is ") + //fmt.Println(chaindb) + //fmt.Println("IN TRACE TRANSACTION the common hash is ") + //fmt.Println(hash) tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) if tx == nil { diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index 73bacd3b16..d0c984d961 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -1,5 +1,6 @@ package eth + import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" @@ -40,4 +41,272 @@ var Global_config *Config func setGlobalConfig(c *Config) { Global_config = c -} \ No newline at end of file +} + +// +//import ( +// "github.com/ethereum/go-ethereum/common" +// "fmt" +// "github.com/ethereum/go-ethereum/core" +// "runtime" +// "context" +//) +// +////const ( +//// // defaultTraceReexec is the number of blocks the tracer is willing to go back +//// // and reexecute to produce missing historical state necessary to run a specific +//// // trace. +//// defaultTraceReexec = uint64(128) +////) +// +////var api *eth.PrivateDebugAPI +// +//var EthereumObject interface{} +// +//type ShyftTracer struct {} +// +//func (st ShyftTracer) MyTraceTransaction(hash string) (interface{}) { +// //fmt.Println("THE stringed hash is in MYTRACETRANSACTION") +// //fmt.Println(hash) +// //fmt.Println(ethObjectInterface.GetEthObject()) +// fmt.Println("CTXXXXXXXXXXXXXXX") +// common_hash := common.HexToHash(hash) +// +// +// fmt.Println("the chain db is in MyTraceTransaction") +// //fmt.Println(Chaindb_global) +// if Chaindb_global == nil { +// return nil +// } +// +// tx, blockHash, _, index := core.GetTransaction(Chaindb_global, common_hash) +// +// if tx == nil { +// fmt.Println("TRANSACTION NOT FOUND IN MyTraceTransaction +++++++++") +// } +// +// reexec := defaultTraceReexec +// //if config != nil && config.Reexec != nil { +// // reexec = *config.Reexec +// //} +// msg, vmctx, statedb, err := DebugApi.computeTxEnv(blockHash, int(index), reexec) +// +// fmt.Println("stuff and nonsense") +// fmt.Println(msg) +// fmt.Println(vmctx) +// fmt.Println(statedb) +// fmt.Println(err) +// fmt.Println("THIS CTX") +// //fmt.Println("the tx is ") +// //fmt.Println(tx) +// //fmt.Println(blockHash) +// //fmt.Println(index) +// //DebugApi.traceTxTest(msg, vmctx, statedb, config) +// return 42 +//} +// +//func (api *PrivateDebugAPI) TraceTransactionTest(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { +// fmt.Println("TRACE TRANSACTION ++++++!+!+!+!+!+!+!+!+!+!+!+!++!") +// _, file, no, ok := runtime.Caller(1) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(2) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(3) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(4) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(5) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(6) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(7) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(8) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(9) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(10) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(11) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(12) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(13) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(14) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(15) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(16) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(17) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(18) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(19) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(20) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(21) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(22) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(23) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(24) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(25) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(26) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(27) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(28) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(29) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(30) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(31) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(32) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(33) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(34) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(35) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(36) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(37) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(38) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(39) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(40) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// fmt.Println("////////////// ++++++++++++++++ /////////////////// Phantom *(!*!*!*!*!*!**!*!*") +// _, file, no, ok = runtime.Caller(41) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(42) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(43) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// _, file, no, ok = runtime.Caller(44) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// fmt.Println("////////////// ++++++++++++++++ /////////////////// TraceTransaction *(!*!*!*!*!*!**!*!*") +// _, file, no, ok = runtime.Caller(45) +// if ok { +// fmt.Printf("called from %s#%d\n", file, no) +// } +// +// tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) +// if tx == nil { +// return nil, fmt.Errorf("transaction %x not found", hash) +// } +// +// reexec := defaultTraceReexec +// if config != nil && config.Reexec != nil { +// reexec = *config.Reexec +// } +// msg, vmctx, statedb, err := api.computeTxEnv(blockHash, int(index), reexec) +// if err != nil { +// return nil, err +// } +// fmt.Println("CTX +++++++++++++++++++++++", ctx) +// return api.traceTxTest(ctx, msg, vmctx, statedb, config) +//} +// +//func setEthObject(ethobj interface{}){ +// EthereumObject = ethobj +//} diff --git a/shyfttracerinterface/tracer_interface.go b/shyfttracerinterface/tracer_interface.go index 366b1534d1..dbadf1e39b 100644 --- a/shyfttracerinterface/tracer_interface.go +++ b/shyfttracerinterface/tracer_interface.go @@ -7,3 +7,8 @@ import ( type IShyftTracer interface { GetTracerToRun(hash common.Hash) (interface{}, error) } + +//type IShyftTracer interface { +// MyTraceTransaction(hash string) (interface{}) +//} + From 3eab46ee8c23e66bb7778aaddff5a2f0b6bd315f Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 11 Jul 2018 12:20:43 -0400 Subject: [PATCH 10/24] clean runtime --- core/shyft_database_util.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index c4232aaf03..2fc57804cb 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -14,6 +14,7 @@ _ "github.com/lib/pq" "github.com/ethereum/go-ethereum/core/types" Rewards "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/shyfttracerinterface" + "reflect" ) var IShyftTracer shyfttracerinterface.IShyftTracer @@ -173,10 +174,11 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H } hash := txData.TxHash + fmt.Println(reflect.TypeOf(hash)) txHash := txData.TxHash.Hex() - prayer, _ := IShyftTracer.GetTracerToRun(hash) - fmt.Printf("%+v\n", prayer) + //prayer, _ := IShyftTracer.GetTracerToRun(hash) + //fmt.Printf("%+v\n", prayer) //var stack *node.Node //var cfg *eth.Config From fbf3fa25c7d3ceae0601806d53f534e3aa60519b Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 11 Jul 2018 18:00:49 -0400 Subject: [PATCH 11/24] internals are being seen --- core/database_util.go | 4 - core/shyft_database_util.go | 45 ++++--- eth/api_tracer.go | 201 ++----------------------------- eth/shyft_tracer.go | 2 - eth/tracers/tracer.go | 50 ++++++-- shyftBlockExplorerApi/handler.go | 143 ++++++++++++---------- 6 files changed, 154 insertions(+), 291 deletions(-) diff --git a/core/database_util.go b/core/database_util.go index af88b7733c..54572ac71b 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -265,15 +265,11 @@ func GetBlockReceipts(db DatabaseReader, hash common.Hash, number uint64) types. // GetTxLookupEntry retrieves the positional metadata associated with a transaction // hash to allow retrieving the transaction or receipt by hash. func GetTxLookupEntry(db DatabaseReader, hash common.Hash) (common.Hash, uint64, uint64) { - fmt.Println("[GetTxLookupEntry FUNCTION RAN]") // Load the positional metadata from disk and bail if it fails //fmt.Println("INSIDE GetTxLookupEntry ") //fmt.Println("the db is ") //fmt.Println(db) - fmt.Println("the hash is", hash.String()) data, _ := db.Get(append(lookupPrefix, hash.Bytes()...)) - fmt.Println("the data is ") - fmt.Println(data) if len(data) == 0 { return common.Hash{}, 0, 0 } diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 2fc57804cb..3478312288 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -14,7 +14,6 @@ _ "github.com/lib/pq" "github.com/ethereum/go-ethereum/core/types" Rewards "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/shyfttracerinterface" - "reflect" ) var IShyftTracer shyfttracerinterface.IShyftTracer @@ -174,11 +173,9 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H } hash := txData.TxHash - fmt.Println(reflect.TypeOf(hash)) txHash := txData.TxHash.Hex() - //prayer, _ := IShyftTracer.GetTracerToRun(hash) - //fmt.Printf("%+v\n", prayer) + IShyftTracer.GetTracerToRun(hash) //var stack *node.Node //var cfg *eth.Config @@ -292,6 +289,25 @@ func writeContractBalance(sqldb *sql.DB, tx *types.Transaction) error { return nil } +func writeContractBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, string, string) { + sendAndReceiveData := SendAndReceive{ + From: tx.From().Hex(), + Amount: tx.Value().String(), + } + + fromAddr := sendAndReceiveData.From + getAccountBalanceSender:= SGetAccount(sqldb, fromAddr) + + var senderBalance SendAndReceive + if err := json.Unmarshal([]byte(getAccountBalanceSender), &senderBalance); err != nil { + log.Fatal(err) + } + balanceSender := senderBalance.Balance + accountNonceSender := senderBalance.TxCountAccount + + return sendAndReceiveData, balanceSender, accountNonceSender +} + //writeFromBalance writes senders balance to accounts db func writeFromBalance(sqldb *sql.DB, tx *types.Transaction) error { sendAndReceiveData, balanceRec, balanceSen, accountNonceRec, accountNonceSen := writeBalanceHelper(sqldb, tx) @@ -375,8 +391,9 @@ func writeBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, s toAddr := sendAndReceiveData.To fromAddr := sendAndReceiveData.From - getAccountBalanceReceiver := GetAccount(sqldb, toAddr) - getAccountBalanceSender:= GetAccount(sqldb, fromAddr) + + getAccountBalanceReceiver := SGetAccount(sqldb, toAddr) + getAccountBalanceSender:= SGetAccount(sqldb, fromAddr) var receiverBalance SendAndReceive if err := json.Unmarshal([]byte(getAccountBalanceReceiver), &receiverBalance); err != nil { @@ -495,7 +512,7 @@ func storeReward(sqldb *sql.DB, address string, reward *big.Int) { //Look into postgres functions array_to_json(array_agg(lap)) //Example select array_to_json(array_agg(lap)) //from ( select * from blocks)lap; -func GetAllBlocks(sqldb *sql.DB) string { +func SGetAllBlocks(sqldb *sql.DB) string { var arr blockRes var blockArr string rows, err := sqldb.Query(` @@ -616,7 +633,7 @@ func SGetBlock(sqldb *sql.DB, blockNumber string) string { return string(json) } -func GetRecentBlock(sqldb *sql.DB) string { +func SGetRecentBlock(sqldb *sql.DB) string { sqlStatement := `SELECT * FROM blocks WHERE number=(SELECT MAX(number) FROM blocks);` row := sqldb.QueryRow(sqlStatement) var hash string @@ -669,7 +686,7 @@ func GetRecentBlock(sqldb *sql.DB) string { return string(json) } -func GetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string { +func SGetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string { var arr txRes var txx string sqlStatement := `SELECT * FROM txs WHERE blocknumber=$1` @@ -737,7 +754,7 @@ func GetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string { return txx } -func GetAllBlocksMinedByAddress(sqldb *sql.DB, coinbase string) string { +func SGetAllBlocksMinedByAddress(sqldb *sql.DB, coinbase string) string { var arr blockRes var blockArr string sqlStatement := `SELECT * FROM blocks WHERE coinbase=$1` @@ -804,7 +821,7 @@ func GetAllBlocksMinedByAddress(sqldb *sql.DB, coinbase string) string { } //GetAllTransactions getter fn for API -func GetAllTransactions(sqldb *sql.DB) string { +func SGetAllTransactions(sqldb *sql.DB) string { var arr txRes var txx string rows, err := sqldb.Query(` @@ -931,7 +948,7 @@ func SGetTransaction(sqldb *sql.DB, txHash string) string { } //GetAccount returns account balances -func GetAccount(sqldb *sql.DB, address string) string { +func SGetAccount(sqldb *sql.DB, address string) string { sqlStatement := `SELECT * FROM accounts WHERE addr=$1;` row := sqldb.QueryRow(sqlStatement, address) var addr string @@ -952,7 +969,7 @@ func GetAccount(sqldb *sql.DB, address string) string { } //GetAllAccounts returns all accounts and balances -func GetAllAccounts(sqldb *sql.DB) string { +func SGetAllAccounts(sqldb *sql.DB) string { var array accountRes var accountsArr string var txCountAccount string @@ -991,7 +1008,7 @@ func GetAllAccounts(sqldb *sql.DB) string { } //GetAccount returns account balances -func GetAccountTxs(sqldb *sql.DB, address string) string { +func SGetAccountTxs(sqldb *sql.DB, address string) string { var arr txRes var txx string sqlStatement := `SELECT * FROM txs WHERE to_addr=$1 OR from_addr=$1;` diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 39c5779d9b..fa4c0d0f95 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -532,189 +532,6 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { - fmt.Println("TRACE TRANSACTION ++++++!+!+!+!+!+!+!+!+!+!+!+!++!") - _, file, no, ok := runtime.Caller(1) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(2) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(3) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(4) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(5) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(6) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(7) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(8) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(9) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(10) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(11) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(12) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(13) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(14) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(15) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(16) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(17) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(18) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(19) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(20) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(21) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(22) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(23) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(24) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(25) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(26) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(27) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(28) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(29) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(30) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(31) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(32) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(33) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(34) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(35) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(36) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(37) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(38) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(39) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(40) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - fmt.Println("////////////// ++++++++++++++++ /////////////////// Phantom *(!*!*!*!*!*!**!*!*") - _, file, no, ok = runtime.Caller(41) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(42) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(43) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - _, file, no, ok = runtime.Caller(44) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - fmt.Println("////////////// ++++++++++++++++ /////////////////// TraceTransaction *(!*!*!*!*!*!**!*!*") - _, file, no, ok = runtime.Caller(45) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } // NOTE:SHYFT //fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config) //fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth) @@ -729,7 +546,6 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Ha return nil, fmt.Errorf("transaction %x not found", hash) } - fmt.Println("TX IN TRACETRANSACTION", tx) reexec := defaultTraceReexec if config != nil && config.Reexec != nil { reexec = *config.Reexec @@ -746,8 +562,6 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Ha // be tracer dependent. func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, vmctx vm.Context, statedb *state.StateDB, config *TraceConfig) (interface{}, error) { // Assemble the structured logger or the JavaScript tracer - fmt.Println("\n [API_TRACER.GO traceTX func]") - // fmt.Printf("%+v", config, "THIS IS CONFIG") var ( tracer vm.Tracer err error @@ -756,23 +570,23 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v case config != nil && config.Tracer != nil: // Define a meaningful timeout of a single transaction trace timeout := defaultTraceTimeout + fmt.Println(timeout) if config.Timeout != nil { if timeout, err = time.ParseDuration(*config.Timeout); err != nil { return nil, err } } // Constuct the JavaScript tracer to execute with - fmt.Printf("%+v \n", *config.Tracer) if tracer, err = tracers.New(*config.Tracer); err != nil { return nil, err } // Handle timeouts and RPC cancellations - deadlineCtx, cancel := context.WithTimeout(ctx, timeout) - go func() { - <-deadlineCtx.Done() - tracer.(*tracers.Tracer).Stop(errors.New("execution timeout")) - }() - defer cancel() + //deadlineCtx, cancel := context.WithTimeout(ctx, timeout) + //go func() { + // <-deadlineCtx.Done() + // tracer.(*tracers.Tracer).Stop(errors.New("execution timeout")) + //}() + //defer cancel() case config == nil: tracer = vm.NewStructLogger(nil) @@ -798,7 +612,6 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v }, nil case *tracers.Tracer: - fmt.Println("THIS RAN MF") return tracer.GetResult() default: diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index d0c984d961..fb39dd5e19 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -5,7 +5,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" "context" - "fmt" ) var EthereumObject interface{} @@ -26,7 +25,6 @@ func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { Timeout: nil, Reexec: nil, } - fmt.Printf("%+v", config, "THIS IS CONFIG IN SHYFT_TRACER") //var fullNode *Ethereum fullNode, _ := SNew(Global_config) privateAPI := NewPrivateDebugAPI(config2, fullNode) diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 8c42b157b3..328549e27b 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -30,7 +30,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" - duktape "gopkg.in/olebedev/go-duktape.v3" + "gopkg.in/olebedev/go-duktape.v3" ) // bigIntegerJS is the minified version of https://github.com/peterolson/BigInteger.js. @@ -307,13 +307,10 @@ type Tracer struct { // which must evaluate to an expression returning an object with 'step', 'fault' // and 'result' functions. func New(code string) (*Tracer, error) { - fmt.Println("\n [TRACER.GO New func]", code) // Resolve any tracers by name and assemble the tracer object if tracer, ok := tracer(code); ok { code = tracer - fmt.Println("\n [ok]", ok) } - fmt.Println("\n [tracer]", tracer) tracer := &Tracer{ vm: duktape.New(), @@ -328,6 +325,7 @@ func New(code string) (*Tracer, error) { costValue: new(uint), depthValue: new(uint), } + // Set up builtins for this environment tracer.vm.PushGlobalGoFunction("toHex", func(ctx *duktape.Context) int { ctx.PushString(hexutil.Encode(popSlice(ctx))) @@ -460,7 +458,6 @@ func New(code string) (*Tracer, error) { tracer.dbWrapper.pushObject(tracer.vm) tracer.vm.PutPropString(tracer.stateObject, "db") - return tracer, nil } @@ -500,11 +497,6 @@ func wrapError(context string, err error) error { // CaptureStart implements the Tracer interface to initialize the tracing operation. func (jst *Tracer) CaptureStart(from common.Address, to common.Address, create bool, input []byte, gas uint64, value *big.Int) error { - //fmt.Println("\n\n\t\t type: ", reflect.TypeOf(input)) - fmt.Println("\t\t [TRACER TO]:", to.String()) - fmt.Println("\t\t [TRACER FROM]:", from.String()) - fmt.Println("\t\t [TRACER VALUE]:", value.String()) - fmt.Println("\t\t [TRACER INPUT STRING]:", string(input[:len(input)]), "\n\n") jst.ctx["type"] = "CALL" if create { jst.ctx["type"] = "CREATE" @@ -573,9 +565,6 @@ func (jst *Tracer) CaptureFault(env *vm.EVM, pc uint64, op vm.OpCode, gas, cost // CaptureEnd is called after the call finishes to finalize the tracing. func (jst *Tracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, err error) error { - //fmt.Println("\n\n\t\t", reflect.TypeOf(output)) - //fmt.Println("\t\t [TRACER OUTPUT]:", output[:len(output)]) - //fmt.Println("\t\t [TRACER OUTPUT STRING]:", string(output[:len(output)]), "\n\n") jst.ctx["output"] = output jst.ctx["gasUsed"] = gasUsed jst.ctx["time"] = t.String() @@ -586,6 +575,13 @@ func (jst *Tracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, er return nil } +type Internals struct { + From string + To string + Value string + Calls []*Internals +} + // GetResult calls the Javascript 'result' function and returns its value, or any accumulated error func (jst *Tracer) GetResult() (json.RawMessage, error) { // Transform the context into a JavaScript object and inject into the state @@ -626,5 +622,33 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) { jst.vm.DestroyHeap() jst.vm.Destroy() + //var dat map[string]interface{} + var dat Internals + + if err := json.Unmarshal(result, &dat); err != nil { + panic(err) + } + + //fmt.Println("[FULL DATA]", string(result)) + //fmt.Println("\n +++++++++++++++++++") + //fmt.Println(dat["calls"]) + //fmt.Println(dat["calls"]["gasUsed"]) + //j, _ := json.Marshal(result) + //internals := string(j) + //fmt.Println("[RESULT]", dat) + //fmt.Println("[RESULT]", dat.To) + //fmt.Println("[Internal Call]", len(dat.Calls)) + + for key, val := range dat.Calls { + fmt.Println(key) + fmt.Println("[INTERNAL TO]", val.To) + fmt.Println("[INTERNAL From]", val.From) + fmt.Println("[INTERNAL Calls length]", len(val.Calls)) + for newKey, newVal := range val.Calls { + fmt.Println(newKey) + fmt.Println("[INSIDE INTERNAL TO]", newVal.To) + } + } + return result, jst.err } diff --git a/shyftBlockExplorerApi/handler.go b/shyftBlockExplorerApi/handler.go index 496941db7b..9f368d6748 100644 --- a/shyftBlockExplorerApi/handler.go +++ b/shyftBlockExplorerApi/handler.go @@ -2,13 +2,12 @@ package main ///@NOTE Shyft handler functions when endpoints are hit import ( - "database/sql" "fmt" "net/http" _ "github.com/lib/pq" - "github.com/ethereum/go-ethereum/shyftdb" + "github.com/ethereum/go-ethereum/core" "github.com/gorilla/mux" "bytes" "io/ioutil" @@ -19,13 +18,13 @@ import ( func GetTransaction(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) txHash := vars["txHash"] - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } - - getTxResponse := shyftdb.GetTransaction(blockExplorerDb, txHash) + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} + sqldb, err := core.DBConnection() + getTxResponse := core.SGetTransaction(sqldb, txHash) if err != nil { http.Error(w, err.Error(), 500) @@ -40,13 +39,15 @@ func GetTransaction(w http.ResponseWriter, r *http.Request) { // GetAllTransactions gets txs func GetAllTransactions(w http.ResponseWriter, r *http.Request) { - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} - txs := shyftdb.GetAllTransactions(blockExplorerDb) + sqldb, err := core.DBConnection() + + txs := core.SGetAllTransactions(sqldb) if err != nil { http.Error(w, err.Error(), 500) @@ -64,13 +65,15 @@ func GetAllTransactions(w http.ResponseWriter, r *http.Request) { func GetAllTransactionsFromBlock(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) blockNumber := vars["blockNumber"] - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} - txsFromBlock := shyftdb.GetAllTransactionsFromBlock(blockExplorerDb, blockNumber) + sqldb, err := core.DBConnection() + + txsFromBlock := core.SGetAllTransactionsFromBlock(sqldb, blockNumber) if err != nil { http.Error(w, err.Error(), 500) @@ -86,13 +89,15 @@ func GetAllTransactionsFromBlock(w http.ResponseWriter, r *http.Request) { func GetAllBlocksMinedByAddress(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) coinbase := vars["coinbase"] - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} - blocksMined := shyftdb.GetAllBlocksMinedByAddress(blockExplorerDb, coinbase) + sqldb, err := core.DBConnection() + + blocksMined := core.SGetAllBlocksMinedByAddress(sqldb, coinbase) if err != nil { http.Error(w, err.Error(), 500) @@ -109,13 +114,15 @@ func GetAllBlocksMinedByAddress(w http.ResponseWriter, r *http.Request) { func GetAccount(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) address := vars["address"] - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} - getAccountBalance := shyftdb.GetAccount(blockExplorerDb, address) + sqldb, err := core.DBConnection() + + getAccountBalance := core.SGetAccount(sqldb, address) if err != nil { http.Error(w, err.Error(), 500) @@ -132,13 +139,15 @@ func GetAccount(w http.ResponseWriter, r *http.Request) { func GetAccountTxs(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) address := vars["address"] - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} - getAccountTxs := shyftdb.GetAccountTxs(blockExplorerDb, address) + sqldb, err := core.DBConnection() + + getAccountTxs := core.SGetAccountTxs(sqldb, address) if err != nil { http.Error(w, err.Error(), 500) @@ -153,12 +162,15 @@ func GetAccountTxs(w http.ResponseWriter, r *http.Request) { // GetAllAccounts gets balances func GetAllAccounts(w http.ResponseWriter, r *http.Request) { - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } - allAccounts := shyftdb.GetAllAccounts(blockExplorerDb) + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} + + sqldb, err := core.DBConnection() + + allAccounts := core.SGetAllAccounts(sqldb) if err != nil { http.Error(w, err.Error(), 500) return @@ -173,13 +185,13 @@ func GetAllAccounts(w http.ResponseWriter, r *http.Request) { func GetBlock(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) blockNumber := vars["blockNumber"] - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } - - getBlockResponse := shyftdb.GetBlock(blockExplorerDb, blockNumber) + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} + sqldb, err := core.DBConnection() + getBlockResponse := core.SGetBlock(sqldb, blockNumber) if err != nil { http.Error(w, err.Error(), 500) @@ -194,12 +206,13 @@ func GetBlock(w http.ResponseWriter, r *http.Request) { // GetAllBlocks response func GetAllBlocks(w http.ResponseWriter, r *http.Request) { - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } - block3 := shyftdb.GetAllBlocks(blockExplorerDb) + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} + sqldb, err := core.DBConnection() + block3 := core.SGetAllBlocks(sqldb) if err != nil { http.Error(w, err.Error(), 500) return @@ -210,12 +223,14 @@ func GetAllBlocks(w http.ResponseWriter, r *http.Request) { } func GetRecentBlock(w http.ResponseWriter, r *http.Request) { - connStr := "user=postgres dbname=shyftdb sslmode=disable" - blockExplorerDb, err := sql.Open("postgres", connStr) - if err != nil { - return - } - mostRecentBlock := shyftdb.GetRecentBlock(blockExplorerDb) + //connStr := "user=postgres dbname=shyftdb sslmode=disable" + //blockExplorerDb, err := sql.Open("postgres", connStr) + //if err != nil { + // return + //} + sqldb, err := core.DBConnection() + + mostRecentBlock := core.SGetRecentBlock(sqldb) if err != nil { http.Error(w, err.Error(), 500) return From efbb2a7a87e254b925c8b99923029291bf48817f Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 11 Jul 2018 19:48:06 -0400 Subject: [PATCH 12/24] recursive fn in place --- core/shyft_database_util.go | 3 --- eth/api_tracer.go | 17 +++++---------- eth/tracers/tracer.go | 42 ++++++++++++++++++------------------- 3 files changed, 26 insertions(+), 36 deletions(-) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 3478312288..5a660890dc 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -177,9 +177,6 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H IShyftTracer.GetTracerToRun(hash) - //var stack *node.Node - //var cfg *eth.Config - from := txData.From.Hex() blockHasher := txData.BlockHash amount := txData.Amount.String() diff --git a/eth/api_tracer.go b/eth/api_tracer.go index fa4c0d0f95..33d6ad6f33 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -533,19 +533,10 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { // NOTE:SHYFT - //fmt.Printf("\n\t[API_TRACER.GO api.config] %+v", api.config) - //fmt.Printf("\n\t[API_TRACER.GO api.eth] %+v\n", api.eth) - // Retrieve the transaction and assemble its EVM context - //fmt.Println("IN TRACE TRANSACTION the chaindb is ") - //fmt.Println(chaindb) - //fmt.Println("IN TRACE TRANSACTION the common hash is ") - //fmt.Println(hash) - tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) if tx == nil { return nil, fmt.Errorf("transaction %x not found", hash) } - reexec := defaultTraceReexec if config != nil && config.Reexec != nil { reexec = *config.Reexec @@ -569,10 +560,11 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v switch { case config != nil && config.Tracer != nil: // Define a meaningful timeout of a single transaction trace - timeout := defaultTraceTimeout - fmt.Println(timeout) + + _ = defaultTraceTimeout + if config.Timeout != nil { - if timeout, err = time.ParseDuration(*config.Timeout); err != nil { + if _, err = time.ParseDuration(*config.Timeout); err != nil { return nil, err } } @@ -580,6 +572,7 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v if tracer, err = tracers.New(*config.Tracer); err != nil { return nil, err } + // NOTE:SHYFT REMOVED CTX DEADLINE // Handle timeouts and RPC cancellations //deadlineCtx, cancel := context.WithTimeout(ctx, timeout) //go func() { diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 328549e27b..fbd783ea31 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -579,9 +579,29 @@ type Internals struct { From string To string Value string + Gas string + GasUsed string Calls []*Internals } + +func (i *Internals) InternalRecursive() { + fmt.Println("[Internal To]", i.To) + fmt.Println("[Internal From]", i.From) + lengthOfCalls := len(i.Calls) + fmt.Println("[LENGTH OF CALLS]", lengthOfCalls) + if lengthOfCalls == 0 { + return + } + + for _, val := range i.Calls { + val.InternalRecursive() + } +} + + + + // GetResult calls the Javascript 'result' function and returns its value, or any accumulated error func (jst *Tracer) GetResult() (json.RawMessage, error) { // Transform the context into a JavaScript object and inject into the state @@ -622,33 +642,13 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) { jst.vm.DestroyHeap() jst.vm.Destroy() - //var dat map[string]interface{} var dat Internals if err := json.Unmarshal(result, &dat); err != nil { panic(err) } - //fmt.Println("[FULL DATA]", string(result)) - //fmt.Println("\n +++++++++++++++++++") - //fmt.Println(dat["calls"]) - //fmt.Println(dat["calls"]["gasUsed"]) - //j, _ := json.Marshal(result) - //internals := string(j) - //fmt.Println("[RESULT]", dat) - //fmt.Println("[RESULT]", dat.To) - //fmt.Println("[Internal Call]", len(dat.Calls)) - - for key, val := range dat.Calls { - fmt.Println(key) - fmt.Println("[INTERNAL TO]", val.To) - fmt.Println("[INTERNAL From]", val.From) - fmt.Println("[INTERNAL Calls length]", len(val.Calls)) - for newKey, newVal := range val.Calls { - fmt.Println(newKey) - fmt.Println("[INSIDE INTERNAL TO]", newVal.To) - } - } + dat.InternalRecursive() return result, jst.err } From 20ff154473ad2be45c359ad3b554021c1fa1c3de Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 11 Jul 2018 20:49:15 -0400 Subject: [PATCH 13/24] wip writing internals --- eth/tracers/tracer.go | 21 ++++++++++++++++++--- shyft-cli/postgres_setup/create_tables.psql | 19 ++++++++++++++++++- shyft-cli/postgres_setup/drop_tables.psql | 2 ++ 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index fbd783ea31..14c6a34874 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -576,20 +576,35 @@ func (jst *Tracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, er } type Internals struct { + Type string From string To string Value string Gas string GasUsed string + Input string + Output string + Time string Calls []*Internals } +//func (i *Internals) SWriteInteralTxs() { +// connStr := "user=postgres dbname=shyftdb sslmode=disable" +// sqldb, err := sql.Open("postgres", connStr) +// if err != nil { +// return +// } +// +// sqlStatement := `INSERT INTO internalTxs(type, txhash, from_addr, to_addr, amount, gas, gasUsed, time, input, output) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10))` +// qerr := sqldb.QueryRow(sqlStatement, i.Type, txHash, i.From, i.To, i.Value, i.Gas, i.GasUsed, i.Time, i.Input, i.Output) +// +// if qerr != nil { +// panic(qerr) +// } +//} func (i *Internals) InternalRecursive() { - fmt.Println("[Internal To]", i.To) - fmt.Println("[Internal From]", i.From) lengthOfCalls := len(i.Calls) - fmt.Println("[LENGTH OF CALLS]", lengthOfCalls) if lengthOfCalls == 0 { return } diff --git a/shyft-cli/postgres_setup/create_tables.psql b/shyft-cli/postgres_setup/create_tables.psql index b746384bdc..259a95b23e 100644 --- a/shyft-cli/postgres_setup/create_tables.psql +++ b/shyft-cli/postgres_setup/create_tables.psql @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS blocks ( ); CREATE TABLE IF NOT EXISTS txs ( - txHash text, + txHash text primary key unique, to_addr text, from_addr text, blockhash text references blocks(hash), @@ -39,3 +39,20 @@ CREATE TABLE IF NOT EXISTS accounts ( txCountAccount numeric ); +CREATE TABLE IF NOT EXISTS contracts ( + txHash text +); + +CREATE TABLE IF NOT EXISTS internalTxs ( + id SERIAL PRIMARY KEY, + txHash text references txs(txHash), + type text, + to_addr text, + from_addr text, + amount text, + gas numeric, + gasUsed numeric, + time text, + input text, + output text +) \ No newline at end of file diff --git a/shyft-cli/postgres_setup/drop_tables.psql b/shyft-cli/postgres_setup/drop_tables.psql index 41563522dd..8826b85093 100644 --- a/shyft-cli/postgres_setup/drop_tables.psql +++ b/shyft-cli/postgres_setup/drop_tables.psql @@ -1,3 +1,5 @@ +DROP TABLE internalTxs; DROP TABLE txs; DROP TABLE blocks; DROP TABLE accounts; +DROP TABLE contracts; \ No newline at end of file From 185c35523da306dab60230c252cde7c73e9cb015 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Fri, 13 Jul 2018 11:55:37 -0400 Subject: [PATCH 14/24] writing internals to db --- core/shyft_database_util.go | 4 +- eth/api_tracer.go | 85 +++++++++++ eth/shyft_tracer.go | 272 +----------------------------------- eth/tracers/tracer.go | 95 ++++++++++--- 4 files changed, 162 insertions(+), 294 deletions(-) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 5a660890dc..8320bc70d3 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -175,8 +175,6 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H hash := txData.TxHash txHash := txData.TxHash.Hex() - IShyftTracer.GetTracerToRun(hash) - from := txData.From.Hex() blockHasher := txData.BlockHash amount := txData.Amount.String() @@ -231,6 +229,8 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H } } + IShyftTracer.GetTracerToRun(hash) + return nil } diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 33d6ad6f33..c4df438414 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -548,6 +548,91 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Ha return api.traceTx(ctx, msg, vmctx, statedb, config) } +// TraceTransaction returns the structured logs created during the execution of EVM +// and returns them as a JSON object. +func (api *PrivateDebugAPI) STraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { + // NOTE:SHYFT + tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) + if tx == nil { + return nil, fmt.Errorf("transaction %x not found", hash) + } + reexec := defaultTraceReexec + if config != nil && config.Reexec != nil { + reexec = *config.Reexec + } + msg, vmctx, statedb, err := api.computeTxEnv(blockHash, int(index), reexec) + if err != nil { + return nil, err + } + return api.StraceTx(ctx, msg, vmctx, statedb, config, hash) +} + +// traceTx configures a new tracer according to the provided configuration, and +// executes the given message in the provided environment. The return value will +// be tracer dependent. +func (api *PrivateDebugAPI) StraceTx(ctx context.Context, message core.Message, vmctx vm.Context, statedb *state.StateDB, config *TraceConfig, hash common.Hash) (interface{}, error) { + // Assemble the structured logger or the JavaScript tracer + var ( + tracer vm.Tracer + err error + ) + switch { + case config != nil && config.Tracer != nil: + // Define a meaningful timeout of a single transaction trace + + _ = defaultTraceTimeout + + if config.Timeout != nil { + if _, err = time.ParseDuration(*config.Timeout); err != nil { + return nil, err + } + } + // Constuct the JavaScript tracer to execute with + if tracer, err = tracers.New(*config.Tracer); err != nil { + return nil, err + } + // NOTE:SHYFT REMOVED CTX DEADLINE + // Handle timeouts and RPC cancellations + //deadlineCtx, cancel := context.WithTimeout(ctx, timeout) + //go func() { + // <-deadlineCtx.Done() + // tracer.(*tracers.Tracer).Stop(errors.New("execution timeout")) + //}() + //defer cancel() + + case config == nil: + tracer = vm.NewStructLogger(nil) + + default: + tracer = vm.NewStructLogger(config.LogConfig) + } + // Run the transaction with tracing enabled. + vmenv := vm.NewEVM(vmctx, statedb, api.config, vm.Config{Debug: true, Tracer: tracer}) + + ret, gas, failed, err := core.ApplyMessage(vmenv, message, new(core.GasPool).AddGas(message.Gas())) + if err != nil { + return nil, fmt.Errorf("tracing failed: %v", err) + } + // Depending on the tracer type, format and return the output + switch tracer := tracer.(type) { + case *vm.StructLogger: + return ðapi.ExecutionResult{ + Gas: gas, + Failed: failed, + ReturnValue: fmt.Sprintf("%x", ret), + StructLogs: ethapi.FormatLogs(tracer.StructLogs()), + }, nil + + case *tracers.Tracer: + return tracer.SGetResult(hash) + + default: + panic(fmt.Sprintf("bad tracer type %T", tracer)) + } +} + + + // traceTx configures a new tracer according to the provided configuration, and // executes the given message in the provided environment. The return value will // be tracer dependent. diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index fb39dd5e19..bd1b1baeec 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -28,7 +28,7 @@ func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { //var fullNode *Ethereum fullNode, _ := SNew(Global_config) privateAPI := NewPrivateDebugAPI(config2, fullNode) - return privateAPI.TraceTransaction(ctx2, hash, config) + return privateAPI.STraceTransaction(ctx2, hash, config) } func setEthObject(ethobj interface{}){ @@ -39,272 +39,4 @@ var Global_config *Config func setGlobalConfig(c *Config) { Global_config = c -} - -// -//import ( -// "github.com/ethereum/go-ethereum/common" -// "fmt" -// "github.com/ethereum/go-ethereum/core" -// "runtime" -// "context" -//) -// -////const ( -//// // defaultTraceReexec is the number of blocks the tracer is willing to go back -//// // and reexecute to produce missing historical state necessary to run a specific -//// // trace. -//// defaultTraceReexec = uint64(128) -////) -// -////var api *eth.PrivateDebugAPI -// -//var EthereumObject interface{} -// -//type ShyftTracer struct {} -// -//func (st ShyftTracer) MyTraceTransaction(hash string) (interface{}) { -// //fmt.Println("THE stringed hash is in MYTRACETRANSACTION") -// //fmt.Println(hash) -// //fmt.Println(ethObjectInterface.GetEthObject()) -// fmt.Println("CTXXXXXXXXXXXXXXX") -// common_hash := common.HexToHash(hash) -// -// -// fmt.Println("the chain db is in MyTraceTransaction") -// //fmt.Println(Chaindb_global) -// if Chaindb_global == nil { -// return nil -// } -// -// tx, blockHash, _, index := core.GetTransaction(Chaindb_global, common_hash) -// -// if tx == nil { -// fmt.Println("TRANSACTION NOT FOUND IN MyTraceTransaction +++++++++") -// } -// -// reexec := defaultTraceReexec -// //if config != nil && config.Reexec != nil { -// // reexec = *config.Reexec -// //} -// msg, vmctx, statedb, err := DebugApi.computeTxEnv(blockHash, int(index), reexec) -// -// fmt.Println("stuff and nonsense") -// fmt.Println(msg) -// fmt.Println(vmctx) -// fmt.Println(statedb) -// fmt.Println(err) -// fmt.Println("THIS CTX") -// //fmt.Println("the tx is ") -// //fmt.Println(tx) -// //fmt.Println(blockHash) -// //fmt.Println(index) -// //DebugApi.traceTxTest(msg, vmctx, statedb, config) -// return 42 -//} -// -//func (api *PrivateDebugAPI) TraceTransactionTest(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { -// fmt.Println("TRACE TRANSACTION ++++++!+!+!+!+!+!+!+!+!+!+!+!++!") -// _, file, no, ok := runtime.Caller(1) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(2) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(3) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(4) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(5) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(6) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(7) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(8) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(9) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(10) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(11) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(12) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(13) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(14) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(15) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(16) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(17) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(18) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(19) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(20) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(21) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(22) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(23) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(24) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(25) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(26) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(27) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(28) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(29) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(30) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(31) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(32) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(33) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(34) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(35) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(36) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(37) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(38) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(39) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(40) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// fmt.Println("////////////// ++++++++++++++++ /////////////////// Phantom *(!*!*!*!*!*!**!*!*") -// _, file, no, ok = runtime.Caller(41) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(42) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(43) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// _, file, no, ok = runtime.Caller(44) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// fmt.Println("////////////// ++++++++++++++++ /////////////////// TraceTransaction *(!*!*!*!*!*!**!*!*") -// _, file, no, ok = runtime.Caller(45) -// if ok { -// fmt.Printf("called from %s#%d\n", file, no) -// } -// -// tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) -// if tx == nil { -// return nil, fmt.Errorf("transaction %x not found", hash) -// } -// -// reexec := defaultTraceReexec -// if config != nil && config.Reexec != nil { -// reexec = *config.Reexec -// } -// msg, vmctx, statedb, err := api.computeTxEnv(blockHash, int(index), reexec) -// if err != nil { -// return nil, err -// } -// fmt.Println("CTX +++++++++++++++++++++++", ctx) -// return api.traceTxTest(ctx, msg, vmctx, statedb, config) -//} -// -//func setEthObject(ethobj interface{}){ -// EthereumObject = ethobj -//} +} \ No newline at end of file diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 14c6a34874..225021c204 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -31,6 +31,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" "gopkg.in/olebedev/go-duktape.v3" + "database/sql" ) // bigIntegerJS is the minified version of https://github.com/peterolson/BigInteger.js. @@ -588,35 +589,37 @@ type Internals struct { Calls []*Internals } -//func (i *Internals) SWriteInteralTxs() { -// connStr := "user=postgres dbname=shyftdb sslmode=disable" -// sqldb, err := sql.Open("postgres", connStr) -// if err != nil { -// return -// } -// -// sqlStatement := `INSERT INTO internalTxs(type, txhash, from_addr, to_addr, amount, gas, gasUsed, time, input, output) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10))` -// qerr := sqldb.QueryRow(sqlStatement, i.Type, txHash, i.From, i.To, i.Value, i.Gas, i.GasUsed, i.Time, i.Input, i.Output) -// -// if qerr != nil { -// panic(qerr) -// } -//} +func (i *Internals) SWriteInteralTxs(hash common.Hash) { + connStr := "user=postgres dbname=shyftdb sslmode=disable" + sqldb, err := sql.Open("postgres", connStr) + if err != nil { + return + } + gas, _ := hexutil.DecodeUint64(i.Gas) + gasUsed, _ := hexutil.DecodeUint64(i.GasUsed) -func (i *Internals) InternalRecursive() { + var returnValue string + sqlStatement := `INSERT INTO internaltxs(type, txhash, from_addr, to_addr, amount, gas, gasUsed, time, input, output) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10)) RETURNING txHash` + qerr := sqldb.QueryRow(sqlStatement, i.Type, hash.Hex(), i.From, i.To, i.Value, gas, gasUsed, i.Time, i.Input, i.Output).Scan(&returnValue) + + if qerr != nil { + fmt.Println(qerr) + panic(qerr) + } +} + +func (i *Internals) InternalRecursive(hash common.Hash) { + i.SWriteInteralTxs(hash) lengthOfCalls := len(i.Calls) if lengthOfCalls == 0 { return } for _, val := range i.Calls { - val.InternalRecursive() + val.InternalRecursive(hash) } } - - - // GetResult calls the Javascript 'result' function and returns its value, or any accumulated error func (jst *Tracer) GetResult() (json.RawMessage, error) { // Transform the context into a JavaScript object and inject into the state @@ -662,8 +665,56 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) { if err := json.Unmarshal(result, &dat); err != nil { panic(err) } - - dat.InternalRecursive() - return result, jst.err } + +// GetResult calls the Javascript 'result' function and returns its value, or any accumulated error +func (jst *Tracer) SGetResult(hash common.Hash) (json.RawMessage, error) { + // Transform the context into a JavaScript object and inject into the state + obj := jst.vm.PushObject() + + for key, val := range jst.ctx { + switch val := val.(type) { + case uint64: + jst.vm.PushUint(uint(val)) + + case string: + jst.vm.PushString(val) + + case []byte: + ptr := jst.vm.PushFixedBuffer(len(val)) + copy(makeSlice(ptr, uint(len(val))), val[:]) + + case common.Address: + ptr := jst.vm.PushFixedBuffer(20) + copy(makeSlice(ptr, 20), val[:]) + + case *big.Int: + pushBigInt(val, jst.vm) + + default: + panic(fmt.Sprintf("unsupported type: %T", val)) + } + jst.vm.PutPropString(obj, key) + } + jst.vm.PutPropString(jst.stateObject, "ctx") + + // Finalize the trace and return the results + result, err := jst.call("result", "ctx", "db") + if err != nil { + jst.err = wrapError("result", err) + } + // Clean up the JavaScript environment + jst.vm.DestroyHeap() + jst.vm.Destroy() + + var dat Internals + + if err := json.Unmarshal(result, &dat); err != nil { + panic(err) + } + fmt.Println("[THIS IS HASH]", hash.Hex()) + dat.InternalRecursive(hash) + + return result, jst.err +} \ No newline at end of file From b9dda84e30d634aea056483a13c273162e2301fa Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Fri, 13 Jul 2018 12:53:42 -0400 Subject: [PATCH 15/24] writing internals correctly --- eth/tracers/tracer.go | 15 ++++++++++++++- .../web3/transfer-through-master/test/test.js | 8 +++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 225021c204..27d016a086 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -32,6 +32,7 @@ import ( "github.com/ethereum/go-ethereum/log" "gopkg.in/olebedev/go-duktape.v3" "database/sql" + "reflect" ) // bigIntegerJS is the minified version of https://github.com/peterolson/BigInteger.js. @@ -595,6 +596,12 @@ func (i *Internals) SWriteInteralTxs(hash common.Hash) { if err != nil { return } + fmt.Println("[VALUE]", reflect.TypeOf(i.Value)) + test := "0x3782dace9d900000" + if test == i.Value { + fmt.Println("[EQUAL]: ", test, i.Value) + } + gas, _ := hexutil.DecodeUint64(i.Gas) gasUsed, _ := hexutil.DecodeUint64(i.GasUsed) @@ -609,6 +616,11 @@ func (i *Internals) SWriteInteralTxs(hash common.Hash) { } func (i *Internals) InternalRecursive(hash common.Hash) { + amount, _ := hexutil.DecodeUint64(i.Value) + if i.Type != "CREATE" { + fmt.Println("[INSIDE RECURSIVE VALUE]", amount) + fmt.Printf("%+v", i) + } i.SWriteInteralTxs(hash) lengthOfCalls := len(i.Calls) if lengthOfCalls == 0 { @@ -713,7 +725,8 @@ func (jst *Tracer) SGetResult(hash common.Hash) (json.RawMessage, error) { if err := json.Unmarshal(result, &dat); err != nil { panic(err) } - fmt.Println("[THIS IS HASH]", hash.Hex()) + //fmt.Println("[THIS IS HASH]", hash.Hex()) + //fmt.Println("DAT DATA STRUCTURE" , dat) dat.InternalRecursive(hash) return result, jst.err diff --git a/shyft-cli/web3/transfer-through-master/test/test.js b/shyft-cli/web3/transfer-through-master/test/test.js index 6153da25c4..c74a91a706 100755 --- a/shyft-cli/web3/transfer-through-master/test/test.js +++ b/shyft-cli/web3/transfer-through-master/test/test.js @@ -4,13 +4,19 @@ var Transfers2 = artifacts.require("Transfers2"); contract('Transfers', function(accounts) { var addressA = web3.eth.accounts[0]; var addressB = web3.eth.accounts[1]; + console.log("Addr A:", addressA) + console.log("Addr B:", addressB) + var transfers; web3.eth.defaultAccount = web3.eth.accounts[0]; it("should initialize", async() => { transfers = await Transfers.new(); transfers2 = await Transfers2.new(); - assert(transfers !== undefined, ""); + console.log("Transfer addr1", transfers.address) + console.log("Transfer addr2", transfers2.address) + + assert(transfers !== undefined, ""); assert(transfers2 !== undefined, ""); }) From 4158caece6915cde7ab6a18d553cb896a31214f3 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Sun, 15 Jul 2018 13:13:41 -0400 Subject: [PATCH 16/24] removed fmt print and added shyft tag to tracer fns --- core/blockchain.go | 5 ----- eth/api_tracer.go | 23 ++++++++++++----------- eth/chaindb.go | 5 ----- eth/tracers/tracer.go | 24 +++++------------------- node/node.go | 1 - 5 files changed, 17 insertions(+), 41 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index 47a3c65913..6042992d5b 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -46,7 +46,6 @@ import ( "github.com/ethereum/go-ethereum/trie" "github.com/hashicorp/golang-lru" "gopkg.in/karalabe/cookiejar.v2/collections/prque" - "runtime" ) var ( @@ -1026,10 +1025,6 @@ func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) { // only reason this method exists as a separate one is to make locking cleaner // with deferred statements. func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*types.Log, error) { - _, file, no, ok := runtime.Caller(1) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } // Do a sanity check that the provided chain is actually ordered and linked for i := 1; i < len(chain); i++ { if chain[i].NumberU64() != chain[i-1].NumberU64()+1 || chain[i].ParentHash() != chain[i-1].Hash() { diff --git a/eth/api_tracer.go b/eth/api_tracer.go index c4df438414..7a77907b58 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -550,6 +550,7 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Ha // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. +//@NOTE:SHYFT func (api *PrivateDebugAPI) STraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { // NOTE:SHYFT tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) @@ -570,6 +571,7 @@ func (api *PrivateDebugAPI) STraceTransaction(ctx context.Context, hash common.H // traceTx configures a new tracer according to the provided configuration, and // executes the given message in the provided environment. The return value will // be tracer dependent. +//@NOTE:SHYFT func (api *PrivateDebugAPI) StraceTx(ctx context.Context, message core.Message, vmctx vm.Context, statedb *state.StateDB, config *TraceConfig, hash common.Hash) (interface{}, error) { // Assemble the structured logger or the JavaScript tracer var ( @@ -591,7 +593,7 @@ func (api *PrivateDebugAPI) StraceTx(ctx context.Context, message core.Message, if tracer, err = tracers.New(*config.Tracer); err != nil { return nil, err } - // NOTE:SHYFT REMOVED CTX DEADLINE + // @NOTE:SHYFT REMOVED CTX DEADLINE // Handle timeouts and RPC cancellations //deadlineCtx, cancel := context.WithTimeout(ctx, timeout) //go func() { @@ -646,10 +648,10 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v case config != nil && config.Tracer != nil: // Define a meaningful timeout of a single transaction trace - _ = defaultTraceTimeout + timeout := defaultTraceTimeout if config.Timeout != nil { - if _, err = time.ParseDuration(*config.Timeout); err != nil { + if timeout, err = time.ParseDuration(*config.Timeout); err != nil { return nil, err } } @@ -657,14 +659,13 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v if tracer, err = tracers.New(*config.Tracer); err != nil { return nil, err } - // NOTE:SHYFT REMOVED CTX DEADLINE - // Handle timeouts and RPC cancellations - //deadlineCtx, cancel := context.WithTimeout(ctx, timeout) - //go func() { - // <-deadlineCtx.Done() - // tracer.(*tracers.Tracer).Stop(errors.New("execution timeout")) - //}() - //defer cancel() + //Handle timeouts and RPC cancellations + deadlineCtx, cancel := context.WithTimeout(ctx, timeout) + go func() { + <-deadlineCtx.Done() + tracer.(*tracers.Tracer).Stop(errors.New("execution timeout")) + }() + defer cancel() case config == nil: tracer = vm.NewStructLogger(nil) diff --git a/eth/chaindb.go b/eth/chaindb.go index f4ced9929b..6b00bc13f8 100644 --- a/eth/chaindb.go +++ b/eth/chaindb.go @@ -3,7 +3,6 @@ package eth import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/node" - "fmt" ) var Chaindb_global ethdb.Database @@ -13,15 +12,11 @@ func SetChainDB(db ethdb.Database){ } func chaindb(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) { - fmt.Println("DO WE GET HERE ++++++++++++++++++++++++++++++++") - fmt.Printf("%+v", ctx) if Chaindb_global != nil { return Chaindb_global, nil } - fmt.Println("FAR OUT ++++++++++++++++++++++++++++++++") chainDb, err := CreateDB(ctx, config, "chaindata") - fmt.Println("CHECK CHECK ++++++++++++++++") if err == nil { SetChainDB(chainDb) return Chaindb_global, nil diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 27d016a086..76d359e558 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -32,7 +32,6 @@ import ( "github.com/ethereum/go-ethereum/log" "gopkg.in/olebedev/go-duktape.v3" "database/sql" - "reflect" ) // bigIntegerJS is the minified version of https://github.com/peterolson/BigInteger.js. @@ -577,6 +576,7 @@ func (jst *Tracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, er return nil } +//@NOTE:SHYFT type Internals struct { Type string From string @@ -590,17 +590,13 @@ type Internals struct { Calls []*Internals } +//@NOTE:SHYFT func (i *Internals) SWriteInteralTxs(hash common.Hash) { connStr := "user=postgres dbname=shyftdb sslmode=disable" sqldb, err := sql.Open("postgres", connStr) if err != nil { return } - fmt.Println("[VALUE]", reflect.TypeOf(i.Value)) - test := "0x3782dace9d900000" - if test == i.Value { - fmt.Println("[EQUAL]: ", test, i.Value) - } gas, _ := hexutil.DecodeUint64(i.Gas) gasUsed, _ := hexutil.DecodeUint64(i.GasUsed) @@ -614,13 +610,8 @@ func (i *Internals) SWriteInteralTxs(hash common.Hash) { panic(qerr) } } - +//@NOTE:SHYFT func (i *Internals) InternalRecursive(hash common.Hash) { - amount, _ := hexutil.DecodeUint64(i.Value) - if i.Type != "CREATE" { - fmt.Println("[INSIDE RECURSIVE VALUE]", amount) - fmt.Printf("%+v", i) - } i.SWriteInteralTxs(hash) lengthOfCalls := len(i.Calls) if lengthOfCalls == 0 { @@ -672,15 +663,12 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) { jst.vm.DestroyHeap() jst.vm.Destroy() - var dat Internals - - if err := json.Unmarshal(result, &dat); err != nil { - panic(err) - } return result, jst.err } // GetResult calls the Javascript 'result' function and returns its value, or any accumulated error + +//@NOTE:SHYFT func (jst *Tracer) SGetResult(hash common.Hash) (json.RawMessage, error) { // Transform the context into a JavaScript object and inject into the state obj := jst.vm.PushObject() @@ -725,8 +713,6 @@ func (jst *Tracer) SGetResult(hash common.Hash) (json.RawMessage, error) { if err := json.Unmarshal(result, &dat); err != nil { panic(err) } - //fmt.Println("[THIS IS HASH]", hash.Hex()) - //fmt.Println("DAT DATA STRUCTURE" , dat) dat.InternalRecursive(hash) return result, jst.err diff --git a/node/node.go b/node/node.go index 6e03cd1606..b02aecfad1 100644 --- a/node/node.go +++ b/node/node.go @@ -642,7 +642,6 @@ func (n *Node) EventMux() *event.TypeMux { // previous can be found) from within the node's instance directory. If the node is // ephemeral, a memory database is returned. func (n *Node) OpenDatabase(name string, cache, handles int) (ethdb.Database, error) { - fmt.Println("DSAhhysagdhkajsndjgasuygdvkhasbdjhs") if n.config.DataDir == "" { return ethdb.NewMemDatabase() } From 5d37a31a1257de40a49bfa9f7a8f77dc3e4db2d3 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Sun, 15 Jul 2018 14:22:18 -0400 Subject: [PATCH 17/24] fixed testing changes due to change in folders dir --- core/shyft_database_util.go | 2 +- shyftDb/shyft_database_util_test.go | 55 +++++++++++++++-------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 8320bc70d3..0c63f5e35d 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -255,7 +255,7 @@ func writeContractBalance(sqldb *sql.DB, tx *types.Transaction) error { panic(insertErr) } default: - getAccountBalanceSender:= GetAccount(sqldb, fromAddr) + getAccountBalanceSender:= SGetAccount(sqldb, fromAddr) var senderBalance SendAndReceive if err := json.Unmarshal([]byte(getAccountBalanceSender), &senderBalance); err != nil { log.Fatal(err) diff --git a/shyftDb/shyft_database_util_test.go b/shyftDb/shyft_database_util_test.go index 5e76048fc1..ac24de22a3 100644 --- a/shyftDb/shyft_database_util_test.go +++ b/shyftDb/shyft_database_util_test.go @@ -3,6 +3,7 @@ package shyftdb import ( "testing" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "math/big" //"time" @@ -40,18 +41,18 @@ func TestBlockToReturnBlock(t *testing.T) { block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) // Write and verify the block in the database - if err := WriteBlock(block, receipts); err != nil { + if err := core.SWriteBlock(block, receipts); err != nil { t.Fatalf("Failed to write block into database: %v", err) } - sqldb, err := DBConnection() - if (err != nil) { + sqldb, err := core.DBConnection() + if err != nil { panic(err) } - entry := GetBlock(sqldb, block.Number().String()) + entry := core.SGetBlock(sqldb, block.Number().String()) byt := []byte(entry) - var data SBlock + var data core.SBlock json.Unmarshal(byt, &data) //TODO Difficulty, rewards, age @@ -89,11 +90,11 @@ func TestBlockToReturnBlock(t *testing.T) { t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) } - if getAllBlocks := GetAllBlocks(sqldb); len(getAllBlocks) == 0 { + if getAllBlocks := core.SGetAllBlocks(sqldb); len(getAllBlocks) == 0 { t.Fatalf("GetAllBlocks [%v]: GetAllBlocks did not return correctly", getAllBlocks) } - if getAllBlocksMinedByAddress := GetAllBlocksMinedByAddress(sqldb, block.Coinbase().String()); len(getAllBlocksMinedByAddress) == 0 { + if getAllBlocksMinedByAddress := core.SGetAllBlocksMinedByAddress(sqldb, block.Coinbase().String()); len(getAllBlocksMinedByAddress) == 0 { t.Fatalf("GetAllBlocksMinedByAddress [%v]: GetAllBlocksMinedByAddress did not return correctly", getAllBlocksMinedByAddress) } @@ -133,19 +134,19 @@ func TestGetRecentBlock(t *testing.T) { for _, bc := range blocks { // Write and verify the block in the database - if err := WriteBlock(bc, receipts); err != nil { + if err := core.SWriteBlock(bc, receipts); err != nil { t.Fatalf("Failed to write block into database: %v", err) } } - sqldb, err := DBConnection() + sqldb, err := core.DBConnection() if (err != nil) { panic(err) } - response := GetRecentBlock(sqldb) + response := core.SGetRecentBlock(sqldb) byteRes := []byte(response) - var recentBlock SBlock + var recentBlock core.SBlock json.Unmarshal(byteRes, &recentBlock) if block.Hash().String() != recentBlock.Hash { @@ -182,7 +183,7 @@ func TestGetRecentBlock(t *testing.T) { t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) } - if allTxsFromBlock:= GetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { + if allTxsFromBlock:= core.SGetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { t.Fatalf("GetAllTransactionsFromBlock [%v]: GetAllTransactionsFromBlock did not return correctly", allTxsFromBlock) } ClearTables() @@ -212,7 +213,7 @@ func TestContractCreationTx(t *testing.T) { receipts := []*types.Receipt{receipt2} block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) - if err := WriteBlock(block, receipts); err != nil { + if err := core.SWriteBlock(block, receipts); err != nil { t.Fatalf("Failed to write block into database: %v", err) } @@ -221,15 +222,15 @@ func TestContractCreationTx(t *testing.T) { contractAddressFromReciept = (*types.ReceiptForStorage)(receipt).ContractAddress.String() } - sqldb, err := DBConnection() + sqldb, err := core.DBConnection() if (err != nil) { panic(err) } for _, tx := range txs { - txn := GetTransaction(sqldb, tx.Hash().String()) + txn := core.SGetTransaction(sqldb, tx.Hash().String()) byt := []byte(txn) - var data ShyftTxEntryPretty + var data core.ShyftTxEntryPretty json.Unmarshal(byt, &data) if tx.Hash().String() != data.TxHash { @@ -316,18 +317,18 @@ func TestTransactionsToReturnTransactions(t *testing.T) { receipts := []*types.Receipt{receipt1} block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) - if err := WriteBlock(block, receipts); err != nil { + if err := core.SWriteBlock(block, receipts); err != nil { t.Fatalf("Failed to write block into database: %v", err) } - sqldb, err := DBConnection() + sqldb, err := core.DBConnection() if (err != nil) { panic(err) } for _, tx := range txs { - txn := GetTransaction(sqldb, tx.Hash().String()) + txn := core.SGetTransaction(sqldb, tx.Hash().String()) byt := []byte(txn) - var data ShyftTxEntryPretty + var data core.ShyftTxEntryPretty json.Unmarshal(byt, &data) //TODO age, data @@ -385,7 +386,7 @@ func TestTransactionsToReturnTransactions(t *testing.T) { } } - if getAllTx := GetAllTransactions(sqldb); len(getAllTx) == 0 { + if getAllTx := core.SGetAllTransactions(sqldb); len(getAllTx) == 0 { t.Fatalf("GetAllTransactions [%v]: GetAllTransactions did not return correctly", getAllTx) } ClearTables() @@ -418,20 +419,20 @@ func TestAccountsToReturnAccounts(t *testing.T) { receipts := []*types.Receipt{receipt1} block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) - if err := WriteBlock(block, receipts); err != nil { + if err := core.SWriteBlock(block, receipts); err != nil { t.Fatalf("Failed to write block into database: %v", err) } - sqldb, err := DBConnection() + sqldb, err := core.DBConnection() if (err != nil) { panic(err) } for _, tx := range txs { - accountAddrTo := GetAccount(sqldb, tx.To().String()) + accountAddrTo := core.SGetAccount(sqldb, tx.To().String()) byts := []byte(accountAddrTo) - var accountDataTo SAccounts + var accountDataTo core.SAccounts json.Unmarshal(byts, &accountDataTo) if tx.To().String() != accountDataTo.Addr { @@ -443,12 +444,12 @@ func TestAccountsToReturnAccounts(t *testing.T) { if strconv.FormatUint(tx.Nonce(), 10) != accountDataTo.TxCountAccount { t.Fatalf("To account nonce [%v]: To account nonce not found", accountDataTo.TxCountAccount) } - if getAllAccountTxs := GetAccountTxs(sqldb, tx.To().String()); len(getAllAccountTxs) == 0 { + if getAllAccountTxs := core.SGetAccountTxs(sqldb, tx.To().String()); len(getAllAccountTxs) == 0 { t.Fatalf("GetAccountTxs [%v]: GetAccountTxs did not return correctly", getAllAccountTxs) } } - if getAllAccounts := GetAllAccounts(sqldb); len(getAllAccounts) == 0 { + if getAllAccounts := core.SGetAllAccounts(sqldb); len(getAllAccounts) == 0 { t.Fatalf("GetAllAccounts [%v]: GetAllAccounts did not return correctly", getAllAccounts) } ClearTables() From 2813a0bb6514a4bcad03949f157f4f5344725812 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Mon, 16 Jul 2018 11:43:17 -0400 Subject: [PATCH 18/24] fixing tests for internals --- console/console_test.go | 8 +- core/db.go | 17 +- core/shyft_database_util.go | 4 +- eth/api_tracer.go | 6 +- eth/backend.go | 6 +- eth/chaindb.go | 2 + eth/shyft_tracer.go | 13 +- eth/tracers/tracer.go | 10 +- shyftDb/shyft_database_util_test.go | 1077 +++++++++++++--------- shyfttracerinterface/tracer_interface.go | 4 - 10 files changed, 693 insertions(+), 454 deletions(-) diff --git a/console/console_test.go b/console/console_test.go index 7b1629c032..8ff19c5ea1 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -34,10 +34,10 @@ import ( "github.com/ethereum/go-ethereum/node" ) -const ( - testInstance = "console-tester" - testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" -) + const ( + testInstance = "console-tester" + testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" + ) // hookedPrompter implements UserPrompter to simulate use input via channels. type hookedPrompter struct { diff --git a/core/db.go b/core/db.go index 3fedb09b18..ff63e3ee9e 100644 --- a/core/db.go +++ b/core/db.go @@ -3,18 +3,25 @@ package core import ( "fmt" "database/sql" - "os" ) var blockExplorerDb *sql.DB func InitDB() (*sql.DB, error){ - var connStr string - if "test" == os.Getenv("SHYFT_ENV") { - connStr = "user=postgres dbname=shyftdbtest sslmode=disable" + var connStr = "user=postgres dbname=shyftdb sslmode=disable" + db, err := sql.Open("postgres", connStr) + if err != nil { + fmt.Println("ERROR OPENING DB, NOT INITIALIZING") + fmt.Println(err) + return nil, err } else { - connStr = "user=postgres dbname=shyftdb sslmode=disable" + blockExplorerDb = db + return blockExplorerDb, nil } +} + +func InitDBTest() (*sql.DB, error){ + var connStr = "user=postgres dbname=shyftdbtest sslmode=disable" db, err := sql.Open("postgres", connStr) if err != nil { fmt.Println("ERROR OPENING DB, NOT INITIALIZING") diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 0c63f5e35d..52aa7e16e6 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -114,7 +114,7 @@ type SendAndReceive struct { func SWriteBlock(block *types.Block, receipts []*types.Receipt) error { sqldb, err := DBConnection() - if (err != nil) { + if err != nil { panic(err) } @@ -204,7 +204,6 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H isContract = true sqlStatement := `INSERT INTO txs(txhash, from_addr, to_addr, blockhash, blockNumber, amount, gasprice, gas, gasLimit,txfee, nonce, isContract, txStatus, age, data) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10), ($11), ($12), ($13), ($14), ($15)) RETURNING nonce` qerr := sqldb.QueryRow(sqlStatement, txHash, from, contractAddressFromReciept, blockHasher, blockNumber, amount, gasPrice, gas, gasLimit, txFee, nonce, isContract, statusFromReciept, age,data).Scan(&retNonce) - if qerr != nil { panic(qerr) } @@ -228,7 +227,6 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H panic(qerr) } } - IShyftTracer.GetTracerToRun(hash) return nil diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 7a77907b58..89de3293b7 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -561,10 +561,12 @@ func (api *PrivateDebugAPI) STraceTransaction(ctx context.Context, hash common.H if config != nil && config.Reexec != nil { reexec = *config.Reexec } + fmt.Println("+++++++++++++++++++++++++++ Middle") msg, vmctx, statedb, err := api.computeTxEnv(blockHash, int(index), reexec) if err != nil { return nil, err } + fmt.Println("+++++++++++++++++++++++++++ BOTTOM") return api.StraceTx(ctx, msg, vmctx, statedb, config, hash) } @@ -581,7 +583,7 @@ func (api *PrivateDebugAPI) StraceTx(ctx context.Context, message core.Message, switch { case config != nil && config.Tracer != nil: // Define a meaningful timeout of a single transaction trace - + fmt.Println("STRACETX") _ = defaultTraceTimeout if config.Timeout != nil { @@ -701,6 +703,7 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v // computeTxEnv returns the execution environment of a certain transaction. func (api *PrivateDebugAPI) computeTxEnv(blockHash common.Hash, txIndex int, reexec uint64) (core.Message, vm.Context, *state.StateDB, error) { // Create the parent state database + fmt.Println("COMPUTETXENV") block := api.eth.blockchain.GetBlockByHash(blockHash) if block == nil { return nil, vm.Context{}, nil, fmt.Errorf("block %x not found", blockHash) @@ -730,5 +733,6 @@ func (api *PrivateDebugAPI) computeTxEnv(blockHash common.Hash, txIndex int, ree } statedb.DeleteSuicides() } + fmt.Println("+++++++++++++++++ BOTTOM COMPUTETXENV") return nil, vm.Context{}, nil, fmt.Errorf("tx index %d out of range for block %x", txIndex, blockHash) } diff --git a/eth/backend.go b/eth/backend.go index 7d705ab0e6..94b94f157e 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -103,9 +103,10 @@ func (s *Ethereum) AddLesServer(ls LesServer) { } func SNew(config *Config) (*Ethereum, error) { + fmt.Println("SNEW FROM SHYFTREACER") stopDbUpgrade := upgradeDeduplicateData(Chaindb_global) + fmt.Println("ChainGlobal v+%", Chaindb_global) chainConfig, _, _ := core.SetupGenesisBlock(Chaindb_global, config.Genesis) - eth := &Ethereum{ config: config, chainDb: Chaindb_global, @@ -139,10 +140,9 @@ func SNew(config *Config) (*Ethereum, error) { // New creates a new Ethereum object (including the // initialisation of the common Ethereum object) func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { - shyft_tracer := new(ShyftTracer) core.SetIShyftTracer(shyft_tracer) - setGlobalConfig(config) + SetGlobalConfig(config) _, file, no, ok := runtime.Caller(1) if ok { diff --git a/eth/chaindb.go b/eth/chaindb.go index 6b00bc13f8..4ff89683fb 100644 --- a/eth/chaindb.go +++ b/eth/chaindb.go @@ -3,6 +3,7 @@ package eth import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/node" + "fmt" ) var Chaindb_global ethdb.Database @@ -12,6 +13,7 @@ func SetChainDB(db ethdb.Database){ } func chaindb(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) { + fmt.Printf("CTX v+%", ctx) if Chaindb_global != nil { return Chaindb_global, nil } diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index bd1b1baeec..5fa2eb392f 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -5,19 +5,17 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" "context" + "fmt" ) var EthereumObject interface{} type ShyftTracer struct {} -//( + func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { config2 := params.ShyftNetworkChainConfig jsTracer := "callTracer" - - // - //var cfg *Config var ctx2 context.Context config := &TraceConfig{ LogConfig: nil, @@ -25,9 +23,11 @@ func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { Timeout: nil, Reexec: nil, } - //var fullNode *Ethereum + fmt.Println("+++++++++++++++++++++++++++ before FULLNODE", Global_config) fullNode, _ := SNew(Global_config) + fmt.Println("+++++++++++++++++++++++++++ after FULLNODE") privateAPI := NewPrivateDebugAPI(config2, fullNode) + fmt.Println("+++++++++++++++++++++++++++ after privateAPI") return privateAPI.STraceTransaction(ctx2, hash, config) } @@ -37,6 +37,7 @@ func setEthObject(ethobj interface{}){ var Global_config *Config -func setGlobalConfig(c *Config) { +func SetGlobalConfig(c *Config) { + fmt.Println("SETGLOBAL") Global_config = c } \ No newline at end of file diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 76d359e558..807886708b 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -27,11 +27,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" "gopkg.in/olebedev/go-duktape.v3" - "database/sql" ) // bigIntegerJS is the minified version of https://github.com/peterolson/BigInteger.js. @@ -592,10 +592,10 @@ type Internals struct { //@NOTE:SHYFT func (i *Internals) SWriteInteralTxs(hash common.Hash) { - connStr := "user=postgres dbname=shyftdb sslmode=disable" - sqldb, err := sql.Open("postgres", connStr) + fmt.Println("WRITE INTERNAL") + sqldb, err := core.DBConnection() if err != nil { - return + panic(err) } gas, _ := hexutil.DecodeUint64(i.Gas) @@ -612,6 +612,7 @@ func (i *Internals) SWriteInteralTxs(hash common.Hash) { } //@NOTE:SHYFT func (i *Internals) InternalRecursive(hash common.Hash) { + fmt.Println("internal recursive") i.SWriteInteralTxs(hash) lengthOfCalls := len(i.Calls) if lengthOfCalls == 0 { @@ -670,6 +671,7 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) { //@NOTE:SHYFT func (jst *Tracer) SGetResult(hash common.Hash) (json.RawMessage, error) { + fmt.Println("SGETRESULT") // Transform the context into a JavaScript object and inject into the state obj := jst.vm.PushObject() diff --git a/shyftDb/shyft_database_util_test.go b/shyftDb/shyft_database_util_test.go index ac24de22a3..4875f656d9 100644 --- a/shyftDb/shyft_database_util_test.go +++ b/shyftDb/shyft_database_util_test.go @@ -5,455 +5,684 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/eth" "math/big" //"time" "encoding/json" "github.com/ethereum/go-ethereum/crypto" - "strconv" + "github.com/ethereum/go-ethereum/consensus/ethash" ) -func TestBlockToReturnBlock(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) +type ShyftTracer struct {} - //Nonce, To Address,Value, GasLimit, Gasprice, data - tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) - tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) - tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) - txs := []*types.Transaction{mytx, mytx2, mytx3} +//Config Below +//&{Genesis: NetworkId:1 SyncMode:fast NoPruning:false LightServ:0 LightPeers:100 SkipBcVersionCheck:false DatabaseHandles:1024 DatabaseCache:768 TrieCache:256 TrieTimeout:5m0s Etherbase:[67 236 109 9 66 247 250 239 6 159 127 99 208 56 74 39 245 41 176 98] MinerThreads:4 ExtraData:[] GasPrice:+18000000000 Ethash:{CacheDir:ethash CachesInMem:2 CachesOnDisk:3 DatasetDir:$HOME/.ethash DatasetsInMem:1 DatasetsOnDisk:2 PowMode:0} TxPool:{NoLocals:false Journal:transactions.rlp Rejournal:1h0m0s PriceLimit:1 PriceBump:10 AccountSlots:16 GlobalSlots:4096 AccountQueue:64 GlobalQueue:1024 Lifetime:3h0m0s} GPO:{Blocks:20 Percentile:60 Default:} EnablePreimageRecording:false DocRoot:}SETGLOBAL +//called from /Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/build/_workspace/src/github.com/ethereum/go-ethereum/cmd/utils/flags.go#1132 +// - receipt := &types.Receipt{ - Status: types.ReceiptStatusSuccessful, - CumulativeGasUsed: 1, - Logs: []*types.Log{ - {Address: common.BytesToAddress([]byte{0x11})}, - {Address: common.BytesToAddress([]byte{0x01, 0x11})}, +//CTX +// !(NOVERB)%!(EXTRA *node.ServiceContext=&{0xc4200326c0 map[] 0xc4201dc6c0 0xc42026f2b0}) + +const ( + testInstance = "console-tester" + testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" +) + +func TestBlock(t *testing.T) { + core.InitDBTest() + shyft_tracer := new(eth.ShyftTracer) + core.SetIShyftTracer(shyft_tracer) + + //workspace, err := ioutil.TempDir("", "console-tester-") + //if err != nil { + // t.Fatalf("failed to create temporary keystore: %v", err) + //} + + //stack, err := node.New(&node.Config{DataDir: workspace, UseLightweightKDF: true, Name: testInstance}) + //if err != nil { + // t.Fatalf("failed to create node: %v", err) + //} + ethConf := ð.Config{ + Genesis: core.DeveloperGenesisBlock(15, common.Address{}), + Etherbase: common.HexToAddress(testAddress), + Ethash: ethash.Config{ + PowMode: ethash.ModeTest, }, - TxHash: common.BytesToHash([]byte{0x11, 0x11}), - ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), - GasUsed: 111111, } + //if err = stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { return eth.New(ctx, ethConf) }); err != nil { + // t.Fatalf("failed to register Ethereum protocol: %v", err) + //} - receipts := []*types.Receipt{receipt} - block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) + eth.SetGlobalConfig(ethConf) - // Write and verify the block in the database - if err := core.SWriteBlock(block, receipts); err != nil { - t.Fatalf("Failed to write block into database: %v", err) - } + t.Run("TestBlockToReturnBlock", func(t *testing.T) { + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) - sqldb, err := core.DBConnection() - if err != nil { - panic(err) - } + //Nonce, To Address,Value, GasLimit, Gasprice, data + tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) + mytx,_ := types.SignTx(tx1, signer, key) + tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) + mytx2,_ := types.SignTx(tx2, signer, key) + tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) + mytx3,_ := types.SignTx(tx3, signer, key) + txs := []*types.Transaction{mytx, mytx2, mytx3} - entry := core.SGetBlock(sqldb, block.Number().String()) - byt := []byte(entry) - var data core.SBlock - json.Unmarshal(byt, &data) + receipt := &types.Receipt{ + Status: types.ReceiptStatusSuccessful, + CumulativeGasUsed: 1, + Logs: []*types.Log{ + {Address: common.BytesToAddress([]byte{0x11})}, + {Address: common.BytesToAddress([]byte{0x01, 0x11})}, + }, + TxHash: common.BytesToHash([]byte{0x11, 0x11}), + ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), + GasUsed: 111111, + } - //TODO Difficulty, rewards, age - if block.Hash().String() != data.Hash { - t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) - } - if block.Coinbase().String() != data.Coinbase { - t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) - } - if block.Number().String() != data.Number { - t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) - } - if block.GasUsed() != data.GasUsed { - t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) - } - if block.GasLimit() != data.GasLimit { - t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) - } - if block.Transactions().Len() != data.TxCount { - t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) - } - if len(block.Uncles()) != data.UncleCount { - t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) - } - if block.ParentHash().String() != data.ParentHash { - t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) - } - if block.UncleHash().String() != data.UncleHash { - t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) - } - if block.Size().String() != data.Size { - t.Fatalf("Size [%v]: Size not found", block.Size().String()) - } - if block.Nonce() != data.Nonce { - t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) - } + receipts := []*types.Receipt{receipt} + block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) - if getAllBlocks := core.SGetAllBlocks(sqldb); len(getAllBlocks) == 0 { - t.Fatalf("GetAllBlocks [%v]: GetAllBlocks did not return correctly", getAllBlocks) - } - - if getAllBlocksMinedByAddress := core.SGetAllBlocksMinedByAddress(sqldb, block.Coinbase().String()); len(getAllBlocksMinedByAddress) == 0 { - t.Fatalf("GetAllBlocksMinedByAddress [%v]: GetAllBlocksMinedByAddress did not return correctly", getAllBlocksMinedByAddress) - } - - ClearTables() -} - -func TestGetRecentBlock(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) - - //Nonce, To Address,Value, GasLimit, Gasprice, data - tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) - tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) - tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) - txs := []*types.Transaction{mytx, mytx2} - txs1 := []*types.Transaction{mytx3} - - receipt1 := &types.Receipt{ - Status: types.ReceiptStatusSuccessful, - CumulativeGasUsed: 1, - Logs: []*types.Log{ - {Address: common.BytesToAddress([]byte{0x11})}, - {Address: common.BytesToAddress([]byte{0x01, 0x11})}, - }, - TxHash: common.BytesToHash([]byte{0x11, 0x11}), - ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), - GasUsed: 111111, - } - - receipts := []*types.Receipt{receipt1} - block := types.NewBlock(&types.Header{Number: big.NewInt(322)}, txs, nil, receipts) - block2 := types.NewBlock(&types.Header{Number: big.NewInt(320)}, txs1, nil, receipts) - blocks := []*types.Block{block, block2} - - for _, bc := range blocks { // Write and verify the block in the database - if err := core.SWriteBlock(bc, receipts); err != nil { - t.Fatalf("Failed to write block into database: %v", err) - } - } - - sqldb, err := core.DBConnection() - if (err != nil) { - panic(err) - } - - response := core.SGetRecentBlock(sqldb) - byteRes := []byte(response) - var recentBlock core.SBlock - json.Unmarshal(byteRes, &recentBlock) - - if block.Hash().String() != recentBlock.Hash { - t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) - } - if block.Coinbase().String() != recentBlock.Coinbase { - t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) - } - if block.Number().String() != recentBlock.Number { - t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) - } - if block.GasUsed() != recentBlock.GasUsed { - t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) - } - if block.GasLimit() != recentBlock.GasLimit { - t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) - } - if block.Transactions().Len() != recentBlock.TxCount { - t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) - } - if len(block.Uncles()) != recentBlock.UncleCount { - t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) - } - if block.ParentHash().String() != recentBlock.ParentHash { - t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) - } - if block.UncleHash().String() != recentBlock.UncleHash { - t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) - } - if block.Size().String() != recentBlock.Size { - t.Fatalf("Size [%v]: Size not found", block.Size().String()) - } - if block.Nonce() != recentBlock.Nonce { - t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) - } - - if allTxsFromBlock:= core.SGetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { - t.Fatalf("GetAllTransactionsFromBlock [%v]: GetAllTransactionsFromBlock did not return correctly", allTxsFromBlock) - } - ClearTables() -} - -func TestContractCreationTx(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) - - //Nonce,Value, GasLimit, Gasprice, data - contractCreation := types.NewContractCreation(1, big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(contractCreation, signer, key) - txs := []*types.Transaction{mytx} - - receipt2 := &types.Receipt{ - Status: types.ReceiptStatusSuccessful, - CumulativeGasUsed: 1, - Logs: []*types.Log{ - {Address: common.BytesToAddress([]byte{0x11})}, - {Address: common.BytesToAddress([]byte{0x01, 0x11})}, - }, - TxHash: common.BytesToHash([]byte{0x11, 0x11}), - ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), - GasUsed: 111111, - } - - receipts := []*types.Receipt{receipt2} - block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) - - if err := core.SWriteBlock(block, receipts); err != nil { - t.Fatalf("Failed to write block into database: %v", err) - } - - var contractAddressFromReciept string - for _, receipt := range receipts { - contractAddressFromReciept = (*types.ReceiptForStorage)(receipt).ContractAddress.String() - } - - sqldb, err := core.DBConnection() - if (err != nil) { - panic(err) - } - - for _, tx := range txs { - txn := core.SGetTransaction(sqldb, tx.Hash().String()) - byt := []byte(txn) - var data core.ShyftTxEntryPretty - json.Unmarshal(byt, &data) - - if tx.Hash().String() != data.TxHash { - t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) - } - if contractAddressFromReciept != data.To { - t.Fatalf("Contract Addr [%v]: Contract addr not found", contractAddressFromReciept) - } - if tx.From().String() != data.From { - t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) - } - if tx.Nonce() != data.Nonce { - t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) - } - if tx.Gas() != data.Gas { - t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) - } - if tx.GasPrice().Uint64() != data.GasPrice { - t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) - } - if block.GasLimit() != data.GasLimit { - t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) - } - if block.Hash().String() != data.BlockHash { - t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) - } - if block.Number().String() != data.BlockNumber { - t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) - } - if tx.Value().String() != data.Amount { - t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) - } - if tx.Cost().Uint64() != data.Cost { - t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) - } - var status string - if receipt2.Status == 1 { - status = "SUCCESS" - } - if receipt2.Status == 0 { - status = "FAIL" - } - if status != data.Status { - t.Fatalf("Receipt status [%v]: Receipt status not found", status) - } - var isContract bool - if tx.To() != nil { - isContract = false - } else { - isContract = true - } - if isContract != data.IsContract { - t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) - } - } - ClearTables() -} - -func TestTransactionsToReturnTransactions(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) - - //Nonce, To Address,Value, GasLimit, Gasprice, data - tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) - tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) - tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) - txs := []*types.Transaction{mytx, mytx2, mytx3} - - receipt1 := &types.Receipt{ - Status: types.ReceiptStatusSuccessful, - CumulativeGasUsed: 1, - Logs: []*types.Log{ - {Address: common.BytesToAddress([]byte{0x11})}, - {Address: common.BytesToAddress([]byte{0x01, 0x11})}, - }, - TxHash: common.BytesToHash([]byte{0x11, 0x11}), - ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), - GasUsed: 111111, - } - - receipts := []*types.Receipt{receipt1} - block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) - - if err := core.SWriteBlock(block, receipts); err != nil { - t.Fatalf("Failed to write block into database: %v", err) - } - sqldb, err := core.DBConnection() - if (err != nil) { - panic(err) - } - - for _, tx := range txs { - txn := core.SGetTransaction(sqldb, tx.Hash().String()) - byt := []byte(txn) - var data core.ShyftTxEntryPretty - json.Unmarshal(byt, &data) - - //TODO age, data - if tx.Hash().String() != data.TxHash { - t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) - } - if tx.From().String() != data.From { - t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) - } - if tx.To().String() != data.To { - t.Fatalf("To Addr [%v]: To addr not found", tx.To().String()) - } - if tx.Nonce() != data.Nonce { - t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) - } - if tx.Gas() != data.Gas { - t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) - } - if tx.GasPrice().Uint64() != data.GasPrice { - t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) - } - if block.GasLimit() != data.GasLimit { - t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) - } - if block.Hash().String() != data.BlockHash { - t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) - } - if block.Number().String() != data.BlockNumber { - t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) - } - if tx.Value().String() != data.Amount { - t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) - } - if tx.Cost().Uint64() != data.Cost { - t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) - } - var status string - if receipt1.Status == 1 { - status = "SUCCESS" - } - if receipt1.Status == 0 { - status = "FAIL" - } - if status != data.Status { - t.Fatalf("Receipt status [%v]: Receipt status not found", status) - } - var isContract bool - if tx.To() != nil { - isContract = false - } else { - isContract = true - } - if isContract != data.IsContract { - t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) - } - } - - if getAllTx := core.SGetAllTransactions(sqldb); len(getAllTx) == 0 { - t.Fatalf("GetAllTransactions [%v]: GetAllTransactions did not return correctly", getAllTx) - } - ClearTables() -} - -func TestAccountsToReturnAccounts(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) - - //Nonce, To Address,Value, GasLimit, Gasprice, data - tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) - mytx,_ := types.SignTx(tx1, signer, key) - tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) - mytx2,_ := types.SignTx(tx2, signer, key) - tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) - mytx3,_ := types.SignTx(tx3, signer, key) - txs := []*types.Transaction{mytx, mytx2, mytx3} - - receipt1 := &types.Receipt{ - Status: types.ReceiptStatusSuccessful, - CumulativeGasUsed: 1, - Logs: []*types.Log{ - {Address: common.BytesToAddress([]byte{0x11})}, - {Address: common.BytesToAddress([]byte{0x01, 0x11})}, - }, - TxHash: common.BytesToHash([]byte{0x11, 0x11}), - ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), - GasUsed: 111111, - } - - receipts := []*types.Receipt{receipt1} - block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) if err := core.SWriteBlock(block, receipts); err != nil { t.Fatalf("Failed to write block into database: %v", err) } - sqldb, err := core.DBConnection() - if (err != nil) { - panic(err) - } - - - for _, tx := range txs { - accountAddrTo := core.SGetAccount(sqldb, tx.To().String()) - byts := []byte(accountAddrTo) - var accountDataTo core.SAccounts - json.Unmarshal(byts, &accountDataTo) - - if tx.To().String() != accountDataTo.Addr { - t.Fatalf("To address [%v]: To address not found", accountDataTo.Addr) + sqldb, err := core.DBConnection() + if err != nil { + panic(err) } - if tx.Value().String() != accountDataTo.Balance { - t.Fatalf("To address balance [%v]: To address balance not found", accountDataTo.Balance) - } - if strconv.FormatUint(tx.Nonce(), 10) != accountDataTo.TxCountAccount { - t.Fatalf("To account nonce [%v]: To account nonce not found", accountDataTo.TxCountAccount) - } - if getAllAccountTxs := core.SGetAccountTxs(sqldb, tx.To().String()); len(getAllAccountTxs) == 0 { - t.Fatalf("GetAccountTxs [%v]: GetAccountTxs did not return correctly", getAllAccountTxs) - } - } - if getAllAccounts := core.SGetAllAccounts(sqldb); len(getAllAccounts) == 0 { - t.Fatalf("GetAllAccounts [%v]: GetAllAccounts did not return correctly", getAllAccounts) - } + entry := core.SGetBlock(sqldb, block.Number().String()) + byt := []byte(entry) + var data core.SBlock + json.Unmarshal(byt, &data) + + //TODO Difficulty, rewards, age + if block.Hash().String() != data.Hash { + t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) + } + if block.Coinbase().String() != data.Coinbase { + t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) + } + if block.Number().String() != data.Number { + t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) + } + if block.GasUsed() != data.GasUsed { + t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) + } + if block.GasLimit() != data.GasLimit { + t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) + } + if block.Transactions().Len() != data.TxCount { + t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) + } + if len(block.Uncles()) != data.UncleCount { + t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) + } + if block.ParentHash().String() != data.ParentHash { + t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) + } + if block.UncleHash().String() != data.UncleHash { + t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) + } + if block.Size().String() != data.Size { + t.Fatalf("Size [%v]: Size not found", block.Size().String()) + } + if block.Nonce() != data.Nonce { + t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) + } + + if getAllBlocks := core.SGetAllBlocks(sqldb); len(getAllBlocks) == 0 { + t.Fatalf("GetAllBlocks [%v]: GetAllBlocks did not return correctly", getAllBlocks) + } + + if getAllBlocksMinedByAddress := core.SGetAllBlocksMinedByAddress(sqldb, block.Coinbase().String()); len(getAllBlocksMinedByAddress) == 0 { + t.Fatalf("GetAllBlocksMinedByAddress [%v]: GetAllBlocksMinedByAddress did not return correctly", getAllBlocksMinedByAddress) + } + + ClearTables() + }) + + t.Run("TestGetRecentBlock", func(t *testing.T) { + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) + + //Nonce, To Address,Value, GasLimit, Gasprice, data + tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) + mytx,_ := types.SignTx(tx1, signer, key) + tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) + mytx2,_ := types.SignTx(tx2, signer, key) + tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) + mytx3,_ := types.SignTx(tx3, signer, key) + txs := []*types.Transaction{mytx, mytx2} + txs1 := []*types.Transaction{mytx3} + + receipt1 := &types.Receipt{ + Status: types.ReceiptStatusSuccessful, + CumulativeGasUsed: 1, + Logs: []*types.Log{ + {Address: common.BytesToAddress([]byte{0x11})}, + {Address: common.BytesToAddress([]byte{0x01, 0x11})}, + }, + TxHash: common.BytesToHash([]byte{0x11, 0x11}), + ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), + GasUsed: 111111, + } + + receipts := []*types.Receipt{receipt1} + block := types.NewBlock(&types.Header{Number: big.NewInt(322)}, txs, nil, receipts) + block2 := types.NewBlock(&types.Header{Number: big.NewInt(320)}, txs1, nil, receipts) + blocks := []*types.Block{block, block2} + + for _, bc := range blocks { + // Write and verify the block in the database + if err := core.SWriteBlock(bc, receipts); err != nil { + t.Fatalf("Failed to write block into database: %v", err) + } + } + + sqldb, err := core.DBConnection() + if (err != nil) { + panic(err) + } + + response := core.SGetRecentBlock(sqldb) + byteRes := []byte(response) + var recentBlock core.SBlock + json.Unmarshal(byteRes, &recentBlock) + + if block.Hash().String() != recentBlock.Hash { + t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) + } + if block.Coinbase().String() != recentBlock.Coinbase { + t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) + } + if block.Number().String() != recentBlock.Number { + t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) + } + if block.GasUsed() != recentBlock.GasUsed { + t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) + } + if block.GasLimit() != recentBlock.GasLimit { + t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) + } + if block.Transactions().Len() != recentBlock.TxCount { + t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) + } + if len(block.Uncles()) != recentBlock.UncleCount { + t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) + } + if block.ParentHash().String() != recentBlock.ParentHash { + t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) + } + if block.UncleHash().String() != recentBlock.UncleHash { + t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) + } + if block.Size().String() != recentBlock.Size { + t.Fatalf("Size [%v]: Size not found", block.Size().String()) + } + if block.Nonce() != recentBlock.Nonce { + t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) + } + + if allTxsFromBlock:= core.SGetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { + t.Fatalf("GetAllTransactionsFromBlock [%v]: GetAllTransactionsFromBlock did not return correctly", allTxsFromBlock) + } + ClearTables() + }) + ClearTables() } + + +//func TestBlockToReturnBlock(t *testing.T) { +// core.InitDBTest() +// +// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") +// signer := types.NewEIP155Signer(big.NewInt(2147483647)) +// +// //Nonce, To Address,Value, GasLimit, Gasprice, data +// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) +// mytx,_ := types.SignTx(tx1, signer, key) +// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) +// mytx2,_ := types.SignTx(tx2, signer, key) +// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) +// mytx3,_ := types.SignTx(tx3, signer, key) +// txs := []*types.Transaction{mytx, mytx2, mytx3} +// +// receipt := &types.Receipt{ +// Status: types.ReceiptStatusSuccessful, +// CumulativeGasUsed: 1, +// Logs: []*types.Log{ +// {Address: common.BytesToAddress([]byte{0x11})}, +// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, +// }, +// TxHash: common.BytesToHash([]byte{0x11, 0x11}), +// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), +// GasUsed: 111111, +// } +// +// receipts := []*types.Receipt{receipt} +// block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) +// +// // Write and verify the block in the database +// if err := core.SWriteBlock(block, receipts); err != nil { +// t.Fatalf("Failed to write block into database: %v", err) +// } +// +// sqldb, err := core.DBConnection() +// if err != nil { +// panic(err) +// } +// +// entry := core.SGetBlock(sqldb, block.Number().String()) +// byt := []byte(entry) +// var data core.SBlock +// json.Unmarshal(byt, &data) +// +// //TODO Difficulty, rewards, age +// if block.Hash().String() != data.Hash { +// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) +// } +// if block.Coinbase().String() != data.Coinbase { +// t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) +// } +// if block.Number().String() != data.Number { +// t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) +// } +// if block.GasUsed() != data.GasUsed { +// t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) +// } +// if block.GasLimit() != data.GasLimit { +// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) +// } +// if block.Transactions().Len() != data.TxCount { +// t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) +// } +// if len(block.Uncles()) != data.UncleCount { +// t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) +// } +// if block.ParentHash().String() != data.ParentHash { +// t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) +// } +// if block.UncleHash().String() != data.UncleHash { +// t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) +// } +// if block.Size().String() != data.Size { +// t.Fatalf("Size [%v]: Size not found", block.Size().String()) +// } +// if block.Nonce() != data.Nonce { +// t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) +// } +// +// if getAllBlocks := core.SGetAllBlocks(sqldb); len(getAllBlocks) == 0 { +// t.Fatalf("GetAllBlocks [%v]: GetAllBlocks did not return correctly", getAllBlocks) +// } +// +// if getAllBlocksMinedByAddress := core.SGetAllBlocksMinedByAddress(sqldb, block.Coinbase().String()); len(getAllBlocksMinedByAddress) == 0 { +// t.Fatalf("GetAllBlocksMinedByAddress [%v]: GetAllBlocksMinedByAddress did not return correctly", getAllBlocksMinedByAddress) +// } +// +// ClearTables() +//} +// +//func TestGetRecentBlock(t *testing.T) { +// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") +// signer := types.NewEIP155Signer(big.NewInt(2147483647)) +// +// //Nonce, To Address,Value, GasLimit, Gasprice, data +// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) +// mytx,_ := types.SignTx(tx1, signer, key) +// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) +// mytx2,_ := types.SignTx(tx2, signer, key) +// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) +// mytx3,_ := types.SignTx(tx3, signer, key) +// txs := []*types.Transaction{mytx, mytx2} +// txs1 := []*types.Transaction{mytx3} +// +// receipt1 := &types.Receipt{ +// Status: types.ReceiptStatusSuccessful, +// CumulativeGasUsed: 1, +// Logs: []*types.Log{ +// {Address: common.BytesToAddress([]byte{0x11})}, +// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, +// }, +// TxHash: common.BytesToHash([]byte{0x11, 0x11}), +// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), +// GasUsed: 111111, +// } +// +// receipts := []*types.Receipt{receipt1} +// block := types.NewBlock(&types.Header{Number: big.NewInt(322)}, txs, nil, receipts) +// block2 := types.NewBlock(&types.Header{Number: big.NewInt(320)}, txs1, nil, receipts) +// blocks := []*types.Block{block, block2} +// +// for _, bc := range blocks { +// // Write and verify the block in the database +// if err := core.SWriteBlock(bc, receipts); err != nil { +// t.Fatalf("Failed to write block into database: %v", err) +// } +// } +// +// sqldb, err := core.DBConnection() +// if (err != nil) { +// panic(err) +// } +// +// response := core.SGetRecentBlock(sqldb) +// byteRes := []byte(response) +// var recentBlock core.SBlock +// json.Unmarshal(byteRes, &recentBlock) +// +// if block.Hash().String() != recentBlock.Hash { +// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) +// } +// if block.Coinbase().String() != recentBlock.Coinbase { +// t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) +// } +// if block.Number().String() != recentBlock.Number { +// t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) +// } +// if block.GasUsed() != recentBlock.GasUsed { +// t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) +// } +// if block.GasLimit() != recentBlock.GasLimit { +// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) +// } +// if block.Transactions().Len() != recentBlock.TxCount { +// t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) +// } +// if len(block.Uncles()) != recentBlock.UncleCount { +// t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) +// } +// if block.ParentHash().String() != recentBlock.ParentHash { +// t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) +// } +// if block.UncleHash().String() != recentBlock.UncleHash { +// t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) +// } +// if block.Size().String() != recentBlock.Size { +// t.Fatalf("Size [%v]: Size not found", block.Size().String()) +// } +// if block.Nonce() != recentBlock.Nonce { +// t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) +// } +// +// if allTxsFromBlock:= core.SGetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { +// t.Fatalf("GetAllTransactionsFromBlock [%v]: GetAllTransactionsFromBlock did not return correctly", allTxsFromBlock) +// } +// ClearTables() +//} +// +//func TestContractCreationTx(t *testing.T) { +// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") +// signer := types.NewEIP155Signer(big.NewInt(2147483647)) +// +// //Nonce,Value, GasLimit, Gasprice, data +// contractCreation := types.NewContractCreation(1, big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) +// mytx,_ := types.SignTx(contractCreation, signer, key) +// txs := []*types.Transaction{mytx} +// +// receipt2 := &types.Receipt{ +// Status: types.ReceiptStatusSuccessful, +// CumulativeGasUsed: 1, +// Logs: []*types.Log{ +// {Address: common.BytesToAddress([]byte{0x11})}, +// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, +// }, +// TxHash: common.BytesToHash([]byte{0x11, 0x11}), +// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), +// GasUsed: 111111, +// } +// +// receipts := []*types.Receipt{receipt2} +// block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) +// +// if err := core.SWriteBlock(block, receipts); err != nil { +// t.Fatalf("Failed to write block into database: %v", err) +// } +// +// var contractAddressFromReciept string +// for _, receipt := range receipts { +// contractAddressFromReciept = (*types.ReceiptForStorage)(receipt).ContractAddress.String() +// } +// +// sqldb, err := core.DBConnection() +// if (err != nil) { +// panic(err) +// } +// +// for _, tx := range txs { +// txn := core.SGetTransaction(sqldb, tx.Hash().String()) +// byt := []byte(txn) +// var data core.ShyftTxEntryPretty +// json.Unmarshal(byt, &data) +// +// if tx.Hash().String() != data.TxHash { +// t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) +// } +// if contractAddressFromReciept != data.To { +// t.Fatalf("Contract Addr [%v]: Contract addr not found", contractAddressFromReciept) +// } +// if tx.From().String() != data.From { +// t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) +// } +// if tx.Nonce() != data.Nonce { +// t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) +// } +// if tx.Gas() != data.Gas { +// t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) +// } +// if tx.GasPrice().Uint64() != data.GasPrice { +// t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) +// } +// if block.GasLimit() != data.GasLimit { +// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) +// } +// if block.Hash().String() != data.BlockHash { +// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) +// } +// if block.Number().String() != data.BlockNumber { +// t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) +// } +// if tx.Value().String() != data.Amount { +// t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) +// } +// if tx.Cost().Uint64() != data.Cost { +// t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) +// } +// var status string +// if receipt2.Status == 1 { +// status = "SUCCESS" +// } +// if receipt2.Status == 0 { +// status = "FAIL" +// } +// if status != data.Status { +// t.Fatalf("Receipt status [%v]: Receipt status not found", status) +// } +// var isContract bool +// if tx.To() != nil { +// isContract = false +// } else { +// isContract = true +// } +// if isContract != data.IsContract { +// t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) +// } +// } +// ClearTables() +//} +// +//func TestTransactionsToReturnTransactions(t *testing.T) { +// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") +// signer := types.NewEIP155Signer(big.NewInt(2147483647)) +// +// //Nonce, To Address,Value, GasLimit, Gasprice, data +// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) +// mytx,_ := types.SignTx(tx1, signer, key) +// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) +// mytx2,_ := types.SignTx(tx2, signer, key) +// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) +// mytx3,_ := types.SignTx(tx3, signer, key) +// txs := []*types.Transaction{mytx, mytx2, mytx3} +// +// receipt1 := &types.Receipt{ +// Status: types.ReceiptStatusSuccessful, +// CumulativeGasUsed: 1, +// Logs: []*types.Log{ +// {Address: common.BytesToAddress([]byte{0x11})}, +// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, +// }, +// TxHash: common.BytesToHash([]byte{0x11, 0x11}), +// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), +// GasUsed: 111111, +// } +// +// receipts := []*types.Receipt{receipt1} +// block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) +// +// if err := core.SWriteBlock(block, receipts); err != nil { +// t.Fatalf("Failed to write block into database: %v", err) +// } +// sqldb, err := core.DBConnection() +// if (err != nil) { +// panic(err) +// } +// +// for _, tx := range txs { +// txn := core.SGetTransaction(sqldb, tx.Hash().String()) +// byt := []byte(txn) +// var data core.ShyftTxEntryPretty +// json.Unmarshal(byt, &data) +// +// //TODO age, data +// if tx.Hash().String() != data.TxHash { +// t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) +// } +// if tx.From().String() != data.From { +// t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) +// } +// if tx.To().String() != data.To { +// t.Fatalf("To Addr [%v]: To addr not found", tx.To().String()) +// } +// if tx.Nonce() != data.Nonce { +// t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) +// } +// if tx.Gas() != data.Gas { +// t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) +// } +// if tx.GasPrice().Uint64() != data.GasPrice { +// t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) +// } +// if block.GasLimit() != data.GasLimit { +// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) +// } +// if block.Hash().String() != data.BlockHash { +// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) +// } +// if block.Number().String() != data.BlockNumber { +// t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) +// } +// if tx.Value().String() != data.Amount { +// t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) +// } +// if tx.Cost().Uint64() != data.Cost { +// t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) +// } +// var status string +// if receipt1.Status == 1 { +// status = "SUCCESS" +// } +// if receipt1.Status == 0 { +// status = "FAIL" +// } +// if status != data.Status { +// t.Fatalf("Receipt status [%v]: Receipt status not found", status) +// } +// var isContract bool +// if tx.To() != nil { +// isContract = false +// } else { +// isContract = true +// } +// if isContract != data.IsContract { +// t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) +// } +// } +// +// if getAllTx := core.SGetAllTransactions(sqldb); len(getAllTx) == 0 { +// t.Fatalf("GetAllTransactions [%v]: GetAllTransactions did not return correctly", getAllTx) +// } +// ClearTables() +//} +// +//func TestAccountsToReturnAccounts(t *testing.T) { +// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") +// signer := types.NewEIP155Signer(big.NewInt(2147483647)) +// +// //Nonce, To Address,Value, GasLimit, Gasprice, data +// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) +// mytx,_ := types.SignTx(tx1, signer, key) +// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) +// mytx2,_ := types.SignTx(tx2, signer, key) +// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) +// mytx3,_ := types.SignTx(tx3, signer, key) +// txs := []*types.Transaction{mytx, mytx2, mytx3} +// +// receipt1 := &types.Receipt{ +// Status: types.ReceiptStatusSuccessful, +// CumulativeGasUsed: 1, +// Logs: []*types.Log{ +// {Address: common.BytesToAddress([]byte{0x11})}, +// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, +// }, +// TxHash: common.BytesToHash([]byte{0x11, 0x11}), +// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), +// GasUsed: 111111, +// } +// +// receipts := []*types.Receipt{receipt1} +// block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) +// if err := core.SWriteBlock(block, receipts); err != nil { +// t.Fatalf("Failed to write block into database: %v", err) +// } +// +// sqldb, err := core.DBConnection() +// if (err != nil) { +// panic(err) +// } +// +// +// for _, tx := range txs { +// accountAddrTo := core.SGetAccount(sqldb, tx.To().String()) +// byts := []byte(accountAddrTo) +// var accountDataTo core.SAccounts +// json.Unmarshal(byts, &accountDataTo) +// +// if tx.To().String() != accountDataTo.Addr { +// t.Fatalf("To address [%v]: To address not found", accountDataTo.Addr) +// } +// if tx.Value().String() != accountDataTo.Balance { +// t.Fatalf("To address balance [%v]: To address balance not found", accountDataTo.Balance) +// } +// if strconv.FormatUint(tx.Nonce(), 10) != accountDataTo.TxCountAccount { +// t.Fatalf("To account nonce [%v]: To account nonce not found", accountDataTo.TxCountAccount) +// } +// if getAllAccountTxs := core.SGetAccountTxs(sqldb, tx.To().String()); len(getAllAccountTxs) == 0 { +// t.Fatalf("GetAccountTxs [%v]: GetAccountTxs did not return correctly", getAllAccountTxs) +// } +// } +// +// if getAllAccounts := core.SGetAllAccounts(sqldb); len(getAllAccounts) == 0 { +// t.Fatalf("GetAllAccounts [%v]: GetAllAccounts did not return correctly", getAllAccounts) +// } +// ClearTables() +//} + + + diff --git a/shyfttracerinterface/tracer_interface.go b/shyfttracerinterface/tracer_interface.go index dbadf1e39b..43fd883788 100644 --- a/shyfttracerinterface/tracer_interface.go +++ b/shyfttracerinterface/tracer_interface.go @@ -8,7 +8,3 @@ type IShyftTracer interface { GetTracerToRun(hash common.Hash) (interface{}, error) } -//type IShyftTracer interface { -// MyTraceTransaction(hash string) (interface{}) -//} - From 7c98e75c726b8f45711c36277a2aa7986358b1f3 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Tue, 17 Jul 2018 09:25:02 -0400 Subject: [PATCH 19/24] get tests to run with tracer correctly initialized --- eth/backend.go | 2 ++ eth/chaindb.go | 20 ++++++++++++++++++++ eth/shyft_tracer.go | 16 ++++++++++++++-- shyftDb/shyft_database_util_test.go | 3 +++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/eth/backend.go b/eth/backend.go index 94b94f157e..3f9a813567 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -232,6 +232,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { DebugApi.eth = eth DebugApi.config = chainConfig + // Shyft Tracer + InitTracerEnv() return eth, nil } diff --git a/eth/chaindb.go b/eth/chaindb.go index 4ff89683fb..19f999d023 100644 --- a/eth/chaindb.go +++ b/eth/chaindb.go @@ -4,6 +4,8 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/node" "fmt" + "io/ioutil" + "os" ) var Chaindb_global ethdb.Database @@ -24,4 +26,22 @@ func chaindb(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) { return Chaindb_global, nil } return nil, err +} + +//(*ethdb.LDBDatabase, func()) +func NewShyftTestLDB() { + dirname, err := ioutil.TempDir(os.TempDir(), "shyftdb_test_") + if err != nil { + panic("failed to create test file: " + err.Error()) + } + db, err := ethdb.NewLDBDatabase(dirname, 0, 0) + if err != nil { + panic("failed to create test database: " + err.Error()) + } + Chaindb_global = db + + //return db, func() { + // db.Close() + // os.RemoveAll(dirname) + //} } \ No newline at end of file diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index 5fa2eb392f..0e1bcd6734 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -12,23 +12,35 @@ var EthereumObject interface{} type ShyftTracer struct {} -func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { +var PrivateAPI *PrivateDebugAPI +var Context context.Context +var TracerConfig *TraceConfig + +func InitTracerEnv() { + fmt.Println("INIT tracer Env") config2 := params.ShyftNetworkChainConfig jsTracer := "callTracer" var ctx2 context.Context + Context = ctx2 config := &TraceConfig{ LogConfig: nil, Tracer: &jsTracer, // needs to be non-nil Timeout: nil, Reexec: nil, } + TracerConfig = config fmt.Println("+++++++++++++++++++++++++++ before FULLNODE", Global_config) + // called here fullNode, _ := SNew(Global_config) fmt.Println("+++++++++++++++++++++++++++ after FULLNODE") privateAPI := NewPrivateDebugAPI(config2, fullNode) + PrivateAPI = privateAPI fmt.Println("+++++++++++++++++++++++++++ after privateAPI") - return privateAPI.STraceTransaction(ctx2, hash, config) +} + +func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { + return PrivateAPI.STraceTransaction(Context, hash, TracerConfig) } func setEthObject(ethobj interface{}){ diff --git a/shyftDb/shyft_database_util_test.go b/shyftDb/shyft_database_util_test.go index 4875f656d9..9ce11ea3b8 100644 --- a/shyftDb/shyft_database_util_test.go +++ b/shyftDb/shyft_database_util_test.go @@ -29,6 +29,7 @@ const ( ) func TestBlock(t *testing.T) { + eth.NewShyftTestLDB() core.InitDBTest() shyft_tracer := new(eth.ShyftTracer) core.SetIShyftTracer(shyft_tracer) @@ -55,6 +56,8 @@ func TestBlock(t *testing.T) { eth.SetGlobalConfig(ethConf) + eth.InitTracerEnv() + t.Run("TestBlockToReturnBlock", func(t *testing.T) { key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") signer := types.NewEIP155Signer(big.NewInt(2147483647)) From 274ae75ad3fecc0683dea76aa3848726b94da6b9 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Tue, 17 Jul 2018 10:15:15 -0400 Subject: [PATCH 20/24] internal txs are being recorded --- core/genesis.go | 2 - eth/api_tracer.go | 5 - eth/backend.go | 21 +- eth/chaindb.go | 2 - eth/shyft_tracer.go | 7 - eth/tracers/tracer.go | 3 - shyftDb/shyft_database_util_test.go | 739 ++++++++++------------------ 7 files changed, 268 insertions(+), 511 deletions(-) diff --git a/core/genesis.go b/core/genesis.go index ade6d3f0de..9382442449 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -186,8 +186,6 @@ func WriteShyftGen(gen *Genesis, block *types.Block) { panic(insertError) } } - - default: log.Info("Found Genesis Block") }}} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 89de3293b7..ea6c0556b6 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -561,12 +561,10 @@ func (api *PrivateDebugAPI) STraceTransaction(ctx context.Context, hash common.H if config != nil && config.Reexec != nil { reexec = *config.Reexec } - fmt.Println("+++++++++++++++++++++++++++ Middle") msg, vmctx, statedb, err := api.computeTxEnv(blockHash, int(index), reexec) if err != nil { return nil, err } - fmt.Println("+++++++++++++++++++++++++++ BOTTOM") return api.StraceTx(ctx, msg, vmctx, statedb, config, hash) } @@ -583,7 +581,6 @@ func (api *PrivateDebugAPI) StraceTx(ctx context.Context, message core.Message, switch { case config != nil && config.Tracer != nil: // Define a meaningful timeout of a single transaction trace - fmt.Println("STRACETX") _ = defaultTraceTimeout if config.Timeout != nil { @@ -703,7 +700,6 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v // computeTxEnv returns the execution environment of a certain transaction. func (api *PrivateDebugAPI) computeTxEnv(blockHash common.Hash, txIndex int, reexec uint64) (core.Message, vm.Context, *state.StateDB, error) { // Create the parent state database - fmt.Println("COMPUTETXENV") block := api.eth.blockchain.GetBlockByHash(blockHash) if block == nil { return nil, vm.Context{}, nil, fmt.Errorf("block %x not found", blockHash) @@ -733,6 +729,5 @@ func (api *PrivateDebugAPI) computeTxEnv(blockHash common.Hash, txIndex int, ree } statedb.DeleteSuicides() } - fmt.Println("+++++++++++++++++ BOTTOM COMPUTETXENV") return nil, vm.Context{}, nil, fmt.Errorf("tx index %d out of range for block %x", txIndex, blockHash) } diff --git a/eth/backend.go b/eth/backend.go index 3f9a813567..65d3909f43 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -103,17 +103,12 @@ func (s *Ethereum) AddLesServer(ls LesServer) { } func SNew(config *Config) (*Ethereum, error) { - fmt.Println("SNEW FROM SHYFTREACER") stopDbUpgrade := upgradeDeduplicateData(Chaindb_global) - fmt.Println("ChainGlobal v+%", Chaindb_global) chainConfig, _, _ := core.SetupGenesisBlock(Chaindb_global, config.Genesis) eth := &Ethereum{ config: config, chainDb: Chaindb_global, chainConfig: chainConfig, - //eventMux: ctx.EventMux, - //accountManager: ctx.AccountManager, - //engine: CreateConsensusEngine(ctx, &config.Ethash, chainConfig, Chaindb_global), shutdownChan: make(chan bool), stopDbUpgrade: stopDbUpgrade, networkId: config.NetworkId, @@ -123,15 +118,6 @@ func SNew(config *Config) (*Ethereum, error) { bloomIndexer: NewBloomIndexer(Chaindb_global, params.BloomBitsBlocks), } - //var ( - // vmConfig = vm.Config{EnablePreimageRecording: config.EnablePreimageRecording} - // cacheConfig = &core.CacheConfig{Disabled: config.NoPruning, TrieNodeLimit: config.TrieCache, TrieTimeLimit: config.TrieTimeout} - //) - // - //eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, eth.chainConfig, eth.engine, vmConfig) - // - //BlockchainObject = eth.blockchain - eth.blockchain = BlockchainObject return eth, nil @@ -144,11 +130,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { core.SetIShyftTracer(shyft_tracer) SetGlobalConfig(config) - _, file, no, ok := runtime.Caller(1) - if ok { - fmt.Printf("called from %s#%d\n", file, no) - } - if config.SyncMode == downloader.LightSync { return nil, errors.New("can't run eth.Ethereum in light sync mode, use les.LightEthereum") } @@ -232,7 +213,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { DebugApi.eth = eth DebugApi.config = chainConfig - // Shyft Tracer + //@NOTE Shyft Tracer InitTracerEnv() return eth, nil diff --git a/eth/chaindb.go b/eth/chaindb.go index 19f999d023..7ff01a7e13 100644 --- a/eth/chaindb.go +++ b/eth/chaindb.go @@ -3,7 +3,6 @@ package eth import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/node" - "fmt" "io/ioutil" "os" ) @@ -15,7 +14,6 @@ func SetChainDB(db ethdb.Database){ } func chaindb(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) { - fmt.Printf("CTX v+%", ctx) if Chaindb_global != nil { return Chaindb_global, nil } diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index 0e1bcd6734..0db8e7a23b 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -5,7 +5,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" "context" - "fmt" ) var EthereumObject interface{} @@ -17,7 +16,6 @@ var Context context.Context var TracerConfig *TraceConfig func InitTracerEnv() { - fmt.Println("INIT tracer Env") config2 := params.ShyftNetworkChainConfig jsTracer := "callTracer" @@ -30,13 +28,9 @@ func InitTracerEnv() { Reexec: nil, } TracerConfig = config - fmt.Println("+++++++++++++++++++++++++++ before FULLNODE", Global_config) - // called here fullNode, _ := SNew(Global_config) - fmt.Println("+++++++++++++++++++++++++++ after FULLNODE") privateAPI := NewPrivateDebugAPI(config2, fullNode) PrivateAPI = privateAPI - fmt.Println("+++++++++++++++++++++++++++ after privateAPI") } func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { @@ -50,6 +44,5 @@ func setEthObject(ethobj interface{}){ var Global_config *Config func SetGlobalConfig(c *Config) { - fmt.Println("SETGLOBAL") Global_config = c } \ No newline at end of file diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index 807886708b..c79ce7e411 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -592,7 +592,6 @@ type Internals struct { //@NOTE:SHYFT func (i *Internals) SWriteInteralTxs(hash common.Hash) { - fmt.Println("WRITE INTERNAL") sqldb, err := core.DBConnection() if err != nil { panic(err) @@ -612,7 +611,6 @@ func (i *Internals) SWriteInteralTxs(hash common.Hash) { } //@NOTE:SHYFT func (i *Internals) InternalRecursive(hash common.Hash) { - fmt.Println("internal recursive") i.SWriteInteralTxs(hash) lengthOfCalls := len(i.Calls) if lengthOfCalls == 0 { @@ -671,7 +669,6 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) { //@NOTE:SHYFT func (jst *Tracer) SGetResult(hash common.Hash) (json.RawMessage, error) { - fmt.Println("SGETRESULT") // Transform the context into a JavaScript object and inject into the state obj := jst.vm.PushObject() diff --git a/shyftDb/shyft_database_util_test.go b/shyftDb/shyft_database_util_test.go index 9ce11ea3b8..b5f0409e31 100644 --- a/shyftDb/shyft_database_util_test.go +++ b/shyftDb/shyft_database_util_test.go @@ -11,20 +11,12 @@ import ( "encoding/json" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/consensus/ethash" + "strconv" ) type ShyftTracer struct {} -//Config Below -//&{Genesis: NetworkId:1 SyncMode:fast NoPruning:false LightServ:0 LightPeers:100 SkipBcVersionCheck:false DatabaseHandles:1024 DatabaseCache:768 TrieCache:256 TrieTimeout:5m0s Etherbase:[67 236 109 9 66 247 250 239 6 159 127 99 208 56 74 39 245 41 176 98] MinerThreads:4 ExtraData:[] GasPrice:+18000000000 Ethash:{CacheDir:ethash CachesInMem:2 CachesOnDisk:3 DatasetDir:$HOME/.ethash DatasetsInMem:1 DatasetsOnDisk:2 PowMode:0} TxPool:{NoLocals:false Journal:transactions.rlp Rejournal:1h0m0s PriceLimit:1 PriceBump:10 AccountSlots:16 GlobalSlots:4096 AccountQueue:64 GlobalQueue:1024 Lifetime:3h0m0s} GPO:{Blocks:20 Percentile:60 Default:} EnablePreimageRecording:false DocRoot:}SETGLOBAL -//called from /Users/dustinbrickwood/go/src/github.com/ethereum/go-ethereum/build/_workspace/src/github.com/ethereum/go-ethereum/cmd/utils/flags.go#1132 -// - -//CTX -// !(NOVERB)%!(EXTRA *node.ServiceContext=&{0xc4200326c0 map[] 0xc4201dc6c0 0xc42026f2b0}) - const ( - testInstance = "console-tester" testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" ) @@ -34,15 +26,6 @@ func TestBlock(t *testing.T) { shyft_tracer := new(eth.ShyftTracer) core.SetIShyftTracer(shyft_tracer) - //workspace, err := ioutil.TempDir("", "console-tester-") - //if err != nil { - // t.Fatalf("failed to create temporary keystore: %v", err) - //} - - //stack, err := node.New(&node.Config{DataDir: workspace, UseLightweightKDF: true, Name: testInstance}) - //if err != nil { - // t.Fatalf("failed to create node: %v", err) - //} ethConf := ð.Config{ Genesis: core.DeveloperGenesisBlock(15, common.Address{}), Etherbase: common.HexToAddress(testAddress), @@ -50,9 +33,6 @@ func TestBlock(t *testing.T) { PowMode: ethash.ModeTest, }, } - //if err = stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { return eth.New(ctx, ethConf) }); err != nil { - // t.Fatalf("failed to register Ethereum protocol: %v", err) - //} eth.SetGlobalConfig(ethConf) @@ -235,457 +215,272 @@ func TestBlock(t *testing.T) { ClearTables() }) +// +t.Run("TestContractCreationTx", func (t *testing.T) { + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) + + //Nonce,Value, GasLimit, Gasprice, data + contractCreation := types.NewContractCreation(1, big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) + mytx,_ := types.SignTx(contractCreation, signer, key) + txs := []*types.Transaction{mytx} + + receipt2 := &types.Receipt{ + Status: types.ReceiptStatusSuccessful, + CumulativeGasUsed: 1, + Logs: []*types.Log{ + {Address: common.BytesToAddress([]byte{0x11})}, + {Address: common.BytesToAddress([]byte{0x01, 0x11})}, + }, + TxHash: common.BytesToHash([]byte{0x11, 0x11}), + ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), + GasUsed: 111111, + } + + receipts := []*types.Receipt{receipt2} + block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) + + if err := core.SWriteBlock(block, receipts); err != nil { + t.Fatalf("Failed to write block into database: %v", err) + } + + var contractAddressFromReciept string + for _, receipt := range receipts { + contractAddressFromReciept = (*types.ReceiptForStorage)(receipt).ContractAddress.String() + } + + sqldb, err := core.DBConnection() + if (err != nil) { + panic(err) + } + + for _, tx := range txs { + txn := core.SGetTransaction(sqldb, tx.Hash().String()) + byt := []byte(txn) + var data core.ShyftTxEntryPretty + json.Unmarshal(byt, &data) + + if tx.Hash().String() != data.TxHash { + t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) + } + if contractAddressFromReciept != data.To { + t.Fatalf("Contract Addr [%v]: Contract addr not found", contractAddressFromReciept) + } + if tx.From().String() != data.From { + t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) + } + if tx.Nonce() != data.Nonce { + t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) + } + if tx.Gas() != data.Gas { + t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) + } + if tx.GasPrice().Uint64() != data.GasPrice { + t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) + } + if block.GasLimit() != data.GasLimit { + t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) + } + if block.Hash().String() != data.BlockHash { + t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) + } + if block.Number().String() != data.BlockNumber { + t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) + } + if tx.Value().String() != data.Amount { + t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) + } + if tx.Cost().Uint64() != data.Cost { + t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) + } + var status string + if receipt2.Status == 1 { + status = "SUCCESS" + } + if receipt2.Status == 0 { + status = "FAIL" + } + if status != data.Status { + t.Fatalf("Receipt status [%v]: Receipt status not found", status) + } + var isContract bool + if tx.To() != nil { + isContract = false + } else { + isContract = true + } + if isContract != data.IsContract { + t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) + } + } + ClearTables() +}) + +t.Run("TestTransactionsToReturnTransactions", func(t *testing.T) { + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) + + //Nonce, To Address,Value, GasLimit, Gasprice, data + tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) + mytx,_ := types.SignTx(tx1, signer, key) + tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) + mytx2,_ := types.SignTx(tx2, signer, key) + tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) + mytx3,_ := types.SignTx(tx3, signer, key) + txs := []*types.Transaction{mytx, mytx2, mytx3} + + receipt1 := &types.Receipt{ + Status: types.ReceiptStatusSuccessful, + CumulativeGasUsed: 1, + Logs: []*types.Log{ + {Address: common.BytesToAddress([]byte{0x11})}, + {Address: common.BytesToAddress([]byte{0x01, 0x11})}, + }, + TxHash: common.BytesToHash([]byte{0x11, 0x11}), + ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), + GasUsed: 111111, + } + + receipts := []*types.Receipt{receipt1} + block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) + + if err := core.SWriteBlock(block, receipts); err != nil { + t.Fatalf("Failed to write block into database: %v", err) + } + sqldb, err := core.DBConnection() + if (err != nil) { + panic(err) + } + + for _, tx := range txs { + txn := core.SGetTransaction(sqldb, tx.Hash().String()) + byt := []byte(txn) + var data core.ShyftTxEntryPretty + json.Unmarshal(byt, &data) + + //TODO age, data + if tx.Hash().String() != data.TxHash { + t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) + } + if tx.From().String() != data.From { + t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) + } + if tx.To().String() != data.To { + t.Fatalf("To Addr [%v]: To addr not found", tx.To().String()) + } + if tx.Nonce() != data.Nonce { + t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) + } + if tx.Gas() != data.Gas { + t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) + } + if tx.GasPrice().Uint64() != data.GasPrice { + t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) + } + if block.GasLimit() != data.GasLimit { + t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) + } + if block.Hash().String() != data.BlockHash { + t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) + } + if block.Number().String() != data.BlockNumber { + t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) + } + if tx.Value().String() != data.Amount { + t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) + } + if tx.Cost().Uint64() != data.Cost { + t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) + } + var status string + if receipt1.Status == 1 { + status = "SUCCESS" + } + if receipt1.Status == 0 { + status = "FAIL" + } + if status != data.Status { + t.Fatalf("Receipt status [%v]: Receipt status not found", status) + } + var isContract bool + if tx.To() != nil { + isContract = false + } else { + isContract = true + } + if isContract != data.IsContract { + t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) + } + } + + if getAllTx := core.SGetAllTransactions(sqldb); len(getAllTx) == 0 { + t.Fatalf("GetAllTransactions [%v]: GetAllTransactions did not return correctly", getAllTx) + } + ClearTables() +}) + +t.Run("TestAccountsToReturnAccounts",func(t *testing.T) { + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) + + //Nonce, To Address,Value, GasLimit, Gasprice, data + tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) + mytx,_ := types.SignTx(tx1, signer, key) + tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) + mytx2,_ := types.SignTx(tx2, signer, key) + tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) + mytx3,_ := types.SignTx(tx3, signer, key) + txs := []*types.Transaction{mytx, mytx2, mytx3} + + receipt1 := &types.Receipt{ + Status: types.ReceiptStatusSuccessful, + CumulativeGasUsed: 1, + Logs: []*types.Log{ + {Address: common.BytesToAddress([]byte{0x11})}, + {Address: common.BytesToAddress([]byte{0x01, 0x11})}, + }, + TxHash: common.BytesToHash([]byte{0x11, 0x11}), + ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), + GasUsed: 111111, + } + + receipts := []*types.Receipt{receipt1} + block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) + if err := core.SWriteBlock(block, receipts); err != nil { + t.Fatalf("Failed to write block into database: %v", err) + } + + sqldb, err := core.DBConnection() + if (err != nil) { + panic(err) + } + + for _, tx := range txs { + accountAddrTo := core.SGetAccount(sqldb, tx.To().String()) + byts := []byte(accountAddrTo) + var accountDataTo core.SAccounts + json.Unmarshal(byts, &accountDataTo) + + if tx.To().String() != accountDataTo.Addr { + t.Fatalf("To address [%v]: To address not found", accountDataTo.Addr) + } + if tx.Value().String() != accountDataTo.Balance { + t.Fatalf("To address balance [%v]: To address balance not found", accountDataTo.Balance) + } + if strconv.FormatUint(tx.Nonce(), 10) != accountDataTo.TxCountAccount { + t.Fatalf("To account nonce [%v]: To account nonce not found", accountDataTo.TxCountAccount) + } + if getAllAccountTxs := core.SGetAccountTxs(sqldb, tx.To().String()); len(getAllAccountTxs) == 0 { + t.Fatalf("GetAccountTxs [%v]: GetAccountTxs did not return correctly", getAllAccountTxs) + } + } + + if getAllAccounts := core.SGetAllAccounts(sqldb); len(getAllAccounts) == 0 { + t.Fatalf("GetAllAccounts [%v]: GetAllAccounts did not return correctly", getAllAccounts) + } + ClearTables() +}) + ClearTables() } - - - - -//func TestBlockToReturnBlock(t *testing.T) { -// core.InitDBTest() -// -// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") -// signer := types.NewEIP155Signer(big.NewInt(2147483647)) -// -// //Nonce, To Address,Value, GasLimit, Gasprice, data -// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) -// mytx,_ := types.SignTx(tx1, signer, key) -// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) -// mytx2,_ := types.SignTx(tx2, signer, key) -// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) -// mytx3,_ := types.SignTx(tx3, signer, key) -// txs := []*types.Transaction{mytx, mytx2, mytx3} -// -// receipt := &types.Receipt{ -// Status: types.ReceiptStatusSuccessful, -// CumulativeGasUsed: 1, -// Logs: []*types.Log{ -// {Address: common.BytesToAddress([]byte{0x11})}, -// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, -// }, -// TxHash: common.BytesToHash([]byte{0x11, 0x11}), -// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), -// GasUsed: 111111, -// } -// -// receipts := []*types.Receipt{receipt} -// block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) -// -// // Write and verify the block in the database -// if err := core.SWriteBlock(block, receipts); err != nil { -// t.Fatalf("Failed to write block into database: %v", err) -// } -// -// sqldb, err := core.DBConnection() -// if err != nil { -// panic(err) -// } -// -// entry := core.SGetBlock(sqldb, block.Number().String()) -// byt := []byte(entry) -// var data core.SBlock -// json.Unmarshal(byt, &data) -// -// //TODO Difficulty, rewards, age -// if block.Hash().String() != data.Hash { -// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) -// } -// if block.Coinbase().String() != data.Coinbase { -// t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) -// } -// if block.Number().String() != data.Number { -// t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) -// } -// if block.GasUsed() != data.GasUsed { -// t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) -// } -// if block.GasLimit() != data.GasLimit { -// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) -// } -// if block.Transactions().Len() != data.TxCount { -// t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) -// } -// if len(block.Uncles()) != data.UncleCount { -// t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) -// } -// if block.ParentHash().String() != data.ParentHash { -// t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) -// } -// if block.UncleHash().String() != data.UncleHash { -// t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) -// } -// if block.Size().String() != data.Size { -// t.Fatalf("Size [%v]: Size not found", block.Size().String()) -// } -// if block.Nonce() != data.Nonce { -// t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) -// } -// -// if getAllBlocks := core.SGetAllBlocks(sqldb); len(getAllBlocks) == 0 { -// t.Fatalf("GetAllBlocks [%v]: GetAllBlocks did not return correctly", getAllBlocks) -// } -// -// if getAllBlocksMinedByAddress := core.SGetAllBlocksMinedByAddress(sqldb, block.Coinbase().String()); len(getAllBlocksMinedByAddress) == 0 { -// t.Fatalf("GetAllBlocksMinedByAddress [%v]: GetAllBlocksMinedByAddress did not return correctly", getAllBlocksMinedByAddress) -// } -// -// ClearTables() -//} -// -//func TestGetRecentBlock(t *testing.T) { -// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") -// signer := types.NewEIP155Signer(big.NewInt(2147483647)) -// -// //Nonce, To Address,Value, GasLimit, Gasprice, data -// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) -// mytx,_ := types.SignTx(tx1, signer, key) -// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) -// mytx2,_ := types.SignTx(tx2, signer, key) -// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) -// mytx3,_ := types.SignTx(tx3, signer, key) -// txs := []*types.Transaction{mytx, mytx2} -// txs1 := []*types.Transaction{mytx3} -// -// receipt1 := &types.Receipt{ -// Status: types.ReceiptStatusSuccessful, -// CumulativeGasUsed: 1, -// Logs: []*types.Log{ -// {Address: common.BytesToAddress([]byte{0x11})}, -// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, -// }, -// TxHash: common.BytesToHash([]byte{0x11, 0x11}), -// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), -// GasUsed: 111111, -// } -// -// receipts := []*types.Receipt{receipt1} -// block := types.NewBlock(&types.Header{Number: big.NewInt(322)}, txs, nil, receipts) -// block2 := types.NewBlock(&types.Header{Number: big.NewInt(320)}, txs1, nil, receipts) -// blocks := []*types.Block{block, block2} -// -// for _, bc := range blocks { -// // Write and verify the block in the database -// if err := core.SWriteBlock(bc, receipts); err != nil { -// t.Fatalf("Failed to write block into database: %v", err) -// } -// } -// -// sqldb, err := core.DBConnection() -// if (err != nil) { -// panic(err) -// } -// -// response := core.SGetRecentBlock(sqldb) -// byteRes := []byte(response) -// var recentBlock core.SBlock -// json.Unmarshal(byteRes, &recentBlock) -// -// if block.Hash().String() != recentBlock.Hash { -// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) -// } -// if block.Coinbase().String() != recentBlock.Coinbase { -// t.Fatalf("Block coinbase [%v]: Block coinbase not found", block.Coinbase().String()) -// } -// if block.Number().String() != recentBlock.Number { -// t.Fatalf("Block number [%v]: Block number not found", block.Number().String()) -// } -// if block.GasUsed() != recentBlock.GasUsed { -// t.Fatalf("Gas Used [%v]: Gas used not found", block.GasUsed()) -// } -// if block.GasLimit() != recentBlock.GasLimit { -// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) -// } -// if block.Transactions().Len() != recentBlock.TxCount { -// t.Fatalf("Tx Count [%v]: Tx Count not found", block.Transactions().Len()) -// } -// if len(block.Uncles()) != recentBlock.UncleCount { -// t.Fatalf("Uncle count [%v]: Uncle count not found", len(block.Uncles())) -// } -// if block.ParentHash().String() != recentBlock.ParentHash { -// t.Fatalf("Parent hash [%v]: Parent hash not found", block.ParentHash().String()) -// } -// if block.UncleHash().String() != recentBlock.UncleHash { -// t.Fatalf("Uncle hash [%v]: Uncle hash not found", block.UncleHash().String()) -// } -// if block.Size().String() != recentBlock.Size { -// t.Fatalf("Size [%v]: Size not found", block.Size().String()) -// } -// if block.Nonce() != recentBlock.Nonce { -// t.Fatalf("Block nonce [%v]: Block nonce not found", block.Nonce()) -// } -// -// if allTxsFromBlock:= core.SGetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { -// t.Fatalf("GetAllTransactionsFromBlock [%v]: GetAllTransactionsFromBlock did not return correctly", allTxsFromBlock) -// } -// ClearTables() -//} -// -//func TestContractCreationTx(t *testing.T) { -// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") -// signer := types.NewEIP155Signer(big.NewInt(2147483647)) -// -// //Nonce,Value, GasLimit, Gasprice, data -// contractCreation := types.NewContractCreation(1, big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) -// mytx,_ := types.SignTx(contractCreation, signer, key) -// txs := []*types.Transaction{mytx} -// -// receipt2 := &types.Receipt{ -// Status: types.ReceiptStatusSuccessful, -// CumulativeGasUsed: 1, -// Logs: []*types.Log{ -// {Address: common.BytesToAddress([]byte{0x11})}, -// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, -// }, -// TxHash: common.BytesToHash([]byte{0x11, 0x11}), -// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), -// GasUsed: 111111, -// } -// -// receipts := []*types.Receipt{receipt2} -// block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) -// -// if err := core.SWriteBlock(block, receipts); err != nil { -// t.Fatalf("Failed to write block into database: %v", err) -// } -// -// var contractAddressFromReciept string -// for _, receipt := range receipts { -// contractAddressFromReciept = (*types.ReceiptForStorage)(receipt).ContractAddress.String() -// } -// -// sqldb, err := core.DBConnection() -// if (err != nil) { -// panic(err) -// } -// -// for _, tx := range txs { -// txn := core.SGetTransaction(sqldb, tx.Hash().String()) -// byt := []byte(txn) -// var data core.ShyftTxEntryPretty -// json.Unmarshal(byt, &data) -// -// if tx.Hash().String() != data.TxHash { -// t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) -// } -// if contractAddressFromReciept != data.To { -// t.Fatalf("Contract Addr [%v]: Contract addr not found", contractAddressFromReciept) -// } -// if tx.From().String() != data.From { -// t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) -// } -// if tx.Nonce() != data.Nonce { -// t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) -// } -// if tx.Gas() != data.Gas { -// t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) -// } -// if tx.GasPrice().Uint64() != data.GasPrice { -// t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) -// } -// if block.GasLimit() != data.GasLimit { -// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) -// } -// if block.Hash().String() != data.BlockHash { -// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) -// } -// if block.Number().String() != data.BlockNumber { -// t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) -// } -// if tx.Value().String() != data.Amount { -// t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) -// } -// if tx.Cost().Uint64() != data.Cost { -// t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) -// } -// var status string -// if receipt2.Status == 1 { -// status = "SUCCESS" -// } -// if receipt2.Status == 0 { -// status = "FAIL" -// } -// if status != data.Status { -// t.Fatalf("Receipt status [%v]: Receipt status not found", status) -// } -// var isContract bool -// if tx.To() != nil { -// isContract = false -// } else { -// isContract = true -// } -// if isContract != data.IsContract { -// t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) -// } -// } -// ClearTables() -//} -// -//func TestTransactionsToReturnTransactions(t *testing.T) { -// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") -// signer := types.NewEIP155Signer(big.NewInt(2147483647)) -// -// //Nonce, To Address,Value, GasLimit, Gasprice, data -// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) -// mytx,_ := types.SignTx(tx1, signer, key) -// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) -// mytx2,_ := types.SignTx(tx2, signer, key) -// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) -// mytx3,_ := types.SignTx(tx3, signer, key) -// txs := []*types.Transaction{mytx, mytx2, mytx3} -// -// receipt1 := &types.Receipt{ -// Status: types.ReceiptStatusSuccessful, -// CumulativeGasUsed: 1, -// Logs: []*types.Log{ -// {Address: common.BytesToAddress([]byte{0x11})}, -// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, -// }, -// TxHash: common.BytesToHash([]byte{0x11, 0x11}), -// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), -// GasUsed: 111111, -// } -// -// receipts := []*types.Receipt{receipt1} -// block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, receipts) -// -// if err := core.SWriteBlock(block, receipts); err != nil { -// t.Fatalf("Failed to write block into database: %v", err) -// } -// sqldb, err := core.DBConnection() -// if (err != nil) { -// panic(err) -// } -// -// for _, tx := range txs { -// txn := core.SGetTransaction(sqldb, tx.Hash().String()) -// byt := []byte(txn) -// var data core.ShyftTxEntryPretty -// json.Unmarshal(byt, &data) -// -// //TODO age, data -// if tx.Hash().String() != data.TxHash { -// t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) -// } -// if tx.From().String() != data.From { -// t.Fatalf("From Addr [%v]: From addr not found", tx.From().String()) -// } -// if tx.To().String() != data.To { -// t.Fatalf("To Addr [%v]: To addr not found", tx.To().String()) -// } -// if tx.Nonce() != data.Nonce { -// t.Fatalf("Nonce [%v]: Nonce not found", tx.Nonce()) -// } -// if tx.Gas() != data.Gas { -// t.Fatalf("Gas [%v]: Gas not found", tx.Gas()) -// } -// if tx.GasPrice().Uint64() != data.GasPrice { -// t.Fatalf("Gas Price [%v]: Gas price not found", tx.GasPrice().String()) -// } -// if block.GasLimit() != data.GasLimit { -// t.Fatalf("Gas Limit [%v]: Gas limit not found", block.GasLimit()) -// } -// if block.Hash().String() != data.BlockHash { -// t.Fatalf("Block Hash [%v]: Block hash not found", block.Hash().String()) -// } -// if block.Number().String() != data.BlockNumber { -// t.Fatalf("Block Number [%v]: Block number not found", block.Number().String()) -// } -// if tx.Value().String() != data.Amount { -// t.Fatalf("Amount [%v]: Amount not found", tx.Value().String()) -// } -// if tx.Cost().Uint64() != data.Cost { -// t.Fatalf("Cost [%v]: Cost not found", tx.Cost().String()) -// } -// var status string -// if receipt1.Status == 1 { -// status = "SUCCESS" -// } -// if receipt1.Status == 0 { -// status = "FAIL" -// } -// if status != data.Status { -// t.Fatalf("Receipt status [%v]: Receipt status not found", status) -// } -// var isContract bool -// if tx.To() != nil { -// isContract = false -// } else { -// isContract = true -// } -// if isContract != data.IsContract { -// t.Fatalf("isContract [%v]: isContract bool is incorrect", isContract) -// } -// } -// -// if getAllTx := core.SGetAllTransactions(sqldb); len(getAllTx) == 0 { -// t.Fatalf("GetAllTransactions [%v]: GetAllTransactions did not return correctly", getAllTx) -// } -// ClearTables() -//} -// -//func TestAccountsToReturnAccounts(t *testing.T) { -// key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") -// signer := types.NewEIP155Signer(big.NewInt(2147483647)) -// -// //Nonce, To Address,Value, GasLimit, Gasprice, data -// tx1 := types.NewTransaction(1, common.BytesToAddress([]byte{0x11}), big.NewInt(111), 1111, big.NewInt(11111), []byte{0x11, 0x11, 0x11}) -// mytx,_ := types.SignTx(tx1, signer, key) -// tx2 := types.NewTransaction(2, common.BytesToAddress([]byte{0x22}), big.NewInt(222), 2222, big.NewInt(22222), []byte{0x22, 0x22, 0x22}) -// mytx2,_ := types.SignTx(tx2, signer, key) -// tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33}) -// mytx3,_ := types.SignTx(tx3, signer, key) -// txs := []*types.Transaction{mytx, mytx2, mytx3} -// -// receipt1 := &types.Receipt{ -// Status: types.ReceiptStatusSuccessful, -// CumulativeGasUsed: 1, -// Logs: []*types.Log{ -// {Address: common.BytesToAddress([]byte{0x11})}, -// {Address: common.BytesToAddress([]byte{0x01, 0x11})}, -// }, -// TxHash: common.BytesToHash([]byte{0x11, 0x11}), -// ContractAddress: common.BytesToAddress([]byte{0x01, 0x11, 0x11}), -// GasUsed: 111111, -// } -// -// receipts := []*types.Receipt{receipt1} -// block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) -// if err := core.SWriteBlock(block, receipts); err != nil { -// t.Fatalf("Failed to write block into database: %v", err) -// } -// -// sqldb, err := core.DBConnection() -// if (err != nil) { -// panic(err) -// } -// -// -// for _, tx := range txs { -// accountAddrTo := core.SGetAccount(sqldb, tx.To().String()) -// byts := []byte(accountAddrTo) -// var accountDataTo core.SAccounts -// json.Unmarshal(byts, &accountDataTo) -// -// if tx.To().String() != accountDataTo.Addr { -// t.Fatalf("To address [%v]: To address not found", accountDataTo.Addr) -// } -// if tx.Value().String() != accountDataTo.Balance { -// t.Fatalf("To address balance [%v]: To address balance not found", accountDataTo.Balance) -// } -// if strconv.FormatUint(tx.Nonce(), 10) != accountDataTo.TxCountAccount { -// t.Fatalf("To account nonce [%v]: To account nonce not found", accountDataTo.TxCountAccount) -// } -// if getAllAccountTxs := core.SGetAccountTxs(sqldb, tx.To().String()); len(getAllAccountTxs) == 0 { -// t.Fatalf("GetAccountTxs [%v]: GetAccountTxs did not return correctly", getAllAccountTxs) -// } -// } -// -// if getAllAccounts := core.SGetAllAccounts(sqldb); len(getAllAccounts) == 0 { -// t.Fatalf("GetAllAccounts [%v]: GetAllAccounts did not return correctly", getAllAccounts) -// } -// ClearTables() -//} - - - From 1e38e2f577433dac90459ecf1da55baefac347ee Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Tue, 17 Jul 2018 11:04:06 -0400 Subject: [PATCH 21/24] fixed suggested changes --- .gitignore | 1 + console/console_test.go | 6 ++-- core/database_util.go | 3 -- core/db.go | 13 +++++--- core/shyft_database_util.go | 26 +++++++-------- eth/api_tracer.go | 3 +- internal/jsre/jsre.go | 2 -- shyftBlockExplorerApi/handler.go | 54 ++------------------------------ 8 files changed, 29 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index 3561546ca9..720b4764e5 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ $HOME shyftData/* shyft-cli/web3/token_test/node_modules shyft-cli/web3/transfer-through-master/node_modules +shyft-cli/web3/transfer-through-master/build diff --git a/console/console_test.go b/console/console_test.go index 8ff19c5ea1..2f334a1841 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -34,9 +34,9 @@ import ( "github.com/ethereum/go-ethereum/node" ) - const ( - testInstance = "console-tester" - testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" +const ( + testInstance = "console-tester" + testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" ) // hookedPrompter implements UserPrompter to simulate use input via channels. diff --git a/core/database_util.go b/core/database_util.go index 54572ac71b..ca179f6fe1 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -266,9 +266,6 @@ func GetBlockReceipts(db DatabaseReader, hash common.Hash, number uint64) types. // hash to allow retrieving the transaction or receipt by hash. func GetTxLookupEntry(db DatabaseReader, hash common.Hash) (common.Hash, uint64, uint64) { // Load the positional metadata from disk and bail if it fails - //fmt.Println("INSIDE GetTxLookupEntry ") - //fmt.Println("the db is ") - //fmt.Println(db) data, _ := db.Get(append(lookupPrefix, hash.Bytes()...)) if len(data) == 0 { return common.Hash{}, 0, 0 diff --git a/core/db.go b/core/db.go index ff63e3ee9e..48f86ac7a1 100644 --- a/core/db.go +++ b/core/db.go @@ -7,12 +7,16 @@ import ( var blockExplorerDb *sql.DB +const ( + connStr = "user=postgres dbname=shyftdb sslmode=disable" + connStrTest = "user=postgres dbname=shyftdbtest sslmode=disable" +) + func InitDB() (*sql.DB, error){ - var connStr = "user=postgres dbname=shyftdb sslmode=disable" db, err := sql.Open("postgres", connStr) if err != nil { fmt.Println("ERROR OPENING DB, NOT INITIALIZING") - fmt.Println(err) + panic(err) return nil, err } else { blockExplorerDb = db @@ -21,11 +25,10 @@ func InitDB() (*sql.DB, error){ } func InitDBTest() (*sql.DB, error){ - var connStr = "user=postgres dbname=shyftdbtest sslmode=disable" - db, err := sql.Open("postgres", connStr) + db, err := sql.Open("postgres", connStrTest) if err != nil { fmt.Println("ERROR OPENING DB, NOT INITIALIZING") - fmt.Println(err) + panic(err) return nil, err } else { blockExplorerDb = db diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 52aa7e16e6..04f113c99b 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -118,7 +118,7 @@ func SWriteBlock(block *types.Block, receipts []*types.Receipt) error { panic(err) } - rewards := writeMinerRewards(sqldb,block) + rewards := swriteMinerRewards(sqldb,block) coinbase := block.Header().Coinbase.String() number := block.Header().Number.String() gasUsed := block.Header().GasUsed @@ -147,10 +147,10 @@ func SWriteBlock(block *types.Block, receipts []*types.Receipt) error { for _, tx := range block.Transactions() { SwriteTransactions(sqldb, tx, block.Header().Hash(), block.Header().Number.String(), receipts, age, gasLimit) if block.Transactions()[0].To() != nil { - writeFromBalance(sqldb, tx) + swriteFromBalance(sqldb, tx) } if block.Transactions()[0].To() == nil { - writeContractBalance(sqldb, tx) + swriteContractBalance(sqldb, tx) } } } @@ -232,7 +232,7 @@ func SwriteTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.H return nil } -func writeContractBalance(sqldb *sql.DB, tx *types.Transaction) error { +func swriteContractBalance(sqldb *sql.DB, tx *types.Transaction) error { sendAndReceiveData := SendAndReceive{ From: tx.From().Hex(), Amount: tx.Value().String(), @@ -284,7 +284,7 @@ func writeContractBalance(sqldb *sql.DB, tx *types.Transaction) error { return nil } -func writeContractBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, string, string) { +func swriteContractBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, string, string) { sendAndReceiveData := SendAndReceive{ From: tx.From().Hex(), Amount: tx.Value().String(), @@ -304,8 +304,8 @@ func writeContractBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndRe } //writeFromBalance writes senders balance to accounts db -func writeFromBalance(sqldb *sql.DB, tx *types.Transaction) error { - sendAndReceiveData, balanceRec, balanceSen, accountNonceRec, accountNonceSen := writeBalanceHelper(sqldb, tx) +func swriteFromBalance(sqldb *sql.DB, tx *types.Transaction) error { + sendAndReceiveData, balanceRec, balanceSen, accountNonceRec, accountNonceSen := swriteBalanceHelper(sqldb, tx) toAddr := sendAndReceiveData.To fromAddr := sendAndReceiveData.From amount := sendAndReceiveData.Amount @@ -377,7 +377,7 @@ func writeFromBalance(sqldb *sql.DB, tx *types.Transaction) error { return nil } -func writeBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, string, string, string, string) { +func swriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, string, string, string, string) { sendAndReceiveData := SendAndReceive{ To: tx.To().Hex(), From: tx.From().Hex(), @@ -412,7 +412,7 @@ func writeBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, s // uncle blocks, account balance updates based on reorgs, diverges that get dropped. // Reason for this is because the accounts are not deterministic like the block and tx hashes. // @TODO: Calculate reorg -func writeMinerRewards(sqldb *sql.DB, block *types.Block) string { +func swriteMinerRewards(sqldb *sql.DB, block *types.Block) string { minerAddr := block.Coinbase().String() shyftConduitAddress := Rewards.ShyftNetworkConduitAddress.String() // Calculate the total gas used in the block @@ -442,13 +442,13 @@ func writeMinerRewards(sqldb *sql.DB, block *types.Block) string { uncleAddrs = append(uncleAddrs, uncle.Coinbase.String()) } - storeReward(sqldb, minerAddr, totalMinerReward) - storeReward(sqldb, shyftConduitAddress, Rewards.ShyftNetworkBlockReward) + sstoreReward(sqldb, minerAddr, totalMinerReward) + sstoreReward(sqldb, shyftConduitAddress, Rewards.ShyftNetworkBlockReward) var uncRewards = new(big.Int) for i := 0; i < len(uncleAddrs); i++ { uncRewards := uncleRewards[i] fmt.Println(uncRewards) - storeReward(sqldb, uncleAddrs[i], uncleRewards[i]) + sstoreReward(sqldb, uncleAddrs[i], uncleRewards[i]) } fullRewardValue := new(big.Int) @@ -458,7 +458,7 @@ func writeMinerRewards(sqldb *sql.DB, block *types.Block) string { return fullRewardValue.String() } -func storeReward(sqldb *sql.DB, address string, reward *big.Int) { +func sstoreReward(sqldb *sql.DB, address string, reward *big.Int) { // Check if address exists var addressBalance string addressExistsStatement := `SELECT balance from accounts WHERE addr = ($1)` diff --git a/eth/api_tracer.go b/eth/api_tracer.go index ea6c0556b6..e40bfe514c 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -124,7 +124,7 @@ func (api *PrivateDebugAPI) TraceChain(ctx context.Context, start, end rpc.Block // traceChain configures a new tracer according to the provided configuration, and // executes all the transactions contained within. The return value will be one item // per transaction, dependent on the requestd tracer. - func (api *PrivateDebugAPI) traceChain(ctx context.Context, start, end *types.Block, config *TraceConfig) (*rpc.Subscription, error) { +func (api *PrivateDebugAPI) traceChain(ctx context.Context, start, end *types.Block, config *TraceConfig) (*rpc.Subscription, error) { // Tracing a chain is a **long** operation, only do with subscriptions notifier, supported := rpc.NotifierFromContext(ctx) if !supported { @@ -532,7 +532,6 @@ func (api *PrivateDebugAPI) computeStateDB(block *types.Block, reexec uint64) (* // TraceTransaction returns the structured logs created during the execution of EVM // and returns them as a JSON object. func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, hash common.Hash, config *TraceConfig) (interface{}, error) { - // NOTE:SHYFT tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) if tx == nil { return nil, fmt.Errorf("transaction %x not found", hash) diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 7a7ba2efc9..f05865eca6 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -188,8 +188,6 @@ loop: arguments = make([]interface{}, 1) } arguments[0] = timer.call.ArgumentList[0] - fmt.Println("The arguments are") - fmt.Println(arguments) _, err := vm.Call(`Function.call.call`, nil, arguments...) if err != nil { fmt.Println("js error:", err, arguments) diff --git a/shyftBlockExplorerApi/handler.go b/shyftBlockExplorerApi/handler.go index 9f368d6748..830b8999f2 100644 --- a/shyftBlockExplorerApi/handler.go +++ b/shyftBlockExplorerApi/handler.go @@ -18,11 +18,6 @@ import ( func GetTransaction(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) txHash := vars["txHash"] - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} sqldb, err := core.DBConnection() getTxResponse := core.SGetTransaction(sqldb, txHash) @@ -39,11 +34,6 @@ func GetTransaction(w http.ResponseWriter, r *http.Request) { // GetAllTransactions gets txs func GetAllTransactions(w http.ResponseWriter, r *http.Request) { - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} sqldb, err := core.DBConnection() @@ -54,7 +44,6 @@ func GetAllTransactions(w http.ResponseWriter, r *http.Request) { return } - w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.WriteHeader(http.StatusOK) @@ -65,11 +54,6 @@ func GetAllTransactions(w http.ResponseWriter, r *http.Request) { func GetAllTransactionsFromBlock(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) blockNumber := vars["blockNumber"] - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} sqldb, err := core.DBConnection() @@ -89,11 +73,6 @@ func GetAllTransactionsFromBlock(w http.ResponseWriter, r *http.Request) { func GetAllBlocksMinedByAddress(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) coinbase := vars["coinbase"] - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} sqldb, err := core.DBConnection() @@ -114,11 +93,6 @@ func GetAllBlocksMinedByAddress(w http.ResponseWriter, r *http.Request) { func GetAccount(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) address := vars["address"] - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} sqldb, err := core.DBConnection() @@ -139,11 +113,6 @@ func GetAccount(w http.ResponseWriter, r *http.Request) { func GetAccountTxs(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) address := vars["address"] - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} sqldb, err := core.DBConnection() @@ -162,11 +131,6 @@ func GetAccountTxs(w http.ResponseWriter, r *http.Request) { // GetAllAccounts gets balances func GetAllAccounts(w http.ResponseWriter, r *http.Request) { - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} sqldb, err := core.DBConnection() @@ -185,11 +149,7 @@ func GetAllAccounts(w http.ResponseWriter, r *http.Request) { func GetBlock(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) blockNumber := vars["blockNumber"] - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} + sqldb, err := core.DBConnection() getBlockResponse := core.SGetBlock(sqldb, blockNumber) @@ -206,11 +166,7 @@ func GetBlock(w http.ResponseWriter, r *http.Request) { // GetAllBlocks response func GetAllBlocks(w http.ResponseWriter, r *http.Request) { - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} + sqldb, err := core.DBConnection() block3 := core.SGetAllBlocks(sqldb) if err != nil { @@ -223,11 +179,7 @@ func GetAllBlocks(w http.ResponseWriter, r *http.Request) { } func GetRecentBlock(w http.ResponseWriter, r *http.Request) { - //connStr := "user=postgres dbname=shyftdb sslmode=disable" - //blockExplorerDb, err := sql.Open("postgres", connStr) - //if err != nil { - // return - //} + sqldb, err := core.DBConnection() mostRecentBlock := core.SGetRecentBlock(sqldb) From 38645f27f3828b5934ee9765af319cadcf5f8cf8 Mon Sep 17 00:00:00 2001 From: greg Date: Wed, 18 Jul 2018 15:00:14 -0400 Subject: [PATCH 22/24] Move documentation into main repo --- shyft_documentation/.editorconfig | 15 + shyft_documentation/.github/ISSUE_TEMPLATE.md | 18 + .../.github/PULL_REQUEST_TEMPLATE.md | 5 + shyft_documentation/.gitignore | 24 + shyft_documentation/.travis.yml | 10 + shyft_documentation/CHANGELOG.md | 137 + shyft_documentation/CODE_OF_CONDUCT.md | 46 + shyft_documentation/Gemfile | 11 + shyft_documentation/Gemfile.lock | 129 + shyft_documentation/LICENSE | 13 + shyft_documentation/README.md | 19 + shyft_documentation/Vagrantfile | 41 + shyft_documentation/config.rb | 58 + shyft_documentation/deploy.sh | 215 + shyft_documentation/font-selection.json | 148 + shyft_documentation/lib/multilang.rb | 16 + .../lib/nesting_unique_head.rb | 22 + shyft_documentation/lib/toc_data.rb | 30 + shyft_documentation/lib/unique_head.rb | 24 + shyft_documentation/source/fonts/slate.eot | Bin 0 -> 1876 bytes shyft_documentation/source/fonts/slate.svg | 14 + shyft_documentation/source/fonts/slate.ttf | Bin 0 -> 1720 bytes shyft_documentation/source/fonts/slate.woff | Bin 0 -> 1796 bytes shyft_documentation/source/fonts/slate.woff2 | Bin 0 -> 796 bytes shyft_documentation/source/images/logo.png | Bin 0 -> 22317 bytes shyft_documentation/source/images/navbar.png | Bin 0 -> 96 bytes .../source/includes/_errors.md | 22 + shyft_documentation/source/index.html.md | 131 + shyft_documentation/source/javascripts/all.js | 2 + .../source/javascripts/all_nosearch.js | 16 + .../source/javascripts/app/_lang.js | 164 + .../source/javascripts/app/_search.js | 98 + .../source/javascripts/app/_toc.js | 114 + .../source/javascripts/lib/_energize.js | 169 + .../javascripts/lib/_imagesloaded.min.js | 7 + .../javascripts/lib/_jquery.highlight.js | 108 + .../source/javascripts/lib/_jquery.js | 9831 +++++++++++++++++ .../source/javascripts/lib/_lunr.js | 1910 ++++ shyft_documentation/source/layouts/layout.erb | 116 + .../source/stylesheets/_icon-font.scss | 38 + .../source/stylesheets/_normalize.scss | 427 + .../source/stylesheets/_rtl.scss | 140 + .../source/stylesheets/_variables.scss | 103 + .../source/stylesheets/print.css.scss | 147 + .../source/stylesheets/screen.css.scss | 615 ++ 45 files changed, 15153 insertions(+) create mode 100644 shyft_documentation/.editorconfig create mode 100644 shyft_documentation/.github/ISSUE_TEMPLATE.md create mode 100644 shyft_documentation/.github/PULL_REQUEST_TEMPLATE.md create mode 100644 shyft_documentation/.gitignore create mode 100644 shyft_documentation/.travis.yml create mode 100644 shyft_documentation/CHANGELOG.md create mode 100644 shyft_documentation/CODE_OF_CONDUCT.md create mode 100644 shyft_documentation/Gemfile create mode 100644 shyft_documentation/Gemfile.lock create mode 100644 shyft_documentation/LICENSE create mode 100644 shyft_documentation/README.md create mode 100644 shyft_documentation/Vagrantfile create mode 100644 shyft_documentation/config.rb create mode 100755 shyft_documentation/deploy.sh create mode 100755 shyft_documentation/font-selection.json create mode 100644 shyft_documentation/lib/multilang.rb create mode 100644 shyft_documentation/lib/nesting_unique_head.rb create mode 100644 shyft_documentation/lib/toc_data.rb create mode 100644 shyft_documentation/lib/unique_head.rb create mode 100644 shyft_documentation/source/fonts/slate.eot create mode 100644 shyft_documentation/source/fonts/slate.svg create mode 100644 shyft_documentation/source/fonts/slate.ttf create mode 100644 shyft_documentation/source/fonts/slate.woff create mode 100644 shyft_documentation/source/fonts/slate.woff2 create mode 100644 shyft_documentation/source/images/logo.png create mode 100644 shyft_documentation/source/images/navbar.png create mode 100644 shyft_documentation/source/includes/_errors.md create mode 100644 shyft_documentation/source/index.html.md create mode 100644 shyft_documentation/source/javascripts/all.js create mode 100644 shyft_documentation/source/javascripts/all_nosearch.js create mode 100644 shyft_documentation/source/javascripts/app/_lang.js create mode 100644 shyft_documentation/source/javascripts/app/_search.js create mode 100644 shyft_documentation/source/javascripts/app/_toc.js create mode 100644 shyft_documentation/source/javascripts/lib/_energize.js create mode 100644 shyft_documentation/source/javascripts/lib/_imagesloaded.min.js create mode 100644 shyft_documentation/source/javascripts/lib/_jquery.highlight.js create mode 100644 shyft_documentation/source/javascripts/lib/_jquery.js create mode 100644 shyft_documentation/source/javascripts/lib/_lunr.js create mode 100644 shyft_documentation/source/layouts/layout.erb create mode 100644 shyft_documentation/source/stylesheets/_icon-font.scss create mode 100644 shyft_documentation/source/stylesheets/_normalize.scss create mode 100644 shyft_documentation/source/stylesheets/_rtl.scss create mode 100644 shyft_documentation/source/stylesheets/_variables.scss create mode 100644 shyft_documentation/source/stylesheets/print.css.scss create mode 100644 shyft_documentation/source/stylesheets/screen.css.scss diff --git a/shyft_documentation/.editorconfig b/shyft_documentation/.editorconfig new file mode 100644 index 0000000000..7871389c33 --- /dev/null +++ b/shyft_documentation/.editorconfig @@ -0,0 +1,15 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# Top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true + +[*.rb] +charset = utf-8 diff --git a/shyft_documentation/.github/ISSUE_TEMPLATE.md b/shyft_documentation/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000000..c026a82da6 --- /dev/null +++ b/shyft_documentation/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,18 @@ + + +Operating system: ✍️ TODO +Last upstream commit (run `git log --author="Robert Lord" | head -n 1`): ✍️ TODO +Browser version(s): ✍️ TODO +Ruby version (run `ruby -v`): ✍️ TODO + +--- + +✍️ TODO write your issue here diff --git a/shyft_documentation/.github/PULL_REQUEST_TEMPLATE.md b/shyft_documentation/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..eebe789aa0 --- /dev/null +++ b/shyft_documentation/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/shyft_documentation/.gitignore b/shyft_documentation/.gitignore new file mode 100644 index 0000000000..1050158356 --- /dev/null +++ b/shyft_documentation/.gitignore @@ -0,0 +1,24 @@ +*.gem +*.rbc +.bundle +.config +coverage +InstalledFiles +lib/bundler/man +pkg +rdoc +spec/reports +test/tmp +test/version_tmp +tmp +*.DS_STORE +build/ +.cache +.vagrant +.sass-cache + +# YARD artifacts +.yardoc +_yardoc +doc/ +.idea/ diff --git a/shyft_documentation/.travis.yml b/shyft_documentation/.travis.yml new file mode 100644 index 0000000000..0d6d210d94 --- /dev/null +++ b/shyft_documentation/.travis.yml @@ -0,0 +1,10 @@ +sudo: false + +language: ruby + +rvm: + - 2.3.3 + - 2.4.0 + +cache: bundler +script: bundle exec middleman build diff --git a/shyft_documentation/CHANGELOG.md b/shyft_documentation/CHANGELOG.md new file mode 100644 index 0000000000..619b6770ec --- /dev/null +++ b/shyft_documentation/CHANGELOG.md @@ -0,0 +1,137 @@ +# Changelog + +## Version 2.2 + +*January 19, 2018* + +- Fixes bugs with some non-roman languages not generating unique headers +- Adds editorconfig, thanks to [Jay Thomas](https://github.com/jaythomas) +- Adds optional `NestingUniqueHeadCounter`, thanks to [Vladimir Morozov](https://github.com/greenhost87) +- Small fixes to typos and language, thx [Emir Ribić](https://github.com/ribice), [Gregor Martynus](https://github.com/gr2m), and [Martius](https://github.com/martiuslim)! +- Adds links to Spectrum chat for questions in README and ISSUE_TEMPLATE + +## Version 2.1 + +*October 30, 2017* + +- Right-to-left text stylesheet option, thanks to [Mohammad Hossein Rabiee](https://github.com/mhrabiee) +- Fix for HTML5 history state bug, thanks to [Zach Toolson](https://github.com/ztoolson) +- Small styling changes, typo fixes, small bug fixes from [Marian Friedmann](https://github.com/rnarian), [Ben Wilhelm](https://github.com/benwilhelm), [Fouad Matin](https://github.com/fouad), [Nicolas Bonduel](https://github.com/NicolasBonduel), [Christian Oliff](https://github.com/coliff) + +Thanks to everyone who submitted PRs for this version! + +## Version 2.0 + +*July 17, 2017* + +- All-new statically generated table of contents + - Should be much faster loading and scrolling for large pages + - Smaller Javascript file sizes + - Avoids the problem with the last link in the ToC not ever highlighting if the section was shorter than the page + - Fixes control-click not opening in a new page + - Automatically updates the HTML title as you scroll +- Updated design + - New default colors! + - New spacings and sizes! + - System-default typefaces, just like GitHub +- Added search input delay on large corpuses to reduce lag +- We even bumped the major version cause hey, why not? +- Various small bug fixes + +Thanks to everyone who helped debug or wrote code for this version! It was a serious community effort, and I couldn't have done it alone. + +## Version 1.5 + +*February 23, 2017* + +- Add [multiple tabs per programming language](https://github.com/lord/slate/wiki/Multiple-language-tabs-per-programming-language) feature +- Upgrade Middleman to add Ruby 1.4.0 compatibility +- Switch default code highlighting color scheme to better highlight JSON +- Various small typo and bug fixes + +## Version 1.4 + +*November 24, 2016* + +- Upgrade Middleman and Rouge gems, should hopefully solve a number of bugs +- Update some links in README +- Fix broken Vagrant startup script +- Fix some problems with deploy.sh help message +- Fix bug with language tabs not hiding properly if no error +- Add `!default` to SASS variables +- Fix bug with logo margin +- Bump tested Ruby versions in .travis.yml + +## Version 1.3.3 + +*June 11, 2016* + +Documentation and example changes. + +## Version 1.3.2 + +*February 3, 2016* + +A small bugfix for slightly incorrect background colors on code samples in some cases. + +## Version 1.3.1 + +*January 31, 2016* + +A small bugfix for incorrect whitespace in code blocks. + +## Version 1.3 + +*January 27, 2016* + +We've upgraded Middleman and a number of other dependencies, which should fix quite a few bugs. + +Instead of `rake build` and `rake deploy`, you should now run `bundle exec middleman build --clean` to build your server, and `./deploy.sh` to deploy it to Github Pages. + +## Version 1.2 + +*June 20, 2015* + +**Fixes:** + +- Remove crash on invalid languages +- Update Tocify to scroll to the highlighted header in the Table of Contents +- Fix variable leak and update search algorithms +- Update Python examples to be valid Python +- Update gems +- More misc. bugfixes of Javascript errors +- Add Dockerfile +- Remove unused gems +- Optimize images, fonts, and generated asset files +- Add chinese font support +- Remove RedCarpet header ID patch +- Update language tabs to not disturb existing query strings + +## Version 1.1 + +*July 27, 2014* + +**Fixes:** + +- Finally, a fix for the redcarpet upgrade bug + +## Version 1.0 + +*July 2, 2014* + +[View Issues](https://github.com/tripit/slate/issues?milestone=1&state=closed) + +**Features:** + +- Responsive designs for phones and tablets +- Started tagging versions + +**Fixes:** + +- Fixed 'unrecognized expression' error +- Fixed #undefined hash bug +- Fixed bug where the current language tab would be unselected +- Fixed bug where tocify wouldn't highlight the current section while searching +- Fixed bug where ids of header tags would have special characters that caused problems +- Updated layout so that pages with disabled search wouldn't load search.js +- Cleaned up Javascript diff --git a/shyft_documentation/CODE_OF_CONDUCT.md b/shyft_documentation/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..cc17fd98d5 --- /dev/null +++ b/shyft_documentation/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@lord.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/shyft_documentation/Gemfile b/shyft_documentation/Gemfile new file mode 100644 index 0000000000..dae5e50f78 --- /dev/null +++ b/shyft_documentation/Gemfile @@ -0,0 +1,11 @@ +ruby '>=2.3.1' +source 'https://rubygems.org' + +# Middleman +gem 'middleman', '~>4.2.1' +gem 'middleman-syntax', '~> 3.0.0' +gem 'middleman-autoprefixer', '~> 2.7.0' +gem "middleman-sprockets", "~> 4.1.0" +gem 'rouge', '~> 2.0.5' +gem 'redcarpet', '~> 3.4.0' +gem 'nokogiri', '~> 1.6.8' diff --git a/shyft_documentation/Gemfile.lock b/shyft_documentation/Gemfile.lock new file mode 100644 index 0000000000..1fc04a98db --- /dev/null +++ b/shyft_documentation/Gemfile.lock @@ -0,0 +1,129 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + autoprefixer-rails (6.6.1) + execjs + backports (3.6.8) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) + concurrent-ruby (1.0.4) + contracts (0.13.0) + dotenv (2.2.0) + erubis (2.7.0) + execjs (2.7.0) + fast_blank (1.0.0) + fastimage (2.0.1) + addressable (~> 2) + ffi (1.9.17) + haml (4.0.7) + tilt + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.5.1) + i18n (0.7.0) + kramdown (1.13.2) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + memoist (0.15.0) + middleman (4.2.1) + coffee-script (~> 2.2) + compass-import-once (= 1.0.5) + haml (>= 4.0.5) + kramdown (~> 1.2) + middleman-cli (= 4.2.1) + middleman-core (= 4.2.1) + sass (>= 3.4.0, < 4.0) + middleman-autoprefixer (2.7.1) + autoprefixer-rails (>= 6.5.2, < 7.0.0) + middleman-core (>= 3.3.3) + middleman-cli (4.2.1) + thor (>= 0.17.0, < 2.0) + middleman-core (4.2.1) + activesupport (>= 4.2, < 5.1) + addressable (~> 2.3) + backports (~> 3.6) + bundler (~> 1.1) + contracts (~> 0.13.0) + dotenv + erubis + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) + i18n (~> 0.7.0) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.13.0) + parallel + rack (>= 1.4.5, < 3) + sass (>= 3.4) + servolux + tilt (~> 2.0) + uglifier (~> 3.0) + middleman-sprockets (4.1.0) + middleman-core (~> 4.0) + sprockets (>= 3.0) + middleman-syntax (3.0.0) + middleman-core (>= 3.2) + rouge (~> 2.0) + mini_portile2 (2.1.0) + minitest (5.10.1) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + padrino-helpers (0.13.3.3) + i18n (~> 0.6, >= 0.6.7) + padrino-support (= 0.13.3.3) + tilt (>= 1.4.1, < 3) + padrino-support (0.13.3.3) + activesupport (>= 3.1) + parallel (1.10.0) + public_suffix (2.0.5) + rack (2.0.1) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + redcarpet (3.4.0) + rouge (2.0.7) + sass (3.4.23) + servolux (0.12.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + thor (0.19.4) + thread_safe (0.3.5) + tilt (2.0.6) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.4) + execjs (>= 0.3.0, < 3) + +PLATFORMS + ruby + +DEPENDENCIES + middleman (~> 4.2.1) + middleman-autoprefixer (~> 2.7.0) + middleman-sprockets (~> 4.1.0) + middleman-syntax (~> 3.0.0) + nokogiri (~> 1.6.8) + redcarpet (~> 3.4.0) + rouge (~> 2.0.5) + +RUBY VERSION + ruby 2.3.3p222 + +BUNDLED WITH + 1.14.5 diff --git a/shyft_documentation/LICENSE b/shyft_documentation/LICENSE new file mode 100644 index 0000000000..5ceddf59f6 --- /dev/null +++ b/shyft_documentation/LICENSE @@ -0,0 +1,13 @@ +Copyright 2008-2013 Concur Technologies, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); you may +not use this file except in compliance with the License. You may obtain +a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. \ No newline at end of file diff --git a/shyft_documentation/README.md b/shyft_documentation/README.md new file mode 100644 index 0000000000..65a699948e --- /dev/null +++ b/shyft_documentation/README.md @@ -0,0 +1,19 @@ +# shyft_geththemessage +shyft block explorer api & connectivity + +Getting Set Up +Fork this repository on GitHub. +Clone your forked repository (not our original one) to your hard drive with git clone https://github.com/YOURUSERNAME/slate.git +cd slate +Initialize and start Slate. You can either do this locally, or with Vagrant: +# either run this to run locally +bundle install +bundle exec middleman server + +# OR run this to run with vagrant +vagrant up +You can now see the docs at http://localhost:4567. Whoa! That was fast! + +Now that Slate is all set up on your machine, you'll probably want to learn more about editing Slate markdown, or how to publish your docs. + +If you'd prefer to use Docker, instructions are available in the wiki. diff --git a/shyft_documentation/Vagrantfile b/shyft_documentation/Vagrantfile new file mode 100644 index 0000000000..2fccb7c4b9 --- /dev/null +++ b/shyft_documentation/Vagrantfile @@ -0,0 +1,41 @@ +Vagrant.configure(2) do |config| + config.vm.box = "ubuntu/trusty64" + config.vm.network :forwarded_port, guest: 4567, host: 4567 + + config.vm.provision "bootstrap", + type: "shell", + inline: <<-SHELL + sudo apt-add-repository ppa:brightbox/ruby-ng + sudo apt-get update + sudo apt-get install -yq ruby2.4 ruby2.4-dev + sudo apt-get install -yq pkg-config build-essential nodejs git libxml2-dev libxslt-dev + sudo apt-get autoremove -yq + gem2.4 install --no-ri --no-rdoc bundler + SHELL + + # add the local user git config to the vm + config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig" + + config.vm.provision "install", + type: "shell", + privileged: false, + inline: <<-SHELL + echo "==============================================" + echo "Installing app dependencies" + cd /vagrant + bundle config build.nokogiri --use-system-libraries + bundle install + SHELL + + config.vm.provision "run", + type: "shell", + privileged: false, + run: "always", + inline: <<-SHELL + echo "==============================================" + echo "Starting up middleman at http://localhost:4567" + echo "If it does not come up, check the ~/middleman.log file for any error messages" + cd /vagrant + bundle exec middleman server --watcher-force-polling --watcher-latency=1 &> ~/middleman.log & + SHELL +end \ No newline at end of file diff --git a/shyft_documentation/config.rb b/shyft_documentation/config.rb new file mode 100644 index 0000000000..0c501c37b3 --- /dev/null +++ b/shyft_documentation/config.rb @@ -0,0 +1,58 @@ +# Unique header generation +require './lib/unique_head.rb' + +# Markdown +set :markdown_engine, :redcarpet +set :markdown, + fenced_code_blocks: true, + smartypants: true, + disable_indented_code_blocks: true, + prettify: true, + tables: true, + with_toc_data: true, + no_intra_emphasis: true, + renderer: UniqueHeadCounter + +# Assets +set :css_dir, 'stylesheets' +set :js_dir, 'javascripts' +set :images_dir, 'images' +set :fonts_dir, 'fonts' + +# Activate the syntax highlighter +activate :syntax +ready do + require './lib/multilang.rb' +end + +activate :sprockets + +activate :autoprefixer do |config| + config.browsers = ['last 2 version', 'Firefox ESR'] + config.cascade = false + config.inline = true +end + +# Github pages require relative links +activate :relative_assets +set :relative_links, true + +# Build Configuration +configure :build do + # If you're having trouble with Middleman hanging, commenting + # out the following two lines has been known to help + activate :minify_css + activate :minify_javascript + # activate :relative_assets + # activate :asset_hash + # activate :gzip + activate :livereload +end + +# Deploy Configuration +# If you want Middleman to listen on a different port, you can set that below +set :port, 4567 + +helpers do + require './lib/toc_data.rb' +end diff --git a/shyft_documentation/deploy.sh b/shyft_documentation/deploy.sh new file mode 100755 index 0000000000..95fd1843d4 --- /dev/null +++ b/shyft_documentation/deploy.sh @@ -0,0 +1,215 @@ +#!/usr/bin/env bash +set -o errexit #abort if any command fails +me=$(basename "$0") + +help_message="\ +Usage: $me [-c FILE] [] +Deploy generated files to a git branch. + +Options: + + -h, --help Show this help information. + -v, --verbose Increase verbosity. Useful for debugging. + -e, --allow-empty Allow deployment of an empty directory. + -m, --message MESSAGE Specify the message used when committing on the + deploy branch. + -n, --no-hash Don't append the source commit's hash to the deploy + commit's message. + --source-only Only build but not push + --push-only Only push but not build +" + + +run_build() { + bundle exec middleman build --clean +} + +parse_args() { + # Set args from a local environment file. + if [ -e ".env" ]; then + source .env + fi + + # Parse arg flags + # If something is exposed as an environment variable, set/overwrite it + # here. Otherwise, set/overwrite the internal variable instead. + while : ; do + if [[ $1 = "-h" || $1 = "--help" ]]; then + echo "$help_message" + return 0 + elif [[ $1 = "-v" || $1 = "--verbose" ]]; then + verbose=true + shift + elif [[ $1 = "-e" || $1 = "--allow-empty" ]]; then + allow_empty=true + shift + elif [[ ( $1 = "-m" || $1 = "--message" ) && -n $2 ]]; then + commit_message=$2 + shift 2 + elif [[ $1 = "-n" || $1 = "--no-hash" ]]; then + GIT_DEPLOY_APPEND_HASH=false + shift + else + break + fi + done + + # Set internal option vars from the environment and arg flags. All internal + # vars should be declared here, with sane defaults if applicable. + + # Source directory & target branch. + deploy_directory=build + deploy_branch=gh-pages + + #if no user identity is already set in the current git environment, use this: + default_username=${GIT_DEPLOY_USERNAME:-deploy.sh} + default_email=${GIT_DEPLOY_EMAIL:-} + + #repository to deploy to. must be readable and writable. + repo=origin + + #append commit hash to the end of message by default + append_hash=${GIT_DEPLOY_APPEND_HASH:-true} +} + +main() { + parse_args "$@" + + enable_expanded_output + + if ! git diff --exit-code --quiet --cached; then + echo Aborting due to uncommitted changes in the index >&2 + return 1 + fi + + commit_title=`git log -n 1 --format="%s" HEAD` + commit_hash=` git log -n 1 --format="%H" HEAD` + + #default commit message uses last title if a custom one is not supplied + if [[ -z $commit_message ]]; then + commit_message="publish: $commit_title" + fi + + #append hash to commit message unless no hash flag was found + if [ $append_hash = true ]; then + commit_message="$commit_message"$'\n\n'"generated from commit $commit_hash" + fi + + previous_branch=`git rev-parse --abbrev-ref HEAD` + + if [ ! -d "$deploy_directory" ]; then + echo "Deploy directory '$deploy_directory' does not exist. Aborting." >&2 + return 1 + fi + + # must use short form of flag in ls for compatibility with OS X and BSD + if [[ -z `ls -A "$deploy_directory" 2> /dev/null` && -z $allow_empty ]]; then + echo "Deploy directory '$deploy_directory' is empty. Aborting. If you're sure you want to deploy an empty tree, use the --allow-empty / -e flag." >&2 + return 1 + fi + + if git ls-remote --exit-code $repo "refs/heads/$deploy_branch" ; then + # deploy_branch exists in $repo; make sure we have the latest version + + disable_expanded_output + git fetch --force $repo $deploy_branch:$deploy_branch + enable_expanded_output + fi + + # check if deploy_branch exists locally + if git show-ref --verify --quiet "refs/heads/$deploy_branch" + then incremental_deploy + else initial_deploy + fi + + restore_head +} + +initial_deploy() { + git --work-tree "$deploy_directory" checkout --orphan $deploy_branch + git --work-tree "$deploy_directory" add --all + commit+push +} + +incremental_deploy() { + #make deploy_branch the current branch + git symbolic-ref HEAD refs/heads/$deploy_branch + #put the previously committed contents of deploy_branch into the index + git --work-tree "$deploy_directory" reset --mixed --quiet + git --work-tree "$deploy_directory" add --all + + set +o errexit + diff=$(git --work-tree "$deploy_directory" diff --exit-code --quiet HEAD --)$? + set -o errexit + case $diff in + 0) echo No changes to files in $deploy_directory. Skipping commit.;; + 1) commit+push;; + *) + echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to master, use: git symbolic-ref HEAD refs/heads/master && git reset --mixed >&2 + return $diff + ;; + esac +} + +commit+push() { + set_user_id + git --work-tree "$deploy_directory" commit -m "$commit_message" + + disable_expanded_output + #--quiet is important here to avoid outputting the repo URL, which may contain a secret token + git push --quiet $repo $deploy_branch + enable_expanded_output +} + +#echo expanded commands as they are executed (for debugging) +enable_expanded_output() { + if [ $verbose ]; then + set -o xtrace + set +o verbose + fi +} + +#this is used to avoid outputting the repo URL, which may contain a secret token +disable_expanded_output() { + if [ $verbose ]; then + set +o xtrace + set -o verbose + fi +} + +set_user_id() { + if [[ -z `git config user.name` ]]; then + git config user.name "$default_username" + fi + if [[ -z `git config user.email` ]]; then + git config user.email "$default_email" + fi +} + +restore_head() { + if [[ $previous_branch = "HEAD" ]]; then + #we weren't on any branch before, so just set HEAD back to the commit it was on + git update-ref --no-deref HEAD $commit_hash $deploy_branch + else + git symbolic-ref HEAD refs/heads/$previous_branch + fi + + git reset --mixed +} + +filter() { + sed -e "s|$repo|\$repo|g" +} + +sanitize() { + "$@" 2> >(filter 1>&2) | filter +} + +if [[ $1 = --source-only ]]; then + run_build +elif [[ $1 = --push-only ]]; then + main "$@" +else + run_build + main "$@" +fi diff --git a/shyft_documentation/font-selection.json b/shyft_documentation/font-selection.json new file mode 100755 index 0000000000..5e78f5d862 --- /dev/null +++ b/shyft_documentation/font-selection.json @@ -0,0 +1,148 @@ +{ + "IcoMoonType": "selection", + "icons": [ + { + "icon": { + "paths": [ + "M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM512 785.714v-108.571q0-8-5.143-13.429t-12.571-5.429h-109.714q-7.429 0-13.143 5.714t-5.714 13.143v108.571q0 7.429 5.714 13.143t13.143 5.714h109.714q7.429 0 12.571-5.429t5.143-13.429zM510.857 589.143l10.286-354.857q0-6.857-5.714-10.286-5.714-4.571-13.714-4.571h-125.714q-8 0-13.714 4.571-5.714 3.429-5.714 10.286l9.714 354.857q0 5.714 5.714 10t13.714 4.286h105.714q8 0 13.429-4.286t6-10z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "exclamation-circle" + ], + "defaultCode": 61546, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 100, + "order": 4, + "prevSize": 28, + "code": 58880, + "name": "exclamation-sign", + "ligatures": "" + }, + "setIdx": 0, + "iconIdx": 0 + }, + { + "icon": { + "paths": [ + "M585.143 786.286v-91.429q0-8-5.143-13.143t-13.143-5.143h-54.857v-292.571q0-8-5.143-13.143t-13.143-5.143h-182.857q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h54.857v182.857h-54.857q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h256q8 0 13.143-5.143t5.143-13.143zM512 274.286v-91.429q0-8-5.143-13.143t-13.143-5.143h-109.714q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h109.714q8 0 13.143-5.143t5.143-13.143zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "info-circle" + ], + "defaultCode": 61530, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 85, + "order": 3, + "name": "info-sign", + "prevSize": 28, + "code": 58882 + }, + "setIdx": 0, + "iconIdx": 2 + }, + { + "icon": { + "paths": [ + "M733.714 419.429q0-16-10.286-26.286l-52-51.429q-10.857-10.857-25.714-10.857t-25.714 10.857l-233.143 232.571-129.143-129.143q-10.857-10.857-25.714-10.857t-25.714 10.857l-52 51.429q-10.286 10.286-10.286 26.286 0 15.429 10.286 25.714l206.857 206.857q10.857 10.857 25.714 10.857 15.429 0 26.286-10.857l310.286-310.286q10.286-10.286 10.286-25.714zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "check-circle" + ], + "defaultCode": 61528, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 83, + "order": 9, + "prevSize": 28, + "code": 58886, + "name": "ok-sign" + }, + "setIdx": 0, + "iconIdx": 6 + }, + { + "icon": { + "paths": [ + "M658.286 475.429q0-105.714-75.143-180.857t-180.857-75.143-180.857 75.143-75.143 180.857 75.143 180.857 180.857 75.143 180.857-75.143 75.143-180.857zM950.857 950.857q0 29.714-21.714 51.429t-51.429 21.714q-30.857 0-51.429-21.714l-196-195.429q-102.286 70.857-228 70.857-81.714 0-156.286-31.714t-128.571-85.714-85.714-128.571-31.714-156.286 31.714-156.286 85.714-128.571 128.571-85.714 156.286-31.714 156.286 31.714 128.571 85.714 85.714 128.571 31.714 156.286q0 125.714-70.857 228l196 196q21.143 21.143 21.143 51.429z" + ], + "width": 951, + "attrs": [], + "isMulticolor": false, + "tags": [ + "search" + ], + "defaultCode": 61442, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 2, + "order": 1, + "prevSize": 28, + "code": 58887, + "name": "icon-search" + }, + "setIdx": 0, + "iconIdx": 7 + } + ], + "height": 1024, + "metadata": { + "name": "slate", + "license": "SIL OFL 1.1" + }, + "preferences": { + "showGlyphs": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "icon-", + "metadata": { + "fontFamily": "slate", + "majorVersion": 1, + "minorVersion": 0, + "description": "Based on FontAwesome", + "license": "SIL OFL 1.1" + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "resetPoint": 58880, + "showSelector": false, + "selector": "class", + "classSelector": ".icon", + "showMetrics": false, + "showMetadata": true, + "showVersion": true, + "ie7": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 4473924, + "bgColor": 16777215 + }, + "historySize": 100, + "showCodes": true, + "gridSize": 16, + "showLiga": false + } +} diff --git a/shyft_documentation/lib/multilang.rb b/shyft_documentation/lib/multilang.rb new file mode 100644 index 0000000000..36fbe5b1f0 --- /dev/null +++ b/shyft_documentation/lib/multilang.rb @@ -0,0 +1,16 @@ +module Multilang + def block_code(code, full_lang_name) + if full_lang_name + parts = full_lang_name.split('--') + rouge_lang_name = (parts) ? parts[0] : "" # just parts[0] here causes null ref exception when no language specified + super(code, rouge_lang_name).sub("highlight #{rouge_lang_name}") do |match| + match + " tab-" + full_lang_name + end + else + super(code, full_lang_name) + end + end +end + +require 'middleman-core/renderers/redcarpet' +Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, Multilang diff --git a/shyft_documentation/lib/nesting_unique_head.rb b/shyft_documentation/lib/nesting_unique_head.rb new file mode 100644 index 0000000000..0acd7ebe41 --- /dev/null +++ b/shyft_documentation/lib/nesting_unique_head.rb @@ -0,0 +1,22 @@ +# Nested unique header generation +require 'middleman-core/renderers/redcarpet' + +class NestingUniqueHeadCounter < Middleman::Renderers::MiddlemanRedcarpetHTML + def initialize + super + @@headers_history = {} if !defined?(@@headers_history) + end + + def header(text, header_level) + friendly_text = text.parameterize + @@headers_history[header_level] = text.parameterize + + if header_level > 1 + for i in (header_level - 1).downto(1) + friendly_text.prepend("#{@@headers_history[i]}-") if @@headers_history.key?(i) + end + end + + return "#{text}" + end +end diff --git a/shyft_documentation/lib/toc_data.rb b/shyft_documentation/lib/toc_data.rb new file mode 100644 index 0000000000..f4663cd265 --- /dev/null +++ b/shyft_documentation/lib/toc_data.rb @@ -0,0 +1,30 @@ +require 'nokogiri' + +def toc_data(page_content) + html_doc = Nokogiri::HTML::DocumentFragment.parse(page_content) + + # get a flat list of headers + headers = [] + html_doc.css('h1, h2, h3').each do |header| + headers.push({ + id: header.attribute('id').to_s, + content: header.children, + level: header.name[1].to_i, + children: [] + }) + end + + [3,2].each do |header_level| + header_to_nest = nil + headers = headers.reject do |header| + if header[:level] == header_level + header_to_nest[:children].push header if header_to_nest + true + else + header_to_nest = header if header[:level] < header_level + false + end + end + end + headers +end \ No newline at end of file diff --git a/shyft_documentation/lib/unique_head.rb b/shyft_documentation/lib/unique_head.rb new file mode 100644 index 0000000000..e422217309 --- /dev/null +++ b/shyft_documentation/lib/unique_head.rb @@ -0,0 +1,24 @@ +# Unique header generation +require 'middleman-core/renderers/redcarpet' +require 'digest' +class UniqueHeadCounter < Middleman::Renderers::MiddlemanRedcarpetHTML + def initialize + super + @head_count = {} + end + def header(text, header_level) + friendly_text = text.gsub(/<[^<]+>/,"").parameterize + if friendly_text.strip.length == 0 + # Looks like parameterize removed the whole thing! It removes many unicode + # characters like Chinese and Russian. To get a unique URL, let's just + # URI escape the whole header + friendly_text = Digest::SHA1.hexdigest(text)[0,10] + end + @head_count[friendly_text] ||= 0 + @head_count[friendly_text] += 1 + if @head_count[friendly_text] > 1 + friendly_text += "-#{@head_count[friendly_text]}" + end + return "#{text}" + end +end diff --git a/shyft_documentation/source/fonts/slate.eot b/shyft_documentation/source/fonts/slate.eot new file mode 100644 index 0000000000000000000000000000000000000000..13c4839a1975d4c92d66753d75553f922743c6ef GIT binary patch literal 1876 zcmaJ?&2Jl35TEDWeRg&sP8)xqh$Kr)Yzaiu#`dnNaHtS!Xx9i53LF}#nAmmP`Xfq= z;s{Zte*qCEK;i~h4hYFPaA-x4sD#vVrBXQ{MIaD@1Ke8kn|8tnQ^fdI9N^x@? zd<=RUJW{D`U;b-v<0kYSA}zO8E|&DaCqF0BzlPme0}$TUZbAP8`m<~GR{K~75*dg= zcCEQu4DE@ZpmS=+>&5muJwb0nf0^x#V!izR7X1vpggLV7&CM3_1j&!tPMS_)mkgrN zC!rsJe5kniow8zt{RT+zltXle=pd}!=-!|+8X9a|iyqm&z#GOh#?Z4hMmoI$K1va6 zrUYgm&_U=R+`ZrJ0!LQ9E`42ef0@uHvC8U zo}w4%B?O&MCX$JGEG)w^HIqqa()pb0xK4IFpUb457c*fwDPqaQf|z%md}h1{#>ac0 zD>_@{@&c$_-fEYWRBE3yj7U8q4MTz%hA^cOxdwei%19MlXpM(P_)+e=@Rm}B>tXap zwoqO*DogaoKF+^`!zvX>{f10 zq*F6dk@0&Ok4=k2cHR|EKKaOn+_Q3KG-~~J-9n!;&D+d{W9=SQ|IqlDm9?y2uUl{( zi(0o$Q@Cby<g+B7U zE7gMM6{=S}Ps}C~lhg72%h#4X&vB-0d)je4Z)w>(?>M%-xE~jH;l@L}Lcyy(n4O9z z65lS`w&R>XbW_^$2bKN!lz(S%N3N!tcP>R={D&-^3rjyfS-aWi!AkH>sk+00G5&qW zC1%n(1Gmpd;5$IPUF_Lw@K%&WbbxEX?LgKcF9x!K$J`8LiMQ^#KsG5yOZ=|rBS1K&l2uG4tC&hwF_o-hDp_Le zTrgI}?0+pse + + +Generated by IcoMoon + + + + + + + + + + diff --git a/shyft_documentation/source/fonts/slate.ttf b/shyft_documentation/source/fonts/slate.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ace9a46a7e1ed6b6ab3de2f30ef3e27c572f88d3 GIT binary patch literal 1720 zcmaJ>-D_KA7=PaL@t*V?ZMro%kz(6pV-rwZyCyk@Q7?wb>UJv9`gO6wj7^qiCTUqB zO%X@;7dX69!8^V6LWJzXiw!F%45qgVdLa}=5xvm6E&iVKo-9$jJ@CHI_viaTf`}a2 zC!H2wcyVDVd0amU$>&(FZ8pn0bm7yth{U7dH)`ef4)6r{E^wmO*t_`0^~*QG?-S|8 zt!lYq{5ky*k?|Sy{uTt*p8hrX-@re<)$DYS^+1t{800m!H_O^}@g4X@@W-3w?hZXf zuY!M;^{sNV`qeJ|2)=?Gg`Mqo2XzAEd#oqjAaRXMBJF+c79{T|EPkbe7-PE;5S;Q~ zaGL1Q(r@%{&}khDI-bPX!~GUGz-0@x9Aaiik?BxrHq?#(PnWnI%nYaReOv*$ZSm>?)ctla|1hAG;T1^YPnfOv{N&_J8ekcvoG^Cm?MLpzb znO-8ASEU{s)D{<<&JKz%JjTWAM|EWWzjHMajT;ECdZ?bsKw&|^tZONrkvOuIkI%De zUYTtG_26}0jYK0>4*B1QgBuPLXU?}t^*TiboK|r`R>P0_HD+(cdi{Ze{FKYDLBs0R~?v6B%Rx~Edo2aasT@IJ-vtfG(iE^ z$Awv_E5l{^C4s84a|;3+->t#z!u^V-9Nj!@+Ph(RslFP9tMyA^DCS*vdNzG<@yc2l z`u?ov&H8>AuC0gXeBbj{4$|U#n6XQ^x*FE+&d;P>_lp(J^Zj%8%oMl&cI_ZN6TKO{ zkvFp2-&{yO{TDd~50<`txN&oc<4*8TskuV~pXj~g5i{t$k=GYVU^@bQTx>a5uvcK? zADE$i`dge4A3((KH9;?{zv*7K*f>Jt^humckR5yQeHf=xv0R7Ti)jP&N=%#Ng5wPM z_VCv|5z{smX^sCCV+<0Gsc02b(JH2*RZK;zn2MJ0U5I^E%r-TsOdYDyD_EDQO?BF) z7OFc*Cuk9TtZz5Uo$8RKb(q)a%}C8|gD__z_YMNoV9|<#sst6tUZ*|mXK52w&tq|_ J6Wq-M;U6NW`v(93 literal 0 HcmV?d00001 diff --git a/shyft_documentation/source/fonts/slate.woff b/shyft_documentation/source/fonts/slate.woff new file mode 100644 index 0000000000000000000000000000000000000000..1e72e0ee0018119d7c814c2097cc60c0bcd05d84 GIT binary patch literal 1796 zcmaJ>&2Jl35TCanZ=GF;-Nqj%Qj#SmwgjS~vAs(b4i$%lc7v*fuR|jhlemtH?Nqf< z5&;$c3y8RZ#0{p83^QtGf$~^ZU#vdPL3b z4fcBr_DN>rKz!G#?&4f~pM4ZRM6a}~ts1aTadwIM%N_dh>UO7#K7YRFXF@YA68l_? z@xFm7>0K?wZ&VUvut!OxMlIIQ5*<0_&Hha~Yl49Y@PK@!7+CqFG*;eClSR)#j$=Xw zNnrjF9T`VX|4zRT99<||DqHk_nzSa(NzO5voBad{L?lOWoE4r?ZbRP(V_X@TZL>{} z(3A8mk}l-3xojrwNJr*pi-lsLQVxSKC{0w##ljO}){#>poy#tYg)pcTCk9|L<3To?f*omEO$b9ODUa}gVj!a zAvUB1l6OCpmTg;7PgnO)phbF-Xik@UVo+OLa3((}zVs*;Zywi?{r}GOL=0{q1ou!q ztD%;HAbGE?Z5HC#RzAMSTXWiN9ioS*i+Usm@#fI}eK@$`F!8DQHtAj`iEnm!UKH}P zNl{d*%%o>TwzLq6ppv_9BR_a$H<|Q)z2RXkyY6k4BJlQ)o4+xU@=Bif%MA~%sib$? zbw%hV*Y96nzi0MvpHdWZeO#D>x^i4rP!XsqKRYk5@ZB2RF5E9QWp(qg81F^VmBvaG ztu(Ggk(kS7r)DyTm#?ozQ4q}d{!9==(dt@sJ_vk&`7k5ChZ~1PD=Sgs?%Z@HoBe#* z_k-a4JvVKwyWWZ=q2@1#9uk~9EfrHBtA=!8%MC` zIGu@c6SyDi7WCym@ z2-w*rE$c_UfviKEL=Vy>={0bo+(i5#P1q3$6VB``hVMrCzU@B6vbqKcPy}m-BtQn- zkylU>byNe6DE>18g5d9bm%bZqa|qF=7&3(|U!AY)%Yg-vOsqKIq$w0D$r*3}ks4=+ z>U6?w2xMd=B$;zQ9v)F1K7KwfQ9|)<9nl&i?6-rchs{I8LC1eK^@#(|^QwB-{VeQz zoHLn@cwG?Yo(X!F(Q8iBOqSNs${h}C*?qJYLuZAnVXqx{ww|}Ux0`ca^V#hz?c7{r z7ldYbmk!M1m3G+IYC6(!VcCzqp&pJkZ#1@kw2W<^EJMqOM;^&dq6ELC*|pK!(cC0< zbZtF%BzLsuTw5O*+eg;dX0a+hcfI=gj8a~qWYJoMamHAo)!Qq|6&~9S8`{d0T?L&% z@$R=P6H0rTp6V+-Dlb>EB67JEMQ>kk%`y}{hvBC(RNEw)*%|U|4>SL+B=3rE@y*rw zR_bLZr&~XN?C;+yx2IilcDnrb?M)}An;DsTe@^rq$9L-UWNqY_oTyWyYisN3CMIh; z*C)b12exYgK^2c4S}J#2YJ+00rUlj%+LqQ7E%lldEc`K|1Bky)iLkwF{Wltvj!{A+PBEzhE3BX) zFBgqmj@&z?N1*=OK?z54T7is8FiA(N66oe`X+cKl>`n&&000000HC;3 zk^ug-#56-JW5JAtMV6Rgj#+|9A(7;@^`+^dWy@Alt7D86w|;R>QMs>d+47HJVfKhH aD;vc&%m&dlj4($-ipx}q&#}A+00017%3vV? literal 0 HcmV?d00001 diff --git a/shyft_documentation/source/images/logo.png b/shyft_documentation/source/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..68a478fae3611d878af18c575cf8218b818f41db GIT binary patch literal 22317 zcmeFZWo%qs(JSi6L=X^=@bIwUZ?M&v zZNPsZoz-O|AgacRjvye!Amk*)H9a8DIuLv`=hi^}_8jqv6)`_*XrLt_m#|ma7;>~> z60F2sY|2HXs2Xt=4xSo(XIVhSu0bq0-%2%$C}hRqOXwn)V7LbJ0s@%GnF5iQh6Lo! zK`)u9oX+O^<7uf(`_4wyoDb{Ho#x&ff)73yy3`1;&|(n(ef{5Wft(o(Rct95!LU;^ z;K0y(>Zz@1zM$dPn6Ky%kpH>@qoe|`!#@K#he&A30W7gQA*Q-TDg(p9P9LDiApUht z<|4#g$0*-R0cn7NDZW&%aKMH5$kWMS$^HL;WH|(a9^um<3zfb~W5Yg$)E6qjARDWf z1o+bL5by#2x?Da&6`=p3ZHux&T5?FC33nk}0?~K_Lg@K8p#FIkx)GG-)yWXS;5qfl z7gUete{nB0dh`L06qLbSwb+L8M0+UL7X zf;G($bI@tNsZM+)`3ixCOrR*uh$Wz{DA@Wxt5%i_U~~owWj3T$u*R!Eg}q}(?|vIx zmrBxSQjWK+Uvu5PBlDhos$~lBzk&Rp1EFK)$n#|}MF(%riFKr6 z?LJ`v?;AJ{g`!S{P4Qy)t_ashA+KLW|2pWh7@le%B2CK>@MA8m;&4WRJ&pa`YFEK)l5}mDXvc0U%zY1zLBD#1#I{kZUoALn+>UPAB zkh&xqQ+hp>cwLl&KP!w)C}gV$b?wGHLYSKDJUA)dYpHhaUssu_THVIIBUV*J*DnBB zj4}p6|A5W{Jx881jj7t#F~)`uIXcWE{S+JM$J{UFB*b?o09?)N*%4^Rj{;qoeh4#O zYpC1M-xYa9wImD1`ZsC=0>CD+L<4q_6NXp&lHLK=(#s9!!V8BwryMp30J-5;2W zQjV-KX8jU)U+>(;dB)jqBx0vzr-v9=V1zn*?Vz5TMO z5PkZA{O@6Wsu5I!ODMr%3b{0H>Oq=_HY6g!)3cE-3FJ4;rW(=E9W(u86-6TK<+lU` zR6nMZ4hBNN|A-DS&hP6<7WxJYiH;6kQk1EDz#4z&O;8HI@+S&$??3_gWCPHBU(SA2 zd-7bm6&zHiexU@4cVwpxoo;l2Mvv#pReT=S+~*SByEeQpI^5|+KB7Yex={t7#4clq z#KA&}2QaJ*9KI?!t_?+3&>5K2brl0M^PD5D#Rn$jAT0{=leX~LlVdvqZGI0+8yXt+ z_`ly|cXM0MXS91<G9^$dF@5suLel7ORKBx9kF7l=!ghZ zH=&_yl^_sh^s!{T$Z{ye5^YslUjuA(o>;GqXdjlD(0=Y&mieiKQ0unwJ8u85e0#nd zXtG_={^mZ*m&;Y3fQ}-^_t%8+Vmh8f!SUqVuz~aFo2;PoDvS&f-(_qZoWhC0!A(aL zNO#ue{sr-B&$_071Qdd-sq4E18{lIZewV9L0fj39_e}oez{p9)HEf z#liA^StrhM@HqHjjBbGiWq7?eM`Icb5C2HxfD?A>fWyeh*hba4-r`iagezquw-h52 zO|te@R$evSydBQSp{}9vwj4Xh{XXtusHf+3bTc6;+G)4eIz!TL{-{AjNA#}x9U1;d zDg<^E+Xv}evd!RteXF#W`!m5}oTA!VwWS8@1*yhee>U)Y-j}Vbl}LGPK1+k%-`Zs2 zrVtkp))ICGqSHlQPV2Dro9ylcM0&D;Q@=IA;|Bac#{G?>=NE!X%rNKV?#jr-R6*_? zx2n?L*C%DAKAp?ISSg^qPoi4Kb!+l!TsHm*8Eh^1DSOV_EkblA)_=O+O?s7Q!D@)j$ z=E$WLb>;cbj2^G;vde3Jw1~i`O1`ZWHK^d8_kvAm=;dhe`tMDm6U4=w#}Ejb&<}HD zdE;i~)%%i!IwQiu!Zzp82tZ%)U#8UbL`z)zZ-;2JiO{5)!U!SE;pm9Qg&bg@&LqIV zYx^RTNA`t$b3SfrcD9$%IRqOGt#K6y7=dXdx(a~&u-$SOWZrqX7!A)st~9A&%4~{C z#OILIsuV>ku#=_GZdGL=xF)||P5(=N6+pa60Ph(|B zbXUUh@gV_;dV(&zs}7$8=*c=PmTjXC4-ZQMC@wXcb94W^_Td?4Y`-amM?{>wAP*H8Xg`_V5Q41KBE`GV%UnkTttW_ zRx(FpH(emNq+{&sDyp6{yQaON9y4d^`Kg7N2HpwB8*Df<_iPGrS7|RDnZ* zhPY=;@eIgeZ#dDo`g3hwO$Yg;0I6F2;pe|ggGC`oz#Xh#$;-=APn-A3fU8w!m0yhL z=KOBoaW}t?MXO9SS*}xUs#8RO{{>K{-b1Vm=BTd}o40vL8U&%Z&|<$oK&lJe$1gZE zJhV6;Fl2e|r&d}u-HRMlC9kfoX3bi~@H=e&c0sE%O6Une%QkMXnwzrkd@536xLI6W zl(iZ=bRS`E+NGkUy|Jr%Pa{(2Q+{Mb26KMkJXS#Wl-JKtNa*i0Vu%9@*pL2(lpf&h z={|#uItKIG0I>3$#`sigGH{=Bp3Ft?FeS{)%p3^&J?rJ63-m^udfYguA}=5AcRX9V z#Pv>{w z8?ERqlyp6oZS_%{&Sr{LPK6&<<3Ay)h*|+0zwMjji%_;C%PlQ#77O))OF;=qu%|=C zCPe-7fCQhXy<{3alJ=>M8e+q!;sfOrw%moYrVWuv zo*k+jCXEN>53V=u%7Odwd5%0eztO?`2TusL-q%kNq2j*S$J8xKF(subdM)15jpH<0rELS{t4Qk95005xa0{p*g zv%lF*#~O&PkV?(uic6(%_&pj@`Lf6YAbn1@oy)kcxuEi942im#TtT$VVS}#?=0pyg!`E z&oWX{FkCx79YqLgq4{E_E;823mjGtwtp)8WpNsa;QUN`h`0+c=#nZTnZoxB zn{<2p2^?-#Cg~t$rP;S`L$w)8ZTSwjA_owuEeSON4 zRz(dYSy^UaJT7_sEe=rs;tH-6e^7pbOw3iJn!+pJ+Oia88@VzGU%^_bKwWB;2Behb zH8K)2GhSH)25#98*u0;%Xn1-Q!mh&!^ab|F+xWDQiP3OF(>(XI3l+K=hcZY?Nc2P+ zhELlB&|*2h2++61_8S!xuIPua(6UR1N`-t%^G96+E7KEM!Y^3so4*FQE>Wvyp<=`n zoncXmY{mkn19BW6kQ)3FE>Dv)1>Mu=M1>mawf6f7?G+D7D}BK=-Li#TkZ{AKL*{g>VLyH9*ck@dIniuim6Kr~(yLY{;+0n|h z=JavxspU%-PLt5I2U$;?ueHGmdG~ND`&a8C$cyF>9W#{O@2 zx(EmewUE86Q^@gVdRli(O4h>4l}we(@xj=rc3T!Rwe*1rI6$&V90YJohr1I4?0CVc z*+)KX<2WslHp^o>9tZ>m;9kfpD$ZWrUs1|LjW(YGM>s67>gX0cdR)hXcr8z5@W=dG zWY<^=X9=bytSwB@NJZM+$yOGf-;a-v2})jyE_={KnUD)``t+AG~y(h=;LP4J`V$893&+AWssPd^Tt~!8U;91*AXti8!P{WHG3B3 z>88&){(i3)Yf&MEukZApWY*d{^?N33c6+kUAM`GC(#LG5b;%iPNk zD>m~HbVw)@7F(8GLLx!9r&e>1$QZ>P&TubXuE1m9b_siCv^9mEHEPUE}dU{IU=|2EIKN%_2nF{pnI~wqo0_zRDfDxjs zru{o6+Hu=gtazdZ;9ONt4#_3hNNz&~1BT2mT0}xax!0>`|5bTIRGg}FTTi9(jAKgy zYuE`dgvOI#p2)gi6FFMqJv<_x*pB8a^{E=nZo8iL)8SN`)G{0%94e@Sd$jPc$PmrJ zsl@?3pc@0VEEEe`2%RiAsHwobuiH{bb6K;}VZGf`D5&t$$Emw-`VOPk3rNuuIim>d5G*_LrI|pD8by2c~wO|k(mbO zLhDip_fjPBHG1ay>BFRX7LURx&V+-!6To84SA4MX*FIu2G&G>pV_J}3*khL6aklSy zUT*#gbKmfNfH;0X>N)a`zuUx9l9v&)&h!X{8wZ0<{O{bMxu7AzZ3KAkc<)a7?)hb9 zW%q^2M$1M91_m2xk3GamZ5$Sr(by|i`CmyrBuo^&CXJXrz#)J9o!$v!B9bpw9Sf`# zN%;*AmV3|%{&HjwMs0wY7_{us<4-7LXO!ML0aRiEm#hcYe^u+P=W!7_j>+S;O>6V% zHp*UJUcbF-(RJ*GJfcre3M|;H|JBX?hX>N2Z7PXg`_8UJ2h)qE$P|qPUZHG>?elKZ zE(Dp4sxlwG4ULTvqaPYE@$eM7_{5)X$WHNrd=G-J1I5fKHm?8+sfdB?-^I+S#N-DI zh9BbJ_cPlJEFQG6#?08y);m@-jg0K>d2M8p^N%XnzmZvJYHG5bd>}657^i$uQRlJ} z^zw`qML!G&hm=cSTNH;oJQzfmiitR;v@mJph~<-?qvZ)q^?>#pB3Ng@vKDXaoU6tL zp-33H0^GHCQyy!=P;9>_Hq7X=VWaw5<1-zFw5xS=S z5^l&#Iq&i9-qv5gex;8Dv8g>M41sGik3Z$8)^_bz{VvOfJhb3ehdEU7TK$qVW-lN&M@fv3VUoU(2aN(RP#k|5y(+5B*y1&$@FlpY zvhl@5^_U^n|1ya5HkHrun{rIsk~ZeArlI#>?8q7MKyk9aWK0PrP4k=GB2%Q*%PoblEa3BaX-Wbw-!^47EjB5(!QLLT z7-H(_(;t)wTK%RRjt>!lXJ!;J z<~#SRT7A0~>Ye))d(y>f5)Edy7{ z24DwD0!1laSah+LR8x_#r$BKiX53R%9*nAH|Gw>z09uwml+0Ur2}JpVvh-zC9PyTJ z=}W(x3(6!N^?#JEAP9OCUDIr`7lb7*;QFZft|y!>va~x{FaAHbh>=0d#vV$$F)T@$ zPQ(Ld#N61IwgP)$bpM$T7;16>*vP4;AAzYN!Q}rXMF02a|8WaUrosV=^wEBN5?~1Dh&6q-7)(?b zdLlUg>R6_pF!C)uZGHa8MQa?vpkSn)9>}D2)j`NGVj6dNZpdJ<@uAnG3H~fN9UbBJ zqYNaEDuK)g6nIZCJQ%^e>VYYilL(!L18^%H;@SXN92eHtcg~bv>zy->;%Peit5qCb(H0tteH^?jEtPnOovP0|r|)q?s%tu54LyHQGB0rX>><2^)5kb8 zMFy)Q47i$M4O|PybT288L{MDXTr{DIAF8h?C|tJj(2^QX9j&XG!0Jj=37;! zmk&>xrkv)`$u_1K?;sXV?9>0~|AuL@ty~J|iA}O5IKFiN?^bN4gEQyGFEU7|b7*WS zWv)~!ujUu%&2MT#jr9AJ`cUw*`+3xHw=(u&+OrQs>Isw`9Ya4>CRS%-Zhd7bR{>(L zWRqE7(y6EQEm*Te@L`s-Uxu@+Z^YgouF**nH&;`0!Kax~+}JuXzGD7>0M7qair~6e zr}Kr*TNV0U$`D!jt?b8J*n1pRUsT63>Ck=5lYAU9yC0PeN8zX{HvMvXN!1XMbf5eM z^HI#>95;7};sCPTPjm!$7Y?XaiL)! zO?BEeN@I@5$xF(jwfQ(RH_4HSV_erib=f_%dOC)&DI5XjBhX)`kAvWUkb(Wf1J1{n zbOB-k&=hiklc>{@I6J&yK%w78xpC7|V!(|U-++W@(gpeHYHP(JJU$;iy(@KHlCRmr zLw3YNL^=tKSc)`Vb*3ELmx{#Eh;X%=Krf~XV{E|tTQU^^M;?G@JZ^8uPla|qJa7%u zL|$dcDQW_rJFB|~+?IT*C`{jf!hS^y_^MI-gSAmHYzF4ds4hO5iI9;%ziuKiIxyF z_<#T^@vYw)5K!cllab#91c!873Oo{Mk2&qG&1;#A9fL>w8}g`3EnV!nCcm2%uqn}B z<#?o&6RsvCIP76ufeU08mcLB3@Frm=2oZ=Y7ygid5--;!&7N$Rdya*+#*!uB#`F*v zXL@w+IH46RiKx-ZPkp6x?iXj8Nzq2DG*V63eB=t;Z>1q7w;%if@3VpM1$p4%4K?3~ zoK|e)#_k@sw6vXHCr(jDUVeOvFLE@P>V;?Nlct*YdE^!DSN)eMj&x?PciE~U+I&H_F+%acuxcL?>EVa_HdG!%8tTPHjh z?qHA@9tE3T+`Yruj(1c+ln!>LT%HZJo^AqmOy|VZ(Q8zN&!pz!OSALf+NEh)ezoqZ zoF@Yhqy9@$x@?OR4~+(mO6;4XOs4Orhu#qzyaV7R4y&bd2(~+EGnmVvB_IqL0w=#S z!Lvc?+F2GkA_w-=R4_erXnAmlt3Tsv4HK(x6_?hu4`rmwow%8GF>Tmp2gX;#dxV$& z+@c41Gs`FaG%t4Uj@!>XPa^LjP5{d%s9q*9l~GEYhy(+wiAiQ}%V-qkG#WRG@uj^L zbgtqP$M6)o+2R%qrvP6exxV9fg|oy@YsluasAbOa^c(?Wr<#z0o0j@a>FbaYkxYSN zgW%p6o?l&ZQ41b9Vb9#6U)rr91fTHTfi1PHiGH{RHQz;(OSeDW!t@Q9`}CKa{-;lJ z3h7nkipoM#ZYm*$;#z_e4lrO@iZ&2+seo`CiqZ}po*I%MLQVFn@KUUoqpTvGyPxY( ze!{d>Qa%J*&VPCx_ zY!bxLDtwGLIy@ve|B?rU(uw`%iP)kkOL!9POFS*Owz^SCJ7xs>%xrBHdz(+KqD7ax zJV)iea5CGjpMa2<5}~67 zw7y)45kR-{fZt;H@}7T7P9qjBgC#X&h-PC<1@l86+AO0;SgzgvJ8o%92z;#Q;F16};-#>7 zq}I~XGb@ixhj(p%sG51Ts}L98&K#kEJ+*c0RJP8srrxvUf^GW)Bna%6%WNDf@!w&; zze;&F0#C(SDhd0BR8Ao|!3KQOH&d>Ts6y8A^2VVq$2*I~EPFKAVNcz4 zH&|Of5lC2FE=QKdgBD-}FX6Dl9rfw2aAHs}wQaaUgkMuZ_pA$8q9=%1wC896g|w<+ zhjiVYLN$a==IQBHo%>X(gbL*BoezzzV#k_V>xSJ@?fmITz3$&pJS{4edoF(K-uqGX z#zIZ|^39lK{dnX!&g!NExKFku!X$MPGxB43PdweMj+t?q zh@=!&M-AAwAx)>zq3)7iYv5aKFnA9$KoC5ObHz<4C=vvlY99aMLYrpTlIGdb8QC-A znRSo_4z|xA%>rMy<5{aB?^*hF#z8yaO(;g_RU%1=SBD$-e%4~I#x8BXwrCJmohM1k zT`{MZ3=Lcau>I^wg{u<#%@|0CdHbnc81?m*U^d@ePw%zTw&5^&hGUHjhv$#!bty`#Q`pGpo(C=y#qLE*N>wB^ADHMSsf)hHjJShQGd8P2rM zujc^X(liW!cz-qAq{$D>rJW2aYMu@lPD!b+5B}4)E~!6PyhbvsgJZDk7hJ|% z{Vb+`iOFx=slGB1!ibW@?Y%l1C76%8aX|Sq#v>$NUzQ_ORxAez6Ffl}dx3Bw0;t*L zsTjJE=-BNX+Ls#4naW9>(W%x}#JJ43to4ZRBP+f`GRK86O8$HGy?j5`xIWL$XfD>* zE6g5K@Q;~ZC8{)lMC6`>27W74YsqZ8jMr+x^pel6@(DgKHd7SaY(asklnlyA zZ2GT$ekmVNR0hP%mgE_u`K&yUWjZowWJ=w)ANAp%KH;Bj{Qo*Z^538TA1vS^0p&zH zdh@_CLP{_1qAva?-_gsr(t68kY`-}pVQ>cjgN#4Rh*Lv3=%>aV7UxLk+05bbmJ2a8 zz)etN*?IEp>GYIYSgtHlI*RBumFa=+1RKUMwBBm8(9xt{(dSbVb)Q!M!rjZsLRVr@ zM5%H#bEm`J-9y*5!uobK9Y#7T&YF(r>*l9erMs{OW@foCwc#V{>ccuVz^3a79Vzp% zhos1duX(7f|2A}>!W%nQLte!{2V93<9#HFm($DFIh%We=ByP^yyTD~CJjfQr) z)Pg3jMx=z|@(x8<=~7B*Lrw-XZDaPrWX}8=Y2M|U3H!pf3j)f+q*zI#uso3_gsFjU&}E@ zx3LwU40i;v@$AHSt2OMim8T$}RI#&fu2t zxVat+p(6!0#<}*}{x%X%G3JNk7e*Dc6l>tDo!)^O#sOoI=%Wqd%Tv5jduOe~@hwRY z;K{BnZbx>62_HFHvQ_(5@2G5Te+Eg^vBNRlf%7AUI^gM#lVhc;fwz3>=gzsu)TC?& z&fTI_hKKBWaRb3?dV~6CD;hn_cL((l&X32iBiEz(QMba**Hrn+&IVo1tbmQ%*NA&A zS^QLct~9JO)GAtT7h`EPlB%o6ZoeR-+qGZ)obxewg&`zqJNKv_5ed1?d;QhAG}MhY zpn?}a{%P*Q1vG}4>HCk#wJ)JAGu>NFqIVy&CkhX0L-ssf64unTlP>LMA9^vyF_Nt< z{7ofOc<<-m>Q@4BEIj*PKKCLk#(OxwOh*pF$4TF4KHTUo%vSV~e zId{?uBI@Ge`Jdu&86f6fAz;P zNY(oIeEu#lZH21_<6`q@Bm|f@-p=_pZB_d}9`I8RdhB zcb106P@~S-_61bx7v*_PtngfEUcc}9nA23`$F5COJA>1zB2+4pneo$+~$CPVP$fH@OP&;rBkx zOw$xNl$k61_EA*AN5%^w8l&TQjjYzi;RhbN$H--)ey7jegXAE2r5m{?Y44vJ-w5wF zTrcvQRFkDzB$VDms7panfN~xg-OeKGf?oDyW+&w-FC1hn3^bhAgl}vG%T?*})bx%x z4XCOxWPK;)r7(wATP|hqXlm5#8qjEGu||#b(k4mV>UKlTf`&<)N~7E9(w2)=I3rE{ zja)Q@$dOBE!n?wj{N}ID(^pDK)n{ejkMXI_4moljzx|SStHXa@7vTZ%$PGKwMIy>J&1*-zlt8DZ_U%YYM6l@w3f-~#6;uhf`CEW-QCE=3u{so=hBoKz`5G!eza zY594&XNZ!vOJTwUX)P#p4yM>#i*)ImM$TQqqtrEMvhq&$2ipDNvwxw-tDh)zI!y?Y z)RXnPz8{ZLVwkr~v2rxA(*Yvkr?nnE_N=PxK5ghAp*JI_QR6li6;j?1XfligFO zlO5FjMbYiQ-UF0Ot!*1$*AXbQN@YnKCox!3^$iV?{lx%A1#BoJ75g4Y3%C7fN}ty) z*pP8!{ncho?fKE|{tyvfH+9i>OG!#Db*|s4YyC-2<95;LtQ8wPD9~okblLEaEO63o zH9jmcARh^iUI+D@hWaIUnX=vH4?m2c48HnxUPWnyidsR=k!x9F6= z>MFw&X6SSXd+DLKL2yez<3U2kVKiH{ZG0R>(M+9F_4kXvDQjjEnyJ)m28fI%z z87`rZpr2qqofz=$zt_*<{0Mwnw&I}LoBbZP&7di>0Ah5$xp+hOL6uPRi=vFg{$|Zm zfxPo`y}_Wb=4fA>{pkqy)2}}2}DU6Ele*Fj|NLYkH5-km#hBvOwrdJkUuyVg-$6YfeO`kzXino
hg5Z+!{Sa)O9QNxi$tfwtDZos~b$g zf~%$5p41?m+pKz)p$R;(OqAz%NpBzC-Bs|s=5}Fzx{?20LS6w?=8B26nsri7pgQJ;3C5bj0$M1LtS^c{;>_#l@s`gohuYN|zamk(kUh|tL7}g=G2^;)T zUeU-G^*(GZXbEnp8=VhipQGRpEcT%zP$hEGm7S_jENi};dXF4YE~JMgi|Exc7>E5T zb4#?cV^K*FT4Iwbzn+t~$3Qv%rDtC+iB%YXhLdUC{%$m}ruUffNRcHVvPJ%0=IQ&k z9?VV+SK>;krY?^g89zh1#h|K&9TQ zYDRz|t5`ubY6z4BGJK1jhHI0bmu*XuwbnjvGRn%l8qbMM1tsl`tetlhb0vsl`B4); zE#{rhT`06C@8aH^Voznp;rm-!_ikp7iME;3qaYW;HsrzZDomfEQ03=W5i6|cQz+s9 zUo~5bxg-uq1fnQZB4>(Gi~Z0P9(Ixsrn8Ei(}Co24=Cl{pIr)Td?YnY;bD5rhS-JEa3%c%9-tHAd4-hKh&vo)8l%bBQ7v$7%XmKi0jYZXS@ zWG5JWdM#@s)Ic!Ae#4vW`iIFT^raF1Nx$Rf`Ict6!AUcf~GCWX8>1OEAjAA z`4e8So@KJO(KVab`gGRsv3@&dGMN#R!xOD7NV`|2Lv0)37@e;5$M2#363V?ojwG|O z47H#0L!+;=-jO1{eeJZ}<&2BPL6rkDFF=G?UGlX-aAJ+vx-E2it{dVUgGL~rG zoqj=Yk8m!7&==0dFS4R4l%8{68LdZKjEVSq?lWyql9-6y4?e;A>uC}6yBJfb^$n&z zKFSJjT=Z3!w`$NJv!t`4g&DMXL{rrQo3G0EHzvRK_{6(Z%KCTbgc`@{r>Ceo?IMe+ ztO?z8wx=wt6}f~-IOxcqmheaPack{kaFx@J_?^8-VyxM5?=Lc0;fG%y_&r9=GfbsD z1a(>R4F%`D-Yz?SJ)Avmy6@QYc3)}JCn}v0yKFD0Rbe@_c=#RrDFa6SufB$fRObW8 z6xx2g+F?b~*HSM~=kZ|JpkohZr{d=~z!aU4HTDAccuBK(XLXE(aV~03UQe*G+pi|m zRJp>Dvi3lqrAsowwVQE2vp~HgFvkbPC-eD|1bHUrkLSsjD9AnCgg3mXpA3IE*2Xy6 z5TeV{|8cDg$){51%Cm3(TCT2ZW4Q)ouve(#TJS{2Sd3!VQT8mj|{J@P@B%=9sYjut=gZE|TDiBJ<7@;(bJ_jQL$R zz{mWyO6!xn`^s)!f~bz(^O>pv`_pgeh&ZS=}l+4QRzk`0knS(nO zv_G#7s8Ua3%E%js)N)bcxm*#J5P+bQyrM{{X{|njlk*=GXnxo@6kllqaKQ(JQMsN+ z)LEH)Lp#4MX&B}7*_~I~pv>42+p> zU08qLH2D*qSwnLpP-*#v*f}S*B0}RU;2Ny9Ge%{S78l{D#ay?}VhHv3NUi#LrnCml zejqp_Ns9lH$~S=dic{?GD$MxNYUGL=27|uZr_2wQZ(Na}#3F^m(MhYz+8B{*cpya9 znt9_C+hHUY>t@GxY+0i^{4F^2q?CNxioEXqcc43_Er~|;ui6F|_#p?9Pa|rX8U)tl zB-}$94~EY2_pliK7EB@(;|)<5v%+MnGJyVfjSR+Tx(KL&g%F;(sbALabvd%Fx-L2> zhvc@d$uR|+8)$m9PY1Z+*D}<%?-B)#R;f$Vl?+u!{QLOwG$K{!v}btd$0l^wIZi}`SLI`KAoH@odD&^$rO}l;`p)v~%>u)=^@wgP9jpTj1rJ&4C*zVhaEY)m{6hrPlLzedM7u3~+H}=A z$DGFW6?~3xP6ckG+_6^x@#Wtafi z?WoIE9#(F>oJ-^te$A^BL@BTccaxu(Gky_}*1NlSc&IWsY8@_Bwz8yGYJFJ$W&JMG zO37l#o&NRoM@ZJxF9kK+X{T|sci@T<_7hac55JM1(?gh>Q=grz;y%0vN9!GP#tr|b z%WFvf>Wr!gSymB^+mY})>6P|(?4!|n(Kl8U7@sNr$jubKfhqQ?ciD1q6`+ZH2XQJg z!~}c+u&@o>a}bO8y~?%h)>L}`G(Ksde&5&Q-LBe@EwigmSiFAg-LO=OUu1U|rYvRX zNm!KU#rK~%NpLC%;3d*5I8yGtVKCDg(KV8@?JwX|7(czwXZgZ13EGtr>sWA&=gi}#=l0D$Pt-P*!Rv^?g8Wnm z@e$FRlV=pW(6Psr%)G+f6n0)`$Pd%nTKftW0NLo|ZT;aF)$2toqs2Czshtn<}<;k!zWe-PP1CJGTA%>V{Qe+Ov3%>Eh$4HPI-L zcjHB#);{O#)+b2;vindYsHG84H6XPW*#jJ0&tuJ`V4}21P zFORC8Pr!==fxDCfX8`x@Xsb#d$FB6$x`<~~+DuXy^s`4vaWq`+=Y&b*{5VRPL(y^` zAtQi8YjLfHouW@W=`4Hs#N3q!h&B62Wh?4u-fLa;#asB*$TopG0~6@$xQd$Gnc@(K z@cNZct#@`oe}k`6Hi$VJ2`gMEwAsOi6uk3kNqSDAp+s8ZuD@yR=I{AQ%W7QRI!E?c zkN!zj5*-6WgMPe&l#silVR{CeN(MBOw*K*}cUa6dx!jwX{Vg_ao6M@`8f!49)!rJE z&3CZ>s$2iv?D$Zy*t(QQ4I>ig=g^XgT`I>2$D-zs8`11#MM)t$nK_Fmy3BP-_gFto zN#;t8E$c1TsYx59$YIL~O^J$cn4ZlUW{GSOB29#LHuEXDnAP?yT#6(3>n5iaFciOx zWz-+7wmEHgVCe4r>O|d$m=^c41Zlfn;k_*bS z@|PCG?Y|`~4hah_00XJt#m~!8Q+eZD zAy-VNpOZ?3`&#>32?jT^uz`tAWTY)%drA|N&;Na}#z2RS2lrdcM+TtcME;8a@A_v| zA|cr{Mwhe^ks{RnrY9RRAdvx;SBLSqQk3s6E8M?xRlB;w)xMV5k9smX2>tqIt zo4I@Vor{Oor#Iifr?yYe+?kZ|3|{xQN>u~lsaxi?oS$FKx`vfc1!c_ZZK+-7BcQhr;-a}8(@@73qbT3kqqb-yE zjQ{Z72Ni^&H7^GP6WxDwXQ$x3kT&MXPaj*%2^;mEac#&vJtH)or}zJ^lN;!WVZWX! za9Bwb>?PSadtMp`HKANe+H0RPw+8|x1-luLYMwve_AINXd(jx<5==(T{tM&Zo zeoObG=bgU?G&PsVdYP#ornW4drPls%e9P@ya3f*Nc6nbhBj&1!#(w#X*2+#UQ=-ynh31gdV%&hvbKV3NY)9@-$v`;?_|E zdVP$fT{8KXZd`tknyZwn9Ilkxe^*Y?)sDADkt3hLBWGj~v6iP%4`=`dM_r?%E)WSFj^?b37B0aT&T#TW2vctPUCo2;7yw{|f-~D|fVu z=(^F}(SAxAX0oq1(X<+dE6xl_^D~DoiLG&!VWxjb!AmM*Q%<&m*6dAFh7WtK#S2o! zB3Qrgt?Ay1Y+xu^ITBExRD9}(D$hIIS3<29mA7LO=3G|Da)w`jYEC$hJ>a7{Y9)Ge z{!rZo!l}dtrwNSev>*p(;rX z{=3*&okSZ{ef{acKi7TS0?W+Tr1h1r*_avKClr~(`@09tHOW$>^v)MSeI@t^yp<+j zQ~mmvajMUp?_O5=gQ}m^dH8-gT0fa58jq(lcb7jQf$#Bg>7{3O-{Nt%-m2Cm-_;j3 zebwmN=5$RpxJVaR``Z%?m%_|)?0!3hAt_YnG4NSqF}7E&!XAe8#$71bV;I(Nhi)qJ zjL`cHR=3ZTmNo+-nQMoncao`(WoMss+S;p4>qvBqEAu0v&Q8%M&OT`jod;{LqwCdd^}0Gm<|X;n@JhI>a@OSs33;0#KhMLN zkvYeAz*1RHJO6jK_@C6m8A49iZP<;$-O?2-e8T0=gGo=?{vD=V($nX5xuiA8`2Mka zs#zIgjx!=SxL6%dGYeg1!Ve9F_#N#mzCZHXr}UFZo48OwiJj{4*Of}AOqrM~HJ~bQ z(vIM3L*=I=GzE1K@rbr<6vu+;6>4sn35&jI*xcU0my{G1IpG#Xy`L^33fJd;ng}%b zk+*%!ay`?GB}f#PSJ3^H&l4q3Ib&T!mD1Jw_Qpy$p&Qae#!bDteCiCV%eO==9fzlO z9c7;OPfJ{h10DGq#RI4<&cSDXCyhkb&G`-saMq6_YhP5KJ(gkSjP3r2B$qMCJ2#Qk z(YuXJ19q}&=-jOQ{U>z!BXsS2bO#4ctdGk5_dheV72<@n!8Ee!H>^F6%1&oF%c;x^ z{C;t|&To@SX`+j2-kX0Jw`=5+zHuH{xIHao1_vY}aRUi}TB|BCL}csMA4!UYk65Mu z&cFU?vQSRSTg1T3HY_Z5{49f4CN68%#uedK7`x1TNJDpX{r&IBK9Df{C)8$&>fNO8 zIc=lIN;2n4z}*VnR-uP2Q2bs9PG8A$~ zpwNOo}sg^=@7h`m*!TZRzUoHI<3?aWz5+ka9%T6({?YiUA$cAIF>G9zhgFwl5R&MT<@7)e=i z-kzP*pttn5-J$2`Ds;Mft0P=_+t1}P_0V_i+;A_w;H{e|W`|^VmnD3eX{Kz;rVf1@ z@VEOTlzeac_#Vv)guV ze7UL5vm`1xjj2twRcax@?@3u_fcH>gb}CYp($L*}J*bLf`}t3LfBT^=I)H5$R_FWG z0IzOmLP(*G2K7gu5zViF2RZqk6CEeN^d!PA+^744&-X{2qKN$3B=T@7wQKnvass#g zzTGNBnHTOI124X`C@k7&PPkihGX5yj`7*eD=hm?90L5FO^lQamw$HuP~$f#RD!1d zYWECz{{3AKs&v`Zplg`Ydou7Z4unfW=#}i=xjrKMO5Vzhv`(mYdJkMTDA?UsGi+U) zedONW7exYLj(8xMECKzQSvFd(@^uo!g>{fb@7VK7r7$G(n1YQ0gn(NAiX4nK@Uve-OMyYi58 zW<^nFJ8kFf#0`b3kon#4iWx+srw+b9%);GBle^$rXun|9>w4m;1}NFIvYNJ#-T|5% z`0%;meMrVZ-_BZayOV@3O>3}Tt~(={(o3n!n{5HzH0m`coh`BVp6#!5UUbN_>BB@u?iD#Qe^=3xVo2*B? z#Gjfm&VQEBK548hXpdHYXo-4qB;L4qX_WW%g(ef_!6|14t75LK6GPVZZ-EG_zO|5r z`D31JWSS=yfBGmp%TX{*eCJ`rw=?PuuX0J~9fZ&Gf-974&eSXeiQ1%6TIhy=CT5=f0kZ+GreHr*Q`X#_I^ zAzBNX(vIrOsdz?Ai#(IEoK_8>MwY3#Vo-r&xs3&}aqg=U67qY8D!Z(jVsXQoXAdjh zQe>!^Qw7-JvoUH zud0$NIqIBO{GR<*ZzyPo-KvI%EAVTwu@av|d|s8_RWU6%WZC)D%<3$tD?N!x>1ML2 z6YKVi2OXqDl&AM_!j-oX?*yl?EL7?*fDDf%)gDQ5V_#`66K)DS7SXc$N+-G=rMgMw zeTFebq7p)7=*c35{n^NfR&< z)rl>OH3xHyUV1n7x{!8fS@zxXeBkwjPWuDQ4~#x6QAW?)@}9_FO9O*2PC5(NSK(z& z>mbQ-Ve?D4=@@_88X2_?67i?tI^*1yWZP%dH)!HYOLri%zj&@UtLJ-K(Qf0hl;I`}mk`cS_iTM7rv!79T$VK<^#>EDT3vBM4wt+m?%xNFUYL+BeY;z^jtfEdiglxO`qP;3D%0fGrjXE zg!D+t;{q@3Y_PUUtEqTwZTvoi&pR!~KmZt?Sz@&QS$E)6x|#U7FgF7$oa`h5s31M- z*um<^Y+SK%ban&x!!nhvz#PyK|8NHnd5ZqFQZH+;sD% z_hf)BFAOM3sSiOWtJaxIUOb5*_mazzNkcG8CLe)Gs)3EmRB@U!%bZDnxFt`P zLYYr3yn)tewRuw8r&=i|ns>zUF?3j_CdpQvboGX4s%|iRN`G8(p*B7Yd2PQjpBtdb z3(YfHFTI-NZ*__?Rg(oS@|kD4y&c2Pao#Cn2jO@dN>P~OSgSTFo?6*(Un#A*bZp9Y zxn$-u>0>2~I1guGKySX|pW(rz&!Q5pzl(Hau$&{5tMu~m!(UsG zaoeA=_h0Q-R}26rxt=M9p6|}Ndp?O9#=qYkw?IbGh zy1u!Xx=3wLx6FV#WHPRDxzfAh&$G|pWIF>{T!@P_)GAE+PPGfYywR@gT7Dj>huP>= zvYLS_25*0F!QpUAJay-&GgPFC@a7tWt1ZXXQIZ$8lBP*Ia51^`Z&cn%&3w71wwuln z6LmiMG7x|e?$oQ@#AfmAL?5+4(P)37JLE|hSGko8MSZ(G!Ijp9E=v{xY@1AmO^%&VnGZT__ z@V3ms@erHoqBQqd4_T%CE~pSJG`B~|{pV@Eh0&kpE75LTtLes-Z4SvYm8!2*hv8cq z=T9WK$#r3|Et$)spM~_j;2iC>h>`Ei`fzt1BU_8EKka(-$Y|I21S^djms3`PEI=?j zy>0;l;XeuYTuII+&hoM>eEFSYs)o)z4h&%&d+c{{4bs+5bjoGujmvWFV&lTfmdYwC z?t{RaYF*RC9|0fXuEh{x!Tt5T_9LYzDJ!O0ayT=2l=-lNke$sxs&`69RA6@z%! z>0OP=Rts2np+?WM6VthIn=wGn^M;Ej@TU(&{87&UprMx2h33srC_NKsqA!Pi9OCpu zkJ^%K7!Mfe?GJKkL!MkabaI3oWICL~Ovn|aH);w-rNS{Wp@R*>=~S(^xa2j&Sjuhx z_ZaytkNL2SxeWPoud%w_v(5-5#!Ia};MM!tswhWgk;X=W8&&d{=o(<)TXN1>hd+}@ z)lvhSYko9@M-m8fo0ObgJ0~x_cwkRTJP&+nKk+Lp<*-jZ2Vapz+ndl-IsDO{s;e`U z4t$%EfiN&`*y+VT>TDAzyq7Ijl7TFDCtY_s=7Qy~E>Wu2q~e)V(j-sxirjvUXyHoY z6$2}-*BcFM+ck3D$yYPod*frE-xKznDUFhj(uw2w;`cl0?B}Z?m4my@(z6^~STC(g ztdP{^Ys-QM=Rf+Us~_vO2i86w&f1bt~8EnTyzL_g--|{ z9nVx>=l1(~HqTB&DV;xb@Rv*nvmDJU%`33Mj+cNL_Tcg)k5&^+!^BmMar>?TUnwKz&qv9N3|Jj3c&L| z>*(keg~1g!gK+-Gj3d`0a|drt2Ph+1eg;3|FPtfATSWcrDc0_|=)FvILvY0ATgUcMa7@ATTWxOU493lGQc2-Atku>vjmO91y z!?u`)ck`^07!7MSb6ugaZ?8IoxoB8>@+E3+ni>#qudw&>~NYjS_f7N8b=8WsF zDjY}y+agAyI471;MdJ0$)Fi`v<`o&yfGiJ;mt*inKa0Q+E6VYKA0Hvc`;??*^L+g$ zzoV1Ur~^vFB*Ja1FnaN-y60k zH?lnLkM2i>xf1$Yzn7gSD7zdqHst2a*_tD^@~m@({8YWCkxT}?V%O;@V1L<3Y86L_ zo9<876ChnrXK9=+WYqo0gLPk=Rg zbi7J?5aFy~W~TUDG825HvN007Ap&>u7Ir+n`Kf>ViN1p;!_?N}9`H(FFo5GLjfsqR zkb>hKMtN(T{{_LtAQ>5_-r5B%>Fp#FG4t z61LJ3@5f4L7K7G(amMN3=!sU36fAo2^_1YBtQhrhX6H)S1+X*5sEHxPRQ48!rp{Vq z*=stS65K@YZ0@IZ#HI|c)`?yr2zZkY(Q;iu#JfQnm19hOBCp&#(bKYX{?Z?a@ zzEfQ>oR3MIJUaEGIeUi(-Qi}`{}(--BFvDHAUGv?wo0y|L&8PbBlJ)ARAQUF+MpsPS3x+00!x4ls~b4 F`9JqINYVfR literal 0 HcmV?d00001 diff --git a/shyft_documentation/source/images/navbar.png b/shyft_documentation/source/images/navbar.png new file mode 100644 index 0000000000000000000000000000000000000000..df38e90d87e1a215371b4977e18cde90f8832537 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk@BpAX3RW*PVQ%R6tFatx` +This error section is stored in a separate file in includes/_errors.md. Slate allows you to optionally separate out your docs into many files...just save them to the includes folder and add them to the top of your index.md's frontmatter. Files are included in the order listed. + + +The Kittn API uses the following error codes: + + +Error Code | Meaning +---------- | ------- +400 | Bad Request -- Your request is invalid. +401 | Unauthorized -- Your API key is wrong. +403 | Forbidden -- The kitten requested is hidden for administrators only. +404 | Not Found -- The specified kitten could not be found. +405 | Method Not Allowed -- You tried to access a kitten with an invalid method. +406 | Not Acceptable -- You requested a format that isn't json. +410 | Gone -- The kitten requested has been removed from our servers. +418 | I'm a teapot. +429 | Too Many Requests -- You're requesting too many kittens! Slow down! +500 | Internal Server Error -- We had a problem with our server. Try again later. +503 | Service Unavailable -- We're temporarily offline for maintenance. Please try again later. diff --git a/shyft_documentation/source/index.html.md b/shyft_documentation/source/index.html.md new file mode 100644 index 0000000000..4160978a52 --- /dev/null +++ b/shyft_documentation/source/index.html.md @@ -0,0 +1,131 @@ +--- +title: API Reference + +language_tabs: # must be one of https://git.io/vQNgJ + - shell + +toc_footers: + - Documentation Powered by Slate + +includes: + - errors + +search: true +--- + +# Introduction + +### A Note From The Developers + +Our goal was to avoid compromising the integrity of Geth and simply extend existing functionality to meet the specific needs of the Shyft Network. To our utmost ability we have documented, within the codebase, exactly where we have extended our functionality using the following notation: NOTE:SHYFT. This document is meant to provide a high level overview of the changes made to Geth and to provide explanations, where needed, on the changes that were made. Another benefit of this document is to allow others to quickly see the changes that were made in order to get quicker feedback on a compromising line of code. + +### Contributing To Shyft Geth + +In order to successfully accept a PR the maintainers of the Shyft repositories require that this document must be updated, reflecting the changes made in the PR. Along with the documentation, we ask that contributors provide the NOTE:SHYFT. The tag could should contain a brief on the modified code. This will help with releases further down the road as we document what breaking changes have been made along the journey. + +# Setup + +### Build GETH + +Before running any CLI options ensure you run `make geth` in the root directory. + +### CLI + +> In the root directory run `./shyft-geth.sh` with any of the following flags: + +```shell +--setup - Setups postgres and the shyft chain db. +--start - Starts geth. +--reset - Drops postgres and chain db, and instantiates both. +--js - Executes web3 calls with a passed file name. + If the file name is sendTransactions.js: + ./shyft-geth.sh --js sendTransactions +``` + +For convenience a simple CLI was built using `shyft-geth.sh` as the executable file with some basic commands to get your environment setup. + +This will create a new database for geth to use as well as all the necessary tables for the shyft blockexplorer. + +### Govendor and Packages/Dependencies + +> Download Go Vendor + +```shell +go get -u github.com/kardianos/govendor +``` + +> To run govendor globally, have this in your bash_profile file: + +```shell +export GOPATH=$HOME/go +export PATH=$PATH:$HOME/go/bin +``` + +> Then shyft_geth will need to be cloned to this directory: + +```shell +$GOPATH/src/github.com/ethereum/go-ethereum +``` + +Geth uses govendor to manage packages/dependencies: [Go Vendor](https://github.com/kardianos/govendor) + +This has some more information: [Ethereum Wiki](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) + +To add a new dependency, run govendor fetch , and commit the changes to git. Then the deps will be accessible on other machines that pull from git. + + + +# Custom Shyft Constants + +### Block Rewards + +> ./consensus/ethash/consensus.go + +```go +``` + +Shyft inflation is different than that of Ethereum, therefore the constants were changed in order to support this. + +# Shyft Extended Functionality + +## Database Functions + +> ./eth/backend.go + +```go +``` + +### Database instanitation + +The local database is instantiated in the same function where geth instantiates the merkel tri database. + +> ./core/blockchain.go + +```go +``` + +### Writing Blocks + +In our case, we use `WriteBlock()` to store all our data. So far, it contains all the data that we need to store to our local block explorer database. This may change in the future. + +## Transaction Helper Functions + +> ./core/types/transaction.go + +```go +``` + +The existing transaction type in Geth did not allow the evm to call a helper function to retrieve the from address, essentially the sender. Therefore, we extended the functionality of the Transaction type to generate the from address through `*Transaction.From()`. + +> ./shyftdb/shyft_database_util.go + +```go +``` + +## Database Getters And Setters + +In order to store the block explorer database, a custom folder was created `./shyftdb` that contains all the necessary functions to read and write to the explorer database. + +The main functions exist in `./shyftdb/shyft_database_util.go`. diff --git a/shyft_documentation/source/javascripts/all.js b/shyft_documentation/source/javascripts/all.js new file mode 100644 index 0000000000..5f5d4067ba --- /dev/null +++ b/shyft_documentation/source/javascripts/all.js @@ -0,0 +1,2 @@ +//= require ./all_nosearch +//= require ./app/_search diff --git a/shyft_documentation/source/javascripts/all_nosearch.js b/shyft_documentation/source/javascripts/all_nosearch.js new file mode 100644 index 0000000000..b18c1d833d --- /dev/null +++ b/shyft_documentation/source/javascripts/all_nosearch.js @@ -0,0 +1,16 @@ +//= require ./lib/_energize +//= require ./app/_toc +//= require ./app/_lang + +$(function() { + loadToc($('#toc'), '.toc-link', '.toc-list-h2', 10); + setupLanguages($('body').data('languages')); + $('.content').imagesLoaded( function() { + window.recacheHeights(); + window.refreshToc(); + }); +}); + +window.onpopstate = function() { + activateLanguage(getLanguageFromQueryString()); +}; diff --git a/shyft_documentation/source/javascripts/app/_lang.js b/shyft_documentation/source/javascripts/app/_lang.js new file mode 100644 index 0000000000..0fbaaef704 --- /dev/null +++ b/shyft_documentation/source/javascripts/app/_lang.js @@ -0,0 +1,164 @@ +//= require ../lib/_jquery + +/* +Copyright 2008-2013 Concur Technologies, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); you may +not use this file except in compliance with the License. You may obtain +a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +License for the specific language governing permissions and limitations +under the License. +*/ +;(function () { + 'use strict'; + + var languages = []; + + window.setupLanguages = setupLanguages; + window.activateLanguage = activateLanguage; + window.getLanguageFromQueryString = getLanguageFromQueryString; + + function activateLanguage(language) { + if (!language) return; + if (language === "") return; + + $(".lang-selector a").removeClass('active'); + $(".lang-selector a[data-language-name='" + language + "']").addClass('active'); + for (var i=0; i < languages.length; i++) { + $(".highlight.tab-" + languages[i]).hide(); + $(".lang-specific." + languages[i]).hide(); + } + $(".highlight.tab-" + language).show(); + $(".lang-specific." + language).show(); + + window.recacheHeights(); + + // scroll to the new location of the position + if ($(window.location.hash).get(0)) { + $(window.location.hash).get(0).scrollIntoView(true); + } + } + + // parseURL and stringifyURL are from https://github.com/sindresorhus/query-string + // MIT licensed + // https://github.com/sindresorhus/query-string/blob/7bee64c16f2da1a326579e96977b9227bf6da9e6/license + function parseURL(str) { + if (typeof str !== 'string') { + return {}; + } + + str = str.trim().replace(/^(\?|#|&)/, ''); + + if (!str) { + return {}; + } + + return str.split('&').reduce(function (ret, param) { + var parts = param.replace(/\+/g, ' ').split('='); + var key = parts[0]; + var val = parts[1]; + + key = decodeURIComponent(key); + // missing `=` should be `null`: + // http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters + val = val === undefined ? null : decodeURIComponent(val); + + if (!ret.hasOwnProperty(key)) { + ret[key] = val; + } else if (Array.isArray(ret[key])) { + ret[key].push(val); + } else { + ret[key] = [ret[key], val]; + } + + return ret; + }, {}); + }; + + function stringifyURL(obj) { + return obj ? Object.keys(obj).sort().map(function (key) { + var val = obj[key]; + + if (Array.isArray(val)) { + return val.sort().map(function (val2) { + return encodeURIComponent(key) + '=' + encodeURIComponent(val2); + }).join('&'); + } + + return encodeURIComponent(key) + '=' + encodeURIComponent(val); + }).join('&') : ''; + }; + + // gets the language set in the query string + function getLanguageFromQueryString() { + if (location.search.length >= 1) { + var language = parseURL(location.search).language; + if (language) { + return language; + } else if (jQuery.inArray(location.search.substr(1), languages) != -1) { + return location.search.substr(1); + } + } + + return false; + } + + // returns a new query string with the new language in it + function generateNewQueryString(language) { + var url = parseURL(location.search); + if (url.language) { + url.language = language; + return stringifyURL(url); + } + return language; + } + + // if a button is clicked, add the state to the history + function pushURL(language) { + if (!history) { return; } + var hash = window.location.hash; + if (hash) { + hash = hash.replace(/^#+/, ''); + } + history.pushState({}, '', '?' + generateNewQueryString(language) + '#' + hash); + + // save language as next default + localStorage.setItem("language", language); + } + + function setupLanguages(l) { + var defaultLanguage = localStorage.getItem("language"); + + languages = l; + + var presetLanguage = getLanguageFromQueryString(); + if (presetLanguage) { + // the language is in the URL, so use that language! + activateLanguage(presetLanguage); + + localStorage.setItem("language", presetLanguage); + } else if ((defaultLanguage !== null) && (jQuery.inArray(defaultLanguage, languages) != -1)) { + // the language was the last selected one saved in localstorage, so use that language! + activateLanguage(defaultLanguage); + } else { + // no language selected, so use the default + activateLanguage(languages[0]); + } + } + + // if we click on a language tab, activate that language + $(function() { + $(".lang-selector a").on("click", function() { + var language = $(this).data("language-name"); + pushURL(language); + activateLanguage(language); + return false; + }); + }); +})(); diff --git a/shyft_documentation/source/javascripts/app/_search.js b/shyft_documentation/source/javascripts/app/_search.js new file mode 100644 index 0000000000..9ff4233c18 --- /dev/null +++ b/shyft_documentation/source/javascripts/app/_search.js @@ -0,0 +1,98 @@ +//= require ../lib/_lunr +//= require ../lib/_jquery +//= require ../lib/_jquery.highlight +;(function () { + 'use strict'; + + var content, searchResults; + var highlightOpts = { element: 'span', className: 'search-highlight' }; + var searchDelay = 0; + var timeoutHandle = 0; + + var index = new lunr.Index(); + + index.ref('id'); + index.field('title', { boost: 10 }); + index.field('body'); + index.pipeline.add(lunr.trimmer, lunr.stopWordFilter); + + $(populate); + $(bind); + + function populate() { + $('h1, h2').each(function() { + var title = $(this); + var body = title.nextUntil('h1, h2'); + index.add({ + id: title.prop('id'), + title: title.text(), + body: body.text() + }); + }); + + determineSearchDelay(); + } + function determineSearchDelay() { + if(index.tokenStore.length>5000) { + searchDelay = 300; + } + } + + function bind() { + content = $('.content'); + searchResults = $('.search-results'); + + $('#input-search').on('keyup',function(e) { + var wait = function() { + return function(executingFunction, waitTime){ + clearTimeout(timeoutHandle); + timeoutHandle = setTimeout(executingFunction, waitTime); + }; + }(); + wait(function(){ + search(e); + }, searchDelay ); + }); + } + + function search(event) { + + var searchInput = $('#input-search')[0]; + + unhighlight(); + searchResults.addClass('visible'); + + // ESC clears the field + if (event.keyCode === 27) searchInput.value = ''; + + if (searchInput.value) { + var results = index.search(searchInput.value).filter(function(r) { + return r.score > 0.0001; + }); + + if (results.length) { + searchResults.empty(); + $.each(results, function (index, result) { + var elem = document.getElementById(result.ref); + searchResults.append("
  • " + $(elem).text() + "
    • "); + }); + highlight.call(searchInput); + } else { + searchResults.html('
  • '); + $('.search-results li').text('No Results Found for "' + searchInput.value + '"'); + } + } else { + unhighlight(); + searchResults.removeClass('visible'); + } + } + + function highlight() { + if (this.value) content.highlight(this.value, highlightOpts); + } + + function unhighlight() { + content.unhighlight(highlightOpts); + } +})(); + diff --git a/shyft_documentation/source/javascripts/app/_toc.js b/shyft_documentation/source/javascripts/app/_toc.js new file mode 100644 index 0000000000..f1937bc92f --- /dev/null +++ b/shyft_documentation/source/javascripts/app/_toc.js @@ -0,0 +1,114 @@ +//= require ../lib/_jquery +//= require ../lib/_imagesloaded.min +;(function () { + 'use strict'; + + var loaded = false; + + var debounce = function(func, waitTime) { + var timeout = false; + return function() { + if (timeout === false) { + setTimeout(function() { + func(); + timeout = false; + }, waitTime); + timeout = true; + } + }; + }; + + var closeToc = function() { + $(".toc-wrapper").removeClass('open'); + $("#nav-button").removeClass('open'); + }; + + function loadToc($toc, tocLinkSelector, tocListSelector, scrollOffset) { + var headerHeights = {}; + var pageHeight = 0; + var windowHeight = 0; + var originalTitle = document.title; + + var recacheHeights = function() { + headerHeights = {}; + pageHeight = $(document).height(); + windowHeight = $(window).height(); + + $toc.find(tocLinkSelector).each(function() { + var targetId = $(this).attr('href'); + if (targetId[0] === "#") { + headerHeights[targetId] = $(targetId).offset().top; + } + }); + }; + + var refreshToc = function() { + var currentTop = $(document).scrollTop() + scrollOffset; + + if (currentTop + windowHeight >= pageHeight) { + // at bottom of page, so just select last header by making currentTop very large + // this fixes the problem where the last header won't ever show as active if its content + // is shorter than the window height + currentTop = pageHeight + 1000; + } + + var best = null; + for (var name in headerHeights) { + if ((headerHeights[name] < currentTop && headerHeights[name] > headerHeights[best]) || best === null) { + best = name; + } + } + + // Catch the initial load case + if (currentTop == scrollOffset && !loaded) { + best = window.location.hash; + loaded = true; + } + + var $best = $toc.find("[href='" + best + "']").first(); + if (!$best.hasClass("active")) { + // .active is applied to the ToC link we're currently on, and its parent
      s selected by tocListSelector + // .active-expanded is applied to the ToC links that are parents of this one + $toc.find(".active").removeClass("active"); + $toc.find(".active-parent").removeClass("active-parent"); + $best.addClass("active"); + $best.parents(tocListSelector).addClass("active").siblings(tocLinkSelector).addClass('active-parent'); + $best.siblings(tocListSelector).addClass("active"); + $toc.find(tocListSelector).filter(":not(.active)").slideUp(150); + $toc.find(tocListSelector).filter(".active").slideDown(150); + // TODO remove classnames + document.title = $best.data("title") + " – " + originalTitle; + } + }; + + var makeToc = function() { + recacheHeights(); + refreshToc(); + + $("#nav-button").click(function() { + $(".toc-wrapper").toggleClass('open'); + $("#nav-button").toggleClass('open'); + return false; + }); + $(".page-wrapper").click(closeToc); + $(".toc-link").click(closeToc); + + // reload immediately after scrolling on toc click + $toc.find(tocLinkSelector).click(function() { + setTimeout(function() { + refreshToc(); + }, 0); + }); + + $(window).scroll(debounce(refreshToc, 200)); + $(window).resize(debounce(recacheHeights, 200)); + }; + + makeToc(); + + window.recacheHeights = recacheHeights; + window.refreshToc = refreshToc; + } + + window.loadToc = loadToc; +})(); diff --git a/shyft_documentation/source/javascripts/lib/_energize.js b/shyft_documentation/source/javascripts/lib/_energize.js new file mode 100644 index 0000000000..6798f3c03f --- /dev/null +++ b/shyft_documentation/source/javascripts/lib/_energize.js @@ -0,0 +1,169 @@ +/** + * energize.js v0.1.0 + * + * Speeds up click events on mobile devices. + * https://github.com/davidcalhoun/energize.js + */ + +(function() { // Sandbox + /** + * Don't add to non-touch devices, which don't need to be sped up + */ + if(!('ontouchstart' in window)) return; + + var lastClick = {}, + isThresholdReached, touchstart, touchmove, touchend, + click, closest; + + /** + * isThresholdReached + * + * Compare touchstart with touchend xy coordinates, + * and only fire simulated click event if the coordinates + * are nearby. (don't want clicking to be confused with a swipe) + */ + isThresholdReached = function(startXY, xy) { + return Math.abs(startXY[0] - xy[0]) > 5 || Math.abs(startXY[1] - xy[1]) > 5; + }; + + /** + * touchstart + * + * Save xy coordinates when the user starts touching the screen + */ + touchstart = function(e) { + this.startXY = [e.touches[0].clientX, e.touches[0].clientY]; + this.threshold = false; + }; + + /** + * touchmove + * + * Check if the user is scrolling past the threshold. + * Have to check here because touchend will not always fire + * on some tested devices (Kindle Fire?) + */ + touchmove = function(e) { + // NOOP if the threshold has already been reached + if(this.threshold) return false; + + this.threshold = isThresholdReached(this.startXY, [e.touches[0].clientX, e.touches[0].clientY]); + }; + + /** + * touchend + * + * If the user didn't scroll past the threshold between + * touchstart and touchend, fire a simulated click. + * + * (This will fire before a native click) + */ + touchend = function(e) { + // Don't fire a click if the user scrolled past the threshold + if(this.threshold || isThresholdReached(this.startXY, [e.changedTouches[0].clientX, e.changedTouches[0].clientY])) { + return; + } + + /** + * Create and fire a click event on the target element + * https://developer.mozilla.org/en/DOM/event.initMouseEvent + */ + var touch = e.changedTouches[0], + evt = document.createEvent('MouseEvents'); + evt.initMouseEvent('click', true, true, window, 0, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null); + evt.simulated = true; // distinguish from a normal (nonsimulated) click + e.target.dispatchEvent(evt); + }; + + /** + * click + * + * Because we've already fired a click event in touchend, + * we need to listed for all native click events here + * and suppress them as necessary. + */ + click = function(e) { + /** + * Prevent ghost clicks by only allowing clicks we created + * in the click event we fired (look for e.simulated) + */ + var time = Date.now(), + timeDiff = time - lastClick.time, + x = e.clientX, + y = e.clientY, + xyDiff = [Math.abs(lastClick.x - x), Math.abs(lastClick.y - y)], + target = closest(e.target, 'A') || e.target, // needed for standalone apps + nodeName = target.nodeName, + isLink = nodeName === 'A', + standAlone = window.navigator.standalone && isLink && e.target.getAttribute("href"); + + lastClick.time = time; + lastClick.x = x; + lastClick.y = y; + + /** + * Unfortunately Android sometimes fires click events without touch events (seen on Kindle Fire), + * so we have to add more logic to determine the time of the last click. Not perfect... + * + * Older, simpler check: if((!e.simulated) || standAlone) + */ + if((!e.simulated && (timeDiff < 500 || (timeDiff < 1500 && xyDiff[0] < 50 && xyDiff[1] < 50))) || standAlone) { + e.preventDefault(); + e.stopPropagation(); + if(!standAlone) return false; + } + + /** + * Special logic for standalone web apps + * See http://stackoverflow.com/questions/2898740/iphone-safari-web-app-opens-links-in-new-window + */ + if(standAlone) { + window.location = target.getAttribute("href"); + } + + /** + * Add an energize-focus class to the targeted link (mimics :focus behavior) + * TODO: test and/or remove? Does this work? + */ + if(!target || !target.classList) return; + target.classList.add("energize-focus"); + window.setTimeout(function(){ + target.classList.remove("energize-focus"); + }, 150); + }; + + /** + * closest + * @param {HTMLElement} node current node to start searching from. + * @param {string} tagName the (uppercase) name of the tag you're looking for. + * + * Find the closest ancestor tag of a given node. + * + * Starts at node and goes up the DOM tree looking for a + * matching nodeName, continuing until hitting document.body + */ + closest = function(node, tagName){ + var curNode = node; + + while(curNode !== document.body) { // go up the dom until we find the tag we're after + if(!curNode || curNode.nodeName === tagName) { return curNode; } // found + curNode = curNode.parentNode; // not found, so keep going up + } + + return null; // not found + }; + + /** + * Add all delegated event listeners + * + * All the events we care about bubble up to document, + * so we can take advantage of event delegation. + * + * Note: no need to wait for DOMContentLoaded here + */ + document.addEventListener('touchstart', touchstart, false); + document.addEventListener('touchmove', touchmove, false); + document.addEventListener('touchend', touchend, false); + document.addEventListener('click', click, true); // TODO: why does this use capture? + +})(); \ No newline at end of file diff --git a/shyft_documentation/source/javascripts/lib/_imagesloaded.min.js b/shyft_documentation/source/javascripts/lib/_imagesloaded.min.js new file mode 100644 index 0000000000..d66f658937 --- /dev/null +++ b/shyft_documentation/source/javascripts/lib/_imagesloaded.min.js @@ -0,0 +1,7 @@ +/*! + * imagesLoaded PACKAGED v3.1.8 + * JavaScript is all like "You images are done yet or what?" + * MIT License + */ + +(function(){function e(){}function t(e,t){for(var n=e.length;n--;)if(e[n].listener===t)return n;return-1}function n(e){return function(){return this[e].apply(this,arguments)}}var i=e.prototype,r=this,o=r.EventEmitter;i.getListeners=function(e){var t,n,i=this._getEvents();if("object"==typeof e){t={};for(n in i)i.hasOwnProperty(n)&&e.test(n)&&(t[n]=i[n])}else t=i[e]||(i[e]=[]);return t},i.flattenListeners=function(e){var t,n=[];for(t=0;e.length>t;t+=1)n.push(e[t].listener);return n},i.getListenersAsObject=function(e){var t,n=this.getListeners(e);return n instanceof Array&&(t={},t[e]=n),t||n},i.addListener=function(e,n){var i,r=this.getListenersAsObject(e),o="object"==typeof n;for(i in r)r.hasOwnProperty(i)&&-1===t(r[i],n)&&r[i].push(o?n:{listener:n,once:!1});return this},i.on=n("addListener"),i.addOnceListener=function(e,t){return this.addListener(e,{listener:t,once:!0})},i.once=n("addOnceListener"),i.defineEvent=function(e){return this.getListeners(e),this},i.defineEvents=function(e){for(var t=0;e.length>t;t+=1)this.defineEvent(e[t]);return this},i.removeListener=function(e,n){var i,r,o=this.getListenersAsObject(e);for(r in o)o.hasOwnProperty(r)&&(i=t(o[r],n),-1!==i&&o[r].splice(i,1));return this},i.off=n("removeListener"),i.addListeners=function(e,t){return this.manipulateListeners(!1,e,t)},i.removeListeners=function(e,t){return this.manipulateListeners(!0,e,t)},i.manipulateListeners=function(e,t,n){var i,r,o=e?this.removeListener:this.addListener,s=e?this.removeListeners:this.addListeners;if("object"!=typeof t||t instanceof RegExp)for(i=n.length;i--;)o.call(this,t,n[i]);else for(i in t)t.hasOwnProperty(i)&&(r=t[i])&&("function"==typeof r?o.call(this,i,r):s.call(this,i,r));return this},i.removeEvent=function(e){var t,n=typeof e,i=this._getEvents();if("string"===n)delete i[e];else if("object"===n)for(t in i)i.hasOwnProperty(t)&&e.test(t)&&delete i[t];else delete this._events;return this},i.removeAllListeners=n("removeEvent"),i.emitEvent=function(e,t){var n,i,r,o,s=this.getListenersAsObject(e);for(r in s)if(s.hasOwnProperty(r))for(i=s[r].length;i--;)n=s[r][i],n.once===!0&&this.removeListener(e,n.listener),o=n.listener.apply(this,t||[]),o===this._getOnceReturnValue()&&this.removeListener(e,n.listener);return this},i.trigger=n("emitEvent"),i.emit=function(e){var t=Array.prototype.slice.call(arguments,1);return this.emitEvent(e,t)},i.setOnceReturnValue=function(e){return this._onceReturnValue=e,this},i._getOnceReturnValue=function(){return this.hasOwnProperty("_onceReturnValue")?this._onceReturnValue:!0},i._getEvents=function(){return this._events||(this._events={})},e.noConflict=function(){return r.EventEmitter=o,e},"function"==typeof define&&define.amd?define("eventEmitter/EventEmitter",[],function(){return e}):"object"==typeof module&&module.exports?module.exports=e:this.EventEmitter=e}).call(this),function(e){function t(t){var n=e.event;return n.target=n.target||n.srcElement||t,n}var n=document.documentElement,i=function(){};n.addEventListener?i=function(e,t,n){e.addEventListener(t,n,!1)}:n.attachEvent&&(i=function(e,n,i){e[n+i]=i.handleEvent?function(){var n=t(e);i.handleEvent.call(i,n)}:function(){var n=t(e);i.call(e,n)},e.attachEvent("on"+n,e[n+i])});var r=function(){};n.removeEventListener?r=function(e,t,n){e.removeEventListener(t,n,!1)}:n.detachEvent&&(r=function(e,t,n){e.detachEvent("on"+t,e[t+n]);try{delete e[t+n]}catch(i){e[t+n]=void 0}});var o={bind:i,unbind:r};"function"==typeof define&&define.amd?define("eventie/eventie",o):e.eventie=o}(this),function(e,t){"function"==typeof define&&define.amd?define(["eventEmitter/EventEmitter","eventie/eventie"],function(n,i){return t(e,n,i)}):"object"==typeof exports?module.exports=t(e,require("wolfy87-eventemitter"),require("eventie")):e.imagesLoaded=t(e,e.EventEmitter,e.eventie)}(window,function(e,t,n){function i(e,t){for(var n in t)e[n]=t[n];return e}function r(e){return"[object Array]"===d.call(e)}function o(e){var t=[];if(r(e))t=e;else if("number"==typeof e.length)for(var n=0,i=e.length;i>n;n++)t.push(e[n]);else t.push(e);return t}function s(e,t,n){if(!(this instanceof s))return new s(e,t);"string"==typeof e&&(e=document.querySelectorAll(e)),this.elements=o(e),this.options=i({},this.options),"function"==typeof t?n=t:i(this.options,t),n&&this.on("always",n),this.getImages(),a&&(this.jqDeferred=new a.Deferred);var r=this;setTimeout(function(){r.check()})}function f(e){this.img=e}function c(e){this.src=e,v[e]=this}var a=e.jQuery,u=e.console,h=u!==void 0,d=Object.prototype.toString;s.prototype=new t,s.prototype.options={},s.prototype.getImages=function(){this.images=[];for(var e=0,t=this.elements.length;t>e;e++){var n=this.elements[e];"IMG"===n.nodeName&&this.addImage(n);var i=n.nodeType;if(i&&(1===i||9===i||11===i))for(var r=n.querySelectorAll("img"),o=0,s=r.length;s>o;o++){var f=r[o];this.addImage(f)}}},s.prototype.addImage=function(e){var t=new f(e);this.images.push(t)},s.prototype.check=function(){function e(e,r){return t.options.debug&&h&&u.log("confirm",e,r),t.progress(e),n++,n===i&&t.complete(),!0}var t=this,n=0,i=this.images.length;if(this.hasAnyBroken=!1,!i)return this.complete(),void 0;for(var r=0;i>r;r++){var o=this.images[r];o.on("confirm",e),o.check()}},s.prototype.progress=function(e){this.hasAnyBroken=this.hasAnyBroken||!e.isLoaded;var t=this;setTimeout(function(){t.emit("progress",t,e),t.jqDeferred&&t.jqDeferred.notify&&t.jqDeferred.notify(t,e)})},s.prototype.complete=function(){var e=this.hasAnyBroken?"fail":"done";this.isComplete=!0;var t=this;setTimeout(function(){if(t.emit(e,t),t.emit("always",t),t.jqDeferred){var n=t.hasAnyBroken?"reject":"resolve";t.jqDeferred[n](t)}})},a&&(a.fn.imagesLoaded=function(e,t){var n=new s(this,e,t);return n.jqDeferred.promise(a(this))}),f.prototype=new t,f.prototype.check=function(){var e=v[this.img.src]||new c(this.img.src);if(e.isConfirmed)return this.confirm(e.isLoaded,"cached was confirmed"),void 0;if(this.img.complete&&void 0!==this.img.naturalWidth)return this.confirm(0!==this.img.naturalWidth,"naturalWidth"),void 0;var t=this;e.on("confirm",function(e,n){return t.confirm(e.isLoaded,n),!0}),e.check()},f.prototype.confirm=function(e,t){this.isLoaded=e,this.emit("confirm",this,t)};var v={};return c.prototype=new t,c.prototype.check=function(){if(!this.isChecked){var e=new Image;n.bind(e,"load",this),n.bind(e,"error",this),e.src=this.src,this.isChecked=!0}},c.prototype.handleEvent=function(e){var t="on"+e.type;this[t]&&this[t](e)},c.prototype.onload=function(e){this.confirm(!0,"onload"),this.unbindProxyEvents(e)},c.prototype.onerror=function(e){this.confirm(!1,"onerror"),this.unbindProxyEvents(e)},c.prototype.confirm=function(e,t){this.isConfirmed=!0,this.isLoaded=e,this.emit("confirm",this,t)},c.prototype.unbindProxyEvents=function(e){n.unbind(e.target,"load",this),n.unbind(e.target,"error",this)},s}); \ No newline at end of file diff --git a/shyft_documentation/source/javascripts/lib/_jquery.highlight.js b/shyft_documentation/source/javascripts/lib/_jquery.highlight.js new file mode 100644 index 0000000000..9dcf3c7af3 --- /dev/null +++ b/shyft_documentation/source/javascripts/lib/_jquery.highlight.js @@ -0,0 +1,108 @@ +/* + * jQuery Highlight plugin + * + * Based on highlight v3 by Johann Burkard + * http://johannburkard.de/blog/programming/javascript/highlight-javascript-text-higlighting-jquery-plugin.html + * + * Code a little bit refactored and cleaned (in my humble opinion). + * Most important changes: + * - has an option to highlight only entire words (wordsOnly - false by default), + * - has an option to be case sensitive (caseSensitive - false by default) + * - highlight element tag and class names can be specified in options + * + * Usage: + * // wrap every occurrance of text 'lorem' in content + * // with (default options) + * $('#content').highlight('lorem'); + * + * // search for and highlight more terms at once + * // so you can save some time on traversing DOM + * $('#content').highlight(['lorem', 'ipsum']); + * $('#content').highlight('lorem ipsum'); + * + * // search only for entire word 'lorem' + * $('#content').highlight('lorem', { wordsOnly: true }); + * + * // don't ignore case during search of term 'lorem' + * $('#content').highlight('lorem', { caseSensitive: true }); + * + * // wrap every occurrance of term 'ipsum' in content + * // with + * $('#content').highlight('ipsum', { element: 'em', className: 'important' }); + * + * // remove default highlight + * $('#content').unhighlight(); + * + * // remove custom highlight + * $('#content').unhighlight({ element: 'em', className: 'important' }); + * + * + * Copyright (c) 2009 Bartek Szopka + * + * Licensed under MIT license. + * + */ + +jQuery.extend({ + highlight: function (node, re, nodeName, className) { + if (node.nodeType === 3) { + var match = node.data.match(re); + if (match) { + var highlight = document.createElement(nodeName || 'span'); + highlight.className = className || 'highlight'; + var wordNode = node.splitText(match.index); + wordNode.splitText(match[0].length); + var wordClone = wordNode.cloneNode(true); + highlight.appendChild(wordClone); + wordNode.parentNode.replaceChild(highlight, wordNode); + return 1; //skip added node in parent + } + } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children + !/(script|style)/i.test(node.tagName) && // ignore script and style nodes + !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted + for (var i = 0; i < node.childNodes.length; i++) { + i += jQuery.highlight(node.childNodes[i], re, nodeName, className); + } + } + return 0; + } +}); + +jQuery.fn.unhighlight = function (options) { + var settings = { className: 'highlight', element: 'span' }; + jQuery.extend(settings, options); + + return this.find(settings.element + "." + settings.className).each(function () { + var parent = this.parentNode; + parent.replaceChild(this.firstChild, this); + parent.normalize(); + }).end(); +}; + +jQuery.fn.highlight = function (words, options) { + var settings = { className: 'highlight', element: 'span', caseSensitive: false, wordsOnly: false }; + jQuery.extend(settings, options); + + if (words.constructor === String) { + words = [words]; + } + words = jQuery.grep(words, function(word, i){ + return word != ''; + }); + words = jQuery.map(words, function(word, i) { + return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); + }); + if (words.length == 0) { return this; }; + + var flag = settings.caseSensitive ? "" : "i"; + var pattern = "(" + words.join("|") + ")"; + if (settings.wordsOnly) { + pattern = "\\b" + pattern + "\\b"; + } + var re = new RegExp(pattern, flag); + + return this.each(function () { + jQuery.highlight(this, re, settings.element, settings.className); + }); +}; + diff --git a/shyft_documentation/source/javascripts/lib/_jquery.js b/shyft_documentation/source/javascripts/lib/_jquery.js new file mode 100644 index 0000000000..b78120e6a1 --- /dev/null +++ b/shyft_documentation/source/javascripts/lib/_jquery.js @@ -0,0 +1,9831 @@ +/*! + * jQuery JavaScript Library v2.2.0 + * http://jquery.com/ + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2016-01-08T20:02Z + */ + +(function( global, factory ) { + + if ( typeof module === "object" && typeof module.exports === "object" ) { + // For CommonJS and CommonJS-like environments where a proper `window` + // is present, execute the factory and get jQuery. + // For environments that do not have a `window` with a `document` + // (such as Node.js), expose a factory as module.exports. + // This accentuates the need for the creation of a real `window`. + // e.g. var jQuery = require("jquery")(window); + // See ticket #14549 for more info. + module.exports = global.document ? + factory( global, true ) : + function( w ) { + if ( !w.document ) { + throw new Error( "jQuery requires a window with a document" ); + } + return factory( w ); + }; + } else { + factory( global ); + } + +// Pass this if window is not defined yet +}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Support: Firefox 18+ +// Can't be in strict mode, several libs including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +//"use strict"; +var arr = []; + +var document = window.document; + +var slice = arr.slice; + +var concat = arr.concat; + +var push = arr.push; + +var indexOf = arr.indexOf; + +var class2type = {}; + +var toString = class2type.toString; + +var hasOwn = class2type.hasOwnProperty; + +var support = {}; + + + +var + version = "2.2.0", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }, + + // Support: Android<4.1 + // Make sure we trim BOM and NBSP + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + + // Matches dashed string for camelizing + rmsPrefix = /^-ms-/, + rdashAlpha = /-([\da-z])/gi, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }; + +jQuery.fn = jQuery.prototype = { + + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // Start with an empty selector + selector: "", + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num != null ? + + // Return just the one element from the set + ( num < 0 ? this[ num + this.length ] : this[ num ] ) : + + // Return all the elements in a clean array + slice.call( this ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + ret.context = this.context; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + each: function( callback ) { + return jQuery.each( this, callback ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map( this, function( elem, i ) { + return callback.call( elem, i, elem ); + } ) ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[ 0 ] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction( target ) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + + // Only deal with non-null/undefined values + if ( ( options = arguments[ i ] ) != null ) { + + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject( copy ) || + ( copyIsArray = jQuery.isArray( copy ) ) ) ) { + + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray( src ) ? src : []; + + } else { + clone = src && jQuery.isPlainObject( src ) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend( { + + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + isFunction: function( obj ) { + return jQuery.type( obj ) === "function"; + }, + + isArray: Array.isArray, + + isWindow: function( obj ) { + return obj != null && obj === obj.window; + }, + + isNumeric: function( obj ) { + + // parseFloat NaNs numeric-cast false positives (null|true|false|"") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + // adding 1 corrects loss of precision from parseFloat (#15100) + var realStringObj = obj && obj.toString(); + return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0; + }, + + isPlainObject: function( obj ) { + + // Not plain objects: + // - Any object or value whose internal [[Class]] property is not "[object Object]" + // - DOM nodes + // - window + if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.constructor && + !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { + return false; + } + + // If the function hasn't returned already, we're confident that + // |obj| is a plain object, created by {} or constructed with new Object + return true; + }, + + isEmptyObject: function( obj ) { + var name; + for ( name in obj ) { + return false; + } + return true; + }, + + type: function( obj ) { + if ( obj == null ) { + return obj + ""; + } + + // Support: Android<4.0, iOS<6 (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call( obj ) ] || "object" : + typeof obj; + }, + + // Evaluates a script in a global context + globalEval: function( code ) { + var script, + indirect = eval; + + code = jQuery.trim( code ); + + if ( code ) { + + // If the code includes a valid, prologue position + // strict mode pragma, execute code by injecting a + // script tag into the document. + if ( code.indexOf( "use strict" ) === 1 ) { + script = document.createElement( "script" ); + script.text = code; + document.head.appendChild( script ).parentNode.removeChild( script ); + } else { + + // Otherwise, avoid the DOM node creation, insertion + // and removal by using an indirect global eval + + indirect( code ); + } + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Support: IE9-11+ + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + }, + + each: function( obj, callback ) { + var length, i = 0; + + if ( isArrayLike( obj ) ) { + length = obj.length; + for ( ; i < length; i++ ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } else { + for ( i in obj ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } + + return obj; + }, + + // Support: Android<4.1 + trim: function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArrayLike( Object( arr ) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var length, value, + i = 0, + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArrayLike( elems ) ) { + length = elems.length; + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + var tmp, args, proxy; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; + }, + + now: Date.now, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +} ); + +// JSHint would error on this code due to the Symbol not being defined in ES5. +// Defining this global in .jshintrc would create a danger of using the global +// unguarded in another place, it seems safer to just disable JSHint for these +// three lines. +/* jshint ignore: start */ +if ( typeof Symbol === "function" ) { + jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; +} +/* jshint ignore: end */ + +// Populate the class2type map +jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), +function( i, name ) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +} ); + +function isArrayLike( obj ) { + + // Support: iOS 8.2 (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = !!obj && "length" in obj && obj.length, + type = jQuery.type( obj ); + + if ( type === "function" || jQuery.isWindow( obj ) ) { + return false; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} +var Sizzle = +/*! + * Sizzle CSS Selector Engine v2.2.1 + * http://sizzlejs.com/ + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2015-10-17 + */ +(function( window ) { + +var i, + support, + Expr, + getText, + isXML, + tokenize, + compile, + select, + outermostContext, + sortInput, + hasDuplicate, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + 1 * new Date(), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + } + return 0; + }, + + // General-purpose constants + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf as it's faster than native + // http://jsperf.com/thor-indexof-vs-for/5 + indexOf = function( list, elem ) { + var i = 0, + len = list.length; + for ( ; i < len; i++ ) { + if ( list[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + + // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + + // Operator (capture 2) + "*([*^$|!~]?=)" + whitespace + + // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" + "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + + "*\\]", + + pseudos = ":(" + identifier + ")(?:\\((" + + // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: + // 1. quoted (capture 3; capture 4 or capture 5) + "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + + // 2. simple (capture 6) + "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + + // 3. anything else (capture 2) + ".*" + + ")\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rwhitespace = new RegExp( whitespace + "+", "g" ), + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + identifier + ")" ), + "CLASS": new RegExp( "^\\.(" + identifier + ")" ), + "TAG": new RegExp( "^(" + identifier + "|[*])" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rsibling = /[+~]/, + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox<24 + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + high < 0 ? + // BMP codepoint + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }, + + // Used for iframes + // See setDocument() + // Removing the function wrapper causes a "Permission Denied" + // error in IE + unloadHandler = function() { + setDocument(); + }; + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var m, i, elem, nid, nidselect, match, groups, newSelector, + newContext = context && context.ownerDocument, + + // nodeType defaults to 9, since context defaults to document + nodeType = context ? context.nodeType : 9; + + results = results || []; + + // Return early from calls with invalid selector or context + if ( typeof selector !== "string" || !selector || + nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { + + return results; + } + + // Try to shortcut find operations (as opposed to filters) in HTML documents + if ( !seed ) { + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + context = context || document; + + if ( documentIsHTML ) { + + // If the selector is sufficiently simple, try using a "get*By*" DOM method + // (excepting DocumentFragment context, where the methods don't exist) + if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { + + // ID selector + if ( (m = match[1]) ) { + + // Document context + if ( nodeType === 9 ) { + if ( (elem = context.getElementById( m )) ) { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + + // Element context + } else { + + // Support: IE, Opera, Webkit + // TODO: identify versions + // getElementById can match elements by name instead of ID + if ( newContext && (elem = newContext.getElementById( m )) && + contains( context, elem ) && + elem.id === m ) { + + results.push( elem ); + return results; + } + } + + // Type selector + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Class selector + } else if ( (m = match[3]) && support.getElementsByClassName && + context.getElementsByClassName ) { + + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // Take advantage of querySelectorAll + if ( support.qsa && + !compilerCache[ selector + " " ] && + (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + + if ( nodeType !== 1 ) { + newContext = context; + newSelector = selector; + + // qSA looks outside Element context, which is not what we want + // Thanks to Andrew Dupont for this workaround technique + // Support: IE <=8 + // Exclude object elements + } else if ( context.nodeName.toLowerCase() !== "object" ) { + + // Capture the context ID, setting it first if necessary + if ( (nid = context.getAttribute( "id" )) ) { + nid = nid.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", (nid = expando) ); + } + + // Prefix every selector in the list + groups = tokenize( selector ); + i = groups.length; + nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']"; + while ( i-- ) { + groups[i] = nidselect + " " + toSelector( groups[i] ); + } + newSelector = groups.join( "," ); + + // Expand context for sibling selectors + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || + context; + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch ( qsaError ) { + } finally { + if ( nid === expando ) { + context.removeAttribute( "id" ); + } + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {function(string, object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key + " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key + " " ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); + + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = arr.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Checks a node for validity as a Sizzle context + * @param {Element|Object=} context + * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value + */ +function testContext( context ) { + return context && typeof context.getElementsByTagName !== "undefined" && context; +} + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Detects XML nodes + * @param {Element|Object} elem An element or a document + * @returns {Boolean} True iff elem is a non-HTML XML node + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var hasCompare, parent, + doc = node ? node.ownerDocument || node : preferredDoc; + + // Return early if doc is invalid or already selected + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Update global variables + document = doc; + docElem = document.documentElement; + documentIsHTML = !isXML( document ); + + // Support: IE 9-11, Edge + // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) + if ( (parent = document.defaultView) && parent.top !== parent ) { + // Support: IE 11 + if ( parent.addEventListener ) { + parent.addEventListener( "unload", unloadHandler, false ); + + // Support: IE 9 - 10 only + } else if ( parent.attachEvent ) { + parent.attachEvent( "onunload", unloadHandler ); + } + } + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties + // (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( document.createComment("") ); + return !div.getElementsByTagName("*").length; + }); + + // Support: IE<9 + support.getElementsByClassName = rnative.test( document.getElementsByClassName ); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !document.getElementsByName || !document.getElementsByName( expando ).length; + }); + + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var m = context.getElementById( id ); + return m ? [ m ] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== "undefined" && + elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( tag ); + + // DocumentFragment nodes don't have gEBTN + } else if ( support.qsa ) { + return context.querySelectorAll( tag ); + } + } : + + function( tag, context ) { + var elem, + tmp = [], + i = 0, + // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( document.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + docElem.appendChild( div ).innerHTML = "" + + ""; + + // Support: IE8, Opera 11-12.16 + // Nothing should be selected when empty strings follow ^= or $= or *= + // The test attribute must be unknown in Opera but "safe" for WinRT + // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section + if ( div.querySelectorAll("[msallowcapture^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ + if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { + rbuggyQSA.push("~="); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + + // Support: Safari 8+, iOS 8+ + // https://bugs.webkit.org/show_bug.cgi?id=136851 + // In-page `selector#id sibing-combinator selector` fails + if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { + rbuggyQSA.push(".#.+[+~]"); + } + }); + + assert(function( div ) { + // Support: Windows 8 Native Apps + // The type and name attributes are restricted during .innerHTML assignment + var input = document.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "name", "D" ); + + // Support: IE8 + // Enforce case-sensitivity of name attribute + if ( div.querySelectorAll("[name=d]").length ) { + rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || + docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + hasCompare = rnative.test( docElem.compareDocumentPosition ); + + // Element contains another + // Purposefully self-exclusive + // As in, an element does not contain itself + contains = hasCompare || rnative.test( docElem.contains ) ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = hasCompare ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + // Sort on method existence if only one input has compareDocumentPosition + var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; + if ( compare ) { + return compare; + } + + // Calculate position if both inputs belong to the same document + compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? + a.compareDocumentPosition( b ) : + + // Otherwise we know they are disconnected + 1; + + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { + return -1; + } + if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } : + function( a, b ) { + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Parentless nodes are either documents or disconnected + if ( !aup || !bup ) { + return a === document ? -1 : + b === document ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return document; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + !compilerCache[ expr + " " ] && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch (e) {} + } + + return Sizzle( expr, document, null, [ elem ] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val !== undefined ? + val : + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + // Clear input after sorting to release objects + // See https://github.com/jquery/sizzle/pull/225 + sortInput = null; + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + while ( (node = elem[i++]) ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (jQuery #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[6] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] ) { + match[2] = match[4] || match[5] || ""; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, uniqueCache, outerCache, node, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType, + diff = false; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) { + + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + + // Seek `elem` from a previously-cached index + + // ...in a gzip-friendly way + node = parent; + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex && cache[ 2 ]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + uniqueCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + } else { + // Use previously-cached element index if available + if ( useCache ) { + // ...in a gzip-friendly way + node = elem; + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + cache = uniqueCache[ type ] || []; + nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; + diff = nodeIndex; + } + + // xml :nth-child(...) + // or :nth-last-child(...) or :nth(-last)?-of-type(...) + if ( diff === false ) { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? + node.nodeName.toLowerCase() === name : + node.nodeType === 1 ) && + ++diff ) { + + // Cache the index of each encountered element + if ( useCache ) { + outerCache = node[ expando ] || (node[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ node.uniqueID ] || + (outerCache[ node.uniqueID ] = {}); + + uniqueCache[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + // Don't keep the element (issue #299) + input[0] = null; + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + text = text.replace( runescape, funescape ); + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), + // but not by others (comment: 8; processing instruction: 7; etc.) + // nodeType < 6 works because attributes (2) do not appear as children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeType < 6 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + + // Support: IE<8 + // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +tokenize = Sizzle.tokenize = function( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( (tokens = []) ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +}; + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var oldCache, uniqueCache, outerCache, + newCache = [ dirruns, doneName ]; + + // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + + // Support: IE <9 only + // Defend against cloned attroperties (jQuery gh-1709) + uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {}); + + if ( (oldCache = uniqueCache[ dir ]) && + oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { + + // Assign to newCache so results back-propagate to previous elements + return (newCache[ 2 ] = oldCache[ 2 ]); + } else { + // Reuse newcache so results back-propagate to previous elements + uniqueCache[ dir ] = newCache; + + // A match means we're done; a fail means we have to keep checking + if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { + return true; + } + } + } + } + } + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + // Avoid hanging onto element (issue #299) + checkContext = null; + return ret; + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + var bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, outermost ) { + var elem, j, matcher, + matchedCount = 0, + i = "0", + unmatched = seed && [], + setMatched = [], + contextBackup = outermostContext, + // We must always have either seed elements or outermost context + elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), + len = elems.length; + + if ( outermost ) { + outermostContext = context === document || context || outermost; + } + + // Add elements passing elementMatchers directly to results + // Support: IE<9, Safari + // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id + for ( ; i !== len && (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + if ( !context && elem.ownerDocument !== document ) { + setDocument( elem ); + xml = !documentIsHTML; + } + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context || document, xml) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // `i` is now the count of elements visited above, and adding it to `matchedCount` + // makes the latter nonnegative. + matchedCount += i; + + // Apply set filters to unmatched elements + // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` + // equals `i`), unless we didn't visit _any_ elements in the above loop because we have + // no element matchers and no seed. + // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that + // case, which will result in a "00" `matchedCount` that differs from `i` but is also + // numerically zero. + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !match ) { + match = tokenize( selector ); + } + i = match.length; + while ( i-- ) { + cached = matcherFromTokens( match[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + + // Save selector and tokenization + cached.selector = selector; + } + return cached; +}; + +/** + * A low-level selection function that works with Sizzle's compiled + * selector functions + * @param {String|Function} selector A selector or a pre-compiled + * selector function built with Sizzle.compile + * @param {Element} context + * @param {Array} [results] + * @param {Array} [seed] A set of elements to match against + */ +select = Sizzle.select = function( selector, context, results, seed ) { + var i, tokens, token, type, find, + compiled = typeof selector === "function" && selector, + match = !seed && tokenize( (selector = compiled.selector || selector) ); + + results = results || []; + + // Try to minimize operations if there is only one selector in the list and no seed + // (the latter of which guarantees us context) + if ( match.length === 1 ) { + + // Reduce context if the leading compound selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + + // Precompiled matchers will still verify ancestry, so step up a level + } else if ( compiled ) { + context = context.parentNode; + } + + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + + // Compile and execute a filtering function if one is not provided + // Provide `match` to avoid retokenization if we modified the selector above + ( compiled || compile( selector, match ) )( + seed, + context, + !documentIsHTML, + results, + !context || rsibling.test( selector ) && testContext( context.parentNode ) || context + ); + return results; +}; + +// One-time assignments + +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; + +// Support: Chrome 14-35+ +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = !!hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return elem[ name ] === true ? name.toLowerCase() : + (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + null; + } + }); +} + +return Sizzle; + +})( window ); + + + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[ ":" ] = jQuery.expr.pseudos; +jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + + +var dir = function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; +}; + + +var siblings = function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; +}; + + +var rneedsContext = jQuery.expr.match.needsContext; + +var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ ); + + + +var risSimple = /^.[^:#\[\.,]*$/; + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; + } ); + + } + + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + } ); + + } + + if ( typeof qualifier === "string" ) { + if ( risSimple.test( qualifier ) ) { + return jQuery.filter( qualifier, elements, not ); + } + + qualifier = jQuery.filter( qualifier, elements ); + } + + return jQuery.grep( elements, function( elem ) { + return ( indexOf.call( qualifier, elem ) > -1 ) !== not; + } ); +} + +jQuery.filter = function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + } ) ); +}; + +jQuery.fn.extend( { + find: function( selector ) { + var i, + len = this.length, + ret = [], + self = this; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter( function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + } ) ); + } + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; + return ret; + }, + filter: function( selector ) { + return this.pushStack( winnow( this, selector || [], false ) ); + }, + not: function( selector ) { + return this.pushStack( winnow( this, selector || [], true ) ); + }, + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + } +} ); + + +// Initialize a jQuery object + + +// A central reference to the root jQuery(document) +var rootjQuery, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, + + init = jQuery.fn.init = function( selector, context, root ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Method init() accepts an alternate rootjQuery + // so migrate can support jQuery.sub (gh-2101) + root = root || rootjQuery; + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector[ 0 ] === "<" && + selector[ selector.length - 1 ] === ">" && + selector.length >= 3 ) { + + // Assume that strings that start and end with <> are HTML and skip the regex check + match = [ null, selector, null ]; + + } else { + match = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && ( match[ 1 ] || !context ) ) { + + // HANDLE: $(html) -> $(array) + if ( match[ 1 ] ) { + context = context instanceof jQuery ? context[ 0 ] : context; + + // Option to run scripts is true for back-compat + // Intentionally let the error be thrown if parseHTML is not present + jQuery.merge( this, jQuery.parseHTML( + match[ 1 ], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[ 2 ] ); + + // Support: Blackberry 4.6 + // gEBID returns nodes no longer in the document (#6963) + if ( elem && elem.parentNode ) { + + // Inject the element directly into the jQuery object + this.length = 1; + this[ 0 ] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || root ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[ 0 ] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return root.ready !== undefined ? + root.ready( selector ) : + + // Execute immediately if ready is not present + selector( jQuery ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }; + +// Give the init function the jQuery prototype for later instantiation +init.prototype = jQuery.fn; + +// Initialize central reference +rootjQuery = jQuery( document ); + + +var rparentsprev = /^(?:parents|prev(?:Until|All))/, + + // Methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.fn.extend( { + has: function( target ) { + var targets = jQuery( target, this ), + l = targets.length; + + return this.filter( function() { + var i = 0; + for ( ; i < l; i++ ) { + if ( jQuery.contains( this, targets[ i ] ) ) { + return true; + } + } + } ); + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + matched = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( ; i < l; i++ ) { + for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) { + + // Always skip document fragments + if ( cur.nodeType < 11 && ( pos ? + pos.index( cur ) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector( cur, selectors ) ) ) { + + matched.push( cur ); + break; + } + } + } + + return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched ); + }, + + // Determine the position of an element within the set + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + } + + // Index in selector + if ( typeof elem === "string" ) { + return indexOf.call( jQuery( elem ), this[ 0 ] ); + } + + // Locate the position of the desired element + return indexOf.call( this, + + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[ 0 ] : elem + ); + }, + + add: function( selector, context ) { + return this.pushStack( + jQuery.uniqueSort( + jQuery.merge( this.get(), jQuery( selector, context ) ) + ) + ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter( selector ) + ); + } +} ); + +function sibling( cur, dir ) { + while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {} + return cur; +} + +jQuery.each( { + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return siblings( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return siblings( elem.firstChild ); + }, + contents: function( elem ) { + return elem.contentDocument || jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var matched = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + matched = jQuery.filter( selector, matched ); + } + + if ( this.length > 1 ) { + + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + jQuery.uniqueSort( matched ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + matched.reverse(); + } + } + + return this.pushStack( matched ); + }; +} ); +var rnotwhite = ( /\S+/g ); + + + +// Convert String-formatted options into Object-formatted ones +function createOptions( options ) { + var object = {}; + jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { + object[ flag ] = true; + } ); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * once: will ensure the callback list can only be fired once (like a Deferred) + * + * memory: will keep track of previous values and will call any callback added + * after the list has been fired right away with the latest "memorized" + * values (like a Deferred) + * + * unique: will ensure a callback can only be added once (no duplicate in the list) + * + * stopOnFalse: interrupt callings when a callback returns false + * + */ +jQuery.Callbacks = function( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + createOptions( options ) : + jQuery.extend( {}, options ); + + var // Flag to know if list is currently firing + firing, + + // Last fire value for non-forgettable lists + memory, + + // Flag to know if list was already fired + fired, + + // Flag to prevent firing + locked, + + // Actual callback list + list = [], + + // Queue of execution data for repeatable lists + queue = [], + + // Index of currently firing callback (modified by add/remove as needed) + firingIndex = -1, + + // Fire callbacks + fire = function() { + + // Enforce single-firing + locked = options.once; + + // Execute callbacks for all pending executions, + // respecting firingIndex overrides and runtime changes + fired = firing = true; + for ( ; queue.length; firingIndex = -1 ) { + memory = queue.shift(); + while ( ++firingIndex < list.length ) { + + // Run callback and check for early termination + if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false && + options.stopOnFalse ) { + + // Jump to end and forget the data so .add doesn't re-fire + firingIndex = list.length; + memory = false; + } + } + } + + // Forget the data if we're done with it + if ( !options.memory ) { + memory = false; + } + + firing = false; + + // Clean up if we're done firing for good + if ( locked ) { + + // Keep an empty list if we have data for future add calls + if ( memory ) { + list = []; + + // Otherwise, this object is spent + } else { + list = ""; + } + } + }, + + // Actual Callbacks object + self = { + + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + + // If we have memory from a past run, we should fire after adding + if ( memory && !firing ) { + firingIndex = list.length - 1; + queue.push( memory ); + } + + ( function add( args ) { + jQuery.each( args, function( _, arg ) { + if ( jQuery.isFunction( arg ) ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) { + + // Inspect recursively + add( arg ); + } + } ); + } )( arguments ); + + if ( memory && !firing ) { + fire(); + } + } + return this; + }, + + // Remove a callback from the list + remove: function() { + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + + // Handle firing indexes + if ( index <= firingIndex ) { + firingIndex--; + } + } + } ); + return this; + }, + + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? + jQuery.inArray( fn, list ) > -1 : + list.length > 0; + }, + + // Remove all callbacks from the list + empty: function() { + if ( list ) { + list = []; + } + return this; + }, + + // Disable .fire and .add + // Abort any current/pending executions + // Clear all callbacks and values + disable: function() { + locked = queue = []; + list = memory = ""; + return this; + }, + disabled: function() { + return !list; + }, + + // Disable .fire + // Also disable .add unless we have memory (since it would have no effect) + // Abort any pending executions + lock: function() { + locked = queue = []; + if ( !memory ) { + list = memory = ""; + } + return this; + }, + locked: function() { + return !!locked; + }, + + // Call all callbacks with the given context and arguments + fireWith: function( context, args ) { + if ( !locked ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + queue.push( args ); + if ( !firing ) { + fire(); + } + } + return this; + }, + + // Call all the callbacks with the given arguments + fire: function() { + self.fireWith( this, arguments ); + return this; + }, + + // To know if the callbacks have already been called at least once + fired: function() { + return !!fired; + } + }; + + return self; +}; + + +jQuery.extend( { + + Deferred: function( func ) { + var tuples = [ + + // action, add listener, listener list, final state + [ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ], + [ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ], + [ "notify", "progress", jQuery.Callbacks( "memory" ) ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + then: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + return jQuery.Deferred( function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + + // deferred[ done | fail | progress ] for forwarding actions to newDefer + deferred[ tuple[ 1 ] ]( function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .progress( newDefer.notify ) + .done( newDefer.resolve ) + .fail( newDefer.reject ); + } else { + newDefer[ tuple[ 0 ] + "With" ]( + this === promise ? newDefer.promise() : this, + fn ? [ returned ] : arguments + ); + } + } ); + } ); + fns = null; + } ).promise(); + }, + + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Keep pipe for back-compat + promise.pipe = promise.then; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 3 ]; + + // promise[ done | fail | progress ] = list.add + promise[ tuple[ 1 ] ] = list.add; + + // Handle state + if ( stateString ) { + list.add( function() { + + // state = [ resolved | rejected ] + state = stateString; + + // [ reject_list | resolve_list ].disable; progress_list.lock + }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); + } + + // deferred[ resolve | reject | notify ] + deferred[ tuple[ 0 ] ] = function() { + deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; + deferred[ tuple[ 0 ] + "With" ] = list.fireWith; + } ); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( subordinate /* , ..., subordinateN */ ) { + var i = 0, + resolveValues = slice.call( arguments ), + length = resolveValues.length, + + // the count of uncompleted subordinates + remaining = length !== 1 || + ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + + // the master Deferred. + // If resolveValues consist of only a single Deferred, just use that. + deferred = remaining === 1 ? subordinate : jQuery.Deferred(), + + // Update function for both resolve and progress values + updateFunc = function( i, contexts, values ) { + return function( value ) { + contexts[ i ] = this; + values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; + if ( values === progressValues ) { + deferred.notifyWith( contexts, values ); + } else if ( !( --remaining ) ) { + deferred.resolveWith( contexts, values ); + } + }; + }, + + progressValues, progressContexts, resolveContexts; + + // Add listeners to Deferred subordinates; treat others as resolved + if ( length > 1 ) { + progressValues = new Array( length ); + progressContexts = new Array( length ); + resolveContexts = new Array( length ); + for ( ; i < length; i++ ) { + if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { + resolveValues[ i ].promise() + .progress( updateFunc( i, progressContexts, progressValues ) ) + .done( updateFunc( i, resolveContexts, resolveValues ) ) + .fail( deferred.reject ); + } else { + --remaining; + } + } + } + + // If we're not waiting on anything, resolve the master + if ( !remaining ) { + deferred.resolveWith( resolveContexts, resolveValues ); + } + + return deferred.promise(); + } +} ); + + +// The deferred used on DOM ready +var readyList; + +jQuery.fn.ready = function( fn ) { + + // Add the callback + jQuery.ready.promise().done( fn ); + + return this; +}; + +jQuery.extend( { + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.triggerHandler ) { + jQuery( document ).triggerHandler( "ready" ); + jQuery( document ).off( "ready" ); + } + } +} ); + +/** + * The ready event handler and self cleanup method + */ +function completed() { + document.removeEventListener( "DOMContentLoaded", completed ); + window.removeEventListener( "load", completed ); + jQuery.ready(); +} + +jQuery.ready.promise = function( obj ) { + if ( !readyList ) { + + readyList = jQuery.Deferred(); + + // Catch cases where $(document).ready() is called + // after the browser event has already occurred. + // Support: IE9-10 only + // Older IE sometimes signals "interactive" too soon + if ( document.readyState === "complete" || + ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { + + // Handle it asynchronously to allow scripts the opportunity to delay ready + window.setTimeout( jQuery.ready ); + + } else { + + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed ); + } + } + return readyList.promise( obj ); +}; + +// Kick off the DOM ready check even if the user does not +jQuery.ready.promise(); + + + + +// Multifunctional method to get and set values of a collection +// The value/s can optionally be executed if it's a function +var access = function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + len = elems.length, + bulk = key == null; + + // Sets many values + if ( jQuery.type( key ) === "object" ) { + chainable = true; + for ( i in key ) { + access( elems, fn, i, key[ i ], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !jQuery.isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < len; i++ ) { + fn( + elems[ i ], key, raw ? + value : + value.call( elems[ i ], i, fn( elems[ i ], key ) ) + ); + } + } + } + + return chainable ? + elems : + + // Gets + bulk ? + fn.call( elems ) : + len ? fn( elems[ 0 ], key ) : emptyGet; +}; +var acceptData = function( owner ) { + + // Accepts only: + // - Node + // - Node.ELEMENT_NODE + // - Node.DOCUMENT_NODE + // - Object + // - Any + /* jshint -W018 */ + return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); +}; + + + + +function Data() { + this.expando = jQuery.expando + Data.uid++; +} + +Data.uid = 1; + +Data.prototype = { + + register: function( owner, initial ) { + var value = initial || {}; + + // If it is a node unlikely to be stringify-ed or looped over + // use plain assignment + if ( owner.nodeType ) { + owner[ this.expando ] = value; + + // Otherwise secure it in a non-enumerable, non-writable property + // configurability must be true to allow the property to be + // deleted with the delete operator + } else { + Object.defineProperty( owner, this.expando, { + value: value, + writable: true, + configurable: true + } ); + } + return owner[ this.expando ]; + }, + cache: function( owner ) { + + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return an empty object. + if ( !acceptData( owner ) ) { + return {}; + } + + // Check if the owner object already has a cache + var value = owner[ this.expando ]; + + // If not, create one + if ( !value ) { + value = {}; + + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return an empty object. + if ( acceptData( owner ) ) { + + // If it is a node unlikely to be stringify-ed or looped over + // use plain assignment + if ( owner.nodeType ) { + owner[ this.expando ] = value; + + // Otherwise secure it in a non-enumerable property + // configurable must be true to allow the property to be + // deleted when data is removed + } else { + Object.defineProperty( owner, this.expando, { + value: value, + configurable: true + } ); + } + } + } + + return value; + }, + set: function( owner, data, value ) { + var prop, + cache = this.cache( owner ); + + // Handle: [ owner, key, value ] args + if ( typeof data === "string" ) { + cache[ data ] = value; + + // Handle: [ owner, { properties } ] args + } else { + + // Copy the properties one-by-one to the cache object + for ( prop in data ) { + cache[ prop ] = data[ prop ]; + } + } + return cache; + }, + get: function( owner, key ) { + return key === undefined ? + this.cache( owner ) : + owner[ this.expando ] && owner[ this.expando ][ key ]; + }, + access: function( owner, key, value ) { + var stored; + + // In cases where either: + // + // 1. No key was specified + // 2. A string key was specified, but no value provided + // + // Take the "read" path and allow the get method to determine + // which value to return, respectively either: + // + // 1. The entire cache object + // 2. The data stored at the key + // + if ( key === undefined || + ( ( key && typeof key === "string" ) && value === undefined ) ) { + + stored = this.get( owner, key ); + + return stored !== undefined ? + stored : this.get( owner, jQuery.camelCase( key ) ); + } + + // When the key is not a string, or both a key and value + // are specified, set or extend (existing objects) with either: + // + // 1. An object of properties + // 2. A key and value + // + this.set( owner, key, value ); + + // Since the "set" path can have two possible entry points + // return the expected data based on which path was taken[*] + return value !== undefined ? value : key; + }, + remove: function( owner, key ) { + var i, name, camel, + cache = owner[ this.expando ]; + + if ( cache === undefined ) { + return; + } + + if ( key === undefined ) { + this.register( owner ); + + } else { + + // Support array or space separated string of keys + if ( jQuery.isArray( key ) ) { + + // If "name" is an array of keys... + // When data is initially created, via ("key", "val") signature, + // keys will be converted to camelCase. + // Since there is no way to tell _how_ a key was added, remove + // both plain key and camelCase key. #12786 + // This will only penalize the array argument path. + name = key.concat( key.map( jQuery.camelCase ) ); + } else { + camel = jQuery.camelCase( key ); + + // Try the string as a key before any manipulation + if ( key in cache ) { + name = [ key, camel ]; + } else { + + // If a key with the spaces exists, use it. + // Otherwise, create an array by matching non-whitespace + name = camel; + name = name in cache ? + [ name ] : ( name.match( rnotwhite ) || [] ); + } + } + + i = name.length; + + while ( i-- ) { + delete cache[ name[ i ] ]; + } + } + + // Remove the expando if there's no more data + if ( key === undefined || jQuery.isEmptyObject( cache ) ) { + + // Support: Chrome <= 35-45+ + // Webkit & Blink performance suffers when deleting properties + // from DOM nodes, so set to undefined instead + // https://code.google.com/p/chromium/issues/detail?id=378607 + if ( owner.nodeType ) { + owner[ this.expando ] = undefined; + } else { + delete owner[ this.expando ]; + } + } + }, + hasData: function( owner ) { + var cache = owner[ this.expando ]; + return cache !== undefined && !jQuery.isEmptyObject( cache ); + } +}; +var dataPriv = new Data(); + +var dataUser = new Data(); + + + +// Implementation Summary +// +// 1. Enforce API surface and semantic compatibility with 1.9.x branch +// 2. Improve the module's maintainability by reducing the storage +// paths to a single mechanism. +// 3. Use the same single mechanism to support "private" and "user" data. +// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) +// 5. Avoid exposing implementation details on user objects (eg. expando properties) +// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 + +var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, + rmultiDash = /[A-Z]/g; + +function dataAttr( elem, key, data ) { + var name; + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase(); + data = elem.getAttribute( name ); + + if ( typeof data === "string" ) { + try { + data = data === "true" ? true : + data === "false" ? false : + data === "null" ? null : + + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch ( e ) {} + + // Make sure we set the data so it isn't changed later + dataUser.set( elem, key, data ); + } else { + data = undefined; + } + } + return data; +} + +jQuery.extend( { + hasData: function( elem ) { + return dataUser.hasData( elem ) || dataPriv.hasData( elem ); + }, + + data: function( elem, name, data ) { + return dataUser.access( elem, name, data ); + }, + + removeData: function( elem, name ) { + dataUser.remove( elem, name ); + }, + + // TODO: Now that all calls to _data and _removeData have been replaced + // with direct calls to dataPriv methods, these can be deprecated. + _data: function( elem, name, data ) { + return dataPriv.access( elem, name, data ); + }, + + _removeData: function( elem, name ) { + dataPriv.remove( elem, name ); + } +} ); + +jQuery.fn.extend( { + data: function( key, value ) { + var i, name, data, + elem = this[ 0 ], + attrs = elem && elem.attributes; + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = dataUser.get( elem ); + + if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) { + i = attrs.length; + while ( i-- ) { + + // Support: IE11+ + // The attrs elements can be null (#14894) + if ( attrs[ i ] ) { + name = attrs[ i ].name; + if ( name.indexOf( "data-" ) === 0 ) { + name = jQuery.camelCase( name.slice( 5 ) ); + dataAttr( elem, name, data[ name ] ); + } + } + } + dataPriv.set( elem, "hasDataAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each( function() { + dataUser.set( this, key ); + } ); + } + + return access( this, function( value ) { + var data, camelKey; + + // The calling jQuery object (element matches) is not empty + // (and therefore has an element appears at this[ 0 ]) and the + // `value` parameter was not undefined. An empty jQuery object + // will result in `undefined` for elem = this[ 0 ] which will + // throw an exception if an attempt to read a data cache is made. + if ( elem && value === undefined ) { + + // Attempt to get data from the cache + // with the key as-is + data = dataUser.get( elem, key ) || + + // Try to find dashed key if it exists (gh-2779) + // This is for 2.2.x only + dataUser.get( elem, key.replace( rmultiDash, "-$&" ).toLowerCase() ); + + if ( data !== undefined ) { + return data; + } + + camelKey = jQuery.camelCase( key ); + + // Attempt to get data from the cache + // with the key camelized + data = dataUser.get( elem, camelKey ); + if ( data !== undefined ) { + return data; + } + + // Attempt to "discover" the data in + // HTML5 custom data-* attrs + data = dataAttr( elem, camelKey, undefined ); + if ( data !== undefined ) { + return data; + } + + // We tried really hard, but the data doesn't exist. + return; + } + + // Set the data... + camelKey = jQuery.camelCase( key ); + this.each( function() { + + // First, attempt to store a copy or reference of any + // data that might've been store with a camelCased key. + var data = dataUser.get( this, camelKey ); + + // For HTML5 data-* attribute interop, we have to + // store property names with dashes in a camelCase form. + // This might not apply to all properties...* + dataUser.set( this, camelKey, value ); + + // *... In the case of properties that might _actually_ + // have dashes, we need to also store a copy of that + // unchanged property. + if ( key.indexOf( "-" ) > -1 && data !== undefined ) { + dataUser.set( this, key, value ); + } + } ); + }, null, value, arguments.length > 1, null, true ); + }, + + removeData: function( key ) { + return this.each( function() { + dataUser.remove( this, key ); + } ); + } +} ); + + +jQuery.extend( { + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = dataPriv.get( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || jQuery.isArray( data ) ) { + queue = dataPriv.access( elem, type, jQuery.makeArray( data ) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // Clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // Not public - generate a queueHooks object, or return the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return dataPriv.get( elem, key ) || dataPriv.access( elem, key, { + empty: jQuery.Callbacks( "once memory" ).add( function() { + dataPriv.remove( elem, [ type + "queue", key ] ); + } ) + } ); + } +} ); + +jQuery.fn.extend( { + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[ 0 ], type ); + } + + return data === undefined ? + this : + this.each( function() { + var queue = jQuery.queue( this, type, data ); + + // Ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + } ); + }, + dequeue: function( type ) { + return this.each( function() { + jQuery.dequeue( this, type ); + } ); + }, + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + }, + + // Get a promise resolved when queues of a certain type + // are emptied (fx is the type by default) + promise: function( type, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while ( i-- ) { + tmp = dataPriv.get( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +} ); +var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source; + +var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); + + +var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; + +var isHidden = function( elem, el ) { + + // isHidden might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + return jQuery.css( elem, "display" ) === "none" || + !jQuery.contains( elem.ownerDocument, elem ); + }; + + + +function adjustCSS( elem, prop, valueParts, tween ) { + var adjusted, + scale = 1, + maxIterations = 20, + currentValue = tween ? + function() { return tween.cur(); } : + function() { return jQuery.css( elem, prop, "" ); }, + initial = currentValue(), + unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), + + // Starting value computation is required for potential unit mismatches + initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) && + rcssNum.exec( jQuery.css( elem, prop ) ); + + if ( initialInUnit && initialInUnit[ 3 ] !== unit ) { + + // Trust units reported by jQuery.css + unit = unit || initialInUnit[ 3 ]; + + // Make sure we update the tween properties later on + valueParts = valueParts || []; + + // Iteratively approximate from a nonzero starting point + initialInUnit = +initial || 1; + + do { + + // If previous iteration zeroed out, double until we get *something*. + // Use string for doubling so we don't accidentally see scale as unchanged below + scale = scale || ".5"; + + // Adjust and apply + initialInUnit = initialInUnit / scale; + jQuery.style( elem, prop, initialInUnit + unit ); + + // Update scale, tolerating zero or NaN from tween.cur() + // Break the loop if scale is unchanged or perfect, or if we've just had enough. + } while ( + scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations + ); + } + + if ( valueParts ) { + initialInUnit = +initialInUnit || +initial || 0; + + // Apply relative offset (+=/-=) if specified + adjusted = valueParts[ 1 ] ? + initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] : + +valueParts[ 2 ]; + if ( tween ) { + tween.unit = unit; + tween.start = initialInUnit; + tween.end = adjusted; + } + } + return adjusted; +} +var rcheckableType = ( /^(?:checkbox|radio)$/i ); + +var rtagName = ( /<([\w:-]+)/ ); + +var rscriptType = ( /^$|\/(?:java|ecma)script/i ); + + + +// We have to close these tags to support XHTML (#13200) +var wrapMap = { + + // Support: IE9 + option: [ 1, "" ], + + // XHTML parsers do not magically insert elements in the + // same way that tag soup parsers do. So we cannot shorten + // this by omitting or other required elements. + thead: [ 1, "", "
      " ], + col: [ 2, "", "
      " ], + tr: [ 2, "", "
      " ], + td: [ 3, "", "
      " ], + + _default: [ 0, "", "" ] +}; + +// Support: IE9 +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + + +function getAll( context, tag ) { + + // Support: IE9-11+ + // Use typeof to avoid zero-argument method invocation on host objects (#15151) + var ret = typeof context.getElementsByTagName !== "undefined" ? + context.getElementsByTagName( tag || "*" ) : + typeof context.querySelectorAll !== "undefined" ? + context.querySelectorAll( tag || "*" ) : + []; + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], ret ) : + ret; +} + + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + dataPriv.set( + elems[ i ], + "globalEval", + !refElements || dataPriv.get( refElements[ i ], "globalEval" ) + ); + } +} + + +var rhtml = /<|&#?\w+;/; + +function buildFragment( elems, context, scripts, selection, ignored ) { + var elem, tmp, tag, wrap, contains, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + + // Support: Android<4.1, PhantomJS<2 + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement( "div" ) ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: Android<4.1, PhantomJS<2 + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Ensure the created nodes are orphaned (#12392) + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( ( elem = nodes[ i++ ] ) ) { + + // Skip elements already in the context collection (trac-4087) + if ( selection && jQuery.inArray( elem, selection ) > -1 ) { + if ( ignored ) { + ignored.push( elem ); + } + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( ( elem = tmp[ j++ ] ) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; +} + + +( function() { + var fragment = document.createDocumentFragment(), + div = fragment.appendChild( document.createElement( "div" ) ), + input = document.createElement( "input" ); + + // Support: Android 4.0-4.3, Safari<=5.1 + // Check state lost if the name is set (#11217) + // Support: Windows Web Apps (WWA) + // `name` and `type` must use .setAttribute for WWA (#14901) + input.setAttribute( "type", "radio" ); + input.setAttribute( "checked", "checked" ); + input.setAttribute( "name", "t" ); + + div.appendChild( input ); + + // Support: Safari<=5.1, Android<4.2 + // Older WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE<=11+ + // Make sure textarea (and checkbox) defaultValue is properly cloned + div.innerHTML = ""; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; +} )(); + + +var + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +// Support: IE9 +// See #13393 for more info +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +function on( elem, types, selector, data, fn, one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + on( elem, type, selector, data, types[ type ], one ); + } + return elem; + } + + if ( data == null && fn == null ) { + + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return elem.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + } ); +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + + var handleObjIn, eventHandle, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = dataPriv.get( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !( events = elemData.events ) ) { + events = elemData.events = {}; + } + if ( !( eventHandle = elemData.handle ) ) { + eventHandle = elemData.handle = function( e ) { + + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? + jQuery.event.dispatch.apply( elem, arguments ) : undefined; + }; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend( { + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join( "." ) + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !( handlers = events[ type ] ) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener if the special events handler returns false + if ( !special.setup || + special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var j, origCount, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = dataPriv.hasData( elem ) && dataPriv.get( elem ); + + if ( !elemData || !( events = elemData.events ) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[ 2 ] && + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || + selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || + special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove data and the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + dataPriv.remove( elem, "handle events" ); + } + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); + + var i, j, ret, matched, handleObj, + handlerQueue = [], + args = slice.call( arguments ), + handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[ 0 ] = event; + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( ( handleObj = matched.handlers[ j++ ] ) && + !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or 2) have namespace(s) + // a subset or equal to those in the bound event (both can have no namespace). + if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || + handleObj.handler ).apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( ( event.result = ret ) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, matches, sel, handleObj, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Support (at least): Chrome, IE9 + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // + // Support: Firefox<=42+ + // Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343) + if ( delegateCount && cur.nodeType && + ( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) { + + for ( ; cur !== this; cur = cur.parentNode || this ) { + + // Don't check non-elements (#13208) + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) > -1 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push( { elem: cur, handlers: matches } ); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } ); + } + + return handlerQueue; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " + + "metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split( " " ), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: ( "button buttons clientX clientY offsetX offsetY pageX pageY " + + "screenX screenY toElement" ).split( " " ), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - + ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - + ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: Cordova 2.5 (WebKit) (#13255) + // All events should have a target; Cordova deviceready doesn't + if ( !event.target ) { + event.target = document; + } + + // Support: Safari 6.0+, Chrome<28 + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + special: { + load: { + + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + this.focus(); + return false; + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined && event.originalEvent ) { + event.originalEvent.returnValue = event.result; + } + } + } + } +}; + +jQuery.removeEvent = function( elem, type, handle ) { + + // This "if" is needed for plain objects + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle ); + } +}; + +jQuery.Event = function( src, props ) { + + // Allow instantiation without the 'new' keyword + if ( !( this instanceof jQuery.Event ) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + src.defaultPrevented === undefined && + + // Support: Android<4.0 + src.returnValue === false ? + returnTrue : + returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + constructor: jQuery.Event, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + + if ( e ) { + e.preventDefault(); + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( e ) { + e.stopPropagation(); + } + }, + stopImmediatePropagation: function() { + var e = this.originalEvent; + + this.isImmediatePropagationStopped = returnTrue; + + if ( e ) { + e.stopImmediatePropagation(); + } + + this.stopPropagation(); + } +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +// so that event delegation works in jQuery. +// Do the same for pointerenter/pointerleave and pointerover/pointerout +// +// Support: Safari 7 only +// Safari sends mouseenter too often; see: +// https://code.google.com/p/chromium/issues/detail?id=470258 +// for the description of the bug (it existed in older Chrome versions as well). +jQuery.each( { + mouseenter: "mouseover", + mouseleave: "mouseout", + pointerenter: "pointerover", + pointerleave: "pointerout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mouseenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +} ); + +jQuery.fn.extend( { + on: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn ); + }, + one: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? + handleObj.origType + "." + handleObj.namespace : + handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each( function() { + jQuery.event.remove( this, types, fn, selector ); + } ); + } +} ); + + +var + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi, + + // Support: IE 10-11, Edge 10240+ + // In IE/Edge using regex groups here causes severe slowdowns. + // See https://connect.microsoft.com/IE/feedback/details/1736512/ + rnoInnerhtml = /\s*$/g; + +function manipulationTarget( elem, content ) { + if ( jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) { + + return elem.getElementsByTagName( "tbody" )[ 0 ] || elem; + } + + return elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + var match = rscriptTypeMasked.exec( elem.type ); + + if ( match ) { + elem.type = match[ 1 ]; + } else { + elem.removeAttribute( "type" ); + } + + return elem; +} + +function cloneCopyEvent( src, dest ) { + var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; + + if ( dest.nodeType !== 1 ) { + return; + } + + // 1. Copy private data: events, handlers, etc. + if ( dataPriv.hasData( src ) ) { + pdataOld = dataPriv.access( src ); + pdataCur = dataPriv.set( dest, pdataOld ); + events = pdataOld.events; + + if ( events ) { + delete pdataCur.handle; + pdataCur.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + } + + // 2. Copy user data + if ( dataUser.hasData( src ) ) { + udataOld = dataUser.access( src ); + udataCur = jQuery.extend( {}, udataOld ); + + dataUser.set( dest, udataCur ); + } +} + +// Fix IE bugs, see support tests +function fixInput( src, dest ) { + var nodeName = dest.nodeName.toLowerCase(); + + // Fails to persist the checked state of a cloned checkbox or radio button. + if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + dest.checked = src.checked; + + // Fails to return the selected option to the default selected state when cloning options + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +function domManip( collection, args, callback, ignored ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = collection.length, + iNoClone = l - 1, + value = args[ 0 ], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return collection.each( function( index ) { + var self = collection.eq( index ); + if ( isFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + domManip( self, args, callback, ignored ); + } ); + } + + if ( l ) { + fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + // Require either new content or an interest in ignored elements to invoke the callback + if ( first || ignored ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item + // instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + + // Support: Android<4.1, PhantomJS<2 + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( collection[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !dataPriv.access( node, "globalEval" ) && + jQuery.contains( doc, node ) ) { + + if ( node.src ) { + + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); + } + } + } + } + } + } + + return collection; +} + +function remove( elem, selector, keepData ) { + var node, + nodes = selector ? jQuery.filter( selector, elem ) : elem, + i = 0; + + for ( ; ( node = nodes[ i ] ) != null; i++ ) { + if ( !keepData && node.nodeType === 1 ) { + jQuery.cleanData( getAll( node ) ); + } + + if ( node.parentNode ) { + if ( keepData && jQuery.contains( node.ownerDocument, node ) ) { + setGlobalEval( getAll( node, "script" ) ); + } + node.parentNode.removeChild( node ); + } + } + + return elem; +} + +jQuery.extend( { + htmlPrefilter: function( html ) { + return html.replace( rxhtmlTag, "<$1>" ); + }, + + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var i, l, srcElements, destElements, + clone = elem.cloneNode( true ), + inPage = jQuery.contains( elem.ownerDocument, elem ); + + // Fix IE cloning issues + if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && + !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + fixInput( srcElements[ i ], destElements[ i ] ); + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + // Return the cloned set + return clone; + }, + + cleanData: function( elems ) { + var data, elem, type, + special = jQuery.event.special, + i = 0; + + for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) { + if ( acceptData( elem ) ) { + if ( ( data = elem[ dataPriv.expando ] ) ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + + // Support: Chrome <= 35-45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataPriv.expando ] = undefined; + } + if ( elem[ dataUser.expando ] ) { + + // Support: Chrome <= 35-45+ + // Assign undefined instead of using delete, see Data#remove + elem[ dataUser.expando ] = undefined; + } + } + } + } +} ); + +jQuery.fn.extend( { + + // Keep domManip exposed until 3.0 (gh-2225) + domManip: domManip, + + detach: function( selector ) { + return remove( this, selector, true ); + }, + + remove: function( selector ) { + return remove( this, selector ); + }, + + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().each( function() { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + this.textContent = value; + } + } ); + }, null, value, arguments.length ); + }, + + append: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + } ); + }, + + prepend: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + } ); + }, + + before: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + } ); + }, + + after: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + } ); + }, + + empty: function() { + var elem, + i = 0; + + for ( ; ( elem = this[ i ] ) != null; i++ ) { + if ( elem.nodeType === 1 ) { + + // Prevent memory leaks + jQuery.cleanData( getAll( elem, false ) ); + + // Remove any remaining nodes + elem.textContent = ""; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map( function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + } ); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined && elem.nodeType === 1 ) { + return elem.innerHTML; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = jQuery.htmlPrefilter( value ); + + try { + for ( ; i < l; i++ ) { + elem = this[ i ] || {}; + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch ( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var ignored = []; + + // Make the changes, replacing each non-ignored context element with the new content + return domManip( this, arguments, function( elem ) { + var parent = this.parentNode; + + if ( jQuery.inArray( this, ignored ) < 0 ) { + jQuery.cleanData( getAll( this ) ); + if ( parent ) { + parent.replaceChild( elem, this ); + } + } + + // Force callback invocation + }, ignored ); + } +} ); + +jQuery.each( { + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1, + i = 0; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Support: QtWebKit + // .get() because push.apply(_, arraylike) throws + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +} ); + + +var iframe, + elemdisplay = { + + // Support: Firefox + // We have to pre-define these values for FF (#10227) + HTML: "block", + BODY: "block" + }; + +/** + * Retrieve the actual display of a element + * @param {String} name nodeName of the element + * @param {Object} doc Document object + */ + +// Called only from within defaultDisplay +function actualDisplay( name, doc ) { + var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), + + display = jQuery.css( elem[ 0 ], "display" ); + + // We don't have any data stored on the element, + // so use "detach" method as fast way to get rid of the element + elem.detach(); + + return display; +} + +/** + * Try to determine the default display value of an element + * @param {String} nodeName + */ +function defaultDisplay( nodeName ) { + var doc = document, + display = elemdisplay[ nodeName ]; + + if ( !display ) { + display = actualDisplay( nodeName, doc ); + + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + + // Use the already-created iframe if possible + iframe = ( iframe || jQuery( "