From 37624815bf12a91dabdce1d4fcb22284b6b8ed51 Mon Sep 17 00:00:00 2001 From: David Krett Date: Fri, 3 Aug 2018 08:51:19 -0400 Subject: [PATCH] Updated Vendor Json For Current Commit Added fixes for govendor inconsistent failure in featching c header files. described here https://github.com/kardianos/govendor/issues/124 && https://github.com/kardianos/govendor/issues/61 plus notes added to readme --- .gitignore | 3 + README.md | 27 ++ .../develop-alpine/shyftApi/wait-for.sh | 2 +- shyftBlockExplorerApi/vendor/vendor.json | 332 ++++++++---------- .../components/table/accounts/accountRows.js | 2 +- .../table/accounts/accountsTable.js | 2 +- wait-for.sh | 2 +- 7 files changed, 177 insertions(+), 193 deletions(-) diff --git a/.gitignore b/.gitignore index b9235fb7e1..25703564b2 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,6 @@ pg-data/* # Ignore shyftBlockExplorerApi vendored dependencies used for docker build shyftBlockExplorerApi/vendor/**/.git +shyftBlockExplorerApi/vendor/* +!shyftBlockExplorerApi/vendor/*.json + diff --git a/README.md b/README.md index f2fe9d876f..cd0a5dbe29 100644 --- a/README.md +++ b/README.md @@ -303,10 +303,37 @@ If you would like to reinitialize/rebuild the docker images you can issue the fo The Postgresql Database Container will persist the database data to the the pg-data/ directory. So if you do want to reinitialize the database you should delete the content of this directory prior to launching the docker containers. From your local machine you can view the database by connecting to the database in the container at 127.0.0.1:8001. To access the shyftBlockExplorer open a browser and visit http://localhost:3000 +The docker container for the ShyftBlockExplorerApi utilizes govendor to minimize its image size. As a result, if you would like the docker image for this container to reflect any uncommitted changes which may have occurred in the go-empyrean repository, especially changes with respect to go-empyrean core (ie. cryptographic functions and database). Prior to launching the docker containers you should rebuild the vendor directory for the shyftBlockExplorerApi - by executing the following steps: + +``` +# remove existing shyftBlockExplorerApi vendor.json and vendored components: + +rm -rf shyftBlockExplorerApi/vendor + +# reinitialize vendor.json + +cd shyftBlockExplorerApi && govendor init + +# rebuild vendor.json using latest uncommitted changes + +govendor add -tree -uncommitted +external + +# due to a bug in govendor and it not being able to pull in some dependencies that are c-header files +# you should execute the following commands - see these issues - which whilst closed +# appears to have not been fixed: https://github.com/kardianos/govendor/issues/124 && https://github.com/kardianos/govendor/issues/61 + +govendor remove github.com/ShyftNetwork/go-empyrean/crypto/secp256k1/^ +govendor fetch github.com/ShyftNetwork/go-empyrean/crypto/secp256k1/^ + +``` + + + NB: The Shyft Geth docker image size is 5+ GB so make sure you have adequate space on your disk drive/ _TODO_ +- Find better dependency management solution that pulls in c header files without manual intervention - Reduce size of the ShytfGeth docker container which is responsible for mining and running the blockchain - Adjust docker scripts and ports to facilitate sending of test transactions - Modify Docker scripts to facilitate hot reloading during development diff --git a/containers/docker/develop-alpine/shyftApi/wait-for.sh b/containers/docker/develop-alpine/shyftApi/wait-for.sh index 7b05f7e3f3..e8cd3cfaa6 100755 --- a/containers/docker/develop-alpine/shyftApi/wait-for.sh +++ b/containers/docker/develop-alpine/shyftApi/wait-for.sh @@ -32,7 +32,7 @@ wait_for() { trap 'kill $(jobs -p) &>/dev/null' EXIT START=$(date +%s) -timeout=15 +timeout=20 pids="" for i in $@ ; do case $i in diff --git a/shyftBlockExplorerApi/vendor/vendor.json b/shyftBlockExplorerApi/vendor/vendor.json index 5034c395dc..a7db68c506 100644 --- a/shyftBlockExplorerApi/vendor/vendor.json +++ b/shyftBlockExplorerApi/vendor/vendor.json @@ -1,445 +1,399 @@ { "comment": "", - "ignore": "", - "package": [{ - "checksumSHA1": "4N5EW5g7AXUm43jBk2iC9dtTJNc=", + "ignore": "test", + "package": [ + { + "checksumSHA1": "4/fb4r/Y7MEVCaTN7PdPPRJBe7M=", "path": "github.com/ShyftNetwork/go-empyrean/common", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "zXqJwcRxrCq7llNjHBCamJc3wRc=", + "checksumSHA1": "0lTXpt67indxty1DyfsGUhZUxtc=", "path": "github.com/ShyftNetwork/go-empyrean/common/bitutil", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "lGEgOyS5fKt1sN626mvUgc/Rlkw=", + "checksumSHA1": "Wzv00R7tDEPGN5lbROZLRork+38=", "path": "github.com/ShyftNetwork/go-empyrean/common/hexutil", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "tnoq+cB8JnXxRjytf/+T5X2gG+4=", + "checksumSHA1": "aNgexBwEfI8ANaaMyQDyeHuFCUY=", "path": "github.com/ShyftNetwork/go-empyrean/common/math", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "zaAV9eypVRaotW+MMizuPxPJfHM=", "path": "github.com/ShyftNetwork/go-empyrean/common/mclock", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "FZSyCzy79paVzTFiw9hwQMmYqYM=", "path": "github.com/ShyftNetwork/go-empyrean/consensus", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "xD0P3MnMhT+jWh+rnKjRzWdEi4c=", + "checksumSHA1": "sT7DF05X1yBnMUcVgJhd4p+q7s0=", "path": "github.com/ShyftNetwork/go-empyrean/consensus/ethash", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "Fdv4KUKWQ+owyPIUlv8c2WLS6B4=", "path": "github.com/ShyftNetwork/go-empyrean/consensus/misc", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "1uXB2lYwFOteR+Hl5E5amZwzHSE=", + "checksumSHA1": "2B0x5+B/4dtzj/xOwF7Q+yGhhr0=", "path": "github.com/ShyftNetwork/go-empyrean/core", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "TGjPR5QCoD/o+DbWtFXEjp9Ckhg=", + "checksumSHA1": "vhNvzOqmXFBYdZtrpWhW8jhmGzY=", "path": "github.com/ShyftNetwork/go-empyrean/core/state", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "CNsnI5I6tS0x2aozqDCPpEoZ3F8=", + "checksumSHA1": "SRoGhYQpFaq3OQbf8g2WT2gAnwA=", "path": "github.com/ShyftNetwork/go-empyrean/core/types", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "03odmCBDJMwkqVSOjaigrYVxme0=", + "checksumSHA1": "dMRUmW+Wq2zvupYeXuYj0k3Vndc=", "path": "github.com/ShyftNetwork/go-empyrean/core/vm", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "WGQFgwtvKxobrs+NqMWHObTfLCQ=", + "checksumSHA1": "MGgNhnPT/mJEIpdmWnTtewtzk0g=", "path": "github.com/ShyftNetwork/go-empyrean/crypto", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "3glJGNkz78GAuDWdW0Vn4AshJZ8=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/bn256", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "9TyZ57SlZjA+fmnkgglz/U7Sd3Y=", + "checksumSHA1": "YzKGOtVGw0wcMcQzyOcwx77TSsE=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/bn256/cloudflare", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "61j/0pJ1/X6SE2efWJ0tuMKZ+9s=", + "checksumSHA1": "VXAuy+4VsjnX8wiXEFcxPYwMu0c=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/bn256/google", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "725RdBLWChjphyDjUNepVLZqQpY=", + "checksumSHA1": "VtCDPH1wjVu+6mjuEqY57mRsjwA=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1", "revision": "52062f1538710bce87f5941c19aec85e4df4f7cd", "revisionTime": "2018-06-04T23:27:38Z", "tree": true }, { - "checksumSHA1": "2dTDVGdpGjABDVQPjfNa4WrdRyg=", + "checksumSHA1": "QR0Uoq+x3/CiCbNWHXmsTIDrdF0=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/sha3", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "oG0Io4xO2d+/8U2erCb1Oua2vUg=", + "checksumSHA1": "DD9RzILcd1jH8JQS1wFnntJWb9Q=", "path": "github.com/ShyftNetwork/go-empyrean/ethdb", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "YkJhaBXOOj4NLbql72AcrpXp/Rc=", + "checksumSHA1": "XnrX5RuMLgEGBXCUJCzAAYAyfMQ=", "path": "github.com/ShyftNetwork/go-empyrean/event", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "z1EsZ0xPHsbrmEP9f548xU5vRe0=", "path": "github.com/ShyftNetwork/go-empyrean/log", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "dnTzAhOC0vm7Bu7OW9exb0UQYn8=", + "checksumSHA1": "o1Jo5QZjpoQu/jlV8EdRReqx12I=", "path": "github.com/ShyftNetwork/go-empyrean/metrics", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "FFMuJsy5DnOlBQ5sMnZd3l0t2Uc=", + "checksumSHA1": "YHme1HzZG6QEuj+omsBga9q+Rng=", "path": "github.com/ShyftNetwork/go-empyrean/params", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "gK2qsNNz4fmVYYDVILnifiEkwNA=", + "checksumSHA1": "YaGPda/QZ2y7bTdRsIIlyI1zZlo=", "path": "github.com/ShyftNetwork/go-empyrean/rlp", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "GDQ9/DdZ6XC5VvgQhr/lr+o6ZNs=", + "checksumSHA1": "8IM59NA2oUvUbqXJw+jYUcBIYWY=", "path": "github.com/ShyftNetwork/go-empyrean/rpc", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "X+6gj7lAoWmwGhd8kZCr/r13Ljw=", "path": "github.com/ShyftNetwork/go-empyrean/shyfttracerinterface", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "koQc7lsys/zLoQqkAAlf73Q26Z8=", + "checksumSHA1": "V0TAmfyHQS5bTiNTWBpPyWC26I4=", "path": "github.com/ShyftNetwork/go-empyrean/trie", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "USkefO0g1U9mr+8hagv3fpSkrxg=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/aristanetworks/goarista/monotime", "path": "github.com/aristanetworks/goarista/monotime", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "gZQ6HheWahvZzIc3phBnOwoWHjE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/btcsuite/btcd/btcec", "path": "github.com/btcsuite/btcd/btcec", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" - }, - { - "checksumSHA1": "dvabztWVQX8f6oMLRyv4dLH+TGY=", - "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/davecgh/go-spew/spew", - "path": "github.com/davecgh/go-spew/spew", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "zYnPsNAVm1/ViwCkN++dX2JQhBo=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/edsrzf/mmap-go", "path": "github.com/edsrzf/mmap-go", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { - "checksumSHA1": "5RhGwFpuOAfwyTpi1lMK9GEjuII=", - "path": "github.com/ethereum/go-ethereum/common", - "revision": "46d4721519f80074795a0631f5bab875433a1cc6", - "revisionTime": "2018-07-31T13:34:54Z" - }, - { - "checksumSHA1": "gvBs++4H+laBSZFm4ZS2Nw0w9ow=", - "path": "github.com/ethereum/go-ethereum/common/hexutil", - "revision": "46d4721519f80074795a0631f5bab875433a1cc6", - "revisionTime": "2018-07-31T13:34:54Z" - }, - { - "checksumSHA1": "M7ksSRW0CZUDXCIc81eGogsbzS8=", + "checksumSHA1": "BP3m/oEeoC9ustdCYzAVS/gabqg=", "path": "github.com/ethereum/go-ethereum/common/math", - "revision": "46d4721519f80074795a0631f5bab875433a1cc6", - "revisionTime": "2018-07-31T13:34:54Z" - }, - { - "path": "github.com/ethereum/go-ethereum/crypto/randentropy", - "revision": "" - }, - { - "checksumSHA1": "8eZvG99UTA4QKxhsn+So9BGASro=", - "path": "github.com/ethereum/go-ethereum/crypto/sha3", - "revision": "46d4721519f80074795a0631f5bab875433a1cc6", - "revisionTime": "2018-07-31T13:34:54Z" + "revision": "35fcd2f42388d10c2c638dd3e2b4bd4306b07c19", + "revisionTime": "2018-08-03T10:26:39Z" }, { "checksumSHA1": "KZ3QD2QgUS4RcoKiA3mn5pSlJxQ=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/go-stack/stack", "path": "github.com/go-stack/stack", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "p/8vSviYF91gFflhrt5vkyksroo=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/golang/snappy", "path": "github.com/golang/snappy", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "g/V4qrXjUGG9B+e3hB+4NAYJ5Gs=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/gorilla/context", "path": "github.com/gorilla/context", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "XOY0t65siat4bLbC4VCmBA9dE7Y=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/gorilla/handlers", "path": "github.com/gorilla/handlers", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "YuYKzn2jczaM6DQcFDmukvAHUX4=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/gorilla/mux", "path": "github.com/gorilla/mux", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "d9PxF1XQGLMJZRct2R8qVM/eYlE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/hashicorp/golang-lru", "path": "github.com/hashicorp/golang-lru", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "9hffs0bAIU6CquiRhKQdzjHnKt0=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/hashicorp/golang-lru/simplelru", "path": "github.com/hashicorp/golang-lru/simplelru", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" - }, - { - "checksumSHA1": "jwoPNwN+mUiYFQPjQa/U3Kli7Ak=", - "path": "github.com/kr/pretty", - "revision": "73f6ac0b30a98e433b289500d779f50c1a6f0712", - "revisionTime": "2018-05-06T08:33:45Z" - }, - { - "checksumSHA1": "x9dJv+jQhUFN6R6h4fzPjGLvQLg=", - "path": "github.com/kr/text", - "revision": "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f", - "revisionTime": "2018-05-06T08:24:08Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "F7vsuKOVSMnFSi90odRxfhBEBeA=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/lib/pq", "path": "github.com/lib/pq", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "AU3fA8Sm33Vj9PBoRPSeYfxLRuE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/lib/pq/oid", "path": "github.com/lib/pq/oid", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "LjPdvMphElL0GOVNQCsmZMVgWIw=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/rs/cors", "path": "github.com/rs/cors", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "hCRfPlNpqv8tvVivLzmXsoUOf1c=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/rs/xhandler", "path": "github.com/rs/xhandler", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "3QsnhPTXGytTbW3uDvQLgSo9s9M=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb", "path": "github.com/syndtr/goleveldb/leveldb", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "EKIow7XkgNdWvR/982ffIZxKG8Y=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/cache", "path": "github.com/syndtr/goleveldb/leveldb/cache", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "5KPgnvCPlR0ysDAqo6jApzRQ3tw=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/comparer", "path": "github.com/syndtr/goleveldb/leveldb/comparer", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "1DRAxdlWzS4U0xKN/yQ/fdNN7f0=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/errors", "path": "github.com/syndtr/goleveldb/leveldb/errors", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "eqKeD6DS7eNCtxVYZEHHRKkyZrw=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/filter", "path": "github.com/syndtr/goleveldb/leveldb/filter", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "weSsccMav4BCerDpSLzh3mMxAYo=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/iterator", "path": "github.com/syndtr/goleveldb/leveldb/iterator", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "gJY7bRpELtO0PJpZXgPQ2BYFJ88=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/journal", "path": "github.com/syndtr/goleveldb/leveldb/journal", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "MtYY1b2234y/MlS+djL8tXVAcQs=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/memdb", "path": "github.com/syndtr/goleveldb/leveldb/memdb", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "UmQeotV+m8/FduKEfLOhjdp18rs=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/opt", "path": "github.com/syndtr/goleveldb/leveldb/opt", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "QCSae2ub87f8awH+PKMpd8ZYOtg=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/storage", "path": "github.com/syndtr/goleveldb/leveldb/storage", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "gWFPMz8OQeul0t54RM66yMTX49g=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/table", "path": "github.com/syndtr/goleveldb/leveldb/table", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "V/Dh7NV0/fy/5jX1KaAjmGcNbzI=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/util", "path": "github.com/syndtr/goleveldb/leveldb/util", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "y/oIaxq2d3WPizRZfVjo8RCRYTU=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/golang.org/x/crypto/ripemd160", "path": "golang.org/x/crypto/ripemd160", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/golang.org/x/net/context", "path": "golang.org/x/net/context", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "7EZyXN0EmZLgGxZxK01IJua4c8o=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/golang.org/x/net/websocket", "path": "golang.org/x/net/websocket", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" - }, - { - "checksumSHA1": "iyL0/njjAaU0nmQGSgoNVDpdvpU=", - "path": "gopkg.in/check.v1", - "revision": "788fd78401277ebd861206a03c884797c6ec5541", - "revisionTime": "2018-06-28T17:31:08Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "NGg7/qIJVUfXi7xnEyyDLocdi6Y=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/gopkg.in/fatih/set.v0", "path": "gopkg.in/fatih/set.v0", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "DQXNV0EivoHm4q+bkdahYXrjjfE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/gopkg.in/karalabe/cookiejar.v2/collections/prque", "path": "gopkg.in/karalabe/cookiejar.v2/collections/prque", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "0xgs8lwcWLUffemlj+SsgKlxvDU=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/gopkg.in/natefinch/npipe.v2", "path": "gopkg.in/natefinch/npipe.v2", - "revision": "3f6f14bc1240b5fb031115c56e2f657e7a5a7586", - "revisionTime": "2018-07-27T20:29:58Z" + "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", + "revisionTime": "2018-08-03T12:51:19Z" } ], "rootPath": "github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi" diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js index ecb160a04b..1113538e41 100644 --- a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js +++ b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js @@ -38,7 +38,7 @@ class AccountTable extends Component { Percentage={percentage.toFixed(2)} Addr={data.Addr} Balance={conversion} - TxCountAccount={data.TxCountAccount} + AcountNonce={data.AccountNonce} detailAccountHandler={this.props.detailAccountHandler} /> }); diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js index 62451059dd..2f708d449c 100644 --- a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js +++ b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js @@ -12,7 +12,7 @@ const AccountsTable = (props) => { {props.Balance} {props.Percentage}% - {props.TxCountAccount} + {props.AccountNonce} ) diff --git a/wait-for.sh b/wait-for.sh index 7b05f7e3f3..e8cd3cfaa6 100755 --- a/wait-for.sh +++ b/wait-for.sh @@ -32,7 +32,7 @@ wait_for() { trap 'kill $(jobs -p) &>/dev/null' EXIT START=$(date +%s) -timeout=15 +timeout=20 pids="" for i in $@ ; do case $i in