diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md new file mode 100644 index 00000000..e13fbac4 --- /dev/null +++ b/CHANGELOG_PENDING.md @@ -0,0 +1,13 @@ +# Changelog + +## v0.3.0 +--- + +Tue May 21 16:54:46 PDT 2019 + +IMPROVEMENTS + + * [tendermint] upgrade to v0.31.5 (shall improve mempool performance and fix a leak issue) + * [cosmos-sdk] upgrade to v0.34.4 + * [build] remove cleveldb related patches as tendermint/iavl are upgraded, cosmos's patch is required. + * [build] remove cosmos clelveldb patch as they now support it through build tags. diff --git a/Gopkg.lock b/Gopkg.lock index ff1e6a86..5648ce74 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,6 +2,7 @@ [[projects]] + branch = "master" digest = "1:09a7f74eb6bb3c0f14d8926610c87f569c5cff68e978d30e9a3540aeb626fdf0" name = "github.com/bartekn/go-bip39" packages = ["."] @@ -9,12 +10,12 @@ revision = "a05967ea095d81c8fe4833776774cfaff8e5036c" [[projects]] - branch = "master" digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d" name = "github.com/beorn7/perks" packages = ["quantile"] pruneopts = "UT" - revision = "3a771d992973f24aa725d07868b467d1ddfceafb" + revision = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46" + version = "v1.0.0" [[projects]] digest = "1:1343a2963481a305ca4d051e84bc2abd16b601ee22ed324f8d605de1adb291b0" @@ -25,21 +26,23 @@ version = "v0.1.0" [[projects]] + branch = "master" digest = "1:093bf93a65962e8191e3e8cd8fc6c363f83d43caca9739c906531ba7210a9904" name = "github.com/btcsuite/btcd" packages = ["btcec"] pruneopts = "UT" - revision = "ed77733ec07dfc8a513741138419b8d9d3de9d2d" + revision = "96897255fd17525dd12426345d279533780bc4e1" [[projects]] + branch = "master" digest = "1:386de157f7d19259a7f9c81f26ce011223ce0f090353c1152ffdf730d7d10ac2" name = "github.com/btcsuite/btcutil" packages = ["bech32"] pruneopts = "UT" - revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4" + revision = "9e5f4b9a998d263e3ce9c56664a7816001ac8000" [[projects]] - digest = "1:c14213a4a2ca379ca4cb76bf9da8ae444c471866015d68aa6914487d2479e852" + digest = "1:2c9065e91b3965bd6ac2cb27f7d39a43d286e20191e51e43d10dedc39805c4a0" name = "github.com/cosmos/cosmos-sdk" packages = [ "baseapp", @@ -78,17 +81,15 @@ "x/auth", "x/auth/client/txbuilder", "x/bank", - "x/bank/simulation", + "x/crisis", "x/distribution", "x/distribution/keeper", - "x/distribution/simulation", "x/distribution/tags", "x/distribution/types", "x/gov", "x/gov/tags", "x/mint", "x/mock", - "x/mock/simulation", "x/params", "x/params/subspace", "x/slashing", @@ -97,36 +98,44 @@ "x/staking/client/cli", "x/staking/keeper", "x/staking/querier", - "x/staking/simulation", "x/staking/tags", "x/staking/types", ] pruneopts = "UT" - revision = "906e9509cfcae3330584416c8b8e9cfe6c8d2766" - version = "v0.32.0" + revision = "62fa99e715308dcf53de3bec8bee79e2a6a394bc" + version = "v0.34.4" [[projects]] - digest = "1:e8a3550c8786316675ff54ad6f09d265d129c9d986919af7f541afba50d87ce2" + branch = "master" + digest = "1:0427cfa11785c899dfe0ea6987bc0c9dea61647f6bb3987163d62c867f1cad6a" name = "github.com/cosmos/go-bip39" packages = ["."] pruneopts = "UT" - revision = "52158e4697b87de16ed390e1bdaf813e581008fa" + revision = "555e2067c45d9fcd7292bf3b8e732bc10ac8c58e" [[projects]] - digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" - name = "github.com/davecgh/go-spew" - packages = ["spew"] + digest = "1:b4af4b28b7adce7bb6263f5f249acad6c1e4b346e043fc5b1d0feb3799aded17" + name = "github.com/cosmos/ledger-cosmos-go" + packages = ["."] pruneopts = "UT" - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" + revision = "836324878776cb6f1a6b4ddcd81a67ead217358c" + version = "v0.10.3" + +[[projects]] + digest = "1:34efba6719d5a29ddc868bf772b864980654dc1a1c18e06659e4246ea1665fb8" + name = "github.com/cosmos/ledger-go" + packages = ["."] + pruneopts = "UT" + revision = "1c99b41f1877b58e3517ef93012cc76fe5cd335b" + version = "v0.9.2" [[projects]] - digest = "1:fed20bf7f0da387c96d4cfc140a95572e5aba4bb984beb7de910e090ae39849b" - name = "github.com/ethereum/go-ethereum" - packages = ["crypto/secp256k1"] + digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" + name = "github.com/davecgh/go-spew" + packages = ["spew"] pruneopts = "UT" - revision = "7fa3509e2eaf1a4ebc12344590e5699406690f15" - version = "v1.8.22" + revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" + version = "v1.1.1" [[projects]] digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd" @@ -153,23 +162,23 @@ version = "v0.6.0" [[projects]] - digest = "1:31a18dae27a29aa074515e43a443abfd2ba6deb6d69309d8d7ce789c45f34659" + digest = "1:4062bc6de62d73e2be342243cf138cf499b34d558876db8d9430e2149388a4d8" name = "github.com/go-logfmt/logfmt" packages = ["."] pruneopts = "UT" - revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5" - version = "v0.3.0" + revision = "07c9b44f60d7ffdfb7d8efe1ad539965737836dc" + version = "v0.4.0" [[projects]] - digest = "1:c4a2528ccbcabf90f9f3c464a5fc9e302d592861bbfd0b7135a7de8a943d0406" + digest = "1:586ea76dbd0374d6fb649a91d70d652b7fe0ccffb8910a77468e7702e7901f3d" name = "github.com/go-stack/stack" packages = ["."] pruneopts = "UT" - revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc" - version = "v1.7.0" + revision = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a" + version = "v1.8.0" [[projects]] - digest = "1:35621fe20f140f05a0c4ef662c26c0ab4ee50bca78aa30fe87d33120bd28165e" + digest = "1:95e1006e41c641abd2f365dfa0f1213c04da294e7cd5f0bf983af234b775db64" name = "github.com/gogo/protobuf" packages = [ "gogoproto", @@ -180,11 +189,11 @@ "types", ] pruneopts = "UT" - revision = "636bf0302bc95575d69441b25a2603156ffdddf1" - version = "v1.1.1" + revision = "ba06b47c162d49f2af050fb4c75bcbc86a159d5c" + version = "v1.2.1" [[projects]] - digest = "1:17fe264ee908afc795734e8c4e63db2accabaf57326dbf21763a7d6b86096260" + digest = "1:239c4c7fd2159585454003d9be7207167970194216193a8a210b8d29576f19c9" name = "github.com/golang/protobuf" packages = [ "proto", @@ -194,49 +203,41 @@ "ptypes/timestamp", ] pruneopts = "UT" - revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" - version = "v1.1.0" + revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" + version = "v1.3.1" [[projects]] - branch = "master" - digest = "1:4a0c6bb4805508a6287675fac876be2ac1182539ca8a32468d8128882e9d5009" + digest = "1:e4f5819333ac698d294fe04dbf640f84719658d5c7ce195b10060cc37292ce79" name = "github.com/golang/snappy" packages = ["."] pruneopts = "UT" - revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a" - -[[projects]] - digest = "1:c79fb010be38a59d657c48c6ba1d003a8aa651fa56b579d959d74573b7dff8e1" - name = "github.com/gorilla/context" - packages = ["."] - pruneopts = "UT" - revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42" - version = "v1.1.1" + revision = "2a8bb927dd31d8daada140a5d09578521ce5c36a" + version = "v0.0.1" [[projects]] - digest = "1:e73f5b0152105f18bc131fba127d9949305c8693f8a762588a82a48f61756f5f" + digest = "1:3af6be4fee7c08f81f13d36f04ffb63ad4b6b5aaba12cce96095c7c2863d4912" name = "github.com/gorilla/mux" packages = ["."] pruneopts = "UT" - revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf" - version = "v1.6.2" + revision = "ed099d42384823742bba0bf9a72b53b55c9e2e38" + version = "v1.7.2" [[projects]] - digest = "1:43dd08a10854b2056e615d1b1d22ac94559d822e1f8b6fcc92c1a1057e85188e" + digest = "1:7b5c6e2eeaa9ae5907c391a91c132abfd5c9e8a784a341b5625e750c67e6825d" name = "github.com/gorilla/websocket" packages = ["."] pruneopts = "UT" - revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" - version = "v1.2.0" + revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d" + version = "v1.4.0" [[projects]] - branch = "master" - digest = "1:12247a2e99a060cc692f6680e5272c8adf0b8f572e6bce0d7095e624c958a240" + digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10" name = "github.com/hashicorp/hcl" packages = [ ".", "hcl/ast", "hcl/parser", + "hcl/printer", "hcl/scanner", "hcl/strconv", "hcl/token", @@ -245,7 +246,8 @@ "json/token", ] pruneopts = "UT" - revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168" + revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241" + version = "v1.0.0" [[projects]] digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" @@ -256,12 +258,12 @@ version = "v1.0" [[projects]] - branch = "master" - digest = "1:39b27d1381a30421f9813967a5866fba35dc1d4df43a6eefe3b7a5444cb07214" + digest = "1:a74b5a8e34ee5843cd6e65f698f3e75614f812ff170c2243425d75bc091e9af2" name = "github.com/jmhodges/levigo" packages = ["."] pruneopts = "UT" - revision = "c42d9e0ca023e2198120196f842701bb4c55d7b9" + revision = "853d788c5c416eaaee5b044570784a96c7a26975" + version = "v1.0.0" [[projects]] branch = "master" @@ -272,20 +274,20 @@ revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0" [[projects]] - digest = "1:c568d7727aa262c32bdf8a3f7db83614f7af0ed661474b24588de635c20024c7" + digest = "1:5a0ef768465592efca0412f7e838cdc0826712f8447e70e6ccc52eb441e9ab13" name = "github.com/magiconair/properties" packages = ["."] pruneopts = "UT" - revision = "c2353362d570a7bfa228149c62842019201cfb71" - version = "v1.8.0" + revision = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1" + version = "v1.8.1" [[projects]] - digest = "1:d4d17353dbd05cb52a2a52b7fe1771883b682806f68db442b436294926bbfafb" + digest = "1:e150b5fafbd7607e2d638e4e5cf43aa4100124e5593385147b0a74e2733d8b0d" name = "github.com/mattn/go-isatty" packages = ["."] pruneopts = "UT" - revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" - version = "v0.0.3" + revision = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7" + version = "v0.0.7" [[projects]] digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc" @@ -296,28 +298,28 @@ version = "v1.0.1" [[projects]] - branch = "master" - digest = "1:5ab79470a1d0fb19b041a624415612f8236b3c06070161a910562f2b2d064355" + digest = "1:53bc4cd4914cd7cd52139990d5170d6dc99067ae31c56530621b18b35fc30318" name = "github.com/mitchellh/mapstructure" packages = ["."] pruneopts = "UT" - revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac" + revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe" + version = "v1.1.2" [[projects]] - digest = "1:95741de3af260a92cc5c7f3f3061e85273f5a81b5db20d4bd68da74bd521675e" + digest = "1:93131d8002d7025da13582877c32d1fc302486775a1b06f62241741006428c5e" name = "github.com/pelletier/go-toml" packages = ["."] pruneopts = "UT" - revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" - version = "v1.2.0" + revision = "728039f679cbcd4f6a54e080d2219a4c4928c546" + version = "v1.4.0" [[projects]] - digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" + digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" name = "github.com/pkg/errors" packages = ["."] pruneopts = "UT" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" + revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" + version = "v0.8.1" [[projects]] digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" @@ -328,7 +330,7 @@ version = "v1.0.0" [[projects]] - digest = "1:93a746f1060a8acbcf69344862b2ceced80f854170e1caae089b2834c5fbf7f4" + digest = "1:0de31727c88e9f4a4ae70c28b6caa27f39b25788daf2dc4f7406013421228144" name = "github.com/prometheus/client_golang" packages = [ "prometheus", @@ -336,8 +338,8 @@ "prometheus/promhttp", ] pruneopts = "UT" - revision = "505eaef017263e299324067d40ca2c48f6a2cf50" - version = "v0.9.2" + revision = "50c4339db732beb2165735d2cde0bff78eb3c5a5" + version = "v0.9.3" [[projects]] branch = "master" @@ -345,11 +347,10 @@ name = "github.com/prometheus/client_model" packages = ["go"] pruneopts = "UT" - revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" + revision = "fd36f4220a901265f90734c3183c5f0c91daa0b8" [[projects]] - branch = "master" - digest = "1:63b68062b8968092eb86bedc4e68894bd096ea6b24920faca8b9dcf451f54bb5" + digest = "1:35cf6bdf68db765988baa9c4f10cc5d7dda1126a54bd62e252dbcd0b1fc8da90" name = "github.com/prometheus/common" packages = [ "expfmt", @@ -357,27 +358,27 @@ "model", ] pruneopts = "UT" - revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" + revision = "1ba88736f028e37bc17328369e94a537ae9e0234" + version = "v0.4.0" [[projects]] branch = "master" - digest = "1:8c49953a1414305f2ff5465147ee576dd705487c35b15918fcd4efdc0cb7a290" + digest = "1:b4e48c7af197047d85fad1874951a927084c5be9ef686911258f78f52101d93a" name = "github.com/prometheus/procfs" packages = [ ".", - "internal/util", - "nfs", - "xfs", + "internal/fs", ] pruneopts = "UT" - revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92" + revision = "9935e8e0588d26307d1d4a07bed7bd47271b6bbd" [[projects]] - digest = "1:c4556a44e350b50a490544d9b06e9fba9c286c21d6c0e47f54f3a9214597298c" + branch = "master" + digest = "1:d38f81081a389f1466ec98192cf9115a82158854d6f01e1c23e2e7554b97db71" name = "github.com/rcrowley/go-metrics" packages = ["."] pruneopts = "UT" - revision = "e2704e165165ec55d062f5919b4b29494e9fa790" + revision = "3113b8401b8a98917cde58f8bbd42a1b1c03b1fd" [[projects]] digest = "1:b0c25f00bad20d783d259af2af8666969e2fc343fa0dc9efe52936bbd67fb758" @@ -388,58 +389,58 @@ version = "v1.6.0" [[projects]] - digest = "1:bd1ae00087d17c5a748660b8e89e1043e1e5479d0fea743352cda2f8dd8c4f84" + digest = "1:bb495ec276ab82d3dd08504bbc0594a65de8c3b22c6f2aaa92d05b73fbf3a82e" name = "github.com/spf13/afero" packages = [ ".", "mem", ] pruneopts = "UT" - revision = "787d034dfe70e44075ccc060d346146ef53270ad" - version = "v1.1.1" + revision = "588a75ec4f32903aa5e39a2619ba6a4631e28424" + version = "v1.2.2" [[projects]] - digest = "1:516e71bed754268937f57d4ecb190e01958452336fa73dbac880894164e91c1f" + digest = "1:08d65904057412fc0270fc4812a1c90c594186819243160dc779a402d4b6d0bc" name = "github.com/spf13/cast" packages = ["."] pruneopts = "UT" - revision = "8965335b8c7107321228e3e3702cab9832751bac" - version = "v1.2.0" + revision = "8c9545af88b134710ab1cd196795e7f2388358d7" + version = "v1.3.0" [[projects]] - digest = "1:7ffc0983035bc7e297da3688d9fe19d60a420e9c38bef23f845c53788ed6a05e" + digest = "1:22799aea8fe96dd5693abdd1eaa14b1b29e3eafbdc7733fa155b3cb556c8a7ae" name = "github.com/spf13/cobra" packages = ["."] pruneopts = "UT" - revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" - version = "v0.0.1" + revision = "67fc4837d267bc9bfd6e47f77783fcc3dffc68de" + version = "v0.0.4" [[projects]] - branch = "master" - digest = "1:8a020f916b23ff574845789daee6818daf8d25a4852419aae3f0b12378ba432a" + digest = "1:1b753ec16506f5864d26a28b43703c58831255059644351bbcb019b843950900" name = "github.com/spf13/jwalterweatherman" packages = ["."] pruneopts = "UT" - revision = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2" + revision = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1" + version = "v1.1.0" [[projects]] - digest = "1:dab83a1bbc7ad3d7a6ba1a1cc1760f25ac38cdf7d96a5cdd55cd915a4f5ceaf9" + digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2" name = "github.com/spf13/pflag" packages = ["."] pruneopts = "UT" - revision = "9a97c102cda95a86cec2345a6f09f55a939babf5" - version = "v1.0.2" + revision = "298182f68c66c05229eb03ac171abe6e309ee79a" + version = "v1.0.3" [[projects]] - digest = "1:f8e1a678a2571e265f4bf91a3e5e32aa6b1474a55cb0ea849750cc177b664d96" + digest = "1:1b773526998f3dbde3a51a4a5881680c4d237d3600f570d900f97ac93c7ba0a8" name = "github.com/spf13/viper" packages = ["."] pruneopts = "UT" - revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" - version = "v1.0.0" + revision = "9e56dacc08fbbf8c9ee2dbc717553c758ce42bc9" + version = "v1.3.2" [[projects]] - digest = "1:c52d48fe752736ae45b72959e1e4fc1a5b60d5b56f8fad42c58414daab5f309d" + digest = "1:8ff03ccc603abb0d7cce94d34b613f5f6251a9e1931eba1a3f9888a9029b055c" name = "github.com/stretchr/testify" packages = [ "assert", @@ -447,12 +448,11 @@ "suite", ] pruneopts = "UT" - revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" - version = "v1.2.1" + revision = "ffdc059bfe9ce6a4e144ba849dbedead332c6053" + version = "v1.3.0" [[projects]] - branch = "master" - digest = "1:b3cfb8d82b1601a846417c3f31c03a7961862cb2c98dcf0959c473843e6d9a2b" + digest = "1:5b180f17d5bc50b765f4dcf0d126c72979531cbbd7f7929bf3edd87fb801ea2d" name = "github.com/syndtr/goleveldb" packages = [ "leveldb", @@ -469,7 +469,8 @@ "leveldb/util", ] pruneopts = "UT" - revision = "c4c61651e9e37fa117f53c5a906d3b63090d8445" + revision = "9d007e481048296f09f59bd19bb7ae584563cd95" + version = "v1.0.0" [[projects]] digest = "1:83f5e189eea2baad419a6a410984514266ff690075759c87e9ede596809bd0b8" @@ -488,15 +489,15 @@ version = "v0.14.1" [[projects]] - digest = "1:1bb088f6291e5426e3874a60bca0e481a91a5633395d7e0c427ec3e49b626e7b" + digest = "1:9f8cd74d11cdb703946d85b4d131f014daf989e9f1b22c794ca5210a7773ca3e" name = "github.com/tendermint/iavl" packages = ["."] pruneopts = "UT" - revision = "ac7c35c12e8633a1e9fd0b52a00b900b40f32cd3" - version = "v0.12.1" + revision = "2f35d309e69ffec33c044a910acd9e8d739eb095" + version = "v0.12.2" [[projects]] - digest = "1:89f6fe8d02b427996828fbf43720ed1297a2e92c930b98dd302767b5ad796579" + digest = "1:4b0750aa7ef647aaf13de3eba5e7eab6253e3f148a776b3635a0a780177f5455" name = "github.com/tendermint/tendermint" packages = [ "abci/client", @@ -518,6 +519,7 @@ "crypto/multisig", "crypto/multisig/bitarray", "crypto/secp256k1", + "crypto/secp256k1/internal/secp256k1", "crypto/tmhash", "crypto/xsalsa20symmetric", "evidence", @@ -562,18 +564,18 @@ "version", ] pruneopts = "UT" - revision = "v0.30.0" + revision = "v0.31.5" [[projects]] - digest = "1:b97247853a9ddc82f593fbacff672b8cae8ae82d7bb9b91436098328703c476c" + digest = "1:efa896fd8b5d5ad8189127b936b735cda7c8299a8e6f9c9918abce9888afec36" name = "github.com/tendermint/tmlibs" packages = [ "common", "log", ] pruneopts = "UT" - revision = "49596e0a1f48866603813df843c9409fc19805c6" - version = "v0.9.0" + revision = "1b9b5652a199ab0be2e781393fb275b66377309d" + version = "v0.7.0" [[projects]] digest = "1:5a736f4722932d9a45d28852e85b83f68292d9af2ef0be29d4e5fe6fd89d5d96" @@ -583,22 +585,6 @@ revision = "302fd402163c34626286195dfa9adac758334acc" version = "v0.9.0" -[[projects]] - digest = "1:fca24169988a61ea725d1326de30910d8049fe68bcbc194d28803f9a76dda380" - name = "github.com/zondax/ledger-cosmos-go" - packages = ["."] - pruneopts = "UT" - revision = "69fdb8ce5e5b9d9c3b22b9248e117b231d4f06dd" - version = "v0.9.7" - -[[projects]] - digest = "1:f8e4c0b959174a1fa5946b12f1f2ac7ea5651bef20a9e4a8dac55dbffcaa6cd6" - name = "github.com/zondax/ledger-go" - packages = ["."] - pruneopts = "UT" - revision = "69c15f1333a9b6866e5f66096561c7d138894bc5" - version = "v0.8.0" - [[projects]] digest = "1:6f6dc6060c4e9ba73cf28aa88f12a69a030d3d19d518ef8e931879eaa099628d" name = "golang.org/x/crypto" @@ -626,7 +612,8 @@ source = "https://github.com/tendermint/crypto" [[projects]] - digest = "1:d36f55a999540d29b6ea3c2ea29d71c76b1d9853fdcd3e5c5cb4836f2ba118f1" + branch = "master" + digest = "1:ddd2c4b580cb75cf12861081aed3a68c87fa9ba9e1dc4406ececb759ad84d651" name = "golang.org/x/net" packages = [ "context", @@ -639,27 +626,29 @@ "trace", ] pruneopts = "UT" - revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f" + revision = "3ec19112720433827bbce8be9342797f5a6aaaf9" [[projects]] branch = "master" - digest = "1:4bd75b1a219bc590b05c976bbebf47f4e993314ebb5c7cbf2efe05a09a184d54" + digest = "1:33c50f1dc2abcce48e32e6e078d9283d3bb2c49822a04e719854dce0d189b160" name = "golang.org/x/sys" packages = [ "cpu", "unix", ] pruneopts = "UT" - revision = "4e1fef5609515ec7a2cee7b5de30ba6d9b438cbf" + revision = "ad400b1274690a55531a013560dc08706088f82b" [[projects]] - digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" + digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -672,35 +661,43 @@ "unicode/rangetable", ] pruneopts = "UT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] branch = "master" - digest = "1:077c1c599507b3b3e9156d17d36e1e61928ee9b53a5b420f10f28ebd4a0b275c" + digest = "1:583a0c80f5e3a9343d33aea4aead1e1afcc0043db66fdf961ddd1fe8cd3a4faf" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] pruneopts = "UT" - revision = "383e8b2c3b9e36c4076b235b32537292176bae20" + revision = "bb713bdc0e5239f2b68e560efbe1c701a6fe78f9" [[projects]] - digest = "1:2dab32a43451e320e49608ff4542fdfc653c95dcc35d0065ec9c6c3dd540ed74" + digest = "1:707c3a5d10ed430ea767d73df122d9eb3dfb6312bbacc9f2e39204390686d1d0" name = "google.golang.org/grpc" packages = [ ".", "balancer", "balancer/base", "balancer/roundrobin", + "binarylog/grpc_binarylog_v1", "codes", "connectivity", "credentials", + "credentials/internal", "encoding", "encoding/proto", "grpclog", "internal", "internal/backoff", + "internal/balancerload", + "internal/binarylog", "internal/channelz", + "internal/envconfig", "internal/grpcrand", + "internal/grpcsync", + "internal/syscall", + "internal/transport", "keepalive", "metadata", "naming", @@ -711,19 +708,18 @@ "stats", "status", "tap", - "transport", ] pruneopts = "UT" - revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8" - version = "v1.13.0" + revision = "25c4f928eaa6d96443009bd842389fb4fa48664e" + version = "v1.20.1" [[projects]] - digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" + digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96" name = "gopkg.in/yaml.v2" packages = ["."] pruneopts = "UT" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" + revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" + version = "v2.2.2" [solve-meta] analyzer-name = "dep" diff --git a/Gopkg.toml b/Gopkg.toml index ccd739b6..961dfc22 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -27,13 +27,14 @@ [[constraint]] name = "github.com/cosmos/cosmos-sdk" - version = "=0.32.0" + version = "=0.34.4" [[override]] name = "github.com/tendermint/tendermint" - revision = "v0.30.0" + revision = "v0.31.5" # XXX(yumin): need to override again here, though already specified in cosmos-sdk's Gopkg.toml. +# 05/19: cosmos has switched to go mod. [[override]] name = "golang.org/x/crypto" source = "https://github.com/tendermint/crypto" diff --git a/Makefile b/Makefile index 8c3ac0a5..b897d8a3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ +COMMIT := $(shell git log -1 --format='%H') PACKAGES=$(shell go list ./... | grep -v '/vendor/') -COMMIT_HASH := $(shell git rev-parse --short HEAD) -LD_FLAGS := "-X github.com/tendermint/tendermint/version.GitCommit=`git rev-parse --short=8 HEAD`" +LD_FLAGS := "-X github.com/tendermint/tendermint/version.GitCommit=$(COMMIT) -X vendor/github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb" GO_TAGS := "tendermint gcc cgo" CGO_LDFLAGS := "-lsnappy" @@ -12,10 +12,7 @@ get_tools: apply_patch: dep ensure - cp ./patches/general/constructors ./vendor/github.com/cosmos/cosmos-sdk/server/constructors.go - (cd vendor/github.com/tendermint/tendermint && patch -p1 -t < ../../../../patches/fixes/tendermint-cleveldb-close-batch.patch); exit 0 (cd vendor/github.com/tendermint/tendermint && patch -p1 -t < ../../../../patches/fullnode/tendermint-cached-txindexer.patch); exit 0 - (cd vendor/github.com/tendermint/iavl && patch -p1 -t < ../../../../patches/fixes/iavl-cleveldb-close-batch.patch); exit 0 (cd vendor/github.com/cosmos/cosmos-sdk && patch -p1 -t < ../../../../patches/fixes/cosmos-cleveldb-close-batch.patch); exit 0 _raw_build_cmd: diff --git a/patches/fullnode/tendermint-cached-txindexer.patch b/patches/fullnode/tendermint-cached-txindexer.patch index a8ed046c..e202a273 100644 --- a/patches/fullnode/tendermint-cached-txindexer.patch +++ b/patches/fullnode/tendermint-cached-txindexer.patch @@ -1,5 +1,5 @@ diff --git a/consensus/replay.go b/consensus/replay.go -index 21fef6b2..e2593496 100644 +index e47d4892..c249231a 100644 --- a/consensus/replay.go +++ b/consensus/replay.go @@ -16,6 +16,8 @@ import ( @@ -11,7 +11,7 @@ index 21fef6b2..e2593496 100644 "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" -@@ -201,6 +203,9 @@ type Handshaker struct { +@@ -203,6 +205,9 @@ type Handshaker struct { genDoc *types.GenesisDoc logger log.Logger @@ -21,7 +21,7 @@ index 21fef6b2..e2593496 100644 nBlocks int // number of blocks applied to the state } -@@ -214,6 +219,7 @@ func NewHandshaker(stateDB dbm.DB, state sm.State, +@@ -216,6 +221,7 @@ func NewHandshaker(stateDB dbm.DB, state sm.State, eventBus: types.NopEventBus{}, genDoc: genDoc, logger: log.NewNopLogger(), @@ -29,7 +29,7 @@ index 21fef6b2..e2593496 100644 nBlocks: 0, } } -@@ -222,6 +228,11 @@ func (h *Handshaker) SetLogger(l log.Logger) { +@@ -224,6 +230,11 @@ func (h *Handshaker) SetLogger(l log.Logger) { h.logger = l } @@ -41,7 +41,7 @@ index 21fef6b2..e2593496 100644 // SetEventBus - sets the event bus for publishing block related events. // If not called, it defaults to types.NopEventBus. func (h *Handshaker) SetEventBus(eventBus types.BlockEventPublisher) { -@@ -443,6 +454,9 @@ func (h *Handshaker) replayBlock(state sm.State, height int64, proxyApp proxy.Ap +@@ -445,6 +456,9 @@ func (h *Handshaker) replayBlock(state sm.State, height int64, proxyApp proxy.Ap blockExec := sm.NewBlockExecutor(h.stateDB, h.logger, proxyApp, sm.MockMempool{}, sm.MockEvidencePool{}) blockExec.SetEventBus(h.eventBus) @@ -52,10 +52,10 @@ index 21fef6b2..e2593496 100644 state, err = blockExec.ApplyBlock(state, meta.BlockID, block) if err != nil { diff --git a/node/node.go b/node/node.go -index 969452c4..c86efcf1 100644 +index c0a4d736..aaab98d2 100644 --- a/node/node.go +++ b/node/node.go -@@ -361,6 +361,9 @@ func NewNode(config *cfg.Config, +@@ -362,6 +362,9 @@ func NewNode(config *cfg.Config, sm.BlockExecutorWithMetrics(smMetrics), ) @@ -66,7 +66,7 @@ index 969452c4..c86efcf1 100644 bcReactor := bc.NewBlockchainReactor(state.Copy(), blockExec, blockStore, fastSync) bcReactor.SetLogger(logger.With("module", "blockchain")) diff --git a/state/execution.go b/state/execution.go -index 8ab95839..cca5c1a9 100644 +index 3a11ecca..e962b487 100644 --- a/state/execution.go +++ b/state/execution.go @@ -9,6 +9,8 @@ import ( @@ -153,7 +153,7 @@ index ab509f96..c8aee640 100644 // AddBatch analyzes, indexes and stores a batch of transactions. AddBatch(b *Batch) error diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go -index 93249b7f..defadfbb 100644 +index 84208b8c..c0aad6fe 100644 --- a/state/txindex/kv/kv.go +++ b/state/txindex/kv/kv.go @@ -7,11 +7,13 @@ import ( @@ -247,7 +247,7 @@ index 93249b7f..defadfbb 100644 rawBytes := txi.store.Get(hash) if rawBytes == nil { return nil, nil -@@ -103,6 +148,12 @@ func (txi *TxIndex) AddBatch(b *txindex.Batch) error { +@@ -104,6 +149,12 @@ func (txi *TxIndex) AddBatch(b *txindex.Batch) error { } storeBatch.Write()