From 92092aa00d2f2d4317c53769865af66885a95c17 Mon Sep 17 00:00:00 2001 From: David Krett Date: Fri, 20 Jul 2018 16:08:54 -0400 Subject: [PATCH] Merge Rename Branch Into Dockerize --- .github/CONTRIBUTING.md | 4 +- .gitignore | 1 + accounts/abi/abi_test.go | 4 +- accounts/abi/bind/auth.go | 8 +- accounts/abi/bind/backend.go | 6 +- accounts/abi/bind/backends/simulated.go | 30 +- accounts/abi/bind/base.go | 12 +- accounts/abi/bind/bind.go | 4 +- accounts/abi/bind/bind_test.go | 2 +- accounts/abi/bind/template.go | 2 +- accounts/abi/bind/topics.go | 6 +- accounts/abi/bind/util.go | 6 +- accounts/abi/bind/util_test.go | 12 +- accounts/abi/event.go | 4 +- accounts/abi/event_test.go | 7 +- accounts/abi/method.go | 2 +- accounts/abi/numbers.go | 4 +- accounts/abi/pack.go | 4 +- accounts/abi/pack_test.go | 2 +- accounts/abi/type_test.go | 2 +- accounts/abi/unpack.go | 2 +- accounts/abi/unpack_test.go | 2 +- accounts/accounts.go | 8 +- accounts/keystore/account_cache.go | 6 +- accounts/keystore/account_cache_test.go | 4 +- accounts/keystore/file_cache.go | 2 +- accounts/keystore/key.go | 6 +- accounts/keystore/keystore.go | 10 +- accounts/keystore/keystore_passphrase.go | 8 +- accounts/keystore/keystore_passphrase_test.go | 2 +- accounts/keystore/keystore_plain.go | 2 +- accounts/keystore/keystore_plain_test.go | 4 +- accounts/keystore/keystore_test.go | 6 +- accounts/keystore/keystore_wallet.go | 6 +- accounts/keystore/presale.go | 4 +- accounts/keystore/watch.go | 2 +- accounts/manager.go | 2 +- accounts/usbwallet/hub.go | 6 +- accounts/usbwallet/ledger.go | 12 +- accounts/usbwallet/trezor.go | 12 +- accounts/usbwallet/wallet.go | 8 + bmt/bmt_test.go | 2 +- build/ci.go | 6 +- build/deb.control | 4 +- build/mvn.pom | 6 +- build/nsis.install.nsh | 6 +- cmd/abigen/main.go | 4 +- cmd/bootnode/main.go | 14 +- cmd/ethkey/generate.go | 6 +- cmd/ethkey/inspect.go | 6 +- cmd/ethkey/main.go | 2 +- cmd/ethkey/message.go | 8 +- cmd/ethkey/run_test.go | 2 +- cmd/ethkey/utils.go | 6 +- cmd/evm/compiler.go | 2 +- cmd/evm/disasm.go | 2 +- cmd/evm/internal/compiler/compiler.go | 2 +- cmd/evm/json_logger.go | 6 +- cmd/evm/main.go | 2 +- cmd/evm/runner.go | 20 +- cmd/evm/staterunner.go | 8 +- cmd/faucet/faucet.go | 36 +- cmd/geth/accountcmd.go | 12 +- cmd/geth/accountcmd_test.go | 2 +- cmd/geth/bugcmd.go | 8 +- cmd/geth/chaincmd.go | 22 +- cmd/geth/config.go | 12 +- cmd/geth/consolecmd.go | 14 +- cmd/geth/consolecmd_test.go | 2 +- cmd/geth/dao_test.go | 8 +- cmd/geth/main.go | 22 +- cmd/geth/misccmd.go | 8 +- cmd/geth/monitorcmd.go | 6 +- cmd/geth/run_test.go | 2 +- cmd/geth/usage.go | 4 +- cmd/p2psim/main.go | 12 +- cmd/puppeth/genesis.go | 10 +- cmd/puppeth/module.go | 2 +- cmd/puppeth/module_dashboard.go | 8 +- cmd/puppeth/module_ethstats.go | 2 +- cmd/puppeth/module_explorer.go | 2 +- cmd/puppeth/module_faucet.go | 4 +- cmd/puppeth/module_nginx.go | 2 +- cmd/puppeth/module_node.go | 4 +- cmd/puppeth/module_wallet.go | 2 +- cmd/puppeth/puppeth.go | 2 +- cmd/puppeth/ssh.go | 2 +- cmd/puppeth/wizard.go | 6 +- cmd/puppeth/wizard_dashboard.go | 2 +- cmd/puppeth/wizard_ethstats.go | 2 +- cmd/puppeth/wizard_explorer.go | 2 +- cmd/puppeth/wizard_faucet.go | 4 +- cmd/puppeth/wizard_genesis.go | 8 +- cmd/puppeth/wizard_intro.go | 2 +- cmd/puppeth/wizard_netstats.go | 4 +- cmd/puppeth/wizard_network.go | 2 +- cmd/puppeth/wizard_nginx.go | 2 +- cmd/puppeth/wizard_node.go | 6 +- cmd/puppeth/wizard_wallet.go | 2 +- cmd/rlpdump/main.go | 2 +- cmd/swarm/config.go | 12 +- cmd/swarm/config_test.go | 6 +- cmd/swarm/db.go | 6 +- cmd/swarm/hash.go | 4 +- cmd/swarm/list.go | 4 +- cmd/swarm/main.go | 32 +- cmd/swarm/manifest.go | 6 +- cmd/swarm/run_test.go | 14 +- cmd/swarm/upload.go | 5 + cmd/utils/cmd.go | 12 +- cmd/utils/customflags.go | 2 +- cmd/utils/flags.go | 56 +- cmd/wnode/main.go | 20 +- common/bitutil/compress_test.go | 2 +- common/debug.go | 2 +- common/hexutil/json_example_test.go | 2 +- common/math/big_test.go | 2 +- common/number/int.go | 2 +- common/number/uint_test.go | 2 +- common/types.go | 4 +- compression/rle/read_write.go | 2 +- consensus/clique/api.go | 8 +- consensus/clique/clique.go | 28 +- consensus/clique/snapshot.go | 8 +- consensus/clique/snapshot_test.go | 12 +- consensus/consensus.go | 10 +- consensus/ethash/algorithm.go | 10 +- consensus/ethash/algorithm_test.go | 6 +- consensus/ethash/consensus.go | 14 +- consensus/ethash/consensus_test.go | 6 +- consensus/ethash/ethash.go | 8 +- consensus/ethash/ethash_test.go | 4 +- consensus/ethash/sealer.go | 8 +- consensus/misc/dao.go | 6 +- consensus/misc/forks.go | 6 +- console/bridge.go | 6 +- console/console.go | 6 +- console/console_test.go | 14 +- contracts/chequebook/api.go | 2 +- contracts/chequebook/cheque.go | 16 +- contracts/chequebook/cheque_test.go | 12 +- contracts/chequebook/contract/chequebook.go | 12 +- contracts/chequebook/gencode.go | 10 +- contracts/ens/contract/ens.go | 12 +- contracts/ens/contract/fifsregistrar.go | 8 +- contracts/ens/contract/publicresolver.go | 12 +- contracts/ens/ens.go | 10 +- contracts/ens/ens_test.go | 10 +- core/asm/asm.go | 2 +- core/asm/compiler.go | 4 +- core/bench_test.go | 11 + core/block_validator.go | 8 +- core/block_validator_test.go | 10 +- core/blockchain.go | 44 +- core/blockchain_test.go | 18 +- core/blocks.go | 2 +- core/bloombits/generator.go | 2 +- core/bloombits/generator_test.go | 2 +- core/bloombits/matcher.go | 4 +- core/bloombits/matcher_test.go | 4 +- core/chain_indexer.go | 10 +- core/chain_indexer_test.go | 6 +- core/chain_makers.go | 16 +- core/chain_makers_test.go | 12 +- core/dao_test.go | 8 +- core/database_util.go | 20 +- core/database_util_test.go | 10 +- core/db.go | 47 + core/events.go | 4 +- core/evm.go | 8 +- core/gen_genesis.go | 8 +- core/gen_genesis_account.go | 6 +- core/genesis.go | 25 +- core/genesis_test.go | 10 +- core/headerchain.go | 12 +- core/helper_test.go | 6 +- core/mkalloc.go | 4 +- {shyftDb => core}/shyft_database_util.go | 422 +- core/state/database.go | 6 +- core/state/dump.go | 6 +- core/state/iterator.go | 6 +- core/state/iterator_test.go | 4 +- core/state/journal.go | 2 +- core/state/managed_state.go | 2 +- core/state/managed_state_test.go | 4 +- core/state/state_object.go | 6 +- core/state/state_test.go | 6 +- core/state/statedb.go | 12 +- core/state/statedb_test.go | 8 +- core/state/sync.go | 6 +- core/state/sync_test.go | 8 +- core/state_processor.go | 16 +- core/state_transition.go | 8 +- core/tx_journal.go | 8 +- core/tx_list.go | 6 +- core/tx_list_test.go | 4 +- core/tx_pool.go | 14 +- core/tx_pool_test.go | 14 +- core/types.go | 6 +- core/types/block.go | 8 +- core/types/block_test.go | 4 +- core/types/bloom9.go | 4 +- core/types/bloom9_test.go | 2 +- core/types/derive_sha.go | 6 +- core/types/gen_header_json.go | 4 +- core/types/gen_log_json.go | 4 +- core/types/gen_receipt_json.go | 4 +- core/types/gen_tx_json.go | 4 +- core/types/log.go | 6 +- core/types/log_test.go | 4 +- core/types/receipt.go | 6 +- core/types/transaction.go | 8 +- core/types/transaction_signing.go | 6 +- core/types/transaction_signing_test.go | 6 +- core/types/transaction_test.go | 6 +- core/vm/analysis.go | 2 +- core/vm/common.go | 4 +- core/vm/contract.go | 2 +- core/vm/contracts.go | 10 +- core/vm/contracts_test.go | 2 +- core/vm/evm.go | 6 +- core/vm/gas.go | 2 +- core/vm/gas_table.go | 6 +- core/vm/gen_structlog.go | 6 + core/vm/instructions.go | 10 +- core/vm/instructions_test.go | 4 +- core/vm/interface.go | 4 +- core/vm/interpreter.go | 4 +- core/vm/jump_table.go | 2 +- core/vm/logger.go | 8 +- core/vm/logger_test.go | 4 +- core/vm/memory_table.go | 2 +- core/vm/noop.go | 4 +- core/vm/runtime/env.go | 6 +- core/vm/runtime/runtime.go | 12 +- core/vm/runtime/runtime_example_test.go | 4 +- core/vm/runtime/runtime_test.go | 10 +- core/vm/stack_table.go | 2 +- core/vm/vm_jit.go | 6 +- crypto/bn256/bn256_amd64.go | 2 +- crypto/bn256/bn256_other.go | 2 +- crypto/crypto.go | 8 +- crypto/crypto_test.go | 2 +- crypto/ecies/ecies_test.go | 2 +- crypto/ecies/params.go | 2 +- crypto/secp256k1/curve.go | 2 +- crypto/secp256k1/secp256_test.go | 4 +- crypto/signature_cgo.go | 4 +- crypto/signature_test.go | 6 +- dashboard/assets.go | 2 +- dashboard/cpu.go | 2 +- dashboard/dashboard.go | 10 +- eth/api.go | 22 +- eth/api_backend.go | 28 +- eth/api_test.go | 6 +- eth/api_tracer.go | 126 +- eth/backend.go | 88 +- eth/bloombits.go | 14 +- eth/chaindb.go | 45 + eth/config.go | 14 +- eth/db_upgrade.go | 10 +- eth/downloader/api.go | 6 +- eth/downloader/downloader.go | 18 +- eth/downloader/downloader_test.go | 18 +- eth/downloader/fakepeer.go | 8 +- eth/downloader/metrics.go | 2 +- eth/downloader/peer.go | 6 +- eth/downloader/queue.go | 8 +- eth/downloader/statesync.go | 14 +- eth/downloader/types.go | 2 +- eth/fetcher/fetcher.go | 8 +- eth/fetcher/fetcher_test.go | 14 +- eth/fetcher/metrics.go | 2 +- eth/filters/api.go | 14 +- eth/filters/api_test.go | 4 +- eth/filters/bench_test.go | 16 +- eth/filters/filter.go | 14 +- eth/filters/filter_system.go | 12 +- eth/filters/filter_system_test.go | 20 +- eth/filters/filter_test.go | 16 +- eth/gasprice/gasprice.go | 10 +- eth/gen_config.go | 12 +- eth/handler.go | 28 +- eth/handler_test.go | 24 +- eth/helper_test.go | 24 +- eth/metrics.go | 4 +- eth/peer.go | 8 +- eth/protocol.go | 10 +- eth/protocol_test.go | 12 +- eth/shyft_tracer.go | 48 + eth/sync.go | 10 +- eth/sync_test.go | 6 +- eth/tracers/tracer.go | 120 +- eth/tracers/tracer_test.go | 6 +- eth/tracers/tracers.go | 2 +- eth/tracers/tracers_test.go | 18 +- ethObjectInterface/eth_object.go | 9 + ethclient/ethclient.go | 12 +- ethclient/ethclient_test.go | 2 +- ethclient/signer.go | 4 +- ethdb/database.go | 4 +- ethdb/database_test.go | 2 +- ethdb/memory_database.go | 2 +- ethstats/ethstats.go | 22 +- event/example_feed_test.go | 2 +- event/example_scope_test.go | 2 +- event/example_subscription_test.go | 2 +- event/subscription.go | 2 +- interfaces.go | 4 +- internal/debug/api.go | 2 +- internal/debug/flags.go | 8 +- internal/debug/trace.go | 2 +- internal/ethapi/addrlock.go | 2 +- internal/ethapi/api.go | 34 +- internal/ethapi/backend.go | 22 +- internal/guide/guide_test.go | 4 +- internal/jsre/jsre.go | 4 +- les/api_backend.go | 30 +- les/backend.go | 42 +- les/bloombits.go | 4 +- les/fetcher.go | 14 +- les/flowcontrol/control.go | 2 +- les/flowcontrol/manager.go | 2 +- les/handler.go | 32 +- les/handler_test.go | 24 +- les/helper_test.go | 28 +- les/metrics.go | 4 +- les/odr.go | 8 +- les/odr_requests.go | 18 +- les/odr_test.go | 22 +- les/peer.go | 14 +- les/protocol.go | 10 +- les/request_test.go | 12 +- les/retrieve.go | 2 +- les/server.go | 22 +- les/serverpool.go | 14 +- les/sync.go | 6 +- les/txrelay.go | 4 +- light/lightchain.go | 20 +- light/lightchain_test.go | 12 +- light/nodeset.go | 8 +- light/odr.go | 8 +- light/odr_test.go | 24 +- light/odr_util.go | 10 +- light/postprocess.go | 18 +- light/trie.go | 12 +- light/trie_test.go | 14 +- light/txpool.go | 18 +- light/txpool_test.go | 14 +- log/format.go | 2 +- metrics/exp/exp.go | 2 +- metrics/influxdb/influxdb.go | 2 +- metrics/librato/librato.go | 2 +- metrics/metrics.go | 2 +- miner/agent.go | 4 +- miner/miner.go | 22 +- miner/remote_agent.go | 10 +- miner/unconfirmed.go | 6 +- miner/unconfirmed_test.go | 4 +- miner/worker.go | 23 +- mobile/accounts.go | 8 +- mobile/android_test.go | 4 +- mobile/big.go | 2 +- mobile/bind.go | 8 +- mobile/common.go | 2 +- mobile/discover.go | 2 +- mobile/ethclient.go | 4 +- mobile/ethereum.go | 4 +- mobile/geth.go | 22 +- mobile/init.go | 2 +- mobile/interface.go | 2 +- mobile/logger.go | 2 +- mobile/p2p.go | 2 +- mobile/params.go | 6 +- mobile/types.go | 6 +- mobile/vm.go | 2 +- node/api.go | 12 +- node/config.go | 16 +- node/config_test.go | 4 +- node/defaults.go | 4 +- node/node.go | 15 +- node/node_example_test.go | 6 +- node/node_test.go | 6 +- node/service.go | 10 +- node/utils_test.go | 4 +- p2p/dial.go | 6 +- p2p/dial_test.go | 4 +- p2p/discover/database.go | 6 +- p2p/discover/node.go | 6 +- p2p/discover/node_test.go | 4 +- p2p/discover/ntp.go | 2 +- p2p/discover/table.go | 8 +- p2p/discover/table_test.go | 4 +- p2p/discover/udp.go | 10 +- p2p/discover/udp_test.go | 6 +- p2p/discv5/database.go | 6 +- p2p/discv5/net.go | 14 +- p2p/discv5/net_test.go | 4 +- p2p/discv5/node.go | 4 +- p2p/discv5/node_test.go | 4 +- p2p/discv5/ntp.go | 2 +- p2p/discv5/sim_test.go | 2 +- p2p/discv5/table.go | 2 +- p2p/discv5/table_test.go | 4 +- p2p/discv5/ticket.go | 8 +- p2p/discv5/topic.go | 4 +- p2p/discv5/topic_test.go | 4 +- p2p/discv5/udp.go | 12 +- p2p/discv5/udp_test.go | 6 +- p2p/enr/enr.go | 6 +- p2p/enr/enr_test.go | 4 +- p2p/enr/entries.go | 4 +- p2p/message.go | 6 +- p2p/metrics.go | 2 +- p2p/nat/nat.go | 2 +- p2p/peer.go | 10 +- p2p/protocol.go | 2 +- p2p/protocols/protocol.go | 2 +- p2p/protocols/protocol_test.go | 8 +- p2p/rlpx.go | 12 +- p2p/rlpx_test.go | 10 +- p2p/server.go | 16 +- p2p/server_test.go | 8 +- p2p/simulations/adapters/docker.go | 6 +- p2p/simulations/adapters/exec.go | 10 +- p2p/simulations/adapters/inproc.go | 12 +- p2p/simulations/adapters/types.go | 10 +- p2p/simulations/examples/ping-pong.go | 14 +- p2p/simulations/http.go | 10 +- p2p/simulations/http_test.go | 12 +- p2p/simulations/mocker.go | 4 +- p2p/simulations/mocker_test.go | 2 +- p2p/simulations/network.go | 10 +- p2p/simulations/network_test.go | 4 +- p2p/simulations/simulation.go | 2 +- p2p/testing/peerpool.go | 4 +- p2p/testing/protocolsession.go | 8 +- p2p/testing/protocoltester.go | 16 +- params/config.go | 2 +- params/dao.go | 2 +- rpc/client.go | 2 +- rpc/client_example_test.go | 4 + rpc/client_test.go | 2 +- rpc/ipc.go | 2 +- rpc/json.go | 2 +- rpc/server.go | 2 +- rpc/types.go | 2 +- rpc/types_test.go | 2 +- rpc/websocket.go | 2 +- shyft-cli/postgres_setup/create_tables.psql | 19 +- shyft-cli/postgres_setup/drop_tables.psql | 2 + .../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 +- .../web3/transfer-through-master/test/test.js | 8 +- shyftBlockExplorerApi/handler.go | 95 +- shyftDb/db.go | 37 - shyftDb/shyft_database_util_test.go | 442 +- 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 ++ shyfttracerinterface/tracer_interface.go | 10 + swarm/api/api.go | 8 +- swarm/api/api_test.go | 6 +- swarm/api/client/client.go | 2 +- swarm/api/client/client_test.go | 4 +- swarm/api/config.go | 16 +- swarm/api/config_test.go | 4 +- swarm/api/filesystem.go | 6 +- swarm/api/filesystem_test.go | 4 +- swarm/api/http/error.go | 6 +- swarm/api/http/error_test.go | 2 +- swarm/api/http/roundtripper.go | 8 +- swarm/api/http/server.go | 10 +- swarm/api/http/server_test.go | 10 +- swarm/api/http/templates.go | 2 +- swarm/api/manifest.go | 6 +- swarm/api/manifest_test.go | 2 +- swarm/api/testapi.go | 2 +- swarm/fuse/fuse_file.go | 4 +- swarm/fuse/swarmfs.go | 2 +- swarm/fuse/swarmfs_test.go | 4 +- swarm/fuse/swarmfs_unix.go | 6 +- swarm/fuse/swarmfs_util.go | 2 +- swarm/metrics/flags.go | 8 +- swarm/network/depo.go | 6 +- swarm/network/forwarding.go | 4 +- swarm/network/hive.go | 14 +- swarm/network/kademlia/address.go | 2 +- swarm/network/kademlia/address_test.go | 2 +- swarm/network/kademlia/kaddb.go | 2 +- swarm/network/kademlia/kademlia.go | 4 +- swarm/network/messages.go | 10 +- swarm/network/protocol.go | 14 +- swarm/network/syncdb.go | 4 +- swarm/network/syncdb_test.go | 6 +- swarm/network/syncer.go | 4 +- swarm/services/swap/swap.go | 16 +- swarm/services/swap/swap/swap.go | 2 +- swarm/services/swap/swap/swap_test.go | 2 +- swarm/storage/chunker.go | 2 +- swarm/storage/chunker_test.go | 2 +- swarm/storage/common_test.go | 2 +- swarm/storage/database.go | 2 +- swarm/storage/dbstore.go | 6 +- swarm/storage/dbstore_test.go | 2 +- swarm/storage/dpa.go | 2 +- swarm/storage/localstore.go | 2 +- swarm/storage/memstore.go | 4 +- swarm/storage/netstore.go | 2 +- swarm/storage/types.go | 6 +- swarm/swarm.go | 36 +- swarm/swarm_test.go | 2 +- swarm/testutil/http.go | 6 +- tests/block_test_util.go | 22 +- tests/difficulty_test.go | 4 +- tests/difficulty_test_util.go | 10 +- tests/gen_btheader.go | 8 +- tests/gen_difficultytest.go | 4 +- tests/gen_stenv.go | 4 +- tests/gen_sttransaction.go | 4 +- tests/gen_tttransaction.go | 6 +- tests/gen_vmexec.go | 6 +- tests/init.go | 2 +- tests/init_test.go | 2 +- tests/rlp_test_util.go | 2 +- tests/state_test.go | 2 +- tests/state_test_util.go | 24 +- tests/transaction_test.go | 2 +- tests/transaction_test_util.go | 12 +- tests/vm_test.go | 2 +- tests/vm_test_util.go | 18 +- trie/database.go | 6 +- trie/errors.go | 2 +- trie/hasher.go | 6 +- trie/iterator.go | 2 +- trie/iterator_test.go | 4 +- trie/node.go | 4 +- trie/proof.go | 10 +- trie/proof_test.go | 6 +- trie/secure_trie.go | 4 +- trie/secure_trie_test.go | 6 +- trie/sync.go | 4 +- trie/sync_test.go | 4 +- trie/trie.go | 8 +- trie/trie_test.go | 8 +- whisper/mailserver/mailserver.go | 12 +- whisper/mailserver/server_test.go | 6 +- whisper/shhclient/client.go | 8 +- whisper/whisperv5/api.go | 12 +- whisper/whisperv5/benchmarks_test.go | 2 +- whisper/whisperv5/envelope.go | 10 +- whisper/whisperv5/filter.go | 6 +- whisper/whisperv5/filter_test.go | 4 +- whisper/whisperv5/gen_criteria_json.go | 2 +- whisper/whisperv5/gen_message_json.go | 2 +- whisper/whisperv5/gen_newmessage_json.go | 2 +- whisper/whisperv5/message.go | 8 +- whisper/whisperv5/message_test.go | 4 +- whisper/whisperv5/peer.go | 8 +- whisper/whisperv5/peer_test.go | 10 +- whisper/whisperv5/topic.go | 4 +- whisper/whisperv5/whisper.go | 10 +- whisper/whisperv5/whisper_test.go | 2 +- whisper/whisperv6/api.go | 12 +- whisper/whisperv6/benchmarks_test.go | 2 +- whisper/whisperv6/envelope.go | 10 +- whisper/whisperv6/envelope_test.go | 2 +- whisper/whisperv6/filter.go | 6 +- whisper/whisperv6/filter_test.go | 4 +- whisper/whisperv6/gen_criteria_json.go | 2 +- whisper/whisperv6/gen_message_json.go | 2 +- whisper/whisperv6/gen_newmessage_json.go | 2 +- whisper/whisperv6/message.go | 8 +- whisper/whisperv6/message_test.go | 6 +- whisper/whisperv6/peer.go | 8 +- whisper/whisperv6/peer_test.go | 12 +- whisper/whisperv6/topic.go | 4 +- whisper/whisperv6/whisper.go | 12 +- whisper/whisperv6/whisper_test.go | 2 +- 626 files changed, 19149 insertions(+), 3087 deletions(-) create mode 100644 core/db.go rename {shyftDb => core}/shyft_database_util.go (76%) create mode 100644 eth/chaindb.go create mode 100644 eth/shyft_tracer.go create mode 100644 ethObjectInterface/eth_object.go delete mode 100644 shyftDb/db.go 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 create mode 100644 shyfttracerinterface/tracer_interface.go diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a9f7b210e7..b7e06c3a66 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ Before you do a feature request please check and make sure that it isn't possible through some other means. The JavaScript enabled console is a powerful feature -in the right hands. Please check our [Wiki page](https://github.com/empyrean/go-ethereum/wiki) for more info +in the right hands. Please check our [Wiki page](https://github.com/ShyftNetwork/go-empyrean/wiki) for more info and help. ## Contributing @@ -11,6 +11,6 @@ If you'd like to contribute to go-ethereum please fork, fix, commit and send a pull request. Commits which do not comply with the coding standards are ignored (use gofmt!). -See [Developers' Guide](https://github.com/empyrean/go-ethereum/wiki/Developers'-Guide) +See [Developers' Guide](https://github.com/ShyftNetwork/go-empyrean/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. 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/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 57afe4a9a1..c02c4c4667 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -27,8 +27,8 @@ import ( "reflect" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 0db5678b69..12aad9ab59 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // NewTransactor is a utility method to easily create a transaction signer from diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 6dec891e29..c4e5ed7261 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index a2deeadd2b..4a91f9af26 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,21 +24,21 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/eth/filters" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/filters" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 08ddadab18..b4efe8e080 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 6887edc5f3..6b03198f0c 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/empyrean/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/ShyftNetwork/go-empyrean/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -28,7 +28,7 @@ import ( "text/template" "unicode" - "github.com/empyrean/go-ethereum/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 31e1270199..6c5be2cd71 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index f072c48b62..c714a0f1ae 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/empyrean/go-ethereum/accounts/abi" +import "github.com/ShyftNetwork/go-empyrean/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go index ee5ffc732b..2fe1c3501e 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // makeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index aa546546d4..104935a9e6 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index ac1e9984e4..4cd028f292 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind/backends" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 519bc85512..ab4628ddd9 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index 75156852e6..b974edd1e5 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,13 +25,8 @@ import ( "strings" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) -var jsonEventTransfer = []byte(`{ "anonymous": false, "inputs": [ { @@ -244,7 +239,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/empyrean/go-ethereum/pull/15568 +https://github.com/ShyftNetwork/go-empyrean/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 4a96adecba..b2ca1ea73b 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // Method represents a callable given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 95e087d2b4..59b1cd6837 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 1d2d7cd542..0917f8cd3f 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 05d56ea263..f4715b777f 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 3f1d4efc55..3a2f59aab8 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" + "github.com/ShyftNetwork/go-empyrean/common" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 60c165d19f..61b670a9ce 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // reads the integer based on its kind diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 2aab49060d..b152a68b1e 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index fc4256e543..965212f427 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/event" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" ) // Account represents an Ethereum account located at a specific location defined diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index b9fb2ba4b8..6292ce509e 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index fae3db22b1..881de327a9 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index c15f1ede99..da2867d7fe 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" set "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 73317f4667..b55f138463 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index a367b5ad1c..e87e5b7407 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index 65772a1972..88cbd8d42d 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -36,10 +36,10 @@ import ( "io/ioutil" "path/filepath" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/randentropy" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/randentropy" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/accounts/keystore/keystore_passphrase_test.go b/accounts/keystore/keystore_passphrase_test.go index 6a92727c64..f14cfb7cd6 100644 --- a/accounts/keystore/keystore_passphrase_test.go +++ b/accounts/keystore/keystore_passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index 2db960a5a9..644c7e8532 100644 --- a/accounts/keystore/keystore_plain.go +++ b/accounts/keystore/keystore_plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index e923d9b3c7..ef2a3e3ed2 100644 --- a/accounts/keystore/keystore_plain_test.go +++ b/accounts/keystore/keystore_plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index f0af0161ff..106df7ff6f 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index a719b0a488..3e411f1533 100644 --- a/accounts/keystore/keystore_wallet.go +++ b/accounts/keystore/keystore_wallet.go @@ -19,9 +19,9 @@ package keystore import ( "math/big" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/core/types" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 4d131b3ae7..bb4891ea6f 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index a52936ce3b..ad7ffcd6e4 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,7 +21,7 @@ package keystore import ( "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index e795f4973b..fe2fb3849b 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/event" ) // Manager is an overarching account manager that can communicate with various diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index 7d3d343510..66ebdba8b2 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index 00df8351c4..9332fa0b1e 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 6a9d90b871..8224cc13e2 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/usbwallet/internal/trezor" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/usbwallet/internal/trezor" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 7057eee2d7..2b9e627b39 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,11 +25,19 @@ import ( "sync" "time" +<<<<<<< HEAD ethereum "github.com/empyrean/go-ethereum" "github.com/empyrean/go-ethereum/accounts" "github.com/empyrean/go-ethereum/common" "github.com/empyrean/go-ethereum/core/types" "github.com/empyrean/go-ethereum/log" +======= + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" +>>>>>>> shftBlock_rename "github.com/karalabe/hid" ) diff --git a/bmt/bmt_test.go b/bmt/bmt_test.go index 40620247e9..6b5ae88d84 100644 --- a/bmt/bmt_test.go +++ b/bmt/bmt_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" ) const ( diff --git a/build/ci.go b/build/ci.go index 8cebb6883e..0ec6dc4673 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,7 +58,7 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/internal/build" + "github.com/ShyftNetwork/go-empyrean/internal/build" ) var ( @@ -738,7 +738,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/empyrean/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ShyftNetwork/go-empyrean/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -858,7 +858,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/empyrean/go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/ShyftNetwork/go-empyrean/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/build/deb.control b/build/deb.control index fdb6795681..2949cc538f 100644 --- a/build/deb.control +++ b/build/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/empyrean/go-ethereum.git -Vcs-Browser: https://github.com/empyrean/go-ethereum +Vcs-Git: git://github.com/ShyftNetwork/go-empyrean.git +Vcs-Browser: https://github.com/ShyftNetwork/go-empyrean Package: {{.Name}} Architecture: any diff --git a/build/mvn.pom b/build/mvn.pom index 119b7c3c0a..a28f717a55 100644 --- a/build/mvn.pom +++ b/build/mvn.pom @@ -11,7 +11,7 @@ Android Ethereum Client Android port of the go-ethereum libraries and node - https://github.com/empyrean/go-ethereum + https://github.com/ShyftNetwork/go-empyrean 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/empyrean/go-ethereum/issues/ + https://github.com/ShyftNetwork/go-empyrean/issues/ - https://github.com/empyrean/go-ethereum + https://github.com/ShyftNetwork/go-empyrean diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index ed44b12ad2..0217256e24 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/empyrean/go-ethereum/issues" -!define UPDATEURL "https://github.com/empyrean/go-ethereum/releases" -!define ABOUTURL "https://github.com/empyrean/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/ShyftNetwork/go-empyrean/issues" +!define UPDATEURL "https://github.com/ShyftNetwork/go-empyrean/releases" +!define ABOUTURL "https://github.com/ShyftNetwork/go-empyrean#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index d272aa1689..7c95026185 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common/compiler" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 4023d403f7..2ae46b8e67 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,13 +24,13 @@ import ( "net" "os" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) func main() { diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index 91bdf80bc2..c2e3c6d30f 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/crypto" "github.com/pborman/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index 265ec8e0a0..01843f4e80 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 98f73994ba..3c2618f45c 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index e0fa95e32e..f81ece2250 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 226d9c2768..3d1e016d15 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" + "github.com/ShyftNetwork/go-empyrean/internal/cmdtest" "github.com/docker/docker/pkg/reexec" - "github.com/empyrean/go-ethereum/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index e574a9bf4f..f9c8bf75e2 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/console" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index 0cbff2c22a..ec372eb2c4 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/empyrean/go-ethereum/cmd/evm/internal/compiler" + "github.com/ShyftNetwork/go-empyrean/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 4b25dddb6b..8f4e9cf57f 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/empyrean/go-ethereum/core/asm" + "github.com/ShyftNetwork/go-empyrean/core/asm" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index 06bf700a52..9d2ecb84eb 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/empyrean/go-ethereum/core/asm" + "github.com/ShyftNetwork/go-empyrean/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/json_logger.go b/cmd/evm/json_logger.go index fda5e64038..cab340c8f3 100644 --- a/cmd/evm/json_logger.go +++ b/cmd/evm/json_logger.go @@ -22,9 +22,9 @@ import ( "math/big" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core/vm" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) type JSONLogger struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 65458b1a86..b1420a9c4b 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 4b3bf248a2..aa30975f58 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( goruntime "runtime" - "github.com/empyrean/go-ethereum/cmd/evm/internal/compiler" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/core/vm/runtime" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/cmd/evm/internal/compiler" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/core/vm/runtime" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 47a8e08d67..4ca61668b2 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/tests" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index a11f183385..f9c343898a 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethclient" - "github.com/empyrean/go-ethereum/ethstats" - "github.com/empyrean/go-ethereum/les" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethclient" + "github.com/ShyftNetwork/go-empyrean/ethstats" + "github.com/ShyftNetwork/go-empyrean/les" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/params" "golang.org/x/net/websocket" ) @@ -450,7 +450,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case *noauthFlag: username, avatar, address, err = authNoAuth(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/empyrean/go-ethereum/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/ShyftNetwork/go-empyrean/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index cdf11a204f..1a8fe7ce99 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/console" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index 50b456008b..63bbbb01ac 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -173,7 +173,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/empyrean/go-ethereum/issues/1785 +// https://github.com/ShyftNetwork/go-empyrean/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) geth := runGeth(t, diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go index 85f57acbcb..a9555d948e 100644 --- a/cmd/geth/bugcmd.go +++ b/cmd/geth/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/empyrean/go-ethereum/cmd/internal/browser" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/cmd/internal/browser" + "github.com/ShyftNetwork/go-empyrean/params" - "github.com/empyrean/go-ethereum/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) @@ -41,7 +41,7 @@ var bugCommand = cli.Command{ Category: "MISCELLANEOUS COMMANDS", } -const issueUrl = "https://github.com/empyrean/go-ethereum/issues/new" +const issueUrl = "https://github.com/ShyftNetwork/go-empyrean/issues/new" // reportBug reports a bug by opening a new URL to the go-ethereum GH issue // tracker and setting default values as the issue body. diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index ac5ce26211..a4d39c0e6f 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,17 +25,17 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/console" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/trie" "github.com/syndtr/goleveldb/leveldb/util" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index bbf2b6aa4a..557beaf684 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,12 +27,12 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/dashboard" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/params" - whisper "github.com/empyrean/go-ethereum/whisper/whisperv5" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/dashboard" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/params" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv5" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 5194052de5..f72622106b 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/console" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/rpc" "gopkg.in/urfave/cli.v1" ) @@ -43,7 +43,7 @@ var ( Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console.`, +See https://github.com/ShyftNetwork/go-empyrean/wiki/JavaScript-Console.`, } attachCommand = cli.Command{ @@ -56,7 +56,7 @@ See https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console. +See https://github.com/ShyftNetwork/go-empyrean/wiki/JavaScript-Console. This command allows to open a console on a running geth node.`, } @@ -69,7 +69,7 @@ This command allows to open a console on a running geth node.`, Category: "CONSOLE COMMANDS", Description: ` The JavaScript VM exposes a node admin interface as well as the Ðapp -JavaScript API. See https://github.com/empyrean/go-ethereum/wiki/JavaScript-Console`, +JavaScript API. See https://github.com/ShyftNetwork/go-empyrean/wiki/JavaScript-Console`, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index c7b382692f..a6700d8dce 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index a354af1fe1..f251d55b65 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 3cd8b4fa8c..f05e3ebb82 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,17 +25,17 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/console" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/ethclient" - "github.com/empyrean/go-ethereum/internal/debug" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/node" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethclient" + "github.com/ShyftNetwork/go-empyrean/internal/debug" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index c5ee12dc9f..42548c31f3 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index 48728364a3..85525b95d4 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -25,9 +25,9 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/gizak/termui" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index f0518d3e35..eec2a3412c 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/empyrean/go-ethereum/internal/cmdtest" + "github.com/ShyftNetwork/go-empyrean/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index b0bbd4c842..fc60229a5e 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/internal/debug" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 48b067df10..0f752f1d86 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index 9fb0979a75..9beecd9cf4 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -21,11 +21,11 @@ import ( "errors" "math" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/params" ) // cppEthereumGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index c9e50deb42..192d0b10b0 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 3a1c3fad02..2c9589c024 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -256,7 +256,7 @@ var dashboardContent = `

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.

Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive. +

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Java code you can now import the geth archive and connect to Ethereum: 

import org.ethereum.geth.*;
@@ -287,7 +287,7 @@ node.start();

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.

Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework. +

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous): 

import Geth
@@ -419,7 +419,7 @@ try! node?.start();

Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.

Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.


-

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/empyrean/go-ethereum/cmd/puppeth

+

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/ShyftNetwork/go-empyrean/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 11421bea80..21766718e3 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index cf5d5f49fb..e8f952e5cd 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // explorerDockerfile is the Dockerfile required to run a block explorer. diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 052a370620..ca1164b26e 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" ) // faucetDockerfile is the Dockerfile required to build an faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 0eccaad92f..5a393cba3a 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // nginxDockerfile is theis the Dockerfile required to build an nginx reverse- diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index b0c089d3cc..6c26441fbe 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 0a9f694c88..1b601c6ef8 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index 81dae671a0..f45661c443 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 1adbfc6675..48c933cbd5 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index c878709b04..84b7d7f0e5 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -30,9 +30,9 @@ import ( "strings" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 513d37cff6..7290ff54e6 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // deployDashboard queries the user for various input on deploying a web-service diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go index 6a4452d119..be9ce13621 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go index 68d004d822..74dd29fe9f 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // deployExplorer creates a new block explorer based on some user input. diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 7bced55474..5db981464c 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/log" ) // deployFaucet queries the user for various input on deploying a faucet, after diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index f6e075043f..04934abfe3 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" ) // makeGenesis creates a new genesis struct based on some user input. diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go index a2885c48bc..c0bf535e67 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 8a740715bc..f11d2b6653 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index 85b950a2e1..584c61777e 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // manageServers displays a list of servers the user can disconnect from, and an diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go index 2006604ee3..016c7dcee5 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // ensureVirtualHost checks whether a reverse-proxy is running on the specified diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go index 5cfadf02d8..9c76eb740f 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go index a70d80b6c8..cae249df72 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 24b7046b15..49d2cdcb22 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index d306019be8..feaaa3998b 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -28,13 +28,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" "github.com/naoina/toml" - bzzapi "github.com/empyrean/go-ethereum/swarm/api" + bzzapi "github.com/ShyftNetwork/go-empyrean/swarm/api" ) var ( @@ -84,7 +84,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/empyrean/go-ethereum/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/ShyftNetwork/go-empyrean/swarm/api/config.go for available fields") } return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link) }, diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 40b1f12f9b..ff46c047df 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/rpc" - "github.com/empyrean/go-ethereum/swarm" - "github.com/empyrean/go-ethereum/swarm/api" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/swarm" + "github.com/ShyftNetwork/go-empyrean/swarm/api" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index e7a85b641c..f804124130 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 7641403ffe..b5fcdaee52 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 8d5a8c6f81..cbe0053da2 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/empyrean/go-ethereum/cmd/utils" - swarm "github.com/empyrean/go-ethereum/swarm/api/client" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 382179b765..1893faa19e 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -28,22 +28,22 @@ import ( "strings" "syscall" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/console" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethclient" - "github.com/empyrean/go-ethereum/internal/debug" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/swarm" - bzzapi "github.com/empyrean/go-ethereum/swarm/api" - swarmmetrics "github.com/empyrean/go-ethereum/swarm/metrics" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethclient" + "github.com/ShyftNetwork/go-empyrean/internal/debug" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/swarm" + bzzapi "github.com/ShyftNetwork/go-empyrean/swarm/api" + swarmmetrics "github.com/ShyftNetwork/go-empyrean/swarm/metrics" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index b88ce0a70b..c10382234f 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -24,9 +24,9 @@ import ( "path/filepath" "strings" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/swarm/api" - swarm "github.com/empyrean/go-ethereum/swarm/api/client" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index fc6c0080ec..f76d280866 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -27,13 +27,13 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/internal/cmdtest" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rpc" - "github.com/empyrean/go-ethereum/swarm" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/internal/cmdtest" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/swarm" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index ed42bab18c..d9e3c186e3 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -30,8 +30,13 @@ import ( "path/filepath" "strings" +<<<<<<< HEAD "github.com/empyrean/go-ethereum/cmd/utils" swarm "github.com/empyrean/go-ethereum/swarm/api/client" +======= + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client" +>>>>>>> shftBlock_rename "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 6175f5901c..5fb6ab2c7d 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,12 +27,12 @@ import ( "strings" "syscall" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/internal/debug" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/internal/debug" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index 795445b3f5..c9757f5578 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b32d642c0c..c7c3135bff 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,34 +28,34 @@ import ( "strconv" "strings" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/fdlimit" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/clique" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/dashboard" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/gasprice" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/ethstats" - "github.com/empyrean/go-ethereum/les" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/p2p/netutil" - "github.com/empyrean/go-ethereum/params" - whisper "github.com/empyrean/go-ethereum/whisper/whisperv5" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/fdlimit" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/clique" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/dashboard" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/ethstats" + "github.com/ShyftNetwork/go-empyrean/les" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/params" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv5" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index fcf2b0be52..1fb3c2147a 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/cmd/utils" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/console" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/whisper/mailserver" - whisper "github.com/empyrean/go-ethereum/whisper/whisperv6" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/whisper/mailserver" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index dc87c726d0..db0c28557f 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 7680e17463..895cd9c4ba 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/empyrean/go-ethereum/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ShyftNetwork/go-empyrean/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index dc2c9f3447..448667bffc 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index 1e6074d1ba..51c19c7ca1 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/number/int.go b/common/number/int.go index ddfce3bd9d..40c68d62e9 100644 --- a/common/number/int.go +++ b/common/number/int.go @@ -19,7 +19,7 @@ package number import ( "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) var tt256 = new(big.Int).Lsh(big.NewInt(1), 256) diff --git a/common/number/uint_test.go b/common/number/uint_test.go index 0730f106c1..424472b52d 100644 --- a/common/number/uint_test.go +++ b/common/number/uint_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) func TestSet(t *testing.T) { diff --git a/common/types.go b/common/types.go index 72107bd9b0..e14179f325 100644 --- a/common/types.go +++ b/common/types.go @@ -23,8 +23,8 @@ import ( "math/rand" "reflect" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" ) const ( diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index a1123057a1..34bf381f40 100644 --- a/compression/rle/read_write.go +++ b/compression/rle/read_write.go @@ -21,7 +21,7 @@ import ( "bytes" "errors" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto" ) const ( diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 5c711456db..b1688a8cc6 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 42a880bfb2..2065fc1b2e 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,20 +25,20 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/misc" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 9a499aa0c5..afd510959f 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -20,10 +20,10 @@ import ( "bytes" "encoding/json" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index c2e6939388..50032aaba6 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,12 +22,12 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index 3d831921e4..1b8d1869d0 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -18,11 +18,11 @@ package consensus import ( - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" "math/big" ) diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index a6a18ce256..67a7e43601 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,11 +27,11 @@ import ( "time" "unsafe" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/bitutil" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index a031cccbea..2913b51432 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -25,9 +25,9 @@ import ( "sync" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Tests whether the dataset size calculator works correctly by cross checking the diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index f6ac5578d2..5bbf0b633d 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/misc" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" set "gopkg.in/fatih/set.v0" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 56dd80a887..cbda22a354 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index be5c7a139e..8865859790 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,10 +33,10 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 5c4b4d0e46..1848dc7e88 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Tests that ethash works correctly in test mode. @@ -44,7 +44,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/empyrean/go-ethereum/issues/14943 +// It reproduces https://github.com/ShyftNetwork/go-empyrean/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index c61a2ff42f..50584caeed 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -24,10 +24,10 @@ import ( "runtime" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) // Seal implements consensus.Engine, attempting to find a nonce that satisfies diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 1a1b19bda2..1eeca5e270 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4e6295c216..ddbebce532 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index 4fde085a96..105896b092 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/accounts/usbwallet" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts/usbwallet" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 71dba2a49d..48114097f0 100644 --- a/console/console.go +++ b/console/console.go @@ -28,9 +28,9 @@ import ( "strings" "syscall" - "github.com/empyrean/go-ethereum/internal/jsre" - "github.com/empyrean/go-ethereum/internal/web3ext" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/internal/jsre" + "github.com/ShyftNetwork/go-empyrean/internal/web3ext" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" diff --git a/console/console_test.go b/console/console_test.go index fdd45326c6..d80a4c255f 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,18 +26,18 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/internal/jsre" - "github.com/empyrean/go-ethereum/node" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/internal/jsre" + "github.com/ShyftNetwork/go-empyrean/node" ) const ( testInstance = "console-tester" testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" -) + ) // hookedPrompter implements UserPrompter to simulate use input via channels. type hookedPrompter struct { diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index b80ae09b5b..15f489902a 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 20e2b2e379..88055f3e57 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/contracts/chequebook/contract" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/swarm/services/swap/swap" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook/contract" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/services/swap/swap" ) // TODO(zelig): watch peer solvency and notify of bouncing cheques diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go index bd4053d729..78e1966b86 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/contracts/chequebook/contract" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind/backends" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook/contract" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index e8ed917b93..46d65b36f1 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/event" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index b43b6e3d94..4bcbef9204 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" - "github.com/empyrean/go-ethereum/contracts/chequebook/contract" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind/backends" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook/contract" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index f9f5abe00b..b42c1935b6 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,12 +6,12 @@ package contract import ( "strings" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/event" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go index 793e65f6f4..5a2752d151 100644 --- a/contracts/ens/contract/fifsregistrar.go +++ b/contracts/ens/contract/fifsregistrar.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // FIFSRegistrarABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go index a7eccf21e9..fb3a203cc8 100644 --- a/contracts/ens/contract/publicresolver.go +++ b/contracts/ens/contract/publicresolver.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/event" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" ) // PublicResolverABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index d181fab84f..322a200740 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -23,11 +23,11 @@ package ens import ( "strings" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/contracts/ens/contract" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/contracts/ens/contract" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index b7cbefbf91..523723d63a 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,11 +20,11 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/accounts/abi/bind/backends" - "github.com/empyrean/go-ethereum/contracts/ens/contract" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind/backends" + "github.com/ShyftNetwork/go-empyrean/contracts/ens/contract" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 17cac79b57..532badae3a 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/empyrean/go-ethereum/core/vm" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index a8f25359a0..912f4abf35 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core/vm" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 53ed2c2661..a9fcd6d9bf 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,6 +23,7 @@ import ( "os" "testing" +<<<<<<< HEAD "github.com/empyrean/go-ethereum/common" "github.com/empyrean/go-ethereum/common/math" "github.com/empyrean/go-ethereum/consensus/ethash" @@ -31,6 +32,16 @@ import ( "github.com/empyrean/go-ethereum/crypto" "github.com/empyrean/go-ethereum/ethdb" "github.com/empyrean/go-ethereum/params" +======= + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" +>>>>>>> shftBlock_rename ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 71f60bc1ab..3927b81d0d 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,10 +19,10 @@ package core import ( "fmt" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 0b017cc53a..8600308565 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index e36258fcc6..36d7a0a120 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,22 +28,22 @@ import ( "sync" "sync/atomic" "time" - - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/shyftdb" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + + + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" "github.com/hashicorp/golang-lru" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) @@ -901,15 +901,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 - if err := shyftdb.WriteBlock(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 +999,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 } diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 523dc52103..18d87eae0f 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Test fork of length N starting from block i @@ -1196,7 +1196,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/empyrean/go-ethereum/pull/15941 +// https://github.com/ShyftNetwork/go-empyrean/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index 92ddcde7b1..d8de7cb9db 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/empyrean/go-ethereum/common" +import "github.com/ShyftNetwork/go-empyrean/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index c67a5871e3..327a4a723a 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // errSectionOutOfBounds is returned if the user tried to add more bloom filters diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index 1db75df350..052d85ee36 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index 5f44f198b8..95aeaa6176 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common/bitutil" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index bfbcd2ed4b..64730df9ee 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) const testSectionSize = 4096 @@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifter from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/empyrean/go-ethereum/issues/15309. +// bitset matching https://github.com/ShyftNetwork/go-empyrean/issues/15309. func TestMatcherShifted(t *testing.T) { // Block 0 always matches in the tests, skip ahead of first 8 blocks with the // start to get a potential zero byte in the matcher bitset. diff --git a/core/chain_indexer.go b/core/chain_indexer.go index e69619871a..45eb738930 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index 0de5827c0a..8b70843bd0 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 3a03ba623b..eeab691988 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/misc" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // So we can deterministically seed different blockchains diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 7b67a643cd..ed9311fa30 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 8f4df8cbe8..26ba123cad 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/database_util.go b/core/database_util.go index 108867c577..256a2edd5d 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -24,13 +24,13 @@ import ( "math/big" "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // DatabaseReader wraps the Get method of a backing data store. @@ -283,7 +283,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/database_util_test.go b/core/database_util_test.go index 3a0aff53b2..27a901cf2f 100644 --- a/core/database_util_test.go +++ b/core/database_util_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/db.go b/core/db.go new file mode 100644 index 0000000000..48f86ac7a1 --- /dev/null +++ b/core/db.go @@ -0,0 +1,47 @@ +package core + +import ( + "fmt" + "database/sql" +) + +var blockExplorerDb *sql.DB + +const ( + connStr = "user=postgres dbname=shyftdb sslmode=disable" + connStrTest = "user=postgres dbname=shyftdbtest sslmode=disable" +) + +func InitDB() (*sql.DB, error){ + db, err := sql.Open("postgres", connStr) + if err != nil { + fmt.Println("ERROR OPENING DB, NOT INITIALIZING") + panic(err) + return nil, err + } else { + blockExplorerDb = db + return blockExplorerDb, nil + } +} + +func InitDBTest() (*sql.DB, error){ + db, err := sql.Open("postgres", connStrTest) + if err != nil { + fmt.Println("ERROR OPENING DB, NOT INITIALIZING") + panic(err) + return nil, err + } else { + blockExplorerDb = db + return blockExplorerDb, nil + } +} + +func DBConnection() (*sql.DB, error) { + if (blockExplorerDb == nil) { + _, err := InitDB() + if(err != nil) { + return nil, err + } + } + return blockExplorerDb, nil +} diff --git a/core/events.go b/core/events.go index 447ac30ab2..5d68108b79 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/evm.go b/core/evm.go index d462d6d3e3..674063eb25 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index fadc882ecc..051eab24c0 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 3e03688d26..b7e2280ceb 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index e297d05079..398b38d5f6 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -26,16 +26,15 @@ import ( "strings" _ "github.com/lib/pq" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/shyftdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" "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() @@ -187,15 +186,13 @@ func WriteShyftGen(gen *Genesis, block *types.Block) { panic(insertError) } } - - default: log.Info("Found Genesis 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/core/genesis_test.go b/core/genesis_test.go index 5c4f1dffeb..2383e9637c 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 09a0ee0715..0357cad72c 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -25,12 +25,12 @@ import ( mrand "math/rand" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" "github.com/hashicorp/golang-lru" "sync/atomic" ) diff --git a/core/helper_test.go b/core/helper_test.go index 9c9c760a7c..d1fc01c340 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -20,9 +20,9 @@ import ( "container/list" "fmt" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 43cc34e71b..2c83ce196a 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/shyftDb/shyft_database_util.go b/core/shyft_database_util.go similarity index 76% rename from shyftDb/shyft_database_util.go rename to core/shyft_database_util.go index 36304a7444..46f194bdbf 100644 --- a/shyftDb/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -1,36 +1,43 @@ -package shyftdb +package core import ( - "database/sql" - "encoding/json" - "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "log" - "math/big" - "strconv" - "time" +"encoding/json" +"fmt" +"math/big" +"time" +"strconv" +"database/sql" +"log" +_ "github.com/lib/pq" - Rewards "github.com/empyrean/go-ethereum/consensus/ethash" - _ "github.com/lib/pq" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + Rewards "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/shyfttracerinterface" ) +var IShyftTracer shyfttracerinterface.IShyftTracer + +func SetIShyftTracer(st shyfttracerinterface.IShyftTracer) { + IShyftTracer = st +} + //SBlock type type SBlock struct { - Hash string - Coinbase string - Number string - GasUsed uint64 - GasLimit uint64 - TxCount int + Hash string + Coinbase string + Number string + GasUsed uint64 + GasLimit uint64 + TxCount int UncleCount int Age string ParentHash string - UncleHash string + UncleHash string Difficulty string - Size string - Nonce uint64 - Rewards string + Size string + Nonce uint64 + Rewards string } //blockRes struct @@ -42,8 +49,8 @@ type blockRes struct { } type SAccounts struct { - Addr string - Balance string + Addr string + Balance string TxCountAccount string } @@ -62,7 +69,7 @@ type ShyftTxEntry struct { Amount *big.Int GasPrice *big.Int Gas uint64 - Cost *big.Int + Cost *big.Int Nonce uint64 Data []byte } @@ -72,21 +79,21 @@ type txRes struct { } type ShyftTxEntryPretty struct { - TxHash string - To string - From string - BlockHash string + TxHash string + To string + From string + BlockHash string BlockNumber string - Amount string - GasPrice uint64 - Gas uint64 - GasLimit uint64 - Cost uint64 - Nonce uint64 - Status string - IsContract bool - Age time.Time - Data []byte + Amount string + GasPrice uint64 + Gas uint64 + GasLimit uint64 + Cost uint64 + Nonce uint64 + Status string + IsContract bool + Age time.Time + Data []byte } type ShyftAccountEntry struct { @@ -95,23 +102,23 @@ type ShyftAccountEntry struct { } type SendAndReceive struct { - To string - From string - Amount string - Address string - Balance string + To string + From string + Amount string + Address string + Balance string TxCountAccount string } //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 { panic(err) } - rewards := writeMinerRewards(sqldb, block) + rewards := swriteMinerRewards(sqldb,block) coinbase := block.Header().Coinbase.String() number := block.Header().Number.String() gasUsed := block.Header().GasUsed @@ -138,12 +145,12 @@ 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) + swriteFromBalance(sqldb, tx) } if block.Transactions()[0].To() == nil { - writeContractBalance(sqldb, tx) + swriteContractBalance(sqldb, tx) } } } @@ -151,20 +158,23 @@ 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(), To: tx.To(), BlockHash: blockHash.Hex(), Amount: tx.Value(), - Cost: tx.Cost(), + Cost: tx.Cost(), GasPrice: tx.GasPrice(), Gas: tx.Gas(), Nonce: tx.Nonce(), Data: tx.Data(), } + + hash := txData.TxHash txHash := txData.TxHash.Hex() + from := txData.From.Hex() blockHasher := txData.BlockHash amount := txData.Amount.String() @@ -177,7 +187,7 @@ func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Ha var isContract bool var statusFromReciept string - if to == nil { + if (to == nil){ var contractAddressFromReciept string for _, receipt := range receipts { statusReciept := (*types.ReceiptForStorage)(receipt).Status @@ -193,8 +203,7 @@ func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Ha var retNonce string 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) - + 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) } @@ -212,17 +221,18 @@ func writeTransactions(sqldb *sql.DB, tx *types.Transaction, blockHash common.Ha } 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, to.Hex(), blockHasher, blockNumber, amount, gasPrice, gas, gasLimit, txFee, nonce, isContract, statusFromReciept, age, data).Scan(&retNonce) + qerr := sqldb.QueryRow(sqlStatement, txHash, from, to.Hex(), blockHasher, blockNumber, amount, gasPrice, gas, gasLimit, txFee, nonce, isContract, statusFromReciept, age,data).Scan(&retNonce) if qerr != nil { panic(qerr) } } + IShyftTracer.GetTracerToRun(hash) 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(), @@ -243,7 +253,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) @@ -274,9 +284,28 @@ func writeContractBalance(sqldb *sql.DB, tx *types.Transaction) error { return nil } +func swriteContractBalanceHelper(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) +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 @@ -348,17 +377,18 @@ 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(), + To: tx.To().Hex(), + From: tx.From().Hex(), Amount: tx.Value().String(), } 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 { @@ -382,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 @@ -397,7 +427,7 @@ func writeMinerRewards(sqldb *sql.DB, block *types.Block) string { // https://ethereum.stackexchange.com/questions/27172/different-uncles-reward // line 551 in consensus.go (shyft_go-ethereum/consensus/ethash/consensus.go) // Some weird constants to avoid constant memory allocs for them. - var big8 = big.NewInt(8) + var big8 = big.NewInt(8) var uncleRewards []*big.Int var uncleAddrs []string @@ -412,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) @@ -428,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)` @@ -477,7 +507,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(` @@ -517,23 +547,23 @@ func GetAllBlocks(sqldb *sql.DB) string { &size, &nonce, &rewards, - &num) + &num,) arr.Blocks = append(arr.Blocks, SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash: parentHash, - UncleHash: uncleHash, - Difficulty: difficulty, - Size: size, - Nonce: nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash:parentHash, + UncleHash:uncleHash, + Difficulty:difficulty, + Size: size, + Nonce:nonce, + Rewards: rewards, + Number: num, }) blocks, _ := json.Marshal(arr.Blocks) @@ -545,7 +575,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 @@ -576,29 +606,29 @@ func GetBlock(sqldb *sql.DB, blockNumber string) string { &size, &nonce, &rewards, - &num) + &num,) block := SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash: parentHash, - UncleHash: uncleHash, - Difficulty: difficulty, - Size: size, - Nonce: nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash:parentHash, + UncleHash:uncleHash, + Difficulty:difficulty, + Size: size, + Nonce:nonce, + Rewards: rewards, + Number: num, } json, _ := json.Marshal(block) 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 @@ -629,29 +659,29 @@ func GetRecentBlock(sqldb *sql.DB) string { &size, &nonce, &rewards, - &num) + &num,) block := SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash: parentHash, - UncleHash: uncleHash, - Difficulty: difficulty, - Size: size, - Nonce: nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash:parentHash, + UncleHash:uncleHash, + Difficulty:difficulty, + Size: size, + Nonce:nonce, + Rewards: rewards, + Number: num, } json, _ := json.Marshal(block) 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` @@ -695,21 +725,21 @@ func GetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string { ) arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, }) tx, _ := json.Marshal(arr.TxEntry) @@ -719,7 +749,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` @@ -759,23 +789,23 @@ func GetAllBlocksMinedByAddress(sqldb *sql.DB, coinbase string) string { &size, &nonce, &rewards, - &num) + &num,) arr.Blocks = append(arr.Blocks, SBlock{ - Hash: hash, - Coinbase: coinbase, - GasUsed: gasUsed, - GasLimit: gasLimit, - TxCount: txCount, + Hash: hash, + Coinbase: coinbase, + GasUsed: gasUsed, + GasLimit: gasLimit, + TxCount: txCount, UncleCount: uncleCount, - Age: age, - ParentHash: parentHash, - UncleHash: uncleHash, - Difficulty: difficulty, - Size: size, - Nonce: nonce, - Rewards: rewards, - Number: num, + Age: age, + ParentHash:parentHash, + UncleHash:uncleHash, + Difficulty:difficulty, + Size: size, + Nonce:nonce, + Rewards: rewards, + Number: num, }) blocks, _ := json.Marshal(arr.Blocks) @@ -786,7 +816,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(` @@ -830,21 +860,21 @@ func GetAllTransactions(sqldb *sql.DB) string { ) arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, }) tx, _ := json.Marshal(arr.TxEntry) @@ -855,7 +885,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 @@ -891,21 +921,21 @@ func GetTransaction(sqldb *sql.DB, txHash string) string { &data) tx := ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, } json, _ := json.Marshal(tx) @@ -913,7 +943,7 @@ func GetTransaction(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 @@ -925,8 +955,8 @@ func GetAccount(sqldb *sql.DB, address string) string { &txCountAccount) account := SAccounts{ - Addr: addr, - Balance: balance, + Addr: addr, + Balance: balance, TxCountAccount: txCountAccount, } json, _ := json.Marshal(account) @@ -934,7 +964,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 @@ -960,8 +990,8 @@ func GetAllAccounts(sqldb *sql.DB) string { ) array.AllAccounts = append(array.AllAccounts, SAccounts{ - Addr: addr, - Balance: balance, + Addr: addr, + Balance: balance, TxCountAccount: txCountAccount, }) @@ -973,7 +1003,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;` @@ -1017,21 +1047,21 @@ func GetAccountTxs(sqldb *sql.DB, address string) string { ) arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{ - TxHash: txhash, - To: to_addr, - From: from_addr, - BlockHash: blockhash, + TxHash: txhash, + To: to_addr, + From: from_addr, + BlockHash: blockhash, BlockNumber: blocknumber, - Amount: amount, - GasPrice: gasprice, - Gas: gas, - GasLimit: gasLimit, - Cost: txfee, - Nonce: nonce, - Status: status, - IsContract: isContract, - Age: age, - Data: data, + Amount: amount, + GasPrice: gasprice, + Gas: gas, + GasLimit: gasLimit, + Cost: txfee, + Nonce: nonce, + Status: status, + IsContract: isContract, + Age: age, + Data: data, }) tx, _ := json.Marshal(arr.TxEntry) diff --git a/core/state/database.go b/core/state/database.go index a2db9ee839..e94cd5e7e7 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,9 +20,9 @@ import ( "fmt" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index cf6fd9f881..651edb429e 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index a86c18a99e..ede060239e 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) // NodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 7e47fd9212..00970b6511 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index 74367d90ee..24bf944bc9 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index eedb6ec397..437a705e4c 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index e9d8d60beb..d7449da31d 100644 --- a/core/state/managed_state_test.go +++ b/core/state/managed_state_test.go @@ -19,8 +19,8 @@ package state import ( "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index 3efd323daf..99b81c0b92 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index d103760c1a..c589f2785c 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 685a3b324f..ffb21745dc 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "sort" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index 0981ac88a8..a8ac582196 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,9 +30,9 @@ import ( check "gopkg.in/check.v1" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to @@ -119,7 +119,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a statedb object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/empyrean/go-ethereum/pull/15549. +// https://github.com/ShyftNetwork/go-empyrean/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" db, _ := ethdb.NewMemDatabase() diff --git a/core/state/sync.go b/core/state/sync.go index 219053d9a1..b28689572a 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index de9247d301..485f882a85 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state_processor.go b/core/state_processor.go index 564239e63d..87e3a33d08 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/misc" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index ce13bec076..9ff156a995 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,10 +21,10 @@ import ( "math" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/core/tx_journal.go b/core/tx_journal.go index 54cf17ba0b..1b3b799cdb 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index 472d37ff77..67fdb9d7cd 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index f294b6efca..242c9110c1 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_pool.go b/core/tx_pool.go index 55de9f6dc0..9aa3ea7c2c 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 7a1c98d9f2..c58221a9b1 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index a3a48b9bef..f2fdc48954 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/block.go b/core/types/block.go index 434dfed917..686e931e26 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index 996c934c78..f6d4651e83 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 91be3f5df3..789dfc0eb0 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 2ad5dedc4c..ed06cfd7f4 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -54,7 +54,7 @@ func TestBloom(t *testing.T) { import ( "testing" - "github.com/empyrean/go-ethereum/core/state" + "github.com/ShyftNetwork/go-empyrean/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index d6711e6b95..3931c65cc2 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 084f88aa54..3ae7f7d187 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 9197b87f9b..902f4b09ec 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 3169fb15ae..e4f4d5d869 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index 8cc12be4e7..9be629095d 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index aaef29ac77..c917451142 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index dc8e581434..7dc02639ce 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 8ef929e1d5..7ea654cdca 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "unsafe" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) //go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/transaction.go b/core/types/transaction.go index f99db3589c..e75c5a4252 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -24,10 +24,10 @@ import ( "math/big" "sync/atomic" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 8664e03847..a916be52a8 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 6027eb03e3..b12f817ca8 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 4cdafcbe0c..9b7177e956 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index af195d3d05..e777313c46 100644 --- a/core/vm/analysis.go +++ b/core/vm/analysis.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // destinations stores one map per contract (keyed by hash of code). diff --git a/core/vm/common.go b/core/vm/common.go index b0d411bdc5..21fa806c6f 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 13457421bb..400ecfa4d5 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 21e7b94946..93fa171913 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/bn256" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/bn256" + "github.com/ShyftNetwork/go-empyrean/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 9f5d35aa10..0d75e20ba1 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index df5a6fa184..b58d2902ed 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/gas.go b/core/vm/gas.go index 71b4378271..aa5b055126 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/params" ) const ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 7271257984..5080ea4c78 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/params" ) // memoryGasCosts calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index 4b5eb193a0..916cfa2f73 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,15 @@ import ( "encoding/json" "math/big" +<<<<<<< HEAD "github.com/empyrean/go-ethereum/common" "github.com/empyrean/go-ethereum/common/hexutil" "github.com/empyrean/go-ethereum/common/math" +======= + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" +>>>>>>> shftBlock_rename ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index dd4e55432a..98c3f5d877 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index b05773362e..33c9b2a309 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index 7edcef8470..d5d8f3ee51 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index ee61d14d4b..2bf0dc8630 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,8 +20,8 @@ import ( "fmt" "sync/atomic" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 368ff0966b..9570391943 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index b46700ee19..7bc2e64955 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 69cb233510..e88f44a106 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/params" ) type dummyContractRef struct { diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index 8648fa1fea..683e175dd5 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index 0963c3b488..6ff8620d57 100644 --- a/core/vm/noop.go +++ b/core/vm/noop.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) func NoopCanTransfer(db StateDB, from common.Address, balance *big.Int) bool { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index d6d395024b..2cdef16328 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/vm" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 4ce22875a4..308bc815ae 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b768da7618..01b39cb22e 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/vm/runtime" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index dd9e315f08..fb8250e364 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index d5f7f983b4..019cae39f6 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index e6a3771f55..61e09088d0 100644 --- a/core/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -38,9 +38,9 @@ import ( "math/big" "unsafe" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) type JitVm struct { diff --git a/crypto/bn256/bn256_amd64.go b/crypto/bn256/bn256_amd64.go index d7bfe83352..4f940d04c9 100644 --- a/crypto/bn256/bn256_amd64.go +++ b/crypto/bn256/bn256_amd64.go @@ -22,7 +22,7 @@ package bn256 import ( "math/big" - "github.com/empyrean/go-ethereum/crypto/bn256/cloudflare" + "github.com/ShyftNetwork/go-empyrean/crypto/bn256/cloudflare" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/bn256/bn256_other.go b/crypto/bn256/bn256_other.go index 1b5ca77d72..257fee9e5d 100644 --- a/crypto/bn256/bn256_other.go +++ b/crypto/bn256/bn256_other.go @@ -22,7 +22,7 @@ package bn256 import ( "math/big" - "github.com/empyrean/go-ethereum/crypto/bn256/google" + "github.com/ShyftNetwork/go-empyrean/crypto/bn256/google" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/crypto.go b/crypto/crypto.go index 7c4dc75eb8..b5782b0e6e 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,10 +28,10 @@ import ( "math/big" "os" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index f6df6a2bd5..52e736d4ee 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -25,7 +25,7 @@ import ( "os" "testing" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index f1e6464739..53ea702a9e 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 2e7eefc82c..16ff59cd4f 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/empyrean/go-ethereum/crypto" + ethcrypto "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index 69dfecc2f8..aff1de3a01 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -36,7 +36,7 @@ import ( "math/big" "unsafe" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index 5cf684e2c2..2a9511ad55 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,8 +24,8 @@ import ( "encoding/hex" "testing" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/crypto/randentropy" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index f958892deb..485392308d 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/crypto/secp256k1" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index ec274f3baa..fb72e1a45b 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index 57cc66ff96..851fa5f662 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -31423,7 +31423,7 @@ var _bundleJs = []byte((((((((((`!function(modules) { }, _react2.default.createElement("span", { style: _common.styles.light }, "Commit "), _react2.default.createElement("a", { - href: "https://github.com/empyrean/go-ethereum/commit/" + general.commit, + href: "https://github.com/ShyftNetwork/go-empyrean/commit/" + general.commit, target: "_blank", style: { color: "inherit", diff --git a/dashboard/cpu.go b/dashboard/cpu.go index f601bb88b6..04de0c7223 100644 --- a/dashboard/cpu.go +++ b/dashboard/cpu.go @@ -21,7 +21,7 @@ package dashboard import ( "syscall" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 58b5e3d510..2e15f6af4d 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -33,11 +33,11 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" "golang.org/x/net/websocket" ) diff --git a/eth/api.go b/eth/api.go index b34a258729..8cd2e066b5 100644 --- a/eth/api.go +++ b/eth/api.go @@ -25,17 +25,17 @@ import ( "os" "strings" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/miner" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/rpc" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/miner" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index 2e63bb45e4..4341e377c7 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/gasprice" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 584f40e5ab..200622c772 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 3c194b7a47..983f5913a9 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/eth/tracers" - "github.com/empyrean/go-ethereum/internal/ethapi" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/rpc" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/tracers" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/trie" ) const ( @@ -532,12 +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("\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") - // Retrieve the transaction and assemble its EVM context tx, blockHash, _, index := core.GetTransaction(api.eth.ChainDb(), hash) if tx == nil { return nil, fmt.Errorf("transaction %x not found", hash) @@ -550,13 +544,95 @@ 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) } +// 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) + 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. +//@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 ( + 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. @@ -569,7 +645,9 @@ 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 + + timeout := defaultTraceTimeout + if config.Timeout != nil { if timeout, err = time.ParseDuration(*config.Timeout); err != nil { return nil, err @@ -579,7 +657,7 @@ func (api *PrivateDebugAPI) traceTx(ctx context.Context, message core.Message, v if tracer, err = tracers.New(*config.Tracer); err != nil { return nil, err } - // Handle timeouts and RPC cancellations + //Handle timeouts and RPC cancellations deadlineCtx, cancel := context.WithTimeout(ctx, timeout) go func() { <-deadlineCtx.Done() diff --git a/eth/backend.go b/eth/backend.go index 84d306e2d0..5149c76050 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -24,31 +24,35 @@ import ( "runtime" "sync" "sync/atomic" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/clique" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/filters" - "github.com/empyrean/go-ethereum/eth/gasprice" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/internal/ethapi" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/miner" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/clique" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/filters" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/miner" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" ) +var BlockchainObject *core.BlockChain + +var DebugApi PrivateDebugAPI + type LesServer interface { Start(srvr *p2p.Server) Stop() @@ -98,22 +102,45 @@ 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, + 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), + } + + 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) + if config.SyncMode == downloader.LightSync { return nil, errors.New("can't run eth.Ethereum in light sync mode, use les.LightEthereum") } 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 } - // @TODO: Create Genesis Block - stopDbUpgrade := upgradeDeduplicateData(chainDb) chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis) if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { @@ -150,7 +177,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 } @@ -180,6 +211,11 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { } eth.ApiBackend.gpo = gasprice.NewOracle(eth.ApiBackend, gpoParams) + DebugApi.eth = eth + DebugApi.config = chainConfig + //@NOTE Shyft Tracer + InitTracerEnv() + return eth, nil } diff --git a/eth/bloombits.go b/eth/bloombits.go index ed9e65e37c..956952b2a3 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,13 +19,13 @@ package eth import ( "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/bitutil" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) const ( diff --git a/eth/chaindb.go b/eth/chaindb.go new file mode 100644 index 0000000000..d8f36c1553 --- /dev/null +++ b/eth/chaindb.go @@ -0,0 +1,45 @@ +package eth + +import ( + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/node" + "io/ioutil" + "os" +) + +var Chaindb_global ethdb.Database + +func SetChainDB(db ethdb.Database){ + Chaindb_global = db +} + +func chaindb(ctx *node.ServiceContext, config *Config) (ethdb.Database, error) { + if Chaindb_global != nil { + return Chaindb_global, nil + } + + chainDb, err := CreateDB(ctx, config, "chaindata") + if err == nil { + SetChainDB(chainDb) + 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/config.go b/eth/config.go index 2a84f4e295..fd443eadcb 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/gasprice" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go index 8d9d544f5c..c44389c23c 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -21,11 +21,11 @@ import ( "bytes" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var deduplicateData = []byte("dbUpgrade_20170714deduplicateData") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 66777eb894..e46fa84307 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/rpc" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 41a0899f4d..efd5d572a0 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/params" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 1d3c0c1593..109e28b627 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 4e32c4c0cc..5ea2467f81 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,10 +19,10 @@ package downloader import ( "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // FakePeer is a mock downloader peer that operates on a local database instance diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 1d6222b71c..54fecad383 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 0778261cd0..9918bf5cfe 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index b73e3baecc..0e91bfe8c6 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index da03f88543..2f9a3fa511 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/trie" ) // stateReq represents a batch of state fetch requests groupped together into diff --git a/eth/downloader/types.go b/eth/downloader/types.go index f423710961..ec3ea3a8a5 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index 7a2f2850f9..cafd3ddf7a 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 85ac9a68ff..df7e39fd93 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 4c473f6b6e..66b9a144eb 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 4a890c5f17..fcc34f8817 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "sync" "time" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/rpc" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index a10fe2f093..a0293343d3 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 24446fd345..74af2478c8 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/bitutil" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/node" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 0773bbd459..92a62a4605 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 0c64c55be4..f0f3c17882 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/rpc" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // Type determines the kind of filter and is used to put the filter in to diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index a7c9f83c45..4088e7d105 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,16 +25,16 @@ import ( "testing" "time" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 79205ef3c1..3d4dce58a2 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 7171903b1f..941faf33f3 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,11 +22,11 @@ import ( "sort" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/internal/ethapi" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index fdd4b9af1c..69d07a7dfa 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,12 +5,12 @@ package eth import ( "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index ab0e623775..1cc207c26c 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/misc" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/fetcher" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/fetcher" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index f827f36a9c..c51f046486 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/eth/helper_test.go b/eth/helper_test.go index a847d6f110..f3a0b2e10e 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 41620c28b1..70578cff20 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/p2p" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index bbda5dbf96..847faa3ab5 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index dffe4a7089..ebf64be5d8 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 49a86ba8da..fee3102aab 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func init() { diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go new file mode 100644 index 0000000000..550062c7b2 --- /dev/null +++ b/eth/shyft_tracer.go @@ -0,0 +1,48 @@ +package eth + + +import ( + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/params" + "context" +) + +var EthereumObject interface{} + +type ShyftTracer struct {} + +var PrivateAPI *PrivateDebugAPI +var Context context.Context +var TracerConfig *TraceConfig + +func InitTracerEnv() { + 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 + fullNode, _ := SNew(Global_config) + privateAPI := NewPrivateDebugAPI(config2, fullNode) + PrivateAPI = privateAPI +} + +func (st ShyftTracer) GetTracerToRun (hash common.Hash) (interface{}, error) { + return PrivateAPI.STraceTransaction(Context, hash, TracerConfig) +} + +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/sync.go b/eth/sync.go index 52dd309d00..916897e841 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index c2b4752048..4dd91a1abc 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index e4d13b16b8..934d210d9f 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,12 +25,13 @@ import ( "time" "unsafe" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - duktape "gopkg.in/olebedev/go-duktape.v3" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "gopkg.in/olebedev/go-duktape.v3" ) // bigIntegerJS is the minified version of https://github.com/peterolson/BigInteger.js. @@ -311,6 +312,7 @@ func New(code string) (*Tracer, error) { if tracer, ok := tracer(code); ok { code = tracer } + tracer := &Tracer{ vm: duktape.New(), ctx: make(map[string]interface{}), @@ -324,6 +326,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))) @@ -456,7 +459,6 @@ func New(code string) (*Tracer, error) { tracer.dbWrapper.pushObject(tracer.vm) tracer.vm.PutPropString(tracer.stateObject, "db") - return tracer, nil } @@ -496,9 +498,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 INPUT]:", input) - fmt.Println("\t\t [TRACER INPUT STRING]:", string(input[:len(input)]), "\n\n") jst.ctx["type"] = "CALL" if create { jst.ctx["type"] = "CREATE" @@ -567,9 +566,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() @@ -580,6 +576,52 @@ func (jst *Tracer) CaptureEnd(output []byte, gasUsed uint64, t time.Duration, er return nil } +//@NOTE:SHYFT +type Internals struct { + Type string + From string + To string + Value string + Gas string + GasUsed string + Input string + Output string + Time string + Calls []*Internals +} + +//@NOTE:SHYFT +func (i *Internals) SWriteInteralTxs(hash common.Hash) { + sqldb, err := core.DBConnection() + if err != nil { + panic(err) + } + + gas, _ := hexutil.DecodeUint64(i.Gas) + gasUsed, _ := hexutil.DecodeUint64(i.GasUsed) + + 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) + } +} +//@NOTE:SHYFT +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(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 @@ -622,3 +664,55 @@ func (jst *Tracer) GetResult() (json.RawMessage, error) { 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() + + 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) + } + dat.InternalRecursive(hash) + + return result, jst.err +} \ No newline at end of file diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 96ce3f96e7..9a8f3cae1f 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4dff2aa460..0dc8881b3c 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/empyrean/go-ethereum/eth/tracers/internal/tracers" + "github.com/ShyftNetwork/go-empyrean/eth/tracers/internal/tracers" ) // all contains all the built in JavaScript tracers by name. diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index 22c8897b05..57d3dda6b3 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -25,15 +25,15 @@ import ( "strings" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/tests" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethObjectInterface/eth_object.go b/ethObjectInterface/eth_object.go new file mode 100644 index 0000000000..5a757a421f --- /dev/null +++ b/ethObjectInterface/eth_object.go @@ -0,0 +1,9 @@ +package ethObjectInterface + +import "github.com/ShyftNetwork/go-empyrean/eth" + +//var ethObject *eth.Ethereum + +func GetEthObject() (interface{}){ + return eth.EthObject +} \ No newline at end of file diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 293d0223dd..0d732824f6 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index e3ce982420..58b92a7f78 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -16,7 +16,7 @@ package ethclient -import "github.com/empyrean/go-ethereum" +import "github.com/ShyftNetwork/go-empyrean" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index fbd229f49c..a7543ec83e 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethdb/database.go b/ethdb/database.go index 9dbfebf18a..80b3163bf3 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/database_test.go b/ethdb/database_test.go index 0f3e0e211e..fa02292e1d 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 8fbae7991c..c83636f5ad 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 309dc19f29..875281801a 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/les" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/les" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index d7067fc139..fcd685e745 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index abc63a6a0a..d971de58c1 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 1d4c41f4cd..079a227322 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/empyrean/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index 17d44eedc8..b5e39dcc57 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common/mclock" + "github.com/ShyftNetwork/go-empyrean/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/interfaces.go b/interfaces.go index 3f7a84323e..59c0b71d51 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/debug/api.go b/internal/debug/api.go index 1366fd6141..e04396d059 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,7 +33,7 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 17e3673d6a..617c72bf1f 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,10 +24,10 @@ import ( "os" "runtime" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/log/term" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/metrics/exp" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/log/term" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics/exp" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index 9ed95bceb8..b232dce62f 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 56627a2005..2202da43e9 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 92300c6b9e..a5373469c4 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -25,21 +25,21 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) @@ -421,7 +421,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/empyrean/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/ShyftNetwork/go-empyrean/wiki/Management-APIs#personal_sign func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -448,7 +448,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be be 27 or 28 for legacy reasons. // -// https://github.com/empyrean/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/ShyftNetwork/go-empyrean/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 31d216a469..bee44a8d99 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "math/big" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 3dd2dea808..7c65c6291e 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 8930e21d4f..2b3562791c 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,8 +26,8 @@ import ( "math/rand" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/internal/jsre/deps" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 64e9d63138..94f24e1d55 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,21 +20,21 @@ import ( "context" "math/big" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/gasprice" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 3134a14f1d..84e90fefae 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/bloombits" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/eth/filters" - "github.com/empyrean/go-ethereum/eth/gasprice" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/internal/ethapi" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/params" - rpc "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/filters" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/params" + rpc "github.com/ShyftNetwork/go-empyrean/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index a1b8ef400a..5559275bb7 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/empyrean/go-ethereum/common/bitutil" - "github.com/empyrean/go-ethereum/light" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/light" ) const ( diff --git a/les/fetcher.go b/les/fetcher.go index 9d51df7f58..c732c8ebfd 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index fe74a84df5..f50480b3db 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common/mclock" + "github.com/ShyftNetwork/go-empyrean/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 9e284ca049..56966c10d0 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common/mclock" + "github.com/ShyftNetwork/go-empyrean/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index 8965ac54a8..fefbfe62af 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,22 +26,22 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 1289bbedc6..9b35d387ee 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error { diff --git a/les/helper_test.go b/les/helper_test.go index 54dc3656d7..f8701b0bb9 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,20 +25,20 @@ import ( "sync" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/les/flowcontrol" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/les/flowcontrol" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index d204817617..0425217d25 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/p2p" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 0da7f4c86e..2bac65253b 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index dcf3c62b2b..cdde07d242 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index df9922c8c7..38d4545665 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte diff --git a/les/peer.go b/les/peer.go index af2d03cd71..4c2f820a92 100644 --- a/les/peer.go +++ b/les/peer.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/les/flowcontrol" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/les/flowcontrol" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index c1b01f583b..df7d409383 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,11 +26,11 @@ import ( "io" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/secp256k1" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index 4b2daca32c..bf62d93c38 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/light" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index ca7d2e47b0..5ca06c0da1 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common/mclock" + "github.com/ShyftNetwork/go-empyrean/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index ba5468ebe6..2549474319 100644 --- a/les/server.go +++ b/les/server.go @@ -23,17 +23,17 @@ import ( "math" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/les/flowcontrol" - "github.com/empyrean/go-ethereum/light" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/les/flowcontrol" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index ccd7f21f9d..9886796746 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index 711c7b57a1..79fa0e382c 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/light" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/light" ) const ( diff --git a/les/txrelay.go b/les/txrelay.go index 4d07699cfe..ab4b503d0b 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index e77f00215d..520412dc2c 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,16 +24,16 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 57202d1db6..887c03a7c5 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index bff9228f29..7e69370dd5 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index 1ef28de75b..eeef171654 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,10 +22,10 @@ import ( "context" "math/big" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index 09551c8d7f..3d6755acb7 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/math" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index f37502327d..73a6d7f12c 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,11 +20,11 @@ import ( "bytes" "context" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index f3be175951..ca9d3f8289 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -22,15 +22,15 @@ import ( "math/big" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/bitutil" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) const ( diff --git a/light/trie.go b/light/trie.go index 8f65e23db6..f77a5a6fcb 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/trie" ) func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB { diff --git a/light/trie_test.go b/light/trie_test.go index ccf3fa3ec0..3334750f47 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 96db05503c..70e008d24c 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index 28b0be36ac..f2d8d3b7b7 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index aeb5ae1fd6..ad918c5c73 100644 --- a/log/format.go +++ b/log/format.go @@ -22,7 +22,7 @@ const ( // locationTrims are trimmed for display to avoid unwieldy log lines. var locationTrims = []string{ - "github.com/empyrean/go-ethereum/", + "github.com/ShyftNetwork/go-empyrean/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 63255a7c5f..038e253df1 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index 0f29c3a1e3..e7bda9404a 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -6,7 +6,7 @@ import ( uurl "net/url" "time" - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index 5c76c0b28b..29e46f8c77 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 251be26e3b..35e8bb3478 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/agent.go b/miner/agent.go index e145c50cd0..ecfb3367e5 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,8 +21,8 @@ import ( "sync/atomic" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index 1795486060..25ebfc311c 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -21,17 +21,17 @@ import ( "fmt" "sync/atomic" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 1c6181b66f..9ef59b5f02 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/ethash" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 90437d60d9..c08a251c6c 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) // headerRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index 594a91d422..8e965c719f 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 429d150b1d..3196f9323b 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/consensus" - "github.com/empyrean/go-ethereum/consensus/misc" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/core/state" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/core/vm" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" "gopkg.in/fatih/set.v0" ) @@ -309,6 +309,7 @@ func (self *worker) wait() { for _, log := range work.state.Logs() { log.BlockHash = block.Hash() } + // NOTE:SHYFT Added eth to writeBlockWithState stat, err := self.chain.WriteBlockWithState(block, work.receipts, work.state) if err != nil { log.Error("Failed writing block to chain", "err", err) diff --git a/mobile/accounts.go b/mobile/accounts.go index d41751e483..9cf9b8a964 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 65e2c08ac2..80526b1b92 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/internal/build" + "github.com/ShyftNetwork/go-empyrean/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) { } } // Generate the mobile bindings for Geth and add the tester class - gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/empyrean/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ShyftNetwork/go-empyrean/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index 06a52d5c83..6f3bad0e8f 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index 05bb46d3e6..6e476d2bff 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "github.com/empyrean/go-ethereum/accounts/abi" - "github.com/empyrean/go-ethereum/accounts/abi/bind" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Signer is an interaface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index c782cb613b..debf5aaf82 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index ccea0a6ced..11371a6d6a 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/empyrean/go-ethereum/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index b1ba8d4b22..e313ec2b67 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/ethclient" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index b8b6f24766..e4940401e4 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/empyrean/go-ethereum" - "github.com/empyrean/go-ethereum/common" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index b5da05e6e9..f65112156b 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,17 +24,17 @@ import ( "fmt" "path/filepath" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/eth" - "github.com/empyrean/go-ethereum/eth/downloader" - "github.com/empyrean/go-ethereum/ethclient" - "github.com/empyrean/go-ethereum/ethstats" - "github.com/empyrean/go-ethereum/les" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/params" - whisper "github.com/empyrean/go-ethereum/whisper/whisperv5" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethclient" + "github.com/ShyftNetwork/go-empyrean/ethstats" + "github.com/ShyftNetwork/go-empyrean/les" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/params" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv5" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 5243ed2bf1..9f9574419a 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index 2aaddbec47..4742a8508d 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 70a90b39ae..3508f325d6 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index 6d83970e4b..2815a30c3c 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/empyrean/go-ethereum/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index b011ed989b..c4468ce9b3 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/empyrean/go-ethereum/core" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/types.go b/mobile/types.go index 242bc2fbef..dd7629cbb4 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index b2675d6bf2..06a640378e 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/empyrean/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index c7a29e4ca0..ec36c5242b 100644 --- a/node/api.go +++ b/node/api.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/common/hexutil" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/metrics" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index ab549446e9..1287db07fd 100644 --- a/node/config.go +++ b/node/config.go @@ -25,14 +25,14 @@ import ( "runtime" "strings" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/accounts/keystore" - "github.com/empyrean/go-ethereum/accounts/usbwallet" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/accounts/usbwallet" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index c7b5bf8b38..0a6acf3a99 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/p2p" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 04dd5d2a11..a34d56958c 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,8 +22,8 @@ import ( "path/filepath" "runtime" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index 8ecb004851..edff74ee4f 100644 --- a/node/node.go +++ b/node/node.go @@ -26,13 +26,13 @@ import ( "strings" "sync" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/internal/debug" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/internal/debug" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/prometheus/prometheus/util/flock" ) @@ -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() } diff --git a/node/node_example_test.go b/node/node_example_test.go index 12a86022ba..9df888aaf3 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // SampleService is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index 1b28376844..5db153daf2 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 10ef03068a..0e040fa4c0 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "github.com/empyrean/go-ethereum/accounts" - "github.com/empyrean/go-ethereum/ethdb" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index ffd230f382..91a1cdede3 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 87c1ad6d00..6d347c6a4b 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index c1627574cb..069e0da964 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 5214c7d8a8..4a7439d576 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discover/node.go b/p2p/discover/node.go index a001b14031..7f523d9345 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -31,9 +31,9 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/secp256k1" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index 4f2feb9edc..f4d3fb0d68 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index d6eca87c10..0e46c4c6a8 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index b115666ceb..9e5177ede6 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,10 +33,10 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index dd0d6ae8f4..05fc949711 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 7fa7fae2de..f4dbb4e4ad 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,11 +25,11 @@ import ( "net" "time" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/p2p/netutil" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index 994338aac3..0835fe6cd6 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -34,9 +34,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 07e14f3029..e7db42a521 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 2766bcc6e8..c354c75676 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,13 +24,13 @@ import ( "net" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/netutil" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index c54f897202..691a8e5a4c 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index bb6344bdb9..57131d6e72 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index 3f711decac..9b5a50c0d6 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 6feb8e204f..a8432ed516 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index bb86fd9fc5..4a649cac5d 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index b790d46a9b..774d889b32 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index 0e6050b432..c4b1ee2f8a 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 3a771cd429..dab6e1a672 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 416e66033a..bf2898086b 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index 2032da6b5f..56f57d8bcd 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/mclock" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 25e646559e..e85541de27 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/p2p/netutil" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 4fa82af2ee..c8ce5a92ef 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -27,9 +27,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 79ac622e98..88afb2eb30 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -35,9 +35,9 @@ import ( "io" "sort" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index 751bd8b1fc..0ddfc1abaa 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index beaa9cd1ad..4345ceae09 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,8 +22,8 @@ import ( "io" "net" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 34a6b35d19..cfcc407423 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 46f1e9c189..a672d8b6c9 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/empyrean/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 426e967515..c2fc09d2e6 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index ecda121b94..ac182595c9 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index 40c58e24db..0fc9d6c91c 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,7 +19,7 @@ package p2p import ( "fmt" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index c62a6f0c63..a9204d7d3a 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -34,7 +34,7 @@ import ( "reflect" "sync" - "github.com/empyrean/go-ethereum/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p" ) // error codes used by this protocol scheme diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 367b5d7ed3..1826836bbf 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/empyrean/go-ethereum/p2p/testing" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + p2ptest "github.com/ShyftNetwork/go-empyrean/p2p/testing" ) // handshake message type diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 59f2f81587..fb3f19472f 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,12 +35,12 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/ecies" - "github.com/empyrean/go-ethereum/crypto/secp256k1" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index ebe0276b0a..26c882bf5d 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -31,11 +31,11 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/ecies" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index 380d869646..b7c011940c 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/common/mclock" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/discv5" - "github.com/empyrean/go-ethereum/p2p/nat" - "github.com/empyrean/go-ethereum/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 5b22ad9893..3b73b1391c 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/crypto/sha3" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index a5ab27c818..747737059a 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,9 +28,9 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) // DockerAdapter is a NodeAdapter which runs simulation nodes inside Docker diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 4700686595..677c9e6fc4 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -36,11 +36,11 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 2c7ab00ac7..5c7ee266ab 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,12 +23,12 @@ import ( "net" "sync" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 4e8a469aaf..73aac1b4cc 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,11 +25,11 @@ import ( "os" "github.com/docker/docker/pkg/reexec" - "github.com/empyrean/go-ethereum/crypto" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 45a6e3f9a5..d1c8cae463 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index dad03b8338..11d012cdf0 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "sync" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index 7a87cdfb3e..88376270a7 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 20c2d68994..a9fd8d44fa 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index f50e7f979d..756b4d45b8 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 1c914c9fac..24b40272c0 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/event" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" ) var dialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index b08dabf84f..c7577fa7c6 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" ) // TestNetworkSimulation creates a multi-node simulation network with each node diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index cf7c6ade80..e9a3b699d8 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index d6d5ae761d..0ed27b1451 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index 2f5aa02ec3..aa52abc2a0 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index bc5a2548c5..39104537b1 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -32,14 +32,14 @@ import ( "sync" "testing" - "github.com/empyrean/go-ethereum/log" - "github.com/empyrean/go-ethereum/node" - "github.com/empyrean/go-ethereum/p2p" - "github.com/empyrean/go-ethereum/p2p/discover" - "github.com/empyrean/go-ethereum/p2p/simulations" - "github.com/empyrean/go-ethereum/p2p/simulations/adapters" - "github.com/empyrean/go-ethereum/rlp" - "github.com/empyrean/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index eae072793c..d67f6bfddf 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) var ( diff --git a/params/dao.go b/params/dao.go index cefd28aa07..68a4e6eaa7 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/empyrean/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rpc/client.go b/rpc/client.go index f58416e085..11c00e8a86 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 08b580d864..f12ce64fcc 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,11 @@ import ( "math/big" "time" +<<<<<<< HEAD "github.com/empyrean/go-ethereum/rpc" +======= + "github.com/ShyftNetwork/go-empyrean/rpc" +>>>>>>> shftBlock_rename ) // In this example, our client whishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index d11b3d2489..650aaa6827 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 120d6f38b3..67de4edae1 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on diff --git a/rpc/json.go b/rpc/json.go index 4aff7955bf..cc51a7189b 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 2d8ccdbcfd..352e244a8e 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index dd475ae58a..befa14fa09 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/empyrean/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index f80f26c25e..79a2bb98d5 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/empyrean/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index d02dc1da77..467d391598 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/empyrean/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) 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 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/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, ""); }) diff --git a/shyftBlockExplorerApi/handler.go b/shyftBlockExplorerApi/handler.go index fd076e45af..a6636f8e52 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/empyrean/go-ethereum/shyftdb" + "github.com/ShyftNetwork/go-empyrean/core" "github.com/gorilla/mux" "bytes" "io/ioutil" @@ -19,13 +18,8 @@ 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) + sqldb, err := core.DBConnection() + getTxResponse := core.SGetTransaction(sqldb, txHash) if err != nil { http.Error(w, err.Error(), 500) @@ -40,20 +34,16 @@ 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 - } - txs := shyftdb.GetAllTransactions(blockExplorerDb) + sqldb, err := core.DBConnection() + + txs := core.SGetAllTransactions(sqldb) if err != nil { http.Error(w, err.Error(), 500) return } - w.Header().Set("Content-Type", "application/json; charset=UTF-8") w.WriteHeader(http.StatusOK) @@ -64,13 +54,10 @@ 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 - } - 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 +73,10 @@ 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 - } - 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 +93,10 @@ 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 - } - 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 +113,10 @@ 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 - } - 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 +131,10 @@ 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) + + sqldb, err := core.DBConnection() + + allAccounts := core.SGetAllAccounts(sqldb) if err != nil { http.Error(w, err.Error(), 500) return @@ -173,13 +149,9 @@ 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) + sqldb, err := core.DBConnection() + getBlockResponse := core.SGetBlock(sqldb, blockNumber) if err != nil { http.Error(w, err.Error(), 500) @@ -194,12 +166,9 @@ 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) + + sqldb, err := core.DBConnection() + block3 := core.SGetAllBlocks(sqldb) if err != nil { http.Error(w, err.Error(), 500) return @@ -210,12 +179,10 @@ 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) + + sqldb, err := core.DBConnection() + + mostRecentBlock := core.SGetRecentBlock(sqldb) if err != nil { http.Error(w, err.Error(), 500) return diff --git a/shyftDb/db.go b/shyftDb/db.go deleted file mode 100644 index 9cb8b3e312..0000000000 --- a/shyftDb/db.go +++ /dev/null @@ -1,37 +0,0 @@ -package shyftdb - -import ( - "database/sql" - "fmt" - "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" - } else { - 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 { - blockExplorerDb = db - return blockExplorerDb, nil - } -} - -func DBConnection() (*sql.DB, error) { - if blockExplorerDb == nil { - _, err := InitDB() - if err != nil { - return nil, err - } - } - return blockExplorerDb, nil -} diff --git a/shyftDb/shyft_database_util_test.go b/shyftDb/shyft_database_util_test.go index 92753f5e3a..bfbab5cb06 100644 --- a/shyftDb/shyft_database_util_test.go +++ b/shyftDb/shyft_database_util_test.go @@ -1,200 +1,228 @@ package shyftdb import ( - "github.com/empyrean/go-ethereum/common" - "github.com/empyrean/go-ethereum/core/types" - "math/big" "testing" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "math/big" //"time" "encoding/json" - "github.com/empyrean/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" "strconv" ) -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} +const ( + testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" +) - receipt := &types.Receipt{ - Status: types.ReceiptStatusSuccessful, - CumulativeGasUsed: 1, - Logs: []*types.Log{ - {Address: common.BytesToAddress([]byte{0x11})}, - {Address: common.BytesToAddress([]byte{0x01, 0x11})}, +func TestBlock(t *testing.T) { + eth.NewShyftTestLDB() + core.InitDBTest() + shyft_tracer := new(eth.ShyftTracer) + core.SetIShyftTracer(shyft_tracer) + + 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, } - 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 := WriteBlock(block, receipts); err != nil { - t.Fatalf("Failed to write block into database: %v", err) - } + eth.InitTracerEnv() - sqldb, err := DBConnection() - if err != nil { - panic(err) - } + t.Run("TestBlockToReturnBlock", func(t *testing.T) { + key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") + signer := types.NewEIP155Signer(big.NewInt(2147483647)) - entry := GetBlock(sqldb, block.Number().String()) - byt := []byte(entry) - var data SBlock - json.Unmarshal(byt, &data) + //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} - //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()) - } + 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, + } - if getAllBlocks := GetAllBlocks(sqldb); len(getAllBlocks) == 0 { - t.Fatalf("GetAllBlocks [%v]: GetAllBlocks did not return correctly", getAllBlocks) - } + receipts := []*types.Receipt{receipt} + block := types.NewBlock(&types.Header{Number: big.NewInt(315)}, txs, nil, receipts) - if getAllBlocksMinedByAddress := GetAllBlocksMinedByAddress(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 := WriteBlock(bc, 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 { - panic(err) - } + sqldb, err := core.DBConnection() + if err != nil { + panic(err) + } - response := GetRecentBlock(sqldb) - byteRes := []byte(response) - var recentBlock SBlock - json.Unmarshal(byteRes, &recentBlock) + entry := core.SGetBlock(sqldb, block.Number().String()) + byt := []byte(entry) + var data core.SBlock + json.Unmarshal(byt, &data) - 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()) - } + //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 allTxsFromBlock := GetAllTransactionsFromBlock(sqldb, block2.Number().String()); len(allTxsFromBlock) == 0 { - t.Fatalf("GetAllTransactionsFromBlock [%v]: GetAllTransactionsFromBlock did not return correctly", allTxsFromBlock) - } - ClearTables() -} + if getAllBlocks := core.SGetAllBlocks(sqldb); len(getAllBlocks) == 0 { + t.Fatalf("GetAllBlocks [%v]: GetAllBlocks did not return correctly", getAllBlocks) + } -func TestContractCreationTx(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) + 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() + }) + +// +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) + mytx,_ := types.SignTx(contractCreation, signer, key) txs := []*types.Transaction{mytx} receipt2 := &types.Receipt{ @@ -212,7 +240,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 +249,15 @@ func TestContractCreationTx(t *testing.T) { contractAddressFromReciept = (*types.ReceiptForStorage)(receipt).ContractAddress.String() } - sqldb, err := DBConnection() - if err != nil { + 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 { @@ -286,19 +314,19 @@ func TestContractCreationTx(t *testing.T) { } } ClearTables() -} +}) -func TestTransactionsToReturnTransactions(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) +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) + 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) + 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) + mytx3,_ := types.SignTx(tx3, signer, key) txs := []*types.Transaction{mytx, mytx2, mytx3} receipt1 := &types.Receipt{ @@ -316,21 +344,21 @@ 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() - if err != nil { + sqldb, err := core.DBConnection() + if (err != nil) { panic(err) } for _, tx := range txs { - txn := GetTransaction(sqldb, tx.Hash().String()) - byt := []byte(txn) - var data ShyftTxEntryPretty - json.Unmarshal(byt, &data) + txn := core.SGetTransaction(sqldb, tx.Hash().String()) + byt := []byte(txn) + var data core.ShyftTxEntryPretty + json.Unmarshal(byt, &data) - //TODO age, data + //TODO age, data if tx.Hash().String() != data.TxHash { t.Fatalf("txHash [%v]: tx Hash not found", tx.Hash().String()) } @@ -385,23 +413,23 @@ 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() -} +}) -func TestAccountsToReturnAccounts(t *testing.T) { - key, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") - signer := types.NewEIP155Signer(big.NewInt(2147483647)) +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) + 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) + 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) + mytx3,_ := types.SignTx(tx3, signer, key) txs := []*types.Transaction{mytx, mytx2, mytx3} receipt1 := &types.Receipt{ @@ -418,20 +446,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 { - t.Fatalf("Failed to write block into database: %v", err) - } + 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) } for _, tx := range txs { - accountAddrTo := GetAccount(sqldb, tx.To().String()) - byts := []byte(accountAddrTo) - var accountDataTo SAccounts - json.Unmarshal(byts, &accountDataTo) + 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) @@ -442,13 +470,17 @@ 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() +}) + ClearTables() } + 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( "