Change pins API (#1566)

The pins API is unified and exposes only addresses of pinned roots
without exposinge the associated counter to the users.

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/mux v1.7.4
 	github.com/gorilla/websocket v1.4.2
+	github.com/hashicorp/go-multierror v1.1.1
 	github.com/kardianos/service v1.2.0
 	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/text v0.2.0 // indirect

go.sum

@@ -40,14 +40,12 @@ github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETF
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Shopify/sarama v1.26.1/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VictoriaMetrics/fastcache v1.5.7 h1:4y6y0G8PRzszQUYIQHHssv/jgPHAb5qQuuDNdCbyAgw=
 github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
-github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75 h1:3ILjVyslFbc4jl1w5TWuvvslFD/nDfR2H8tVaMVLrEY=
 github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -59,7 +57,6 @@ github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2uc
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks=
 github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA=
-github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A=
 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1:D/tb0zPVXnP7fmsLZjtdUhSsumbK/ij54UXjjVgMGxQ=
 github.com/aristanetworks/goarista v0.0.0-20201012165903-2cb20defcd66 h1:bylzF2sl5pWmmHcdwEku/BPHp5wYjcdjmOnW4siw688=
 github.com/aristanetworks/goarista v0.0.0-20201012165903-2cb20defcd66/go.mod h1:QZe5Yh80Hp1b6JxQdpfSEEe8X7hTyTEZSosSrFf/oJE=
@@ -80,7 +77,6 @@ github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnC
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
 github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
 github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
-github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.21.0-beta h1:At9hIZdJW0s9E/fAz28nrz6AmcNlSVucCH796ZteX1M=
 github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94=
@@ -133,7 +129,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU=
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
-github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0=
 github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
 github.com/deckarep/golang-set v1.7.1 h1:SCQV0S6gTtp6itiFrTqI+pfmJ4LN85S1YzhDf9rTHJQ=
 github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
@@ -155,7 +150,6 @@ github.com/dvyukov/go-fuzz v0.0.0-20200318091601-be3528f3a813/go.mod h1:11Gm+ccJ
 github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c h1:JHHhtb9XWJrGNMcrVP6vyzO4dusgi/HnceHTgxSejUM=
 github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
@@ -183,12 +177,10 @@ github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15/go.mod h1:tPg4cp
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays=
 github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
@@ -203,7 +195,6 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
@@ -217,7 +208,6 @@ github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
@@ -225,7 +215,6 @@ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4er
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
@@ -233,7 +222,6 @@ github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
@@ -243,14 +231,11 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw=
 github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -258,7 +243,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
@@ -267,7 +251,6 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=
 github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
@@ -276,7 +259,6 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.4 h1:0ecGp3skIrHWPNGPJDaBIghfA6Sp7Ruo2Io8eLKzWm0=
@@ -285,7 +267,6 @@ github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -295,7 +276,6 @@ github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -309,11 +289,14 @@ github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfm
 github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -333,7 +316,6 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/holiman/uint256 v1.1.1 h1:4JywC80b+/hSfljFlEBLHrrh+CIONLDz9NuFl0af4Mw=
 github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo=
 github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
@@ -345,10 +327,8 @@ github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod
 github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.4 h1:UlfXKrZx1DjZoBhQHmNHLC1fK1dUJDN20Y28A7s+gJ8=
 github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
 github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cid v0.0.6 h1:go0y+GcDOGeJIV01FeBsta4FHngoA4Wz7KMeLkXAhMs=
 github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
 github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
 github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
@@ -366,11 +346,9 @@ github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIyk
 github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50=
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
 github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
 github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
-github.com/ipfs/go-log v0.0.1 h1:9XTUN/rW64BCG1YhPK9Hoy3q8nr4gOmHHBpgFdfw6Lc=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
@@ -378,13 +356,10 @@ github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY=
 github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
 github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
-github.com/ipfs/go-log/v2 v2.0.5 h1:fL4YI+1g5V/b1Yxr1qAiXTMg1H8z9vx/VmJxBuQMHvU=
 github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
 github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
 github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM=
-github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc=
 github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
-github.com/jackpal/go-nat-pmp v1.0.1 h1:i0LektDkO1QlrTm/cSuP+PyBCDnYvjPLGl4LdWEMiaA=
 github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
@@ -392,12 +367,10 @@ github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+
 github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs=
 github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2 h1:vhC1OXXiT9R2pczegwz6moDvuRpggaroAXhPIseh57A=
 github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs=
 github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
 github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
-github.com/jbenet/goprocess v0.1.3 h1:YKyIEECS/XvcfHtBzxtjBBbWK+MbvA6dG8ASiqwvr10=
 github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o=
 github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
@@ -415,10 +388,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0=
-github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 h1:I/yrLt2WilKxlQKCM52clh5rGzTKpVctGT1lH4Dc8Jw=
 github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
 github.com/karalabe/usb v0.0.0-20191104083709-911d15fe12a9 h1:ZHuwnjpP8LsVsUYqTqeVAI+GfDfJ6UNPrExZF+vX/DQ=
 github.com/karalabe/usb v0.0.0-20191104083709-911d15fe12a9/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
@@ -436,35 +407,29 @@ github.com/klauspost/reedsolomon v1.9.3/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d h1:68u9r4wEvL3gYg2jvAOgROwZ3H+Y3hIDk4tbbmIjcYQ=
 github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
 github.com/koron/go-ssdp v0.0.2 h1:fL3wAoyT6hXHQlORyXUW4Q23kkQpJRgEAYcZB5BR71o=
 github.com/koron/go-ssdp v0.0.2/go.mod h1:XoLfkAiA2KeZsYh4DbHxD7h3nR2AZNqVQOa+LJuqPYs=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/libp2p/go-addr-util v0.0.1 h1:TpTQm9cXVRVSKsYbgQ7GKc3KbbHVTnbostgGaDEP+88=
 github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpzX4/+RACcnlQ=
 github.com/libp2p/go-addr-util v0.0.2 h1:7cWK5cdA5x72jX0g8iLrQWm5TRJZ6CzGdPEhWj7plWU=
 github.com/libp2p/go-addr-util v0.0.2/go.mod h1:Ecd6Fb3yIuLzq4bD7VcywcVSBtefcAwnUISBM3WG15E=
 github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
 github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs=
 github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
-github.com/libp2p/go-conn-security-multistream v0.1.0 h1:aqGmto+ttL/uJgX0JtQI0tD21CIEy5eYd1Hlp0juHY0=
 github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
 github.com/libp2p/go-conn-security-multistream v0.2.0 h1:uNiDjS58vrvJTg9jO6bySd1rMKejieG7v45ekqHbZ1M=
 github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
-github.com/libp2p/go-eventbus v0.1.0 h1:mlawomSAjjkk97QnYiEmHsLu7E136+2oCWSHRUvMfzQ=
 github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
 github.com/libp2p/go-eventbus v0.2.1 h1:VanAdErQnpTioN2TowqNcOijf6YwhuODe4pPKSDpxGc=
 github.com/libp2p/go-eventbus v0.2.1/go.mod h1:jc2S4SoEVPP48H9Wpzm5aiGwUCBMfGhVhhBjyhhCJs8=
@@ -477,7 +442,6 @@ github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniV
 github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o=
 github.com/libp2p/go-libp2p v0.13.0 h1:tDdrXARSghmusdm0nf1U/4M8aj8Rr0V2IzQOXmbzQ3s=
 github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t2DTVAJxMo=
-github.com/libp2p/go-libp2p-autonat v0.1.1 h1:WLBZcIRsjZlWdAZj9CiBSvU2wQXoUOiS1Zk1tM7DTJI=
 github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
 github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQdNbfzE1C718tcViI=
 github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
@@ -485,11 +449,9 @@ github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/
 github.com/libp2p/go-libp2p-autonat v0.4.0 h1:3y8XQbpr+ssX8QfZUHekjHCYK64sj6/4hnf/awD4+Ug=
 github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
 github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
-github.com/libp2p/go-libp2p-blankhost v0.1.4 h1:I96SWjR4rK9irDHcHq3XHN6hawCRTPUADzkJacgZLvk=
 github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
 github.com/libp2p/go-libp2p-blankhost v0.2.0 h1:3EsGAi0CBGcZ33GwRuXEYJLLPoVWyXJ1bcJzAJjINkk=
 github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod h1:eduNKXGTioTuQAUcZ5epXi9vMl+t4d8ugUBRQ4SqaNQ=
-github.com/libp2p/go-libp2p-circuit v0.1.4 h1:Phzbmrg3BkVzbqd4ZZ149JxCuUWu2wZcXf/Kr6hZJj8=
 github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod h1:CY67BrEjKNDhdTk8UgBX1Y/H5c3xkAcs3gnksxY7osU=
 github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod h1:BXPwYDN5A8z4OEY9sOfr2DUQMLQvKt/6oku45YUmjIo=
 github.com/libp2p/go-libp2p-circuit v0.4.0 h1:eqQ3sEYkGTtybWgr6JLqJY6QLtPWRErvFjFDfAOO1wc=
@@ -499,7 +461,6 @@ github.com/libp2p/go-libp2p-core v0.0.4/go.mod h1:jyuCQP356gzfCFtRKyvAbNkyeuxb7O
 github.com/libp2p/go-libp2p-core v0.2.0/go.mod h1:X0eyB0Gy93v0DZtSYbEM7RnMChm9Uv3j7yRXjO77xSI=
 github.com/libp2p/go-libp2p-core v0.2.2/go.mod h1:8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
 github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
-github.com/libp2p/go-libp2p-core v0.3.0 h1:F7PqduvrztDtFsAa/bcheQ3azmNo+Nq7m8hQY5GiUW8=
 github.com/libp2p/go-libp2p-core v0.3.0/go.mod h1:ACp3DmS3/N64c2jDzcV429ukDpicbL6+TrrxANBjPGw=
 github.com/libp2p/go-libp2p-core v0.3.1/go.mod h1:thvWy0hvaSBhnVBaW37BvzgVV68OUhgJJLAa6almrII=
 github.com/libp2p/go-libp2p-core v0.4.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
@@ -507,16 +468,13 @@ github.com/libp2p/go-libp2p-core v0.5.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZas
 github.com/libp2p/go-libp2p-core v0.5.1/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
 github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
 github.com/libp2p/go-libp2p-core v0.5.5/go.mod h1:vj3awlOr9+GMZJFH9s4mpt9RHHgGqeHCopzbYKZdRjM=
-github.com/libp2p/go-libp2p-core v0.5.6 h1:IxFH4PmtLlLdPf4fF/i129SnK/C+/v8WEX644MxhC48=
 github.com/libp2p/go-libp2p-core v0.5.6/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
 github.com/libp2p/go-libp2p-core v0.5.7/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.6.0 h1:u03qofNYTBN+yVg08PuAKylZogVf0xcTEeM8skGf+ak=
 github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
 github.com/libp2p/go-libp2p-core v0.7.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
 github.com/libp2p/go-libp2p-core v0.8.0 h1:5K3mT+64qDTKbV3yTdbMCzJ7O6wbNsavAEb8iqBvBcI=
 github.com/libp2p/go-libp2p-core v0.8.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
 github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
-github.com/libp2p/go-libp2p-discovery v0.2.0 h1:1p3YSOq7VsgaL+xVHPi8XAmtGyas6D2J6rWBEfz/aiY=
 github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
 github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
 github.com/libp2p/go-libp2p-discovery v0.5.0 h1:Qfl+e5+lfDgwdrXdu4YNCWyEo3fWuP+WgN9mN0iWviQ=
@@ -524,21 +482,17 @@ github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod h1:+srtPIU9gDaBNu//UHvcdliKB
 github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
 github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
 github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
-github.com/libp2p/go-libp2p-mplex v0.2.1 h1:E1xaJBQnbSiTHGI1gaBKmKhu1TUKkErKJnE8iGvirYI=
 github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
 github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo=
-github.com/libp2p/go-libp2p-mplex v0.2.3 h1:2zijwaJvpdesST2MXpI5w9wWFRgYtMcpRX7rrw0jmOo=
 github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek=
 github.com/libp2p/go-libp2p-mplex v0.4.0/go.mod h1:yCyWJE2sc6TBTnFpjvLuEJgTSw/u+MamvzILKdX7asw=
 github.com/libp2p/go-libp2p-mplex v0.4.1 h1:/pyhkP1nLwjG3OM+VuaNJkQT/Pqq73WzB3aDN3Fx1sc=
 github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g=
-github.com/libp2p/go-libp2p-nat v0.0.5 h1:/mH8pXFVKleflDL1YwqMg27W9GD8kjEx7NY0P6eGc98=
 github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
 github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
 github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
 github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
 github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
-github.com/libp2p/go-libp2p-noise v0.1.1 h1:vqYQWvnIcHpIoWJKC7Al4D6Hgj0H012TuXRhPwSMGpQ=
 github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
 github.com/libp2p/go-libp2p-noise v0.1.2 h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk=
 github.com/libp2p/go-libp2p-noise v0.1.2/go.mod h1:9B10b7ueo7TIxZHHcjcDCo5Hd6kfKT2m77by82SFRfE=
@@ -556,15 +510,11 @@ github.com/libp2p/go-libp2p-quic-transport v0.10.0 h1:koDCbWD9CCHwcHZL3/WEvP2A+e
 github.com/libp2p/go-libp2p-quic-transport v0.10.0/go.mod h1:RfJbZ8IqXIhxBRm5hqUEJqjiiY8xmEuq3HUDS993MkA=
 github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
 github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
-github.com/libp2p/go-libp2p-secio v0.2.1 h1:eNWbJTdyPA7NxhP7J3c5lT97DC5d+u+IldkgCYFTPVA=
 github.com/libp2p/go-libp2p-secio v0.2.1/go.mod h1:cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
-github.com/libp2p/go-libp2p-secio v0.2.2 h1:rLLPvShPQAcY6eNurKNZq3eZjPWfU9kXF2eI9jIYdrg=
 github.com/libp2p/go-libp2p-secio v0.2.2/go.mod h1:wP3bS+m5AUnFA+OFO7Er03uO1mncHG0uVwGrwvjYlNY=
 github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4=
-github.com/libp2p/go-libp2p-swarm v0.2.2 h1:T4hUpgEs2r371PweU3DuH7EOmBIdTBCwWs+FLcgx3bQ=
 github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU=
 github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM=
-github.com/libp2p/go-libp2p-swarm v0.2.8 h1:cIUUvytBzNQmGSjnXFlI6UpoBGsaud82mJPIJVfkDlg=
 github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod h1:JQKMGSth4SMqonruY0a8yjlPVIkb0mdNSwckW7OYziM=
 github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
 github.com/libp2p/go-libp2p-swarm v0.4.0 h1:hahq/ijRoeH6dgROOM8x7SeaKK5VgjjIr96vdrT+NUA=
@@ -573,7 +523,6 @@ github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MB
 github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
 github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
 github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-testing v0.1.1 h1:U03z3HnGI7Ni8Xx6ONVZvUFOAzWYmolWf5W5jAOPNmU=
 github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
 github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
 github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g=
@@ -581,10 +530,8 @@ github.com/libp2p/go-libp2p-testing v0.4.0 h1:PrwHRi0IGqOwVQWR3xzgigSlhlLfxgfXgk
 github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
 github.com/libp2p/go-libp2p-tls v0.1.3 h1:twKMhMu44jQO+HgQK9X8NHO5HkeJu2QbhLzLJpa8oNM=
 github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
-github.com/libp2p/go-libp2p-transport-upgrader v0.1.1 h1:PZMS9lhjK9VytzMCW3tWHAXtKXmlURSc3ZdvwEcKCzw=
 github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
 github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns=
-github.com/libp2p/go-libp2p-transport-upgrader v0.3.0 h1:q3ULhsknEQ34eVDhv4YwKS8iet69ffs9+Fir6a7weN4=
 github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D1dwydnTmKRPXiAR/fyvi1dXuL4o=
 github.com/libp2p/go-libp2p-transport-upgrader v0.4.0 h1:xwj4h3hJdBrxqMOyMUjwscjoVst0AASTsKtZiTChoHI=
 github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX5AmegP+dK3CSnU2lMCKsSq/EY0s=
@@ -592,54 +539,42 @@ github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8ME
 github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
 github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA=
 github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU=
-github.com/libp2p/go-libp2p-yamux v0.2.8 h1:0s3ELSLu2O7hWKfX1YjzudBKCP0kZ+m9e2+0veXzkn4=
 github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod h1:/t6tDqeuZf0INZMTgd0WxIRbtK2EzI2h7HbFm9eAKI4=
 github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelNoy5nm3tZ3/Zw30=
 github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLwTGf0L4DFq9g6po=
 github.com/libp2p/go-libp2p-yamux v0.5.1 h1:sX4WQPHMhRxJE5UZTfjEuBvlQWXB5Bo3A2JK9ZJ9EM0=
 github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod h1:dowuvDu8CRWmr0iqySMiSxK+W0iL5cMVO9S94Y6gkv4=
 github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
-github.com/libp2p/go-maddr-filter v0.0.5 h1:CW3AgbMO6vUvT4kf87y4N+0P8KUl2aqLYhrGyDUbLSg=
 github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
 github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
 github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
-github.com/libp2p/go-mplex v0.1.0 h1:/nBTy5+1yRyY82YaO6HXQRnO5IAGsXTjEJaR3LdTPc0=
 github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
 github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.1.2 h1:qOg1s+WdGLlpkrczDqmhYzyk3vCfsQ8+RxRTQjOZWwI=
 github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
 github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
 github.com/libp2p/go-mplex v0.3.0 h1:U1T+vmCYJaEoDJPV1aq31N56hS+lJgb397GsylNSgrU=
 github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
 github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.4 h1:agEFehY3zWJFUHK6SEMR7UYmk2z6kC3oeCM7ybLhguA=
 github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.6 h1:lQ7Uc0kS1wb1EfRxO2Eir/RJoHkHn7t6o+EiwsYIKJA=
 github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-nat v0.0.4 h1:KbizNnq8YIf7+Hn7+VFL/xE0eDrkPru2zIO9NMwL8UQ=
 github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
 github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
 github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
-github.com/libp2p/go-netroute v0.1.2 h1:UHhB35chwgvcRI392znJA3RCBtZ3MpE3ahNCN5MR4Xg=
 github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-netroute v0.1.3 h1:1ngWRx61us/EpaKkdqkMjKk/ufr/JlIFYQAxV2XX8Ig=
 github.com/libp2p/go-netroute v0.1.3/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
 github.com/libp2p/go-netroute v0.1.4 h1:47V0+hJfYaqj1WO0A+cDkRc9xr9qKiK7i8zaoGv8Mmo=
 github.com/libp2p/go-netroute v0.1.4/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
 github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0=
 github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-openssl v0.0.4 h1:d27YZvLoTyMhIN4njrkr8zMDOM4lfpHIp6A+TK9fovg=
 github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
 github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-reuseport v0.0.1 h1:7PhkfH73VXfPJYKQ6JwS5I/eVcoyYi9IMNGc6FWpFLw=
 github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
 github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
 github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
-github.com/libp2p/go-reuseport-transport v0.0.2 h1:WglMwyXyBu61CMkjCCtnmqNqnjib0GIEjMiHTwR/KN4=
 github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
-github.com/libp2p/go-reuseport-transport v0.0.3 h1:zzOeXnTooCkRvoH+bSXEfXhn76+LAiwoneM0gnXjF2M=
 github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM=
 github.com/libp2p/go-reuseport-transport v0.0.4 h1:OZGz0RB620QDGpv300n1zaOcKGGAoGVf8h9txtt/1uM=
 github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw=
@@ -647,18 +582,14 @@ github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2L
 github.com/libp2p/go-sockaddr v0.1.0 h1:Y4s3/jNoryVRKEBrkJ576F17CPOaMIzUeCsg7dlTDj0=
 github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
 github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14=
-github.com/libp2p/go-stream-muxer-multistream v0.2.0 h1:714bRJ4Zy9mdhyTLJ+ZKiROmAFwUHpeRidG+q7LTQOg=
 github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
 github.com/libp2p/go-stream-muxer-multistream v0.3.0 h1:TqnSHPJEIqDEO7h1wZZ0p3DXdvDSiLHQidKKUGZtiOY=
 github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod h1:yDh8abSIzmZtqtOt64gFJUXEryejzNb0lisTt+fAMJA=
 github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc=
-github.com/libp2p/go-tcp-transport v0.1.1 h1:yGlqURmqgNA2fvzjSgZNlHcsd/IulAnKM8Ncu+vlqnw=
 github.com/libp2p/go-tcp-transport v0.1.1/go.mod h1:3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
-github.com/libp2p/go-tcp-transport v0.2.0 h1:YoThc549fzmNJIh7XjHVtMIFaEDRtIrtWciG5LyYAPo=
 github.com/libp2p/go-tcp-transport v0.2.0/go.mod h1:vX2U0CnWimU4h0SGSEsg++AzvBcroCGYw28kh94oLe0=
 github.com/libp2p/go-tcp-transport v0.2.1 h1:ExZiVQV+h+qL16fzCWtd1HSzPsqWottJ8KXwWaVi8Ns=
 github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1PpPUrHIWQ8aFw7M=
-github.com/libp2p/go-ws-transport v0.2.0 h1:MJCw2OrPA9+76YNRvdo1wMnSOxb9Bivj6sVFY1Xrj6w=
 github.com/libp2p/go-ws-transport v0.2.0/go.mod h1:9BHJz/4Q5A9ludYWKoGCFC5gUElzlHoKzu0yY9p/klM=
 github.com/libp2p/go-ws-transport v0.3.0/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
 github.com/libp2p/go-ws-transport v0.4.0 h1:9tvtQ9xbws6cA5LvqdE6Ne3vcmGB4f1z9SByggk4s0k=
@@ -692,7 +623,6 @@ github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1j
 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -702,19 +632,16 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -738,7 +665,6 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
 github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -749,7 +675,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
 github.com/mr-tron/base58 v1.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
 github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
-github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
 github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
@@ -762,10 +687,8 @@ github.com/multiformats/go-multiaddr v0.0.2/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lg
 github.com/multiformats/go-multiaddr v0.0.4/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
 github.com/multiformats/go-multiaddr v0.1.0/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
 github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.0 h1:lR52sFwcTCuQb6bTfnXF6zA2XfyYvyd+5a9qECv/J90=
 github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
 github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
-github.com/multiformats/go-multiaddr v0.2.2 h1:XZLDTszBIJe6m0zF6ITBrEcZR73OPUhCBBS9rYAuUzI=
 github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
 github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
 github.com/multiformats/go-multiaddr v0.3.1 h1:1bxa+W7j9wZKTZREySx1vPMs2TqrYWjVZ7zE6/XLG1I=
@@ -779,38 +702,29 @@ github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/e
 github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
 github.com/multiformats/go-multiaddr-net v0.0.1/go.mod h1:nw6HSxNmCIQH27XPGBuX+d1tnvM7ihcFwHMSstNAVUU=
 github.com/multiformats/go-multiaddr-net v0.1.0/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
-github.com/multiformats/go-multiaddr-net v0.1.1 h1:jFFKUuXTXv+3ARyHZi3XUqQO+YWMKgBdhEvuGRfnL6s=
 github.com/multiformats/go-multiaddr-net v0.1.1/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
 github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y=
 github.com/multiformats/go-multiaddr-net v0.1.3/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.1.5 h1:QoRKvu0xHN1FCFJcMQLbG/yQE2z441L5urvG3+qyz7g=
 github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
 github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
-github.com/multiformats/go-multibase v0.0.1 h1:PN9/v21eLywrFWdFNsFKaU04kLJzuYzmrJR+ubhT9qA=
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
 github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
 github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
 github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
 github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
 github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.10 h1:lMoNbh2Ssd9PUF74Nz008KGzGPlfeV6wH3rit5IIGCM=
 github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc=
 github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
 github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multistream v0.1.0 h1:UpO6jrsjqs46mqAK3n6wKRYFhugss9ArzbyUzU+4wkQ=
 github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
-github.com/multiformats/go-multistream v0.1.1 h1:JlAdpIFhBhGRLxe9W6Om0w++Gd6KMWoFPZL/dEnm9nI=
 github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
 github.com/multiformats/go-multistream v0.2.0 h1:6AuNmQVKUkRnddw2YiDjt5Elit40SFxMJkVnhmETXtU=
 github.com/multiformats/go-multistream v0.2.0/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
-github.com/multiformats/go-varint v0.0.1 h1:TR/0rdQtnNxuN2IhiB639xC3tWM4IUi7DkTBVTdGW/M=
 github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
 github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
@@ -825,7 +739,6 @@ github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c h1:1RHs3tNxjXGHeul8z2t6H2N2TlAqpKe5yryJztRx4Jk=
 github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
@@ -833,7 +746,6 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
@@ -844,7 +756,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34=
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
@@ -852,27 +763,22 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc=
 github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222 h1:goeTyGkArOZIVOMA0dQbyuPWGNQJZGPwPu/QS9GlpnA=
 github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
 github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
 github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw=
 github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
-github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM=
 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/peterh/liner v1.2.0 h1:w/UPXyl5GfahFxcTOz2j9wCIHNI+pUPr2laqpojKNCg=
 github.com/peterh/liner v1.2.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -906,18 +812,15 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/prometheus/tsdb v0.10.0 h1:If5rVCMTp6W2SiRAQFlbpJNgVlgMEd+U2GZckwK38ic=
 github.com/prometheus/tsdb v0.10.0/go.mod h1:oi49uRhEe9dPUTlS3JRZOwJuVi6tmh10QSgwXEyGCt4=
 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
 github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
@@ -933,7 +836,6 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil v2.20.5+incompatible h1:tYH07UPoQt0OCQdgWWMgYHy3/a9bcxNpBIysykNIP7I=
 github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v2.20.9+incompatible h1:msXs2frUV+O/JLva9EDLpuJ84PrFsdCTCQex8PUdtkQ=
 github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
@@ -961,11 +863,9 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
 github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
 github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck=
 github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
@@ -984,19 +884,15 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.3.1 h1:GPTpEAuNr98px18yNQ66JllNil98wfRZ/5Ukny8FeQA=
 github.com/spf13/afero v1.3.1/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
-github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -1004,9 +900,7 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
-github.com/src-d/envconfig v1.0.0 h1:/AJi6DtjFhZKNx3OB2qMsq7y4yT5//AeSZIe7rk+PX8=
 github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc=
-github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969 h1:Oo2KZNP70KE0+IUJSidPj/BFS/RXNHmKIJOdckzml2E=
 github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
@@ -1018,7 +912,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
@@ -1036,7 +929,6 @@ github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEv
 github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4=
 github.com/tjfoc/gmsm v1.3.0/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
 github.com/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8=
 github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
@@ -1057,16 +949,13 @@ github.com/wealdtech/go-string2eth v1.0.0 h1:jY6b1MVqU6k2Uw/kvcU1Y9/3dDyXfPzZrOF
 github.com/wealdtech/go-string2eth v1.0.0/go.mod h1:UZA/snEybGcD6n+Pl+yoDjmexlEJ6dtoS9myfM83Ol4=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
-github.com/whyrusleeping/go-logging v0.0.1 h1:fwpzlmT0kRC/Fmd0MdmGgJG/CXIZ6gFq46FQZjprUcc=
 github.com/whyrusleeping/go-logging v0.0.1/go.mod h1:lDPYj54zutzG1XYfHAhcc7oNXEburHQBn+Iqd4yS4vE=
-github.com/whyrusleeping/mafmt v1.2.8 h1:TCghSl5kkwEE0j+sU/gudyhVMRlpBin8fMBBHg59EbA=
 github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA=
 github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
 github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds=
 github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI=
 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk=
 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees=
-github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg=
 github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
@@ -1082,32 +971,24 @@ go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
-go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo=
 go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo=
 go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
-go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=
 go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
@@ -1136,12 +1017,10 @@ golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200320181102-891825fb96df/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -1162,7 +1041,6 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -1173,7 +1051,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -1207,7 +1084,6 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -1226,7 +1102,6 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
@@ -1275,23 +1150,19 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88=
 golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210108172913-0df2131ae363 h1:wHn06sgWHMO1VsQ8F+KzDJx/JzqfsNLnc+oEi07qD7s=
 golang.org/x/sys v0.0.0-20210108172913-0df2131ae363/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -1328,7 +1199,6 @@ golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
@@ -1337,7 +1207,6 @@ golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f h1:JcoF/bowzCDI+MXu1yLqQGN
 golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1391,7 +1260,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
@@ -1401,15 +1269,12 @@ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod
 gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww=
 gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -1426,7 +1291,6 @@ gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJ
 gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod h1:z+K8VcOYVYcSwSjGebuDL6176A1XskgbtNl64NSg+n8=
-gopkg.in/src-d/go-log.v1 v1.0.1 h1:heWvX7J6qbGWbeFS/aRmiy1eYaT+QMV6wNvHDyMjQV4=
 gopkg.in/src-d/go-log.v1 v1.0.1/go.mod h1:GN34hKP0g305ysm2/hctJ0Y8nWP3zxXXJ8GFabTyABE=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -1440,7 +1304,6 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -1451,7 +1314,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=

openapi/Swarm.yaml

@@ -438,21 +438,21 @@ paths:
         default:
           description: Default response
 
-  "/pin/chunks/{address}":
+  "/pins/{address}":
     parameters:
       - in: path
         name: address
         schema:
           $ref: "SwarmCommon.yaml#/components/schemas/SwarmAddress"
         required: true
-        description: Swarm address of chunk
+        description: Swarm address of the root hash
     post:
-      summary: Pin chunk with given address
+      summary: Pin root hash with given address
       tags:
-        - Chunk pinning
+        - Root hash pinning
       responses:
         "200":
-          description: Pinning chunk with address
+          description: Pinning root hash with address
           content:
             application/json:
               schema:
@@ -466,12 +466,12 @@ paths:
         default:
           description: Default response
     delete:
-      summary: Unpin chunk with given address
+      summary: Unpin root hash with given address
       tags:
-        - Chunk pinning
+        - Root hash pinning
       responses:
         "200":
-          description: Unpinning chunk with address
+          description: Unpinning root hash with address
           content:
             application/json:
               schema:
@@ -485,12 +485,12 @@ paths:
         default:
           description: Default response
     get:
-      summary: Get pinning status of chunk with given address
+      summary: Get pinning status of root hash with given address
       tags:
-        - Chunk pinning
+        - Root hash pinning
       responses:
         "200":
-          description: Pinning state of chunk with address
+          description: Address of pinned root hash
           content:
             application/json:
               schema:
@@ -501,52 +501,15 @@ paths:
           $ref: "SwarmCommon.yaml#/components/responses/500"
         default:
           description: Default response
-    put:
-      summary: Update chunk pin counter
-      tags:
-        - Chunk pinning
-      responses:
-        "200":
-          description: Pinning state of chunk with address
-          content:
-            application/json:
-              schema:
-                $ref: "SwarmCommon.yaml#/components/schemas/PinningState"
-        "400":
-          $ref: "SwarmCommon.yaml#/components/responses/400"
-        "403":
-          $ref: "SwarmCommon.yaml#/components/responses/403"
-        "404":
-          $ref: "SwarmCommon.yaml#/components/responses/404"
-        default:
-          description: Default response
 
-  "/pin/chunks":
+  "/pins":
     get:
-      summary: Get list of pinned chunks
+      summary: Get list of pinned root hashes addresses
       tags:
-        - Chunk pinning
-      parameters:
-        - in: query
-          name: offset
-          schema:
-            type: integer
-            minimum: 0
-            default: 0
-          required: false
-          description: The number of items to skip before starting to collect the result set.
-        - in: query
-          name: limit
-          schema:
-            type: integer
-            minimum: 1
-            maximum: 1000
-            default: 100
-          required: false
-          description: The numbers of items to return.
+        - Root hash pinning
       responses:
         "200":
-          description: List of pinned chunks
+          description: List of pinned root hashes addresses
           content:
             application/json:
               schema:
@@ -558,147 +521,6 @@ paths:
         default:
           description: Default response
 
-  "/pin/bytes/{address}":
-    parameters:
-      - in: path
-        name: address
-        schema:
-          $ref: "SwarmCommon.yaml#/components/schemas/SwarmAddress"
-        required: true
-        description: Swarm address of the bytes
-    post:
-      summary: Pin bytes with given address
-      tags:
-        - Bytes pinning
-      responses:
-        "200":
-          description: Pinning bytes chunks with address
-          content:
-            application/json:
-              schema:
-                $ref: "SwarmCommon.yaml#/components/schemas/Response"
-        "400":
-          $ref: "SwarmCommon.yaml#/components/responses/400"
-        "403":
-          $ref: "SwarmCommon.yaml#/components/responses/403"
-        "404":
-          $ref: "SwarmCommon.yaml#/components/responses/404"
-        default:
-          description: Default response
-    delete:
-      summary: Unpin bytes chunks with given address
-      tags:
-        - Bytes pinning
-      responses:
-        "200":
-          description: Unpinning chunk with address
-          content:
-            application/json:
-              schema:
-                $ref: "SwarmCommon.yaml#/components/schemas/Response"
-        "400":
-          $ref: "SwarmCommon.yaml#/components/responses/400"
-        "403":
-          $ref: "SwarmCommon.yaml#/components/responses/403"
-        "404":
-          $ref: "SwarmCommon.yaml#/components/responses/404"
-        default:
-          description: Default response
-
-  "/pin/files/{address}":
-    parameters:
-      - in: path
-        name: address
-        schema:
-          $ref: "SwarmCommon.yaml#/components/schemas/SwarmAddress"
-        required: true
-        description: Swarm address of the file
-    post:
-      summary: Pin file with given address
-      tags:
-        - File pinning
-      responses:
-        "200":
-          description: Pinning file chunks with address
-          content:
-            application/json:
-              schema:
-                $ref: "SwarmCommon.yaml#/components/schemas/Response"
-        "400":
-          $ref: "SwarmCommon.yaml#/components/responses/400"
-        "403":
-          $ref: "SwarmCommon.yaml#/components/responses/403"
-        "404":
-          $ref: "SwarmCommon.yaml#/components/responses/404"
-        default:
-          description: Default response
-    delete:
-      summary: Unpin file chunks with given address
-      tags:
-        - File pinning
-      responses:
-        "200":
-          description: Unpinning file chunks with address
-          content:
-            application/json:
-              schema:
-                $ref: "SwarmCommon.yaml#/components/schemas/Response"
-        "400":
-          $ref: "SwarmCommon.yaml#/components/responses/400"
-        "403":
-          $ref: "SwarmCommon.yaml#/components/responses/403"
-        "404":
-          $ref: "SwarmCommon.yaml#/components/responses/404"
-        default:
-          description: Default response
-
-  "/pin/bzz/{address}":
-    parameters:
-      - in: path
-        name: address
-        schema:
-          $ref: "SwarmCommon.yaml#/components/schemas/SwarmAddress"
-        required: true
-        description: Swarm address of the collection
-    post:
-      summary: Pin collection with given address
-      tags:
-        - Collection pinning
-      responses:
-        "200":
-          description: Pinning collection chunks (and all referenced files) with address
-          content:
-            application/json:
-              schema:
-                $ref: "SwarmCommon.yaml#/components/schemas/Response"
-        "400":
-          $ref: "SwarmCommon.yaml#/components/responses/400"
-        "403":
-          $ref: "SwarmCommon.yaml#/components/responses/403"
-        "404":
-          $ref: "SwarmCommon.yaml#/components/responses/404"
-        default:
-          description: Default response
-    delete:
-      summary: Unpin file chunks with given address
-      tags:
-        - Collection pinning
-      responses:
-        "200":
-          description: Unpinning collection chunks (and all referenced files) with address
-          content:
-            application/json:
-              schema:
-                $ref: "SwarmCommon.yaml#/components/schemas/Response"
-        "400":
-          $ref: "SwarmCommon.yaml#/components/responses/400"
-        "403":
-          $ref: "SwarmCommon.yaml#/components/responses/403"
-        "404":
-          $ref: "SwarmCommon.yaml#/components/responses/404"
-        default:
-          description: Default response
-
   "/pss/send/{topic}/{targets}":
     post:
       summary: Send to recipient or target with Postal Service for Swarm

pkg/api/api.go

@@ -23,6 +23,7 @@ import (
 	"github.com/ethersphere/bee/pkg/file/pipeline/builder"
 	"github.com/ethersphere/bee/pkg/logging"
 	m "github.com/ethersphere/bee/pkg/metrics"
+	"github.com/ethersphere/bee/pkg/pinning"
 	"github.com/ethersphere/bee/pkg/pss"
 	"github.com/ethersphere/bee/pkg/resolver"
 	"github.com/ethersphere/bee/pkg/storage"
@@ -83,7 +84,8 @@ type server struct {
 	storer      storage.Storer
 	resolver    resolver.Interface
 	pss         pss.Interface
-	traversal   traversal.Service
+	traversal   traversal.Traverser
+	pinning     pinning.Interface
 	logger      logging.Logger
 	tracer      *tracing.Tracer
 	feedFactory feeds.Factory
@@ -107,13 +109,14 @@ const (
 )
 
 // New will create a and initialize a new API service.
-func New(tags *tags.Tags, storer storage.Storer, resolver resolver.Interface, pss pss.Interface, traversalService traversal.Service, feedFactory feeds.Factory, logger logging.Logger, tracer *tracing.Tracer, o Options) Service {
+func New(tags *tags.Tags, storer storage.Storer, resolver resolver.Interface, pss pss.Interface, traversalService traversal.Traverser, pinning pinning.Interface, feedFactory feeds.Factory, logger logging.Logger, tracer *tracing.Tracer, o Options) Service {
 	s := &server{
 		tags:        tags,
 		storer:      storer,
 		resolver:    resolver,
 		pss:         pss,
 		traversal:   traversalService,
+		pinning:     pinning,
 		feedFactory: feedFactory,
 		Options:     o,
 		logger:      logger,

pkg/api/api_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ethersphere/bee/pkg/api"
 	"github.com/ethersphere/bee/pkg/feeds"
 	"github.com/ethersphere/bee/pkg/logging"
+	"github.com/ethersphere/bee/pkg/pinning"
 	"github.com/ethersphere/bee/pkg/pss"
 	"github.com/ethersphere/bee/pkg/resolver"
 	resolverMock "github.com/ethersphere/bee/pkg/resolver/mock"
@@ -32,7 +33,8 @@ type testServerOptions struct {
 	Storer             storage.Storer
 	Resolver           resolver.Interface
 	Pss                pss.Interface
-	Traversal          traversal.Service
+	Traversal          traversal.Traverser
+	Pinning            pinning.Interface
 	WsPath             string
 	Tags               *tags.Tags
 	GatewayMode        bool
@@ -44,6 +46,8 @@ type testServerOptions struct {
 }
 
 func newTestServer(t *testing.T, o testServerOptions) (*http.Client, *websocket.Conn, string) {
+	t.Helper()
+
 	if o.Logger == nil {
 		o.Logger = logging.New(ioutil.Discard, 0)
 	}
@@ -53,7 +57,7 @@ func newTestServer(t *testing.T, o testServerOptions) (*http.Client, *websocket.
 	if o.WsPingPeriod == 0 {
 		o.WsPingPeriod = 60 * time.Second
 	}
-	s := api.New(o.Tags, o.Storer, o.Resolver, o.Pss, o.Traversal, o.Feeds, o.Logger, nil, api.Options{
+	s := api.New(o.Tags, o.Storer, o.Resolver, o.Pss, o.Traversal, o.Pinning, o.Feeds, o.Logger, nil, api.Options{
 		CORSAllowedOrigins: o.CORSAllowedOrigins,
 		GatewayMode:        o.GatewayMode,
 		WsPingPeriod:       o.WsPingPeriod,
@@ -171,7 +175,7 @@ func TestParseName(t *testing.T) {
 				}))
 		}
 
-		s := api.New(nil, nil, tC.res, nil, nil, nil, tC.log, nil, api.Options{}).(*api.Server)
+		s := api.New(nil, nil, tC.res, nil, nil, nil, nil, tC.log, nil, api.Options{}).(*api.Server)
 
 		t.Run(tC.desc, func(t *testing.T) {
 			got, err := s.ResolveNameOrAddress(tC.name)

pkg/api/bytes.go

@@ -7,6 +7,7 @@ package api
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/ethersphere/bee/pkg/file/pipeline/builder"
 	"github.com/ethersphere/bee/pkg/jsonhttp"
@@ -66,6 +67,16 @@ func (s *server) bytesUploadHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
+
+	if strings.ToLower(r.Header.Get(SwarmPinHeader)) == "true" {
+		if err := s.pinning.CreatePin(ctx, address, false); err != nil {
+			logger.Debugf("bytes upload: creation of pin for %q failed: %v", address, err)
+			logger.Error("bytes upload: creation of pin failed")
+			jsonhttp.InternalServerError(w, nil)
+			return
+		}
+	}
+
 	w.Header().Set(SwarmTagHeader, fmt.Sprint(tag.Uid))
 	w.Header().Set("Access-Control-Expose-Headers", SwarmTagHeader)
 	jsonhttp.OK(w, bytesPostResponse{

pkg/api/bytes_test.go

@@ -6,38 +6,43 @@ package api_test
 
 import (
 	"bytes"
+	"context"
 	"io/ioutil"
 	"net/http"
 	"testing"
 
-	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
-
 	"github.com/ethersphere/bee/pkg/api"
 	"github.com/ethersphere/bee/pkg/jsonhttp"
 	"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
 	"github.com/ethersphere/bee/pkg/logging"
+	pinning "github.com/ethersphere/bee/pkg/pinning/mock"
+	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
 	"github.com/ethersphere/bee/pkg/storage/mock"
 	"github.com/ethersphere/bee/pkg/swarm"
 	"github.com/ethersphere/bee/pkg/tags"
-	mockbytes "gitlab.com/nolash/go-mockbytes"
+	"gitlab.com/nolash/go-mockbytes"
 )
 
 // TestBytes tests that the data upload api responds as expected when uploading,
 // downloading and requesting a resource that cannot be found.
 func TestBytes(t *testing.T) {
+	const (
+		resource = "/bytes"
+		targets  = "0x222"
+		expHash  = "29a5fb121ce96194ba8b7b823a1f9c6af87e1791f824940a53b5a7efe3f790d9"
+	)
+
 	var (
-		resource       = "/bytes"
-		targets        = "0x222"
-		expHash        = "29a5fb121ce96194ba8b7b823a1f9c6af87e1791f824940a53b5a7efe3f790d9"
-		mockStorer     = mock.NewStorer()
-		mockStatestore = statestore.NewStateStore()
-		logger         = logging.New(ioutil.Discard, 0)
-		client, _, _   = newTestServer(t, testServerOptions{
-			Storer: mockStorer,
-			Tags:   tags.NewTags(mockStatestore, logger),
-			Logger: logging.New(ioutil.Discard, 5),
+		storerMock   = mock.NewStorer()
+		pinningMock  = pinning.NewServiceMock()
+		client, _, _ = newTestServer(t, testServerOptions{
+			Storer:  storerMock,
+			Tags:    tags.NewTags(statestore.NewStateStore(), logging.New(ioutil.Discard, 0)),
+			Pinning: pinningMock,
+			Logger:  logging.New(ioutil.Discard, 5),
 		})
 	)
+
 	g := mockbytes.New(0, mockbytes.MockTypeStandard).WithModulus(255)
 	content, err := g.SequentialBytes(swarm.ChunkSize * 2)
 	if err != nil {
@@ -45,12 +50,54 @@ func TestBytes(t *testing.T) {
 	}
 
 	t.Run("upload", func(t *testing.T) {
+		chunkAddr := swarm.MustParseHexAddress(expHash)
 		jsonhttptest.Request(t, client, http.MethodPost, resource, http.StatusOK,
 			jsonhttptest.WithRequestBody(bytes.NewReader(content)),
 			jsonhttptest.WithExpectedJSONResponse(api.BytesPostResponse{
-				Reference: swarm.MustParseHexAddress(expHash),
+				Reference: chunkAddr,
 			}),
 		)
+
+		has, err := storerMock.Has(context.Background(), chunkAddr)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !has {
+			t.Fatal("storer check root chunk address: have none; want one")
+		}
+
+		if have, want := len(pinningMock.Entries()), 0; have != want {
+			t.Fatalf("root pin count mismatch: have %d; want %d", have, want)
+		}
+	})
+
+	t.Run("upload-with-pinning", func(t *testing.T) {
+		var res api.BytesPostResponse
+		jsonhttptest.Request(t, client, http.MethodPost, resource, http.StatusOK,
+			jsonhttptest.WithRequestBody(bytes.NewReader(content)),
+			jsonhttptest.WithRequestHeader(api.SwarmPinHeader, "true"),
+			jsonhttptest.WithUnmarshalJSONResponse(&res),
+		)
+		chunkAddr := res.Reference
+
+		has, err := storerMock.Has(context.Background(), chunkAddr)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !has {
+			t.Fatal("storer check root chunk address: have none; want one")
+		}
+
+		if have, want := len(pinningMock.Entries()), 1; have != want {
+			t.Fatalf("root pin count mismatch: have %d; want %d", have, want)
+		}
+		addrs, err := pinningMock.Pins()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if have, want := addrs[0], chunkAddr; !have.Equal(want) {
+			t.Fatalf("root pin reference mismatch: have %q; want %q", have, want)
+		}
 	})
 
 	t.Run("download", func(t *testing.T) {

pkg/api/bzz.go

@@ -224,6 +224,16 @@ func (s *server) fileUploadHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
+
+	if strings.ToLower(r.Header.Get(SwarmPinHeader)) == "true" {
+		if err := s.pinning.CreatePin(ctx, manifestReference, false); err != nil {
+			logger.Debugf("bzz upload file: creation of pin for %q failed: %v", manifestReference, err)
+			logger.Error("bzz upload file: creation of pin failed")
+			jsonhttp.InternalServerError(w, nil)
+			return
+		}
+	}
+
 	w.Header().Set("ETag", fmt.Sprintf("%q", manifestReference.String()))
 	w.Header().Set(SwarmTagHeader, fmt.Sprint(tag.Uid))
 	w.Header().Set("Access-Control-Expose-Headers", SwarmTagHeader)

pkg/api/bzz_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
 	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/manifest"
+	pinning "github.com/ethersphere/bee/pkg/pinning/mock"
 	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
 	"github.com/ethersphere/bee/pkg/storage"
 	smock "github.com/ethersphere/bee/pkg/storage/mock"
@@ -36,12 +37,15 @@ func TestBzzFiles(t *testing.T) {
 		targets              = "0x222"
 		fileDownloadResource = func(addr string) string { return "/bzz/" + addr }
 		simpleData           = []byte("this is a simple text")
-		mockStatestore       = statestore.NewStateStore()
+		storerMock           = smock.NewStorer()
+		statestoreMock       = statestore.NewStateStore()
+		pinningMock          = pinning.NewServiceMock()
 		logger               = logging.New(ioutil.Discard, 0)
 		client, _, _         = newTestServer(t, testServerOptions{
-			Storer: smock.NewStorer(),
-			Tags:   tags.NewTags(mockStatestore, logger),
-			Logger: logger,
+			Storer:  storerMock,
+			Pinning: pinningMock,
+			Tags:    tags.NewTags(statestoreMock, logger),
+			Logger:  logger,
 		})
 	)
 
@@ -83,14 +87,83 @@ func TestBzzFiles(t *testing.T) {
 				},
 			},
 		})
-		rootHash := "f30c0aa7e9e2a0ef4c9b1b750ebfeaeb7c7c24da700bb089da19a46e3677824b"
+		address := swarm.MustParseHexAddress("f30c0aa7e9e2a0ef4c9b1b750ebfeaeb7c7c24da700bb089da19a46e3677824b")
 		jsonhttptest.Request(t, client, http.MethodPost, fileUploadResource, http.StatusOK,
 			jsonhttptest.WithRequestBody(tr),
 			jsonhttptest.WithRequestHeader("Content-Type", api.ContentTypeTar),
 			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
-				Reference: swarm.MustParseHexAddress(rootHash),
+				Reference: address,
 			}),
 		)
+
+		has, err := storerMock.Has(context.Background(), address)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !has {
+			t.Fatal("storer check root chunk address: have none; want one")
+		}
+
+		if have, want := len(pinningMock.Entries()), 0; have != want {
+			t.Fatalf("root pin count mismatch: have %d; want %d", have, want)
+		}
+	})
+
+	t.Run("tar-file-upload-with-pinning", func(t *testing.T) {
+		tr := tarFiles(t, []f{
+			{
+				data: []byte("robots text"),
+				name: "robots.txt",
+				dir:  "",
+				header: http.Header{
+					"Content-Type": {"text/plain; charset=utf-8"},
+				},
+			},
+			{
+				data: []byte("image 1"),
+				name: "1.png",
+				dir:  "img",
+				header: http.Header{
+					"Content-Type": {"image/png"},
+				},
+			},
+			{
+				data: []byte("image 2"),
+				name: "2.png",
+				dir:  "img",
+				header: http.Header{
+					"Content-Type": {"image/png"},
+				},
+			},
+		})
+		address := swarm.MustParseHexAddress("f30c0aa7e9e2a0ef4c9b1b750ebfeaeb7c7c24da700bb089da19a46e3677824b")
+		jsonhttptest.Request(t, client, http.MethodPost, fileUploadResource, http.StatusOK,
+			jsonhttptest.WithRequestHeader(api.SwarmPinHeader, "true"),
+			jsonhttptest.WithRequestBody(tr),
+			jsonhttptest.WithRequestHeader("Content-Type", api.ContentTypeTar),
+			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
+				Reference: address,
+			}),
+		)
+
+		has, err := storerMock.Has(context.Background(), address)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !has {
+			t.Fatal("storer check root chunk address: have none; want one")
+		}
+
+		if have, want := len(pinningMock.Entries()), 1; have != want {
+			t.Fatalf("root pin count mismatch: have %d; want %d", have, want)
+		}
+		addrs, err := pinningMock.Pins()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if have, want := addrs[0], address; !have.Equal(want) {
+			t.Fatalf("root pin reference mismatch: have %q; want %q", have, want)
+		}
 	})
 
 	t.Run("encrypt-decrypt", func(t *testing.T) {

pkg/api/chunk.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"strings"
 
 	"github.com/ethersphere/bee/pkg/cac"
 	"github.com/ethersphere/bee/pkg/netstore"
@@ -111,6 +112,15 @@ func (s *server) chunkUploadHandler(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set(SwarmTagHeader, fmt.Sprint(tag.Uid))
 	}
 
+	if strings.ToLower(r.Header.Get(SwarmPinHeader)) == "true" {
+		if err := s.pinning.CreatePin(ctx, chunk.Address(), false); err != nil {
+			s.logger.Debugf("chunk upload: creation of pin for %q failed: %v", chunk.Address(), err)
+			s.logger.Error("chunk upload: creation of pin failed")
+			jsonhttp.InternalServerError(w, nil)
+			return
+		}
+	}
+
 	w.Header().Set("Access-Control-Expose-Headers", SwarmTagHeader)
 	jsonhttp.OK(w, chunkAddressResponse{Reference: chunk.Address()})
 }

pkg/api/chunk_test.go

@@ -6,11 +6,13 @@ package api_test
 
 import (
 	"bytes"
+	"context"
 	"io/ioutil"
 	"net/http"
 	"testing"
 
 	"github.com/ethersphere/bee/pkg/logging"
+	pinning "github.com/ethersphere/bee/pkg/pinning/mock"
 	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
 
 	"github.com/ethersphere/bee/pkg/tags"
@@ -34,13 +36,15 @@ func TestChunkUploadDownload(t *testing.T) {
 		chunksResource  = func(a swarm.Address) string { return "/chunks/" + a.String() }
 		resourceTargets = func(addr swarm.Address) string { return "/chunks/" + addr.String() + "?targets=" + targets }
 		chunk           = testingc.GenerateTestRandomChunk()
-		mockStatestore  = statestore.NewStateStore()
+		statestoreMock  = statestore.NewStateStore()
 		logger          = logging.New(ioutil.Discard, 0)
-		tag             = tags.NewTags(mockStatestore, logger)
-		mockStorer      = mock.NewStorer()
+		tag             = tags.NewTags(statestoreMock, logger)
+		storerMock      = mock.NewStorer()
+		pinningMock     = pinning.NewServiceMock()
 		client, _, _    = newTestServer(t, testServerOptions{
-			Storer: mockStorer,
-			Tags:   tag,
+			Storer:  storerMock,
+			Pinning: pinningMock,
+			Tags:    tag,
 		})
 	)
 
@@ -79,7 +83,7 @@ func TestChunkUploadDownload(t *testing.T) {
 		)
 
 		// Also check if the chunk is NOT pinned
-		if mockStorer.GetModeSet(chunk.Address()) == storage.ModeSetPin {
+		if storerMock.GetModeSet(chunk.Address()) == storage.ModeSetPin {
 			t.Fatal("chunk should not be pinned")
 		}
 	})
@@ -90,20 +94,35 @@ func TestChunkUploadDownload(t *testing.T) {
 		)
 
 		// Also check if the chunk is NOT pinned
-		if mockStorer.GetModeSet(chunk.Address()) == storage.ModeSetPin {
+		if storerMock.GetModeSet(chunk.Address()) == storage.ModeSetPin {
 			t.Fatal("chunk should not be pinned")
 		}
 	})
 	t.Run("pin-ok", func(t *testing.T) {
+		address := chunk.Address()
 		jsonhttptest.Request(t, client, http.MethodPost, chunksEndpoint, http.StatusOK,
 			jsonhttptest.WithRequestBody(bytes.NewReader(chunk.Data())),
-			jsonhttptest.WithExpectedJSONResponse(api.ChunkAddressResponse{Reference: chunk.Address()}),
+			jsonhttptest.WithExpectedJSONResponse(api.ChunkAddressResponse{Reference: address}),
 			jsonhttptest.WithRequestHeader(api.SwarmPinHeader, "True"),
 		)
 
-		// Also check if the chunk is pinned
-		if mockStorer.GetModePut(chunk.Address()) != storage.ModePutUploadPin {
-			t.Fatal("chunk is not pinned")
+		has, err := storerMock.Has(context.Background(), address)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !has {
+			t.Fatal("storer check root chunk address: have none; want one")
+		}
+
+		if have, want := len(pinningMock.Entries()), 1; have != want {
+			t.Fatalf("root pin count mismatch: have %d; want %d", have, want)
+		}
+		addrs, err := pinningMock.Pins()
+		if err != nil {
+			t.Fatal(err)
+		}
+		if have, want := addrs[0], address; !have.Equal(want) {
+			t.Fatalf("root pin reference mismatch: have %q; want %q", have, want)
 		}
 
 	})

pkg/api/dirs.go

@@ -95,6 +95,16 @@ func (s *server) dirUploadHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
+
+	if strings.ToLower(r.Header.Get(SwarmPinHeader)) == "true" {
+		if err := s.pinning.CreatePin(r.Context(), reference, false); err != nil {
+			logger.Debugf("bzz upload dir: creation of pin for %q failed: %v", reference, err)
+			logger.Error("bzz upload dir: creation of pin failed")
+			jsonhttp.InternalServerError(w, nil)
+			return
+		}
+	}
+
 	w.Header().Set(SwarmTagHeader, fmt.Sprint(tag.Uid))
 	jsonhttp.OK(w, bzzUploadResponse{
 		Reference: reference,

pkg/api/export_test.go

@@ -9,17 +9,14 @@ import "github.com/ethersphere/bee/pkg/swarm"
 type Server = server
 
 type (
-	BytesPostResponse        = bytesPostResponse
-	ChunkAddressResponse     = chunkAddressResponse
-	SocPostResponse          = socPostResponse
-	FeedReferenceResponse    = feedReferenceResponse
-	BzzUploadResponse        = bzzUploadResponse
-	TagResponse              = tagResponse
-	TagRequest               = tagRequest
-	ListTagsResponse         = listTagsResponse
-	PinnedChunk              = pinnedChunk
-	ListPinnedChunksResponse = listPinnedChunksResponse
-	UpdatePinCounter         = updatePinCounter
+	BytesPostResponse     = bytesPostResponse
+	ChunkAddressResponse  = chunkAddressResponse
+	SocPostResponse       = socPostResponse
+	FeedReferenceResponse = feedReferenceResponse
+	BzzUploadResponse     = bzzUploadResponse
+	TagResponse           = tagResponse
+	TagRequest            = tagRequest
+	ListTagsResponse      = listTagsResponse
 )
 
 var (

pkg/api/feed.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -170,6 +171,16 @@ func (s *server) feedPostHandler(w http.ResponseWriter, r *http.Request) {
 		jsonhttp.InternalServerError(w, nil)
 		return
 	}
+
+	if strings.ToLower(r.Header.Get(SwarmPinHeader)) == "true" {
+		if err := s.pinning.CreatePin(r.Context(), ref, false); err != nil {
+			s.logger.Debugf("feed post: creation of pin for %q failed: %v", ref, err)
+			s.logger.Error("feed post: creation of pin failed")
+			jsonhttp.InternalServerError(w, nil)
+			return
+		}
+	}
+
 	jsonhttp.Created(w, feedReferenceResponse{Reference: ref})
 }
 

pkg/api/gatewaymode_test.go

@@ -36,11 +36,11 @@ func TestGatewayMode(t *testing.T) {
 	})
 
 	t.Run("pinning endpoints", func(t *testing.T) {
-		path := "/pin/chunks/0773a91efd6547c754fc1d95fb1c62c7d1b47f959c2caa685dfec8736da95c1c"
+		path := "/pins/0773a91efd6547c754fc1d95fb1c62c7d1b47f959c2caa685dfec8736da95c1c"
 		jsonhttptest.Request(t, client, http.MethodGet, path, http.StatusForbidden, forbiddenResponseOption)
 		jsonhttptest.Request(t, client, http.MethodPost, path, http.StatusForbidden, forbiddenResponseOption)
 		jsonhttptest.Request(t, client, http.MethodDelete, path, http.StatusForbidden, forbiddenResponseOption)
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks", http.StatusForbidden, forbiddenResponseOption)
+		jsonhttptest.Request(t, client, http.MethodGet, "/pins", http.StatusForbidden, forbiddenResponseOption)
 	})
 
 	t.Run("tags endpoints", func(t *testing.T) {

pkg/api/pin.go

+// Copyright 2021 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package api
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/ethersphere/bee/pkg/jsonhttp"
+	"github.com/ethersphere/bee/pkg/pinning"
+	"github.com/ethersphere/bee/pkg/swarm"
+	"github.com/gorilla/mux"
+)
+
+// pinRootHash pins root hash of given address. This method is idempotent.
+func (s *server) pinRootHash(w http.ResponseWriter, r *http.Request) {
+	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
+	if err != nil {
+		s.logger.Debugf("pin root hash: unable to parse address %q: %v", addr, err)
+		s.logger.Error("pin root hash: unable to parse address")
+		jsonhttp.BadRequest(w, "bad address")
+		return
+	}
+
+	has, err := s.pinning.HasPin(addr)
+	if err != nil {
+		s.logger.Debugf("pin root hash: checking of tracking pin for %q failed: %v", addr, err)
+		s.logger.Error("pin root hash: checking of tracking pin failed")
+		jsonhttp.InternalServerError(w, nil)
+		return
+	}
+	if has {
+		jsonhttp.OK(w, nil)
+		return
+	}
+
+	err = s.pinning.CreatePin(r.Context(), addr, true)
+	if err != nil {
+		s.logger.Debugf("pin root hash: creation of tracking pin for %q failed: %v", addr, err)
+		s.logger.Error("pin root hash: creation of tracking pin failed")
+		jsonhttp.InternalServerError(w, nil)
+		return
+	}
+
+	jsonhttp.OK(w, nil)
+}
+
+// unpinRootHash unpin's an already pinned root hash. This method is idempotent.
+func (s *server) unpinRootHash(w http.ResponseWriter, r *http.Request) {
+	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
+	if err != nil {
+		s.logger.Debugf("unpin root hash: unable to parse address: %v", err)
+		s.logger.Error("unpin root hash: unable to parse address")
+		jsonhttp.BadRequest(w, "bad address")
+		return
+	}
+
+	has, err := s.pinning.HasPin(addr)
+	if err != nil {
+		s.logger.Debugf("pin root hash: checking of tracking pin for %q failed: %v", addr, err)
+		s.logger.Error("pin root hash: checking of tracking pin failed")
+		jsonhttp.InternalServerError(w, nil)
+		return
+	}
+	if !has {
+		jsonhttp.NotFound(w, nil)
+		return
+	}
+
+	switch err := s.pinning.DeletePin(r.Context(), addr); {
+	case errors.Is(err, pinning.ErrTraversal):
+		s.logger.Debugf("unpin root hash: deletion of pin for %q failed: %v", addr, err)
+		jsonhttp.InternalServerError(w, nil)
+		return
+	case err != nil:
+		s.logger.Debugf("unpin root hash: deletion of pin for %q failed: %v", addr, err)
+		s.logger.Error("unpin root hash: deletion of pin for failed")
+		jsonhttp.InternalServerError(w, nil)
+		return
+	}
+
+	jsonhttp.OK(w, nil)
+}
+
+// getPinnedRootHash returns back the given address if its root hash is pinned.
+func (s *server) getPinnedRootHash(w http.ResponseWriter, r *http.Request) {
+	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
+	if err != nil {
+		s.logger.Debugf("pinned root hash: unable to parse address %q: %v", addr, err)
+		s.logger.Error("pinned root hash: unable to parse address")
+		jsonhttp.BadRequest(w, "bad address")
+		return
+	}
+
+	has, err := s.pinning.HasPin(addr)
+	if err != nil {
+		s.logger.Debugf("pinned root hash: unable to check address %q in the localstore: %v", addr, err)
+		s.logger.Error("pinned root hash: unable to check address in the localstore")
+		jsonhttp.InternalServerError(w, nil)
+		return
+	}
+
+	if !has {
+		jsonhttp.NotFound(w, nil)
+		return
+	}
+
+	jsonhttp.OK(w, struct {
+		Address swarm.Address `json:"address"`
+	}{
+		Address: addr,
+	})
+}
+
+// listPinnedRootHashes lists all the address of the pinned root hashes..
+func (s *server) listPinnedRootHashes(w http.ResponseWriter, r *http.Request) {
+	pinned, err := s.pinning.Pins()
+	if err != nil {
+		s.logger.Debugf("list pinned root addresses: unable to list addresses: %v", err)
+		s.logger.Error("list pinned root addresses: unable to list addresses")
+		jsonhttp.InternalServerError(w, nil)
+		return
+	}
+
+	jsonhttp.OK(w, struct {
+		Addresses []swarm.Address `json:"addresses"`
+	}{
+		Addresses: pinned,
+	})
+}

pkg/api/pin_bytes.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api
-
-import (
-	"errors"
-	"net/http"
-
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/storage"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/ethersphere/bee/pkg/traversal"
-	"github.com/gorilla/mux"
-)
-
-// pinBytes is used to pin an already uploaded content.
-func (s *server) pinBytes(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin bytes: parse address: %v", err)
-		s.logger.Error("pin bytes: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin bytes: localstore has: %v", err)
-		s.logger.Error("pin bytes: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		_, err := s.storer.Get(r.Context(), storage.ModeGetRequest, addr)
-		if err != nil {
-			s.logger.Debugf("pin chunk: netstore get: %v", err)
-			s.logger.Error("pin chunk: netstore")
-
-			jsonhttp.NotFound(w, nil)
-			return
-		}
-	}
-
-	ctx := r.Context()
-
-	chunkAddressFn := s.pinChunkAddressFn(ctx, addr)
-
-	err = s.traversal.TraverseBytesAddresses(ctx, addr, chunkAddressFn)
-	if err != nil {
-		s.logger.Debugf("pin bytes: traverse chunks: %v, addr %s", err, addr)
-
-		if errors.Is(err, traversal.ErrInvalidType) {
-			s.logger.Error("pin bytes: invalid type")
-			jsonhttp.BadRequest(w, "invalid type")
-			return
-		}
-
-		s.logger.Error("pin bytes: cannot pin")
-		jsonhttp.InternalServerError(w, "cannot pin")
-		return
-	}
-
-	jsonhttp.OK(w, nil)
-}
-
-// unpinBytes removes pinning from content.
-func (s *server) unpinBytes(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin bytes: parse address: %v", err)
-		s.logger.Error("pin bytes: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin bytes: localstore has: %v", err)
-		s.logger.Error("pin bytes: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	ctx := r.Context()
-
-	chunkAddressFn := s.unpinChunkAddressFn(ctx, addr)
-
-	err = s.traversal.TraverseBytesAddresses(ctx, addr, chunkAddressFn)
-	if err != nil {
-		s.logger.Debugf("pin bytes: traverse chunks: %v, addr %s", err, addr)
-
-		if errors.Is(err, traversal.ErrInvalidType) {
-			s.logger.Error("pin bytes: invalid type")
-			jsonhttp.BadRequest(w, "invalid type")
-			return
-		}
-
-		s.logger.Error("pin bytes: cannot unpin")
-		jsonhttp.InternalServerError(w, "cannot unpin")
-		return
-	}
-
-	jsonhttp.OK(w, nil)
-}

pkg/api/pin_bytes_test.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"net/http"
-	"sort"
-	"testing"
-
-	"github.com/ethersphere/bee/pkg/api"
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
-	"github.com/ethersphere/bee/pkg/logging"
-	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
-	"github.com/ethersphere/bee/pkg/storage/mock"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/ethersphere/bee/pkg/tags"
-	"github.com/ethersphere/bee/pkg/traversal"
-)
-
-func TestPinBytesHandler(t *testing.T) {
-	var (
-		bytesUploadResource     = "/bytes"
-		pinBytesResource        = "/pin/bytes"
-		pinBytesAddressResource = func(addr string) string { return pinBytesResource + "/" + addr }
-		pinChunksResource       = "/pin/chunks"
-
-		simpleData = []byte("this is a simple text")
-
-		mockStorer       = mock.NewStorer()
-		mockStatestore   = statestore.NewStateStore()
-		traversalService = traversal.NewService(mockStorer)
-		logger           = logging.New(ioutil.Discard, 0)
-		client, _, _     = newTestServer(t, testServerOptions{
-			Storer:    mockStorer,
-			Traversal: traversalService,
-			Tags:      tags.NewTags(mockStatestore, logger),
-		})
-	)
-
-	t.Run("pin-bytes-1", func(t *testing.T) {
-		rootHash := "838d0a193ecd1152d1bb1432d5ecc02398533b2494889e23b8bd5ace30ac2aeb"
-
-		jsonhttptest.Request(t, client, http.MethodPost, bytesUploadResource, http.StatusOK,
-			jsonhttptest.WithRequestBody(bytes.NewReader(simpleData)),
-			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
-				Reference: swarm.MustParseHexAddress(rootHash),
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodPost, pinBytesAddressResource(rootHash), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		hashes := []string{rootHash}
-		sort.Strings(hashes)
-
-		expectedResponse := api.ListPinnedChunksResponse{
-			Chunks: []api.PinnedChunk{},
-		}
-
-		for _, h := range hashes {
-			expectedResponse.Chunks = append(expectedResponse.Chunks, api.PinnedChunk{
-				Address:    swarm.MustParseHexAddress(h),
-				PinCounter: 1,
-			})
-		}
-
-		jsonhttptest.Request(t, client, http.MethodGet, pinChunksResource, http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(expectedResponse),
-		)
-	})
-
-	t.Run("unpin-bytes-1", func(t *testing.T) {
-		rootHash := "838d0a193ecd1152d1bb1432d5ecc02398533b2494889e23b8bd5ace30ac2aeb"
-
-		jsonhttptest.Request(t, client, http.MethodDelete, pinBytesAddressResource(rootHash), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodGet, pinChunksResource, http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.ListPinnedChunksResponse{
-				Chunks: []api.PinnedChunk{},
-			}),
-		)
-	})
-
-	t.Run("pin-bytes-2", func(t *testing.T) {
-		var b []byte
-		for {
-			b = append(b, simpleData...)
-			if len(b) > swarm.ChunkSize {
-				break
-			}
-		}
-
-		rootHash := "42ee01ae3a50663ca0903f2d5c3b55fc5ef4faf98368b74cf9a24c75955fa388"
-		data1Hash := "933db58bbd119e5d3a8eb4fc7d4a923d5e7cfc7ca35b07832ced495d05721b6d"
-		data2Hash := "430274f4e6d2af72b5491ad0dc7707e45892fb3a166c54b6ac9cee3c14149757"
-
-		jsonhttptest.Request(t, client, http.MethodPost, bytesUploadResource, http.StatusOK,
-			jsonhttptest.WithRequestBody(bytes.NewReader(b)),
-			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
-				Reference: swarm.MustParseHexAddress(rootHash),
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodPost, pinBytesAddressResource(rootHash), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		hashes := []string{rootHash, data1Hash, data2Hash}
-		sort.Strings(hashes)
-
-		// NOTE: all this because we cannot rely on sort from response
-
-		var resp api.ListPinnedChunksResponse
-
-		jsonhttptest.Request(t, client, http.MethodGet, pinChunksResource, http.StatusOK,
-			jsonhttptest.WithUnmarshalJSONResponse(&resp),
-		)
-
-		if len(hashes) != len(resp.Chunks) {
-			t.Fatalf("expected to find %d pinned chunks, got %d", len(hashes), len(resp.Chunks))
-		}
-
-		respChunksHashes := make([]string, 0)
-
-		for _, rc := range resp.Chunks {
-			respChunksHashes = append(respChunksHashes, rc.Address.String())
-		}
-
-		sort.Strings(respChunksHashes)
-
-		for i, h := range hashes {
-			if h != respChunksHashes[i] {
-				t.Fatalf("expected to find %s address, found %s", h, respChunksHashes[i])
-			}
-		}
-	})
-
-}

pkg/api/pin_bzz.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api
-
-import (
-	"errors"
-	"net/http"
-
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/storage"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/ethersphere/bee/pkg/traversal"
-	"github.com/gorilla/mux"
-)
-
-// pinBzz is used to pin an already uploaded content.
-func (s *server) pinBzz(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin bzz: parse address: %v", err)
-		s.logger.Error("pin bzz: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin bzz: localstore has: %v", err)
-		s.logger.Error("pin bzz: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		_, err := s.storer.Get(r.Context(), storage.ModeGetRequest, addr)
-		if err != nil {
-			s.logger.Debugf("pin chunk: netstore get: %v", err)
-			s.logger.Error("pin chunk: netstore")
-
-			jsonhttp.NotFound(w, nil)
-			return
-		}
-	}
-
-	ctx := r.Context()
-
-	chunkAddressFn := s.pinChunkAddressFn(ctx, addr)
-
-	err = s.traversal.TraverseManifestAddresses(ctx, addr, chunkAddressFn)
-	if err != nil {
-		s.logger.Debugf("pin bzz: traverse chunks: %v, addr %s", err, addr)
-
-		if errors.Is(err, traversal.ErrInvalidType) {
-			s.logger.Error("pin bzz: invalid type")
-			jsonhttp.BadRequest(w, "invalid type")
-			return
-		}
-
-		s.logger.Error("pin bzz: cannot pin")
-		jsonhttp.InternalServerError(w, "cannot pin")
-		return
-	}
-
-	jsonhttp.OK(w, nil)
-}
-
-// unpinBzz removes pinning from content.
-func (s *server) unpinBzz(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin bzz: parse address: %v", err)
-		s.logger.Error("pin bzz: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin bzz: localstore has: %v", err)
-		s.logger.Error("pin bzz: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	ctx := r.Context()
-
-	chunkAddressFn := s.unpinChunkAddressFn(ctx, addr)
-
-	err = s.traversal.TraverseManifestAddresses(ctx, addr, chunkAddressFn)
-	if err != nil {
-		s.logger.Debugf("pin bzz: traverse chunks: %v, addr %s", err, addr)
-
-		if errors.Is(err, traversal.ErrInvalidType) {
-			s.logger.Error("pin bzz: invalid type")
-			jsonhttp.BadRequest(w, "invalid type")
-			return
-		}
-
-		s.logger.Error("pin bzz: cannot unpin")
-		jsonhttp.InternalServerError(w, "cannot unpin")
-		return
-	}
-
-	jsonhttp.OK(w, nil)
-}

pkg/api/pin_bzz_test.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api_test
-
-import (
-	"io/ioutil"
-	"net/http"
-	"testing"
-
-	"github.com/ethersphere/bee/pkg/api"
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
-	"github.com/ethersphere/bee/pkg/logging"
-	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
-	"github.com/ethersphere/bee/pkg/storage/mock"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/ethersphere/bee/pkg/tags"
-	"github.com/ethersphere/bee/pkg/traversal"
-)
-
-func TestPinBzzHandler(t *testing.T) {
-	var (
-		dirUploadResource     = "/bzz"
-		pinBzzResource        = "/pin/bzz"
-		pinBzzAddressResource = func(addr string) string { return pinBzzResource + "/" + addr }
-		pinChunksResource     = "/pin/chunks"
-
-		mockStorer       = mock.NewStorer()
-		mockStatestore   = statestore.NewStateStore()
-		traversalService = traversal.NewService(mockStorer)
-		logger           = logging.New(ioutil.Discard, 0)
-		client, _, _     = newTestServer(t, testServerOptions{
-			Storer:    mockStorer,
-			Traversal: traversalService,
-			Tags:      tags.NewTags(mockStatestore, logger),
-			Logger:    logger,
-		})
-	)
-
-	t.Run("pin-bzz-1", func(t *testing.T) {
-		files := []f{
-			{
-				data: []byte("<h1>Swarm"),
-				name: "index.html",
-				dir:  "",
-			},
-		}
-
-		tarReader := tarFiles(t, files)
-
-		rootHash := "9e178dbd1ed4b748379e25144e28dfb29c07a4b5114896ef454480115a56b237"
-
-		// verify directory tar upload response
-		jsonhttptest.Request(t, client, http.MethodPost, dirUploadResource, http.StatusOK,
-			jsonhttptest.WithRequestBody(tarReader),
-			jsonhttptest.WithRequestHeader("Content-Type", api.ContentTypeTar),
-			jsonhttptest.WithRequestHeader(api.SwarmCollectionHeader, "True"),
-			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
-				Reference: swarm.MustParseHexAddress(rootHash),
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodPost, pinBzzAddressResource(rootHash), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		expectedChunkCount := 3
-
-		// get the reference as everytime it will change because of random encryption key
-		var resp api.ListPinnedChunksResponse
-
-		jsonhttptest.Request(t, client, http.MethodGet, pinChunksResource, http.StatusOK,
-			jsonhttptest.WithUnmarshalJSONResponse(&resp),
-		)
-
-		if expectedChunkCount != len(resp.Chunks) {
-			t.Fatalf("expected to find %d pinned chunks, got %d", expectedChunkCount, len(resp.Chunks))
-		}
-	})
-
-	t.Run("unpin-bzz-1", func(t *testing.T) {
-		rootHash := "9e178dbd1ed4b748379e25144e28dfb29c07a4b5114896ef454480115a56b237"
-
-		jsonhttptest.Request(t, client, http.MethodDelete, pinBzzAddressResource(rootHash), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodGet, pinChunksResource, http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.ListPinnedChunksResponse{
-				Chunks: []api.PinnedChunk{},
-			}),
-		)
-	})
-
-}

pkg/api/pin_chunks.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"math"
-	"net/http"
-	"strconv"
-
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/storage"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/gorilla/mux"
-)
-
-// pinChunk pin's the already created chunk given its address.
-// it fails if the chunk is not present in the local store.
-// It also increments a pin counter to keep track of how many pin requests
-// are originating for this chunk.
-func (s *server) pinChunk(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin chunk: parse chunk address: %v", err)
-		s.logger.Error("pin chunk: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	err = s.storer.Set(r.Context(), storage.ModeSetPin, addr)
-	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
-			ch, err := s.storer.Get(r.Context(), storage.ModeGetRequest, addr)
-			if err != nil {
-				s.logger.Debugf("pin chunk: netstore get: %v", err)
-				s.logger.Error("pin chunk: netstore")
-
-				jsonhttp.NotFound(w, nil)
-				return
-			}
-
-			_, err = s.storer.Put(r.Context(), storage.ModePutRequestPin, ch)
-			if err != nil {
-				s.logger.Debugf("pin chunk: storer put pin: %v", err)
-				s.logger.Error("pin chunk: storer put pin")
-
-				jsonhttp.InternalServerError(w, err)
-				return
-			}
-		} else {
-			s.logger.Debugf("pin chunk: pinning error: %v, addr %s", err, addr)
-			s.logger.Error("pin chunk: cannot pin chunk")
-
-			jsonhttp.InternalServerError(w, "cannot pin chunk")
-			return
-		}
-	}
-
-	jsonhttp.OK(w, nil)
-}
-
-// unpinChunk unpin's an already pinned chunk. If the chunk is not present or the
-// if the pin counter is zero, it raises error.
-func (s *server) unpinChunk(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin chunk: parse chunk address: %v", err)
-		s.logger.Error("pin chunk: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin chunk: localstore has: %v", err)
-		s.logger.Error("pin chunk: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	_, err = s.storer.PinCounter(addr)
-	if err != nil {
-		s.logger.Debugf("pin chunk: not pinned: %v", err)
-		s.logger.Error("pin chunk: pin counter")
-		jsonhttp.BadRequest(w, "chunk is not yet pinned")
-		return
-	}
-
-	err = s.storer.Set(r.Context(), storage.ModeSetUnpin, addr)
-	if err != nil {
-		s.logger.Debugf("pin chunk: unpinning error: %v, addr %s", err, addr)
-		s.logger.Error("pin chunk: unpin")
-		jsonhttp.InternalServerError(w, "cannot unpin chunk")
-		return
-	}
-	jsonhttp.OK(w, nil)
-}
-
-type pinnedChunk struct {
-	Address    swarm.Address `json:"address"`
-	PinCounter uint64        `json:"pinCounter"`
-}
-
-type listPinnedChunksResponse struct {
-	Chunks []pinnedChunk `json:"chunks"`
-}
-
-// listPinnedChunks lists all the chunk address and pin counters that are currently pinned.
-func (s *server) listPinnedChunks(w http.ResponseWriter, r *http.Request) {
-	var (
-		err           error
-		offset, limit = 0, 100 // default offset is 0, default limit 100
-	)
-
-	if v := r.URL.Query().Get("offset"); v != "" {
-		offset, err = strconv.Atoi(v)
-		if err != nil {
-			s.logger.Debugf("list pins: parse offset: %v", err)
-			s.logger.Errorf("list pins: bad offset")
-			jsonhttp.BadRequest(w, "bad offset")
-		}
-	}
-	if v := r.URL.Query().Get("limit"); v != "" {
-		limit, err = strconv.Atoi(v)
-		if err != nil {
-			s.logger.Debugf("list pins: parse limit: %v", err)
-			s.logger.Errorf("list pins: bad limit")
-			jsonhttp.BadRequest(w, "bad limit")
-		}
-	}
-
-	pinnedChunks, err := s.storer.PinnedChunks(r.Context(), offset, limit)
-	if err != nil {
-		s.logger.Debugf("list pins: list pinned: %v", err)
-		s.logger.Errorf("list pins: list pinned")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	chunks := make([]pinnedChunk, len(pinnedChunks))
-	for i, c := range pinnedChunks {
-		chunks[i] = pinnedChunk(*c)
-	}
-
-	jsonhttp.OK(w, listPinnedChunksResponse{
-		Chunks: chunks,
-	})
-}
-
-func (s *server) getPinnedChunk(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin counter: parse chunk ddress: %v", err)
-		s.logger.Errorf("pin counter: parse address")
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin counter: localstore has: %v", err)
-		s.logger.Errorf("pin counter: store")
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	if !has {
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	pinCounter, err := s.storer.PinCounter(addr)
-	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
-			jsonhttp.NotFound(w, nil)
-			return
-		}
-		s.logger.Debugf("pin counter: get pin counter: %v", err)
-		s.logger.Errorf("pin counter: get pin counter")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-	jsonhttp.OK(w, pinnedChunk{
-		Address:    addr,
-		PinCounter: pinCounter,
-	})
-}
-
-type updatePinCounter struct {
-	PinCounter uint64 `json:"pinCounter"`
-}
-
-// updatePinnedChunkPinCounter allows changing the pin counter for the chunk.
-func (s *server) updatePinnedChunkPinCounter(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("update pin counter: parse chunk ddress: %v", err)
-		s.logger.Errorf("update pin counter: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("update pin counter: localstore has: %v", err)
-		s.logger.Errorf("update pin counter: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	pinCounter, err := s.storer.PinCounter(addr)
-	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
-			jsonhttp.NotFound(w, nil)
-			return
-		}
-		s.logger.Debugf("pin counter: get pin counter: %v", err)
-		s.logger.Errorf("pin counter: get pin counter")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	body, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		if jsonhttp.HandleBodyReadError(err, w) {
-			return
-		}
-		s.logger.Debugf("update pin counter: read request body error: %v", err)
-		s.logger.Error("update pin counter: read request body error")
-		jsonhttp.InternalServerError(w, "cannot read request")
-		return
-	}
-
-	newPinCount := updatePinCounter{}
-	if len(body) > 0 {
-		err = json.Unmarshal(body, &newPinCount)
-		if err != nil {
-			s.logger.Debugf("update pin counter: unmarshal pin counter error: %v", err)
-			s.logger.Errorf("update pin counter: unmarshal pin counter error")
-			jsonhttp.InternalServerError(w, "error unmarshaling pin counter")
-			return
-		}
-	}
-
-	if newPinCount.PinCounter > math.MaxInt32 {
-		s.logger.Errorf("update pin counter: invalid pin counter %d", newPinCount.PinCounter)
-		jsonhttp.BadRequest(w, "invalid pin counter")
-		return
-	}
-
-	diff := newPinCount.PinCounter - pinCounter
-
-	err = s.updatePinCount(r.Context(), addr, int(diff))
-	if err != nil {
-		s.logger.Debugf("update pin counter: update error: %v, addr %s", err, addr)
-		s.logger.Error("update pin counter: update")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	pinCounter, err = s.storer.PinCounter(addr)
-	if err != nil {
-		if errors.Is(err, storage.ErrNotFound) {
-			pinCounter = 0
-		} else {
-			s.logger.Debugf("update pin counter: get pin counter: %v", err)
-			s.logger.Errorf("update pin counter: get pin counter")
-			jsonhttp.InternalServerError(w, err)
-			return
-		}
-	}
-
-	jsonhttp.OK(w, pinnedChunk{
-		Address:    addr,
-		PinCounter: pinCounter,
-	})
-}
-
-// updatePinCount changes pin counter for a chunk address.
-// This is done with a loop, depending on the delta value supplied.
-// NOTE: If the value is too large, it will result in many database operations.
-func (s *server) updatePinCount(ctx context.Context, reference swarm.Address, delta int) error {
-	diff := delta
-	mode := storage.ModeSetPin
-
-	if diff < 0 {
-		diff = -diff
-		mode = storage.ModeSetUnpin
-	}
-
-	for i := 0; i < diff; i++ {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
-
-		err := s.storer.Set(ctx, mode, reference)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (s *server) pinChunkAddressFn(ctx context.Context, reference swarm.Address) func(address swarm.Address) error {
-	return func(address swarm.Address) error {
-		// NOTE: stop pinning on first error
-
-		err := s.storer.Set(ctx, storage.ModeSetPin, address)
-		if err != nil {
-			if errors.Is(err, storage.ErrNotFound) {
-				// chunk not found locally, try to get from netstore
-				ch, err := s.storer.Get(ctx, storage.ModeGetRequest, address)
-				if err != nil {
-					s.logger.Debugf("pin traversal: storer get: for reference %s, address %s: %w", reference, address, err)
-					return err
-				}
-
-				_, err = s.storer.Put(ctx, storage.ModePutRequestPin, ch)
-				if err != nil {
-					s.logger.Debugf("pin traversal: storer put pin: for reference %s, address %s: %w", reference, address, err)
-					return err
-				}
-
-				return nil
-			}
-
-			s.logger.Debugf("pin traversal: storer set pin: for reference %s, address %s: %w", reference, address, err)
-			return err
-		}
-
-		return nil
-	}
-}
-
-func (s *server) unpinChunkAddressFn(ctx context.Context, reference swarm.Address) func(address swarm.Address) error {
-	return func(address swarm.Address) error {
-		_, err := s.storer.PinCounter(address)
-		if err != nil {
-			return err
-		}
-
-		err = s.storer.Set(ctx, storage.ModeSetUnpin, address)
-		if err != nil {
-			s.logger.Debugf("unpin traversal: for reference %s, address %s: %w", reference, address, err)
-			// continue un-pinning all chunks
-		}
-
-		return nil
-	}
-}

pkg/api/pin_chunks_test.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"net/http"
-	"testing"
-
-	"github.com/ethersphere/bee/pkg/logging"
-	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
-
-	"github.com/ethersphere/bee/pkg/api"
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
-	"github.com/ethersphere/bee/pkg/storage/mock"
-	testingc "github.com/ethersphere/bee/pkg/storage/testing"
-	"github.com/ethersphere/bee/pkg/tags"
-)
-
-// TestPinChunkHandler checks for pinning, unpinning and listing of chunks.
-// It also check other edgw cases like chunk not present and checking for pinning,
-// invalid chunk address case etc. This test case has to be run in sequence and
-// it assumes some state of the DB before another case is run.
-func TestPinChunkHandler(t *testing.T) {
-	var (
-		chunksEndpoint = "/chunks"
-		chunk          = testingc.GenerateTestRandomChunk()
-		mockStorer     = mock.NewStorer()
-		mockStatestore = statestore.NewStateStore()
-		logger         = logging.New(ioutil.Discard, 0)
-		tag            = tags.NewTags(mockStatestore, logger)
-
-		client, _, _ = newTestServer(t, testServerOptions{
-			Storer: mockStorer,
-			Tags:   tag,
-			Logger: logger,
-		})
-	)
-
-	// bad chunk address
-	t.Run("pin-bad-address", func(t *testing.T) {
-		jsonhttptest.Request(t, client, http.MethodPost, "/pin/chunks/abcd1100zz", http.StatusBadRequest,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: "bad address",
-				Code:    http.StatusBadRequest,
-			}),
-		)
-	})
-
-	// list pins without anything pinned
-	t.Run("list-pins-zero-pins", func(t *testing.T) {
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks", http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.ListPinnedChunksResponse{
-				Chunks: []api.PinnedChunk{},
-			}),
-		)
-	})
-
-	// pin a chunk which is not existing
-	t.Run("pin-absent-chunk", func(t *testing.T) {
-		jsonhttptest.Request(t, client, http.MethodPost, "/pin/chunks/123456", http.StatusNotFound,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusNotFound),
-				Code:    http.StatusNotFound,
-			}),
-		)
-	})
-
-	// unpin on a chunk which is not pinned
-	t.Run("unpin-while-not-pinned", func(t *testing.T) {
-		// Post a chunk
-		jsonhttptest.Request(t, client, http.MethodPost, chunksEndpoint, http.StatusOK,
-			jsonhttptest.WithRequestBody(bytes.NewReader(chunk.Data())),
-			jsonhttptest.WithExpectedJSONResponse(api.ChunkAddressResponse{Reference: chunk.Address()}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodDelete, "/pin/chunks/"+chunk.Address().String(), http.StatusBadRequest,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: "chunk is not yet pinned",
-				Code:    http.StatusBadRequest,
-			}),
-		)
-	})
-
-	// pin a existing chunk first time
-	t.Run("pin-chunk-1", func(t *testing.T) {
-		// Post a chunk
-		jsonhttptest.Request(t, client, http.MethodPost, chunksEndpoint, http.StatusOK,
-			jsonhttptest.WithRequestBody(bytes.NewReader(chunk.Data())),
-			jsonhttptest.WithExpectedJSONResponse(api.ChunkAddressResponse{Reference: chunk.Address()}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodPost, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		// Check is the chunk is pinned once
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.PinnedChunk{
-				Address:    chunk.Address(),
-				PinCounter: 1,
-			}),
-		)
-
-	})
-
-	// pin a existing chunk second time
-	t.Run("pin-chunk-2", func(t *testing.T) {
-		jsonhttptest.Request(t, client, http.MethodPost, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		// Check is the chunk is pinned twice
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.PinnedChunk{
-				Address:    chunk.Address(),
-				PinCounter: 2,
-			}),
-		)
-	})
-
-	// unpin a chunk first time
-	t.Run("unpin-chunk-1", func(t *testing.T) {
-		jsonhttptest.Request(t, client, http.MethodDelete, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		// Check is the chunk is pinned once
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.PinnedChunk{
-				Address:    chunk.Address(),
-				PinCounter: 1,
-			}),
-		)
-	})
-
-	// unpin a chunk second time
-	t.Run("unpin-chunk-2", func(t *testing.T) {
-		jsonhttptest.Request(t, client, http.MethodDelete, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		// Check if the chunk is removed from the pinIndex
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks/"+chunk.Address().String(), http.StatusNotFound,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusNotFound),
-				Code:    http.StatusNotFound,
-			}),
-		)
-	})
-
-	// Add 2 chunks, pin it and check if they show up in the list
-	t.Run("list-chunks", func(t *testing.T) {
-		// Post a chunk
-		jsonhttptest.Request(t, client, http.MethodPost, chunksEndpoint, http.StatusOK,
-			jsonhttptest.WithRequestBody(bytes.NewReader(chunk.Data())),
-			jsonhttptest.WithExpectedJSONResponse(api.ChunkAddressResponse{Reference: chunk.Address()}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodPost, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		// post another chunk
-		chunk2 := testingc.GenerateTestRandomChunk()
-		jsonhttptest.Request(t, client, http.MethodPost, chunksEndpoint, http.StatusOK,
-			jsonhttptest.WithRequestBody(bytes.NewReader(chunk2.Data())),
-			jsonhttptest.WithExpectedJSONResponse(api.ChunkAddressResponse{Reference: chunk2.Address()}),
-		)
-		jsonhttptest.Request(t, client, http.MethodPost, "/pin/chunks/"+chunk2.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks", http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.ListPinnedChunksResponse{
-				Chunks: []api.PinnedChunk{
-					{
-						Address:    chunk.Address(),
-						PinCounter: 1,
-					},
-					{
-						Address:    chunk2.Address(),
-						PinCounter: 1,
-					},
-				},
-			}),
-		)
-	})
-
-	t.Run("update-pin-counter-up", func(t *testing.T) {
-		updatePinCounter := api.UpdatePinCounter{
-			PinCounter: 7,
-		}
-
-		jsonhttptest.Request(t, client, http.MethodPut, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithJSONRequestBody(updatePinCounter),
-			jsonhttptest.WithExpectedJSONResponse(api.PinnedChunk{
-				Address:    chunk.Address(),
-				PinCounter: updatePinCounter.PinCounter,
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.PinnedChunk{
-				Address:    chunk.Address(),
-				PinCounter: updatePinCounter.PinCounter,
-			}),
-		)
-	})
-
-	t.Run("update-pin-counter-to-zero", func(t *testing.T) {
-		updatePinCounter := api.UpdatePinCounter{
-			PinCounter: 0,
-		}
-
-		jsonhttptest.Request(t, client, http.MethodPut, "/pin/chunks/"+chunk.Address().String(), http.StatusOK,
-			jsonhttptest.WithJSONRequestBody(updatePinCounter),
-			jsonhttptest.WithExpectedJSONResponse(api.PinnedChunk{
-				Address:    chunk.Address(),
-				PinCounter: updatePinCounter.PinCounter,
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodGet, "/pin/chunks/"+chunk.Address().String(), http.StatusNotFound,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusNotFound),
-				Code:    http.StatusNotFound,
-			}),
-		)
-	})
-
-}

pkg/api/pin_files.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api
-
-import (
-	"errors"
-	"net/http"
-
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/storage"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/ethersphere/bee/pkg/traversal"
-	"github.com/gorilla/mux"
-)
-
-// pinFile is used to pin an already uploaded content.
-func (s *server) pinFile(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin files: parse address: %v", err)
-		s.logger.Error("pin files: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin files: localstore has: %v", err)
-		s.logger.Error("pin files: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		_, err := s.storer.Get(r.Context(), storage.ModeGetRequest, addr)
-		if err != nil {
-			s.logger.Debugf("pin chunk: netstore get: %v", err)
-			s.logger.Error("pin chunk: netstore")
-
-			jsonhttp.NotFound(w, nil)
-			return
-		}
-	}
-
-	ctx := r.Context()
-
-	chunkAddressFn := s.pinChunkAddressFn(ctx, addr)
-
-	err = s.traversal.TraverseAddresses(ctx, addr, chunkAddressFn)
-	if err != nil {
-		s.logger.Debugf("pin files: traverse chunks: %v, addr %s", err, addr)
-
-		if errors.Is(err, traversal.ErrInvalidType) {
-			s.logger.Error("pin files: invalid type")
-			jsonhttp.BadRequest(w, "invalid type")
-			return
-		}
-
-		s.logger.Error("pin files: cannot pin")
-		jsonhttp.InternalServerError(w, "cannot pin")
-		return
-	}
-
-	jsonhttp.OK(w, nil)
-}
-
-// unpinFile removes pinning from content.
-func (s *server) unpinFile(w http.ResponseWriter, r *http.Request) {
-	addr, err := swarm.ParseHexAddress(mux.Vars(r)["address"])
-	if err != nil {
-		s.logger.Debugf("pin files: parse address: %v", err)
-		s.logger.Error("pin files: parse address")
-		jsonhttp.BadRequest(w, "bad address")
-		return
-	}
-
-	has, err := s.storer.Has(r.Context(), addr)
-	if err != nil {
-		s.logger.Debugf("pin files: localstore has: %v", err)
-		s.logger.Error("pin files: store")
-		jsonhttp.InternalServerError(w, err)
-		return
-	}
-
-	if !has {
-		jsonhttp.NotFound(w, nil)
-		return
-	}
-
-	ctx := r.Context()
-
-	chunkAddressFn := s.unpinChunkAddressFn(ctx, addr)
-
-	err = s.traversal.TraverseAddresses(ctx, addr, chunkAddressFn)
-	if err != nil {
-		s.logger.Debugf("pin files: traverse chunks: %v, addr %s", err, addr)
-
-		if errors.Is(err, traversal.ErrInvalidType) {
-			s.logger.Error("pin files: invalid type")
-			jsonhttp.BadRequest(w, "invalid type")
-			return
-		}
-
-		s.logger.Error("pin files: cannot unpin")
-		jsonhttp.InternalServerError(w, "cannot unpin")
-		return
-	}
-
-	jsonhttp.OK(w, nil)
-}

pkg/api/pin_files_test.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package api_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"net/http"
-	"testing"
-
-	"github.com/ethersphere/bee/pkg/api"
-	"github.com/ethersphere/bee/pkg/jsonhttp"
-	"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
-	"github.com/ethersphere/bee/pkg/logging"
-	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
-	"github.com/ethersphere/bee/pkg/storage/mock"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/ethersphere/bee/pkg/tags"
-	"github.com/ethersphere/bee/pkg/traversal"
-)
-
-func TestPinFilesHandler(t *testing.T) {
-	var (
-		fileUploadResource      = "/bzz"
-		pinFilesResource        = "/pin/files"
-		pinFilesAddressResource = func(addr string) string { return pinFilesResource + "/" + addr }
-		pinChunksResource       = "/pin/chunks"
-
-		simpleData = []byte("this is a simple text")
-
-		mockStorer       = mock.NewStorer()
-		mockStatestore   = statestore.NewStateStore()
-		traversalService = traversal.NewService(mockStorer)
-		logger           = logging.New(ioutil.Discard, 0)
-		client, _, _     = newTestServer(t, testServerOptions{
-			Storer:    mockStorer,
-			Traversal: traversalService,
-			Tags:      tags.NewTags(mockStatestore, logger),
-			Logger:    logger,
-		})
-	)
-
-	t.Run("pin-file-1", func(t *testing.T) {
-		rootHash := "dd13a5a6cc9db3ef514d645e6719178dbfb1a90b49b9262cafce35b0d27cf245"
-		metadataHash := "0cc878d32c96126d47f63fbe391114ee1438cd521146fc975dea1546d302b6c0"
-		metadataHash2 := "a14d1ef845307c634e9ec74539bd668d0d1b37f37de4128939d57098135850da"
-		contentHash := "838d0a193ecd1152d1bb1432d5ecc02398533b2494889e23b8bd5ace30ac2aeb"
-
-		jsonhttptest.Request(t, client, http.MethodPost,
-			fileUploadResource+"?name=somefile.txt", http.StatusOK,
-			jsonhttptest.WithRequestBody(bytes.NewReader(simpleData)),
-			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
-				Reference: swarm.MustParseHexAddress(rootHash),
-			}),
-			jsonhttptest.WithRequestHeader("Content-Type", "text/plain"),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodPost, pinFilesAddressResource(rootHash), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		hashes := map[string]int{
-			rootHash:      1,
-			metadataHash:  1,
-			metadataHash2: 1,
-			contentHash:   1,
-		}
-
-		actualResponse := api.ListPinnedChunksResponse{
-			Chunks: []api.PinnedChunk{},
-		}
-
-		jsonhttptest.Request(t, client, http.MethodGet, pinChunksResource, http.StatusOK,
-			jsonhttptest.WithUnmarshalJSONResponse(&actualResponse),
-		)
-		if len(actualResponse.Chunks) != len(hashes) {
-			t.Fatalf("Response chunk count mismatch Expected: %d Found: %d",
-				len(hashes), len(actualResponse.Chunks))
-		}
-		for _, v := range actualResponse.Chunks {
-			if counter, ok := hashes[v.Address.String()]; !ok {
-				t.Fatalf("found unexpected hash %s", v.Address.String())
-			} else if uint64(counter) != v.PinCounter {
-				t.Fatalf("found unexpected pin counter: Expected: %d, Found: %d",
-					counter, v.PinCounter)
-			}
-		}
-	})
-
-	t.Run("unpin-file-1", func(t *testing.T) {
-		rootHash := "dd13a5a6cc9db3ef514d645e6719178dbfb1a90b49b9262cafce35b0d27cf245"
-
-		jsonhttptest.Request(t, client, http.MethodDelete, pinFilesAddressResource(rootHash), http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
-				Message: http.StatusText(http.StatusOK),
-				Code:    http.StatusOK,
-			}),
-		)
-
-		jsonhttptest.Request(t, client, http.MethodGet, pinChunksResource, http.StatusOK,
-			jsonhttptest.WithExpectedJSONResponse(api.ListPinnedChunksResponse{
-				Chunks: []api.PinnedChunk{},
-			}),
-		)
-	})
-
-}

pkg/api/pin_test.go

+// Copyright 2021 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package api_test
+
+import (
+	"bytes"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/ethersphere/bee/pkg/api"
+	"github.com/ethersphere/bee/pkg/jsonhttp"
+	"github.com/ethersphere/bee/pkg/jsonhttp/jsonhttptest"
+	"github.com/ethersphere/bee/pkg/logging"
+	pinning "github.com/ethersphere/bee/pkg/pinning/mock"
+	statestore "github.com/ethersphere/bee/pkg/statestore/mock"
+	"github.com/ethersphere/bee/pkg/storage/mock"
+	testingc "github.com/ethersphere/bee/pkg/storage/testing"
+	"github.com/ethersphere/bee/pkg/swarm"
+	"github.com/ethersphere/bee/pkg/tags"
+	"github.com/ethersphere/bee/pkg/traversal"
+)
+
+func checkPinHandlers(t *testing.T, client *http.Client, rootHash string) {
+	t.Helper()
+
+	const pinsBasePath = "/pins"
+
+	var (
+		pinsAddressPath        = pinsBasePath + "/" + rootHash
+		pinsInvalidAddressPath = pinsBasePath + "/" + "838d0a193ecd1152d1bb1432d5ecc02398533b2494889e23b8bd5ace30ac2zzz"
+		pinsUnknownAddressPath = pinsBasePath + "/" + "838d0a193ecd1152d1bb1432d5ecc02398533b2494889e23b8bd5ace30ac2ccc"
+	)
+
+	jsonhttptest.Request(t, client, http.MethodGet, pinsInvalidAddressPath, http.StatusBadRequest)
+
+	jsonhttptest.Request(t, client, http.MethodGet, pinsUnknownAddressPath, http.StatusNotFound,
+		jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
+			Message: http.StatusText(http.StatusNotFound),
+			Code:    http.StatusNotFound,
+		}),
+	)
+
+	jsonhttptest.Request(t, client, http.MethodPost, pinsAddressPath, http.StatusOK,
+		jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
+			Message: http.StatusText(http.StatusOK),
+			Code:    http.StatusOK,
+		}),
+	)
+
+	jsonhttptest.Request(t, client, http.MethodGet, pinsAddressPath, http.StatusOK,
+		jsonhttptest.WithExpectedJSONResponse(struct {
+			Address swarm.Address `json:"address"`
+		}{
+			Address: swarm.MustParseHexAddress(rootHash),
+		}),
+	)
+
+	jsonhttptest.Request(t, client, http.MethodGet, pinsBasePath, http.StatusOK,
+		jsonhttptest.WithExpectedJSONResponse(struct {
+			Addresses []swarm.Address `json:"addresses"`
+		}{
+			Addresses: []swarm.Address{swarm.MustParseHexAddress(rootHash)},
+		}),
+	)
+
+	jsonhttptest.Request(t, client, http.MethodDelete, pinsAddressPath, http.StatusOK)
+
+	jsonhttptest.Request(t, client, http.MethodGet, pinsAddressPath, http.StatusNotFound,
+		jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
+			Message: http.StatusText(http.StatusNotFound),
+			Code:    http.StatusNotFound,
+		}),
+	)
+}
+
+func TestPinHandlers(t *testing.T) {
+	var (
+		storerMock   = mock.NewStorer()
+		client, _, _ = newTestServer(t, testServerOptions{
+			Storer:    storerMock,
+			Traversal: traversal.NewService(storerMock),
+			Tags:      tags.NewTags(statestore.NewStateStore(), logging.New(ioutil.Discard, 0)),
+			Pinning:   pinning.NewServiceMock(),
+			Logger:    logging.New(ioutil.Discard, 5),
+		})
+	)
+
+	t.Run("bytes", func(t *testing.T) {
+		const rootHash = "838d0a193ecd1152d1bb1432d5ecc02398533b2494889e23b8bd5ace30ac2aeb"
+		jsonhttptest.Request(t, client, http.MethodPost, "/bytes", http.StatusOK,
+			jsonhttptest.WithRequestBody(strings.NewReader("this is a simple text")),
+			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
+				Reference: swarm.MustParseHexAddress(rootHash),
+			}),
+		)
+		checkPinHandlers(t, client, rootHash)
+	})
+
+	t.Run("bzz", func(t *testing.T) {
+		tarReader := tarFiles(t, []f{{
+			data: []byte("<h1>Swarm"),
+			name: "index.html",
+			dir:  "",
+		}})
+		rootHash := "9e178dbd1ed4b748379e25144e28dfb29c07a4b5114896ef454480115a56b237"
+		jsonhttptest.Request(t, client, http.MethodPost, "/bzz", http.StatusOK,
+			jsonhttptest.WithRequestBody(tarReader),
+			jsonhttptest.WithRequestHeader("Content-Type", api.ContentTypeTar),
+			jsonhttptest.WithRequestHeader(api.SwarmCollectionHeader, "True"),
+			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
+				Reference: swarm.MustParseHexAddress(rootHash),
+			}),
+		)
+		checkPinHandlers(t, client, rootHash)
+
+		rootHash = "dd13a5a6cc9db3ef514d645e6719178dbfb1a90b49b9262cafce35b0d27cf245"
+		jsonhttptest.Request(t, client, http.MethodPost, "/bzz?name=somefile.txt", http.StatusOK,
+			jsonhttptest.WithRequestHeader("Content-Type", "text/plain"),
+			jsonhttptest.WithRequestBody(strings.NewReader("this is a simple text")),
+			jsonhttptest.WithExpectedJSONResponse(api.BzzUploadResponse{
+				Reference: swarm.MustParseHexAddress(rootHash),
+			}),
+		)
+		checkPinHandlers(t, client, rootHash)
+	})
+
+	t.Run("chunk", func(t *testing.T) {
+		var (
+			chunk    = testingc.GenerateTestRandomChunk()
+			rootHash = chunk.Address().String()
+		)
+		jsonhttptest.Request(t, client, http.MethodPost, "/chunks", http.StatusOK,
+			jsonhttptest.WithRequestBody(bytes.NewReader(chunk.Data())),
+			jsonhttptest.WithExpectedJSONResponse(api.ChunkAddressResponse{
+				Reference: chunk.Address(),
+			}),
+		)
+		checkPinHandlers(t, client, rootHash)
+	})
+}

pkg/api/router.go

@@ -20,14 +20,19 @@ import (
 )
 
 func (s *server) setupRouting() {
-	apiVersion := "v1" // only one api version exists, this should be configurable with more
+	const (
+		apiVersion = "v1" // Only one api version exists, this should be configurable with more.
+		rootPath   = "/" + apiVersion
+	)
+
+	router := mux.NewRouter()
 
-	handle := func(router *mux.Router, path string, handler http.Handler) {
+	// handle is a helper closure which simplifies the router setup.
+	handle := func(path string, handler http.Handler) {
 		router.Handle(path, handler)
-		router.Handle("/"+apiVersion+path, handler)
+		router.Handle(rootPath+path, handler)
 	}
 
-	router := mux.NewRouter()
 	router.NotFoundHandler = http.HandlerFunc(jsonhttp.NotFoundHandler)
 
 	router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
@@ -38,38 +43,38 @@ func (s *server) setupRouting() {
 		fmt.Fprintln(w, "User-agent: *\nDisallow: /")
 	})
 
-	handle(router, "/bytes", jsonhttp.MethodHandler{
+	handle("/bytes", jsonhttp.MethodHandler{
 		"POST": web.ChainHandlers(
 			s.newTracingHandler("bytes-upload"),
 			web.FinalHandlerFunc(s.bytesUploadHandler),
 		),
 	})
-	handle(router, "/bytes/{address}", jsonhttp.MethodHandler{
+	handle("/bytes/{address}", jsonhttp.MethodHandler{
 		"GET": web.ChainHandlers(
 			s.newTracingHandler("bytes-download"),
 			web.FinalHandlerFunc(s.bytesGetHandler),
 		),
 	})
 
-	handle(router, "/chunks", jsonhttp.MethodHandler{
+	handle("/chunks", jsonhttp.MethodHandler{
 		"POST": web.ChainHandlers(
 			jsonhttp.NewMaxBodyBytesHandler(swarm.ChunkWithSpanSize),
 			web.FinalHandlerFunc(s.chunkUploadHandler),
 		),
 	})
 
-	handle(router, "/chunks/{addr}", jsonhttp.MethodHandler{
+	handle("/chunks/{addr}", jsonhttp.MethodHandler{
 		"GET": http.HandlerFunc(s.chunkGetHandler),
 	})
 
-	handle(router, "/soc/{owner}/{id}", jsonhttp.MethodHandler{
+	handle("/soc/{owner}/{id}", jsonhttp.MethodHandler{
 		"POST": web.ChainHandlers(
 			jsonhttp.NewMaxBodyBytesHandler(swarm.ChunkWithSpanSize),
 			web.FinalHandlerFunc(s.socUploadHandler),
 		),
 	})
 
-	handle(router, "/feeds/{owner}/{topic}", jsonhttp.MethodHandler{
+	handle("/feeds/{owner}/{topic}", jsonhttp.MethodHandler{
 		"GET": http.HandlerFunc(s.feedGetHandler),
 		"POST": web.ChainHandlers(
 			jsonhttp.NewMaxBodyBytesHandler(swarm.ChunkWithSpanSize),
@@ -77,25 +82,25 @@ func (s *server) setupRouting() {
 		),
 	})
 
-	handle(router, "/bzz", jsonhttp.MethodHandler{
+	handle("/bzz", jsonhttp.MethodHandler{
 		"POST": web.ChainHandlers(
 			s.newTracingHandler("bzz-upload"),
 			web.FinalHandlerFunc(s.bzzUploadHandler),
 		),
 	})
-	handle(router, "/bzz/{address}", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	handle("/bzz/{address}", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		u := r.URL
 		u.Path += "/"
 		http.Redirect(w, r, u.String(), http.StatusPermanentRedirect)
 	}))
-	handle(router, "/bzz/{address}/{path:.*}", jsonhttp.MethodHandler{
+	handle("/bzz/{address}/{path:.*}", jsonhttp.MethodHandler{
 		"GET": web.ChainHandlers(
 			s.newTracingHandler("bzz-download"),
 			web.FinalHandlerFunc(s.bzzDownloadHandler),
 		),
 	})
 
-	handle(router, "/pss/send/{topic}/{targets}", web.ChainHandlers(
+	handle("/pss/send/{topic}/{targets}", web.ChainHandlers(
 		s.gatewayModeForbidEndpointHandler,
 		web.FinalHandler(jsonhttp.MethodHandler{
 			"POST": web.ChainHandlers(
@@ -105,12 +110,12 @@ func (s *server) setupRouting() {
 		})),
 	)
 
-	handle(router, "/pss/subscribe/{topic}", web.ChainHandlers(
+	handle("/pss/subscribe/{topic}", web.ChainHandlers(
 		s.gatewayModeForbidEndpointHandler,
 		web.FinalHandlerFunc(s.pssWsHandler),
 	))
 
-	handle(router, "/tags", web.ChainHandlers(
+	handle("/tags", web.ChainHandlers(
 		s.gatewayModeForbidEndpointHandler,
 		web.FinalHandler(jsonhttp.MethodHandler{
 			"GET": http.HandlerFunc(s.listTagsHandler),
@@ -120,7 +125,7 @@ func (s *server) setupRouting() {
 			),
 		})),
 	)
-	handle(router, "/tags/{id}", web.ChainHandlers(
+	handle("/tags/{id}", web.ChainHandlers(
 		s.gatewayModeForbidEndpointHandler,
 		web.FinalHandler(jsonhttp.MethodHandler{
 			"GET":    http.HandlerFunc(s.getTagHandler),
@@ -132,46 +137,18 @@ func (s *server) setupRouting() {
 		})),
 	)
 
-	handle(router, "/pin/chunks/{address}", web.ChainHandlers(
+	handle("/pins", web.ChainHandlers(
 		s.gatewayModeForbidEndpointHandler,
 		web.FinalHandler(jsonhttp.MethodHandler{
-			"GET":    http.HandlerFunc(s.getPinnedChunk),
-			"POST":   http.HandlerFunc(s.pinChunk),
-			"DELETE": http.HandlerFunc(s.unpinChunk),
-			"PUT": web.ChainHandlers(
-				jsonhttp.NewMaxBodyBytesHandler(1024),
-				web.FinalHandlerFunc(s.updatePinnedChunkPinCounter),
-			),
+			"GET": http.HandlerFunc(s.listPinnedRootHashes),
 		})),
 	)
-	handle(router, "/pin/chunks", web.ChainHandlers(
-		s.gatewayModeForbidEndpointHandler,
-		web.FinalHandler(jsonhttp.MethodHandler{
-			"GET": http.HandlerFunc(s.listPinnedChunks),
-		})),
-	)
-
-	handle(router, "/pin/bytes/{address}", web.ChainHandlers(
-		s.gatewayModeForbidEndpointHandler,
-		web.FinalHandler(jsonhttp.MethodHandler{
-			"POST":   http.HandlerFunc(s.pinBytes),
-			"DELETE": http.HandlerFunc(s.unpinBytes),
-		})),
-	)
-
-	handle(router, "/pin/files/{address}", web.ChainHandlers(
-		s.gatewayModeForbidEndpointHandler,
-		web.FinalHandler(jsonhttp.MethodHandler{
-			"POST":   http.HandlerFunc(s.pinFile),
-			"DELETE": http.HandlerFunc(s.unpinFile),
-		})),
-	)
-
-	handle(router, "/pin/bzz/{address}", web.ChainHandlers(
+	handle("/pins/{address}", web.ChainHandlers(
 		s.gatewayModeForbidEndpointHandler,
 		web.FinalHandler(jsonhttp.MethodHandler{
-			"POST":   http.HandlerFunc(s.pinBzz),
-			"DELETE": http.HandlerFunc(s.unpinBzz),
+			"GET":    http.HandlerFunc(s.getPinnedRootHash),
+			"POST":   http.HandlerFunc(s.pinRootHash),
+			"DELETE": http.HandlerFunc(s.unpinRootHash),
 		})),
 	)
 

pkg/api/soc.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"io/ioutil"
 	"net/http"
+	"strings"
 
 	"github.com/ethersphere/bee/pkg/cac"
 	"github.com/ethersphere/bee/pkg/jsonhttp"
@@ -135,5 +136,14 @@ func (s *server) socUploadHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if strings.ToLower(r.Header.Get(SwarmPinHeader)) == "true" {
+		if err := s.pinning.CreatePin(ctx, sch.Address(), false); err != nil {
+			s.logger.Debugf("soc upload: creation of pin for %q failed: %v", sch.Address(), err)
+			s.logger.Error("soc upload: creation of pin failed")
+			jsonhttp.InternalServerError(w, nil)
+			return
+		}
+	}
+
 	jsonhttp.Created(w, chunkAddressResponse{Reference: sch.Address()})
 }

pkg/localstore/metrics.go

@@ -346,6 +346,6 @@ func newMetrics() metrics {
 	}
 }
 
-func (s *DB) Metrics() []prometheus.Collector {
-	return m.PrometheusCollectorsFromFields(s.metrics)
+func (db *DB) Metrics() []prometheus.Collector {
+	return m.PrometheusCollectorsFromFields(db.metrics)
 }

pkg/localstore/mode_get.go

@@ -50,7 +50,7 @@ func (db *DB) Get(ctx context.Context, mode storage.ModeGet, addr swarm.Address)
 		}
 		return nil, err
 	}
-	return swarm.NewChunk(swarm.NewAddress(out.Address), out.Data).WithPinCounter(out.PinCounter), nil
+	return swarm.NewChunk(swarm.NewAddress(out.Address), out.Data), nil
 }
 
 // get returns Item from the retrieval index

pkg/localstore/mode_get_multi.go

@@ -50,7 +50,7 @@ func (db *DB) GetMulti(ctx context.Context, mode storage.ModeGet, addrs ...swarm
 	}
 	chunks = make([]swarm.Chunk, len(out))
 	for i, ch := range out {
-		chunks[i] = swarm.NewChunk(swarm.NewAddress(ch.Address), ch.Data).WithPinCounter(ch.PinCounter)
+		chunks[i] = swarm.NewChunk(swarm.NewAddress(ch.Address), ch.Data)
 	}
 	return chunks, nil
 }

pkg/localstore/mode_get_multi_test.go

@@ -53,7 +53,7 @@ func TestModeGetMulti(t *testing.T) {
 					if err != nil {
 						t.Fatal(err)
 					}
-					chunks[i] = ch.WithPinCounter(1)
+					chunks[i] = ch
 				}
 			}
 

pkg/localstore/pin.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package localstore
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/ethersphere/bee/pkg/shed"
-	"github.com/ethersphere/bee/pkg/storage"
-	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/syndtr/goleveldb/leveldb"
-)
-
-const (
-	maxPage = 1000 // hard limit of page size
-)
-
-// PinnedChunks
-func (db *DB) PinnedChunks(ctx context.Context, offset, limit int) (chunks []*storage.Pinner, err error) {
-	if limit > maxPage {
-		limit = maxPage
-	}
-
-	c, err := db.pinIndex.Count()
-	if err != nil {
-		return nil, fmt.Errorf("list pinned chunks: %w", err)
-	}
-
-	// send empty response if there is nothing pinned
-	if c == 0 {
-		return nil, nil
-	}
-
-	err = db.pinIndex.Iterate(func(item shed.Item) (stop bool, err error) {
-		if offset > 0 {
-			offset--
-			return false, nil
-		}
-		chunks = append(chunks,
-			&storage.Pinner{
-				Address:    swarm.NewAddress(item.Address),
-				PinCounter: item.PinCounter,
-			})
-		limit--
-
-		if limit == 0 {
-			return true, nil
-		}
-		return false, nil
-	}, nil)
-	return chunks, err
-}
-
-// PinCounter returns the pin counter for a given swarm address, provided that the
-// address has been pinned.
-func (db *DB) PinCounter(address swarm.Address) (uint64, error) {
-	out, err := db.pinIndex.Get(shed.Item{
-		Address: address.Bytes(),
-	})
-
-	if err != nil {
-		if errors.Is(err, leveldb.ErrNotFound) {
-			return 0, storage.ErrNotFound
-		}
-		return 0, err
-	}
-	return out.PinCounter, nil
-}

pkg/localstore/pin_test.go

-// Copyright 2020 The Swarm Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package localstore
-
-import (
-	"context"
-	"errors"
-	"sort"
-	"testing"
-
-	"github.com/ethersphere/bee/pkg/storage"
-	"github.com/ethersphere/bee/pkg/swarm"
-)
-
-func TestPinning(t *testing.T) {
-	chunks := generateTestRandomChunks(21)
-	addresses := chunksToSortedStrings(chunks)
-
-	db := newTestDB(t, nil)
-	_, err := db.PinnedChunks(context.Background(), 0, 10)
-
-	// error should be nil
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// chunk must be present
-	_, err = db.Put(context.Background(), storage.ModePutUpload, chunks...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = db.Set(context.Background(), storage.ModeSetPin, chunkAddresses(chunks)...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pinnedChunks, err := db.PinnedChunks(context.Background(), 0, 30)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(pinnedChunks) != len(chunks) {
-		t.Fatalf("want %d pins but got %d", len(chunks), len(pinnedChunks))
-	}
-
-	// Check if they are sorted
-	for i, addr := range pinnedChunks {
-		if addresses[i] != addr.Address.String() {
-			t.Fatal("error in getting sorted address")
-		}
-	}
-}
-
-func TestPinCounter(t *testing.T) {
-	chunk := generateTestRandomChunk()
-	db := newTestDB(t, nil)
-
-	// chunk must be present
-	_, err := db.Put(context.Background(), storage.ModePutUpload, chunk)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// pin once
-	err = db.Set(context.Background(), storage.ModeSetPin, swarm.NewAddress(chunk.Address().Bytes()))
-	if err != nil {
-		t.Fatal(err)
-	}
-	pinCounter, err := db.PinCounter(swarm.NewAddress(chunk.Address().Bytes()))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pinCounter != 1 {
-		t.Fatalf("want pin counter %d but got %d", 1, pinCounter)
-	}
-
-	// pin twice
-	err = db.Set(context.Background(), storage.ModeSetPin, swarm.NewAddress(chunk.Address().Bytes()))
-	if err != nil {
-		t.Fatal(err)
-	}
-	pinCounter, err = db.PinCounter(swarm.NewAddress(chunk.Address().Bytes()))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pinCounter != 2 {
-		t.Fatalf("want pin counter %d but got %d", 2, pinCounter)
-	}
-
-	err = db.Set(context.Background(), storage.ModeSetUnpin, swarm.NewAddress(chunk.Address().Bytes()))
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = db.PinCounter(swarm.NewAddress(chunk.Address().Bytes()))
-	if err != nil {
-		if !errors.Is(err, storage.ErrNotFound) {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestPaging(t *testing.T) {
-	chunks := generateTestRandomChunks(10)
-	addresses := chunksToSortedStrings(chunks)
-	db := newTestDB(t, nil)
-
-	// chunk must be present
-	_, err := db.Put(context.Background(), storage.ModePutUpload, chunks...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// pin once
-	err = db.Set(context.Background(), storage.ModeSetPin, chunkAddresses(chunks)...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pinnedChunks, err := db.PinnedChunks(context.Background(), 0, 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(pinnedChunks) != 5 {
-		t.Fatalf("want %d pins but got %d", 5, len(pinnedChunks))
-	}
-
-	// Check if they are sorted
-	for i, addr := range pinnedChunks {
-		if addresses[i] != addr.Address.String() {
-			t.Fatal("error in getting sorted address")
-		}
-	}
-	pinnedChunks, err = db.PinnedChunks(context.Background(), 5, 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(pinnedChunks) != 5 {
-		t.Fatalf("want %d pins but got %d", 5, len(pinnedChunks))
-	}
-
-	// Check if they are sorted
-	for i, addr := range pinnedChunks {
-		if addresses[5+i] != addr.Address.String() {
-			t.Fatal("error in getting sorted address")
-		}
-	}
-}
-
-func chunksToSortedStrings(chunks []swarm.Chunk) []string {
-	var addresses []string
-	for _, c := range chunks {
-		addresses = append(addresses, c.Address().String())
-	}
-	sort.Strings(addresses)
-	return addresses
-}

pkg/manifest/manifest.go

@@ -76,7 +76,7 @@ func NewDefaultManifest(
 	return NewManifest(DefaultManifestType, ls, encrypted)
 }
 
-// NewDefaultManifest creates a new manifest with default type.
+// NewDefaultManifestReference creates a new manifest with default type.
 func NewDefaultManifestReference(
 	reference swarm.Address,
 	ls file.LoadSaver,

pkg/manifest/mantaray/marshal.go

@@ -75,12 +75,12 @@ func initVersion(hash string, bytes *[]byte) {
 }
 
 var (
-	// ErrTooShort too short input
+	// ErrTooShort signals too short input.
 	ErrTooShort = errors.New("serialised input too short")
-	// ErrInvalid input to seralise invalid
-	ErrInvalid = errors.New("input invalid")
-	// ErrForkIvalid shows embedded node on a fork has no reference
-	ErrForkIvalid = errors.New("fork node without reference")
+	// ErrInvalidInput signals invalid input to serialise.
+	ErrInvalidInput = errors.New("input invalid")
+	// ErrInvalidVersionHash signals unknown version of hash.
+	ErrInvalidVersionHash = errors.New("invalid version hash")
 )
 
 var obfuscationKeyFn = rand.Read
@@ -96,7 +96,7 @@ func SetObfuscationKeyFn(fn func([]byte) (int, error)) {
 // MarshalBinary serialises the node
 func (n *Node) MarshalBinary() (bytes []byte, err error) {
 	if n.forks == nil {
-		return nil, ErrInvalid
+		return nil, ErrInvalidInput
 	}
 
 	// header
@@ -323,7 +323,7 @@ func (n *Node) UnmarshalBinary(data []byte) error {
 		})
 	}
 
-	return fmt.Errorf("invalid version hash %x", versionHash)
+	return fmt.Errorf("%x: %w", versionHash, ErrInvalidVersionHash)
 }
 
 func (f *fork) fromBytes(b []byte) error {

pkg/netstore/netstore.go

@@ -39,6 +39,8 @@ func New(s storage.Storer, rcb recovery.Callback, r retrieval.Interface, logger
 
 // Get retrieves a given chunk address.
 // It will request a chunk from the network whenever it cannot be found locally.
+// If the network path is taken, the method also stores the found chunk into the
+// local-store.
 func (s *store) Get(ctx context.Context, mode storage.ModeGet, addr swarm.Address) (ch swarm.Chunk, err error) {
 	ch, err = s.Storer.Get(ctx, mode, addr)
 	if err != nil {
@@ -54,7 +56,12 @@ func (s *store) Get(ctx context.Context, mode storage.ModeGet, addr swarm.Addres
 				return nil, ErrRecoveryAttempt
 			}
 
-			_, err = s.Storer.Put(ctx, storage.ModePutRequest, ch)
+			putMode := storage.ModePutRequest
+			if mode == storage.ModeGetRequestPin {
+				putMode = storage.ModePutRequestPin
+			}
+
+			_, err = s.Storer.Put(ctx, putMode, ch)
 			if err != nil {
 				return nil, fmt.Errorf("netstore retrieve put: %w", err)
 			}

pkg/node/node.go

@@ -35,6 +35,7 @@ import (
 	"github.com/ethersphere/bee/pkg/netstore"
 	"github.com/ethersphere/bee/pkg/p2p/libp2p"
 	"github.com/ethersphere/bee/pkg/pingpong"
+	"github.com/ethersphere/bee/pkg/pinning"
 	"github.com/ethersphere/bee/pkg/pricer"
 	"github.com/ethersphere/bee/pkg/pricing"
 	"github.com/ethersphere/bee/pkg/pss"
@@ -429,6 +430,8 @@ func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey,
 
 	traversalService := traversal.NewService(ns)
 
+	pinningService := pinning.NewService(storer, stateStore, traversalService)
+
 	pushSyncProtocol := pushsync.New(swarmAddress, p2ps, storer, kad, tagService, pssService.TryUnwrap, logger, acc, pricer, signer, tracer)
 
 	// set the pushSyncer in the PSS
@@ -470,7 +473,7 @@ func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey,
 	if o.APIAddr != "" {
 		// API server
 		feedFactory := factory.New(ns)
-		apiService = api.New(tagService, ns, multiResolver, pssService, traversalService, feedFactory, logger, tracer, api.Options{
+		apiService = api.New(tagService, ns, multiResolver, pssService, traversalService, pinningService, feedFactory, logger, tracer, api.Options{
 			CORSAllowedOrigins: o.CORSAllowedOrigins,
 			GatewayMode:        o.GatewayMode,
 			WsPingPeriod:       60 * time.Second,

pkg/pinning/doc.go

+// Copyright 2021 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package pinning provides a simple set of
+// operations for tracking pinned addresses.
+package pinning

pkg/pinning/mock/mock.go

+// Copyright 2021 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mock
+
+import (
+	"context"
+
+	"github.com/ethersphere/bee/pkg/pinning"
+	"github.com/ethersphere/bee/pkg/swarm"
+)
+
+var _ pinning.Interface = (*ServiceMock)(nil)
+
+// NewServiceMock is a convenient constructor for creating ServiceMock.
+func NewServiceMock() *ServiceMock {
+	return &ServiceMock{index: make(map[string]int)}
+}
+
+// ServiceMock represents a simple mock of pinning.Interface.
+// The implementation is not goroutine-safe.
+type ServiceMock struct {
+	index   map[string]int
+	entries []swarm.Address
+}
+
+// CreatePin implements pinning.Interface CreatePin method.
+func (sm *ServiceMock) CreatePin(_ context.Context, addr swarm.Address, _ bool) error {
+	if _, ok := sm.index[addr.String()]; ok {
+		return nil
+	}
+	sm.index[addr.String()] = len(sm.entries)
+	sm.entries = append(sm.entries, addr)
+	return nil
+}
+
+// DeletePin implements pinning.Interface DeletePin method.
+func (sm *ServiceMock) DeletePin(_ context.Context, addr swarm.Address) error {
+	i, ok := sm.index[addr.String()]
+	if !ok {
+		return nil
+	}
+	delete(sm.index, addr.String())
+	sm.entries = append(sm.entries[:i], sm.entries[i+1:]...)
+	return nil
+}
+
+// HasPin implements pinning.Interface HasPin method.
+func (sm *ServiceMock) HasPin(addr swarm.Address) (bool, error) {
+	_, ok := sm.index[addr.String()]
+	return ok, nil
+}
+
+// Pins implements pinning.Interface Pins method.
+func (sm *ServiceMock) Pins() ([]swarm.Address, error) {
+	return append([]swarm.Address(nil), sm.entries...), nil
+}
+
+// Entries returns all pinned entries.
+func (sm *ServiceMock) Entries() []swarm.Address {
+	return sm.entries
+}

pkg/pinning/pinning.go

+// Copyright 2021 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package pinning
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/ethersphere/bee/pkg/storage"
+	"github.com/ethersphere/bee/pkg/swarm"
+	"github.com/ethersphere/bee/pkg/traversal"
+	"github.com/hashicorp/go-multierror"
+)
+
+// ErrTraversal signals that errors occurred during nodes traversal.
+var ErrTraversal = errors.New("traversal iteration failed")
+
+// Interface defines pinning operations.
+type Interface interface {
+	// CreatePin creates a new pin for the given address.
+	// The boolean arguments specifies whether all nodes
+	// in the tree should also be traversed and pinned.
+	// Repeating calls of this method are idempotent.
+	CreatePin(context.Context, swarm.Address, bool) error
+	// DeletePin deletes given address. All the existing
+	// nodes in the tree will also be traversed and un-pinned.
+	// Repeating calls of this method are idempotent.
+	DeletePin(context.Context, swarm.Address) error
+	// HasPin returns true if the given address has root pin.
+	HasPin(swarm.Address) (bool, error)
+	// Pins return all pinned addresses.
+	Pins() ([]swarm.Address, error)
+}
+
+const storePrefix = "root-pin"
+
+func rootPinKey(addr swarm.Address) string {
+	return fmt.Sprintf("%s-%s", storePrefix, addr)
+}
+
+// NewService is a convenient constructor for Service.
+func NewService(
+	pinStorage storage.Storer,
+	rhStorage storage.StateStorer,
+	traverser traversal.Traverser,
+) *Service {
+	return &Service{
+		pinStorage: pinStorage,
+		rhStorage:  rhStorage,
+		traverser:  traverser,
+	}
+}
+
+// Service is implementation of the pinning.Interface.
+type Service struct {
+	pinStorage storage.Storer
+	rhStorage  storage.StateStorer
+	traverser  traversal.Traverser
+}
+
+// CreatePin implements Interface.CreatePin method.
+func (s *Service) CreatePin(ctx context.Context, addr swarm.Address, traverse bool) error {
+	// iterFn is a pinning iterator function over the leaves of the root.
+	iterFn := func(leaf swarm.Address) error {
+		switch err := s.pinStorage.Set(ctx, storage.ModeSetPin, leaf); {
+		case errors.Is(err, storage.ErrNotFound):
+			ch, err := s.pinStorage.Get(ctx, storage.ModeGetRequestPin, leaf)
+			if err != nil {
+				return fmt.Errorf("unable to get pin for leaf %q of root %q: %w", leaf, addr, err)
+			}
+			_, err = s.pinStorage.Put(ctx, storage.ModePutRequestPin, ch)
+			if err != nil {
+				return fmt.Errorf("unable to put pin for leaf %q of root %q: %w", leaf, addr, err)
+			}
+		case err != nil:
+			return fmt.Errorf("unable to set pin for leaf %q of root %q: %w", leaf, addr, err)
+		}
+		return nil
+	}
+
+	if traverse {
+		if err := s.traverser.Traverse(ctx, addr, iterFn); err != nil {
+			return fmt.Errorf("traversal of %q failed: %w", addr, err)
+		}
+	}
+
+	key := rootPinKey(addr)
+	switch err := s.rhStorage.Get(key, new(swarm.Address)); {
+	case errors.Is(err, storage.ErrNotFound):
+		return s.rhStorage.Put(key, addr)
+	case err != nil:
+		return fmt.Errorf("unable to pin %q: %w", addr, err)
+	}
+	return nil
+}
+
+// DeletePin implements Interface.DeletePin method.
+func (s *Service) DeletePin(ctx context.Context, addr swarm.Address) error {
+	var iterErr error
+	// iterFn is a unpinning iterator function over the leaves of the root.
+	iterFn := func(leaf swarm.Address) error {
+		err := s.pinStorage.Set(ctx, storage.ModeSetUnpin, leaf)
+		if err != nil {
+			iterErr = multierror.Append(err, fmt.Errorf("unable to unpin the chunk for leaf %q of root %q: %w", leaf, addr, err))
+			// Continue un-pinning all chunks.
+		}
+		return nil
+	}
+
+	if err := s.traverser.Traverse(ctx, addr, iterFn); err != nil {
+		return fmt.Errorf("traversal of %q failed: %w", addr, multierror.Append(err, iterErr))
+	}
+	if iterErr != nil {
+		return multierror.Append(ErrTraversal, iterErr)
+	}
+
+	key := rootPinKey(addr)
+	if err := s.rhStorage.Delete(key); err != nil {
+		return fmt.Errorf("unable to delete pin for key %q: %w", key, err)
+	}
+	return nil
+}
+
+// HasPin implements Interface.HasPin method.
+func (s *Service) HasPin(addr swarm.Address) (bool, error) {
+	key, val := rootPinKey(addr), swarm.NewAddress(nil)
+	switch err := s.rhStorage.Get(key, &val); {
+	case errors.Is(err, storage.ErrNotFound):
+		return false, nil
+	case err != nil:
+		return false, fmt.Errorf("unable to get pin for key %q: %w", key, err)
+	}
+	return val.Equal(addr), nil
+}
+
+// Pins implements Interface.Pins method.
+func (s *Service) Pins() ([]swarm.Address, error) {
+	var addrs []swarm.Address
+	err := s.rhStorage.Iterate(storePrefix, func(key, val []byte) (stop bool, err error) {
+		var addr swarm.Address
+		if err := json.Unmarshal(val, &addr); err != nil {
+			return true, fmt.Errorf("invalid address value %q: %w", string(val), err)
+		}
+		addrs = append(addrs, addr)
+		return false, nil
+	})
+	if err != nil {
+		return nil, fmt.Errorf("iteration failed: %w", err)
+	}
+	return addrs, nil
+}

pkg/pinning/pinning_test.go

+// Copyright 2021 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package pinning
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/ethersphere/bee/pkg/file/pipeline/builder"
+	statestorem "github.com/ethersphere/bee/pkg/statestore/mock"
+	"github.com/ethersphere/bee/pkg/storage"
+	storagem "github.com/ethersphere/bee/pkg/storage/mock"
+	"github.com/ethersphere/bee/pkg/traversal"
+)
+
+var _ Interface = (*Service)(nil)
+
+func TestPinningService(t *testing.T) {
+	const content = "Hello, Bee!"
+
+	var (
+		ctx        = context.Background()
+		storerMock = storagem.NewStorer()
+		service    = NewService(
+			storerMock,
+			statestorem.NewStateStore(),
+			traversal.NewService(storerMock),
+		)
+	)
+
+	pipe := builder.NewPipelineBuilder(ctx, storerMock, storage.ModePutUpload, false)
+	addr, err := builder.FeedPipeline(ctx, pipe, strings.NewReader(content), int64(len(content)))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Run("create and list", func(t *testing.T) {
+		if err := service.CreatePin(ctx, addr, false); err != nil {
+			t.Fatalf("CreatePin(...): unexpected error: %v", err)
+		}
+		addrs, err := service.Pins()
+		if err != nil {
+			t.Fatalf("Pins(...): unexpected error: %v", err)
+		}
+		if have, want := len(addrs), 1; have != want {
+			t.Fatalf("Pins(...): have %d; want %d", have, want)
+		}
+		if have, want := addrs[0], addr; !have.Equal(want) {
+			t.Fatalf("address mismatch: have %q; want %q", have, want)
+		}
+	})
+
+	t.Run("create idempotent and list", func(t *testing.T) {
+		if err := service.CreatePin(ctx, addr, false); err != nil {
+			t.Fatalf("CreatePin(...): unexpected error: %v", err)
+		}
+		addrs, err := service.Pins()
+		if err != nil {
+			t.Fatalf("Pins(...): unexpected error: %v", err)
+		}
+		if have, want := len(addrs), 1; have != want {
+			t.Fatalf("Pins(...): have %d; want %d", have, want)
+		}
+		if have, want := addrs[0], addr; !have.Equal(want) {
+			t.Fatalf("address mismatch: have %q; want %q", have, want)
+		}
+	})
+
+	t.Run("delete and has", func(t *testing.T) {
+		err := service.DeletePin(ctx, addr)
+		if err != nil {
+			t.Fatalf("DeletePin(...): unexpected error: %v", err)
+		}
+		has, err := service.HasPin(addr)
+		if err != nil {
+			t.Fatalf("HasPin(...): unexpected error: %v", err)
+		}
+		if has {
+			t.Fatalf("HasPin(...): have %t; want %t", has, !has)
+		}
+	})
+
+	t.Run("delete idempotent and has", func(t *testing.T) {
+		err := service.DeletePin(ctx, addr)
+		if err != nil {
+			t.Fatalf("DeletePin(...): unexpected error: %v", err)
+		}
+		has, err := service.HasPin(addr)
+		if err != nil {
+			t.Fatalf("HasPin(...): unexpected error: %v", err)
+		}
+		if has {
+			t.Fatalf("HasPin(...): have %t; want %t", has, !has)
+		}
+	})
+}

pkg/storage/mock/storer.go

@@ -6,7 +6,6 @@ package mock
 
 import (
 	"context"
-	"errors"
 	"sync"
 
 	"github.com/ethersphere/bee/pkg/storage"
@@ -290,36 +289,6 @@ func (m *MockStorer) SubscribePush(ctx context.Context) (c <-chan swarm.Chunk, s
 	panic("not implemented") // TODO: Implement
 }
 
-func (m *MockStorer) PinnedChunks(ctx context.Context, offset, cursor int) (pinnedChunks []*storage.Pinner, err error) {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-	if len(m.pinnedAddress) == 0 {
-		return pinnedChunks, nil
-	}
-	for i, addr := range m.pinnedAddress {
-		pi := &storage.Pinner{
-			Address:    swarm.NewAddress(addr.Bytes()),
-			PinCounter: m.pinnedCounter[i],
-		}
-		pinnedChunks = append(pinnedChunks, pi)
-	}
-	if pinnedChunks == nil {
-		return pinnedChunks, errors.New("pin chunks: leveldb: not found")
-	}
-	return pinnedChunks, nil
-}
-
-func (m *MockStorer) PinCounter(address swarm.Address) (uint64, error) {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-	for i, addr := range m.pinnedAddress {
-		if addr.String() == address.String() {
-			return m.pinnedCounter[i], nil
-		}
-	}
-	return 0, storage.ErrNotFound
-}
-
 func (m *MockStorer) Close() error {
 	close(m.quit)
 	return nil

pkg/storage/store.go

@@ -34,6 +34,8 @@ func (m ModeGet) String() string {
 		return "Lookup"
 	case ModeGetPin:
 		return "PinLookup"
+	case ModeGetRequestPin:
+		return "RequestPin"
 	default:
 		return "Unknown"
 	}
@@ -49,6 +51,8 @@ const (
 	ModeGetLookup
 	// ModeGetPin: used when a pinned chunk is accessed
 	ModeGetPin
+	// ModeGetRequestPin represents request for retrieval of pinned chunk.
+	ModeGetRequestPin
 )
 
 // ModePut enumerates different Putter modes.
@@ -120,12 +124,6 @@ type Descriptor struct {
 	BinID   uint64
 }
 
-// Pinner holds the required information for pinning
-type Pinner struct {
-	Address    swarm.Address
-	PinCounter uint64
-}
-
 func (d *Descriptor) String() string {
 	if d == nil {
 		return ""
@@ -142,8 +140,6 @@ type Storer interface {
 	LastPullSubscriptionBinID(bin uint8) (id uint64, err error)
 	PullSubscriber
 	SubscribePush(ctx context.Context) (c <-chan swarm.Chunk, stop func())
-	PinnedChunks(ctx context.Context, offset, limit int) (pinnedChunks []*Pinner, err error)
-	PinCounter(address swarm.Address) (uint64, error)
 	io.Closer
 }
 

pkg/swarm/swarm.go

@@ -127,18 +127,15 @@ type AddressIterFunc func(address Address) error
 type Chunk interface {
 	Address() Address
 	Data() []byte
-	PinCounter() uint64
-	WithPinCounter(p uint64) Chunk
 	TagID() uint32
 	WithTagID(t uint32) Chunk
 	Equal(Chunk) bool
 }
 
 type chunk struct {
-	addr       Address
-	sdata      []byte
-	pinCounter uint64
-	tagID      uint32
+	addr  Address
+	sdata []byte
+	tagID uint32
 }
 
 func NewChunk(addr Address, data []byte) Chunk {
@@ -148,11 +145,6 @@ func NewChunk(addr Address, data []byte) Chunk {
 	}
 }
 
-func (c *chunk) WithPinCounter(p uint64) Chunk {
-	c.pinCounter = p
-	return c
-}
-
 func (c *chunk) WithTagID(t uint32) Chunk {
 	c.tagID = t
 	return c
@@ -166,10 +158,6 @@ func (c *chunk) Data() []byte {
 	return c.sdata
 }
 
-func (c *chunk) PinCounter() uint64 {
-	return c.pinCounter
-}
-
 func (c *chunk) TagID() uint32 {
 	return c.tagID
 }

pkg/traversal/traversal.go

@@ -16,127 +16,63 @@ import (
 	"github.com/ethersphere/bee/pkg/file/joiner"
 	"github.com/ethersphere/bee/pkg/file/loadsave"
 	"github.com/ethersphere/bee/pkg/manifest"
+	"github.com/ethersphere/bee/pkg/manifest/mantaray"
 	"github.com/ethersphere/bee/pkg/storage"
 	"github.com/ethersphere/bee/pkg/swarm"
 )
 
-var (
-	// ErrInvalidType is returned when the reference was not expected type.
-	ErrInvalidType = errors.New("traversal: invalid type")
-)
-
-// Service is the service to find dependent chunks for an address.
-type Service interface {
-	// TraverseAddresses iterates through each address related to the supplied
-	// one, if possible.
-	TraverseAddresses(context.Context, swarm.Address, swarm.AddressIterFunc) error
-
-	// TraverseBytesAddresses iterates through each address of a bytes.
-	TraverseBytesAddresses(context.Context, swarm.Address, swarm.AddressIterFunc) error
-	// TraverseManifestAddresses iterates through each address of a manifest,
-	// as well as each entry found in it.
-	TraverseManifestAddresses(context.Context, swarm.Address, swarm.AddressIterFunc) error
-}
-
-type traversalService struct {
-	storer storage.Storer
-}
-
-func NewService(storer storage.Storer) Service {
-	return &traversalService{
-		storer: storer,
-	}
+// Traverser represents service which traverse through address dependent chunks.
+type Traverser interface {
+	// Traverse iterates through each address related to the supplied one, if possible.
+	Traverse(context.Context, swarm.Address, swarm.AddressIterFunc) error
 }
 
-func (s *traversalService) TraverseAddresses(
-	ctx context.Context,
-	reference swarm.Address,
-	chunkAddressFunc swarm.AddressIterFunc,
-) error {
-
-	isManifest, m, err := s.checkIsManifest(ctx, reference)
-	if err != nil {
-		return err
-	}
-
-	if isManifest {
-		return m.IterateAddresses(ctx, func(manifestNodeAddr swarm.Address) error {
-			return s.processBytes(ctx, manifestNodeAddr, chunkAddressFunc)
-		})
-	}
-	return s.processBytes(ctx, reference, chunkAddressFunc)
+// NewService is a convenient constructor for Service.
+func NewService(store storage.Storer) *Service {
+	return &Service{store: store}
 }
 
-func (s *traversalService) TraverseBytesAddresses(
-	ctx context.Context,
-	reference swarm.Address,
-	chunkAddressFunc swarm.AddressIterFunc,
-) error {
-	return s.processBytes(ctx, reference, chunkAddressFunc)
+// Service is implementation of Interface using storage.Storer as its storage.
+type Service struct {
+	store storage.Storer
 }
 
-func (s *traversalService) TraverseManifestAddresses(
-	ctx context.Context,
-	reference swarm.Address,
-	chunkAddressFunc swarm.AddressIterFunc,
-) error {
-
-	isManifest, m, err := s.checkIsManifest(ctx, reference)
-	if err != nil {
-		return err
-	}
-	if !isManifest {
-		return ErrInvalidType
-	}
-
-	err = m.IterateAddresses(ctx, func(manifestNodeAddr swarm.Address) error {
-		return s.processBytes(ctx, manifestNodeAddr, chunkAddressFunc)
-	})
-	if err != nil {
-		return fmt.Errorf("traversal: iterate chunks: %s: %w", reference, err)
-	}
-
-	return nil
-}
-
-// checkIsManifest checks if the content is manifest.
-func (s *traversalService) checkIsManifest(
-	ctx context.Context,
-	reference swarm.Address,
-) (isManifest bool, m manifest.Interface, err error) {
-
-	// NOTE: 'encrypted' parameter only used for saving manifest
-	m, err = manifest.NewDefaultManifestReference(
-		reference,
-		loadsave.New(s.storer, storage.ModePutRequest, false),
-	)
-	if err != nil {
-		if err == manifest.ErrInvalidManifestType {
-			// ignore
-			err = nil
-			return
+// Traverse implements Traverser.Traverse method.
+func (s *Service) Traverse(ctx context.Context, addr swarm.Address, iterFn swarm.AddressIterFunc) error {
+	processBytes := func(ref swarm.Address) error {
+		j, _, err := joiner.New(ctx, s.store, ref)
+		if err != nil {
+			return fmt.Errorf("traversal: joiner error on %q: %w", ref, err)
+		}
+		err = j.IterateChunkAddresses(iterFn)
+		if err != nil {
+			return fmt.Errorf("traversal: iterate chunk address error for %q: %w", ref, err)
 		}
-		err = fmt.Errorf("traversal: read manifest: %s: %w", reference, err)
-		return
+		return nil
 	}
-	isManifest = true
-	return
-}
 
-func (s *traversalService) processBytes(
-	ctx context.Context,
-	reference swarm.Address,
-	chunkAddressFunc swarm.AddressIterFunc,
-) error {
-	j, _, err := joiner.New(ctx, s.storer, reference)
-	if err != nil {
-		return fmt.Errorf("traversal: joiner: %s: %w", reference, err)
+	ls := loadsave.New(s.store, storage.ModePutRequest, false)
+	switch mf, err := manifest.NewDefaultManifestReference(addr, ls); {
+	case errors.Is(err, manifest.ErrInvalidManifestType):
+		break
+	case err != nil:
+		return fmt.Errorf("traversal: unable to create manifest reference for %q: %w", addr, err)
+	default:
+		err := mf.IterateAddresses(ctx, processBytes)
+		if errors.Is(err, mantaray.ErrTooShort) || errors.Is(err, mantaray.ErrInvalidVersionHash) {
+			// Based on the returned errors we conclude that it might
+			// not be a manifest, so we try non-manifest processing.
+			break
+		}
+		if err != nil {
+			return fmt.Errorf("traversal: unable to process bytes for %q: %w", addr, err)
+		}
+		return nil
 	}
 
-	err = j.IterateChunkAddresses(chunkAddressFunc)
-	if err != nil {
-		return fmt.Errorf("traversal: iterate chunks: %s: %w", reference, err)
+	// Non-manifest processing.
+	if err := processBytes(addr); err != nil {
+		return fmt.Errorf("traversal: unable to process bytes for %q: %w", addr, err)
 	}
-
 	return nil
 }

pkg/traversal/traversal_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package traversal_test
+package traversal
 
 import (
 	"bytes"
@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"math"
 	"path"
-	"sort"
 	"sync"
 	"testing"
 	"time"
@@ -21,150 +20,184 @@ import (
 	"github.com/ethersphere/bee/pkg/storage"
 	"github.com/ethersphere/bee/pkg/storage/mock"
 	"github.com/ethersphere/bee/pkg/swarm"
-	"github.com/ethersphere/bee/pkg/traversal"
 )
 
-var (
-	simpleData       = []byte("hello test world") // fixed, 16 bytes
+const (
+	dataCorpus       = "hello test world" // 16 bytes.
 	defaultMediaType = "bzz-manifest-mantaray"
 )
 
-func generateSampleData(size int) (b []byte) {
-	for {
-		b = append(b, simpleData...)
-		if len(b) >= size {
-			break
-		}
+func generateSample(size int) []byte {
+	buf := make([]byte, size)
+	for n := 0; n < size; {
+		n += copy(buf[n:], dataCorpus)
 	}
+	return buf
+}
 
-	b = b[:size]
+// newAddressIterator is a convenient constructor for creating addressIterator.
+func newAddressIterator(ignoreDuplicates bool) *addressIterator {
+	return &addressIterator{
+		seen:             make(map[string]bool),
+		ignoreDuplicates: ignoreDuplicates,
+	}
+}
 
-	return b
+// addressIterator is a simple collector of statistics
+// targeting swarm.AddressIterFunc execution.
+type addressIterator struct {
+	mu   sync.Mutex // mu guards cnt and seen fields.
+	cnt  int
+	seen map[string]bool
+	// Settings.
+	ignoreDuplicates bool
 }
 
-func TestTraversalBytes(t *testing.T) {
-	traverseFn := func(traversalService traversal.Service) func(context.Context, swarm.Address, swarm.AddressIterFunc) error {
-		return traversalService.TraverseBytesAddresses
+// Next matches the signature of swarm.AddressIterFunc needed in
+// Traverser.Traverse method and collects statistics about it's execution.
+func (i *addressIterator) Next(addr swarm.Address) error {
+	i.mu.Lock()
+	defer i.mu.Unlock()
+
+	i.cnt++
+	if !i.ignoreDuplicates && i.seen[addr.String()] {
+		return fmt.Errorf("duplicit address: %q", addr.String())
 	}
+	i.seen[addr.String()] = true
+	return nil
+}
 
+var _ Traverser = (*Service)(nil)
+
+func TestTraversalBytes(t *testing.T) {
 	testCases := []struct {
-		dataSize            int
-		expectedHashesCount int
-		expectedHashes      []string
-		ignoreDuplicateHash bool
+		dataSize              int
+		wantHashCount         int
+		wantHashes            []string
+		ignoreDuplicateHashes bool
 	}{
 		{
-			dataSize:            len(simpleData),
-			expectedHashesCount: 1,
-			expectedHashes: []string{
+			dataSize:      len(dataCorpus),
+			wantHashCount: 1,
+			wantHashes: []string{
 				"e94a5aadf259f008b7d5039420c65d692901846523f503d97d24e2f077786d9a",
 			},
 		},
 		{
-			dataSize:            swarm.ChunkSize,
-			expectedHashesCount: 1,
-			expectedHashes: []string{
+			dataSize:      swarm.ChunkSize,
+			wantHashCount: 1,
+			wantHashes: []string{
 				"f833c17be12d68aec95eca7f9d993f7d7aaa7a9c282eb2c3d79ab26a5aeaf384", // bytes (4096)
 			},
 		},
 		{
-			dataSize:            swarm.ChunkSize + 1,
-			expectedHashesCount: 3,
-			expectedHashes: []string{
+			dataSize:      swarm.ChunkSize + 1,
+			wantHashCount: 3,
+			wantHashes: []string{
 				"a1c4483d15167aeb406017942c9625464574cf70bf7e42f237094acbccdb6834", // bytes (joiner)
 				"f833c17be12d68aec95eca7f9d993f7d7aaa7a9c282eb2c3d79ab26a5aeaf384", // bytes (4096)
 				"dcbfb467950a28f8c5023b86d31de4ff3a337993e921ae623ae62c7190d60329", // bytes (1)
 			},
 		},
 		{
-			dataSize:            swarm.ChunkSize * 128,
-			expectedHashesCount: 129,
-			expectedHashes: []string{
+			dataSize:      swarm.ChunkSize * 128,
+			wantHashCount: 129,
+			wantHashes: []string{
 				"5060cfd2a34df0269b47201e1f202eb2a165d787a0c5043ceb29bb85b7567c61", // bytes (joiner)
 				"f833c17be12d68aec95eca7f9d993f7d7aaa7a9c282eb2c3d79ab26a5aeaf384", // bytes (4096)
 			},
-			ignoreDuplicateHash: true,
+			ignoreDuplicateHashes: true,
 		},
 		{
-			dataSize:            swarm.ChunkSize * 129,
-			expectedHashesCount: 131,
-			expectedHashes: []string{
+			dataSize:      swarm.ChunkSize * 129,
+			wantHashCount: 131,
+			wantHashes: []string{
 				"150665dfbd81f80f5ba00a0caa2caa34f8b94e662e1dea769fe9ce7ea170bf25", // root (joiner, chunk)
 				"5060cfd2a34df0269b47201e1f202eb2a165d787a0c5043ceb29bb85b7567c61", // bytes (joiner)
 				"f833c17be12d68aec95eca7f9d993f7d7aaa7a9c282eb2c3d79ab26a5aeaf384", // bytes (4096)
 			},
-			ignoreDuplicateHash: true,
+			ignoreDuplicateHashes: true,
 		},
 		{
-			dataSize:            swarm.ChunkSize*129 - 1,
-			expectedHashesCount: 131,
-			expectedHashes: []string{
+			dataSize:      swarm.ChunkSize*129 - 1,
+			wantHashCount: 131,
+			wantHashes: []string{
 				"895610b2d795e7cc351a8336d46ba9ef37309d83267d272c6e257e46a78ecb7c", // root (joiner, chunk)
 				"5060cfd2a34df0269b47201e1f202eb2a165d787a0c5043ceb29bb85b7567c61", // bytes (joiner)
 				"f833c17be12d68aec95eca7f9d993f7d7aaa7a9c282eb2c3d79ab26a5aeaf384", // bytes (4096)
 				"d18f0d81b832086376684558978cfe6773ed773178f84961c8b750fe72033a26", // bytes (4095)
 			},
-			ignoreDuplicateHash: true,
+			ignoreDuplicateHashes: true,
 		},
 		{
-			dataSize:            swarm.ChunkSize*129 + 1,
-			expectedHashesCount: 133,
-			expectedHashes: []string{
+			dataSize:      swarm.ChunkSize*129 + 1,
+			wantHashCount: 133,
+			wantHashes: []string{
 				"023ee8b901702a999e9ef90ca2bc1c6db1daefb3f178b683a87b0fd613fd8e21", // root (joiner, chunk)
 				"5060cfd2a34df0269b47201e1f202eb2a165d787a0c5043ceb29bb85b7567c61", // bytes (joiner [4096 * 128])
 				"f833c17be12d68aec95eca7f9d993f7d7aaa7a9c282eb2c3d79ab26a5aeaf384", // bytes (4096)
 				"dcbfb467950a28f8c5023b86d31de4ff3a337993e921ae623ae62c7190d60329", // bytes (1)
 				"a1c4483d15167aeb406017942c9625464574cf70bf7e42f237094acbccdb6834", // bytes (joiner - [4096, 1])
 			},
-			ignoreDuplicateHash: true,
+			ignoreDuplicateHashes: true,
 		},
 	}
 
 	for _, tc := range testCases {
 		chunkCount := int(math.Ceil(float64(tc.dataSize) / swarm.ChunkSize))
-
-		testName := fmt.Sprintf("%d-chunk-%d-bytes", chunkCount, tc.dataSize)
-
-		t.Run(testName, func(t *testing.T) {
+		t.Run(fmt.Sprintf("%d-chunk-%d-bytes", chunkCount, tc.dataSize), func(t *testing.T) {
 			var (
-				mockStorer = mock.NewStorer()
+				data       = generateSample(tc.dataSize)
+				iter       = newAddressIterator(tc.ignoreDuplicateHashes)
+				storerMock = mock.NewStorer()
 			)
 
-			ctx := context.Background()
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
 
-			bytesData := generateSampleData(tc.dataSize)
+			pipe := builder.NewPipelineBuilder(ctx, storerMock, storage.ModePutUpload, false)
+			address, err := builder.FeedPipeline(ctx, pipe, bytes.NewReader(data), int64(len(data)))
+			if err != nil {
+				t.Fatal(err)
+			}
 
-			pipe := builder.NewPipelineBuilder(ctx, mockStorer, storage.ModePutUpload, false)
-			address, err := builder.FeedPipeline(ctx, pipe, bytes.NewReader(bytesData), int64(len(bytesData)))
+			err = NewService(storerMock).Traverse(ctx, address, iter.Next)
 			if err != nil {
 				t.Fatal(err)
 			}
 
-			traversalCheck(t, mockStorer, traverseFn, address, tc.expectedHashesCount, tc.expectedHashes, tc.ignoreDuplicateHash)
+			haveCnt, wantCnt := tc.wantHashCount, iter.cnt
+			if !tc.ignoreDuplicateHashes {
+				haveCnt, wantCnt = len(iter.seen), len(tc.wantHashes)
+			}
+			if haveCnt != wantCnt {
+				t.Fatalf("hash count mismatch: have %d; want %d", haveCnt, wantCnt)
+			}
+
+			for _, hash := range tc.wantHashes {
+				if !iter.seen[hash] {
+					t.Fatalf("hash check: want %q; have none", hash)
+				}
+			}
 		})
 	}
-
 }
 
 func TestTraversalFiles(t *testing.T) {
-	traverseFn := func(traversalService traversal.Service) func(context.Context, swarm.Address, swarm.AddressIterFunc) error {
-		return traversalService.TraverseAddresses
-	}
-
 	testCases := []struct {
-		filesSize           int
-		contentType         string
-		filename            string
-		expectedHashesCount int
-		expectedHashes      []string
-		ignoreDuplicateHash bool
+		filesSize             int
+		contentType           string
+		filename              string
+		wantHashCount         int
+		wantHashes            []string
+		ignoreDuplicateHashes bool
 	}{
 		{
-			filesSize:           len(simpleData),
-			contentType:         "text/plain; charset=utf-8",
-			filename:            "simple.txt",
-			expectedHashesCount: 4,
-			expectedHashes: []string{
+			filesSize:     len(dataCorpus),
+			contentType:   "text/plain; charset=utf-8",
+			filename:      "simple.txt",
+			wantHashCount: 4,
+			wantHashes: []string{
 				"ae16fb27474b41273c0deb355e4405d3cd0a6639f834285f97c75636c9e29df7", // root manifest
 				"0cc878d32c96126d47f63fbe391114ee1438cd521146fc975dea1546d302b6c0", // mainifest root metadata
 				"05e34f11a0967e8c09968b69c4f486f569ef58a31a197992e01304a1e59f8e75", // manifest file entry
@@ -172,10 +205,10 @@ func TestTraversalFiles(t *testing.T) {
 			},
 		},
 		{
-			filesSize:           swarm.ChunkSize,
-			contentType:         "text/plain; charset=utf-8",
-			expectedHashesCount: 6,
-			expectedHashes: []string{
+			filesSize:     swarm.ChunkSize,
+			contentType:   "text/plain; charset=utf-8",
+			wantHashCount: 6,
+			wantHashes: []string{
 				"7e0a4b6cd542eb501f372438cbbbcd8a82c444740f00bdd54f4981f487bcf8b7", // root manifest
 				"0cc878d32c96126d47f63fbe391114ee1438cd521146fc975dea1546d302b6c0", // manifest root metadata
 				"3f538c3b5225111a79b3b1dbb5e269ca2115f2a7caf0e6925b773457cdef7be5", // manifest file entry (Edge)
@@ -185,11 +218,11 @@ func TestTraversalFiles(t *testing.T) {
 			},
 		},
 		{
-			filesSize:           swarm.ChunkSize + 1,
-			contentType:         "text/plain; charset=utf-8",
-			filename:            "simple.txt",
-			expectedHashesCount: 6,
-			expectedHashes: []string{
+			filesSize:     swarm.ChunkSize + 1,
+			contentType:   "text/plain; charset=utf-8",
+			filename:      "simple.txt",
+			wantHashCount: 6,
+			wantHashes: []string{
 				"ea58761906f98bd88204efbbab5c690329af02548afec37d7a556a47ca78ac62", // manifest root
 				"0cc878d32c96126d47f63fbe391114ee1438cd521146fc975dea1546d302b6c0", // manifest root metadata
 				"85617df0249a12649b56d09cf7f21e8642627b4fb9c0c9e03e2d25340cf60499", // manifest file entry
@@ -202,25 +235,23 @@ func TestTraversalFiles(t *testing.T) {
 
 	for _, tc := range testCases {
 		chunkCount := int(math.Ceil(float64(tc.filesSize) / swarm.ChunkSize))
-
-		testName := fmt.Sprintf("%d-chunk-%d-bytes", chunkCount, tc.filesSize)
-
-		t.Run(testName, func(t *testing.T) {
+		t.Run(fmt.Sprintf("%d-chunk-%d-bytes", chunkCount, tc.filesSize), func(t *testing.T) {
 			var (
-				mockStorer = mock.NewStorer()
+				data       = generateSample(tc.filesSize)
+				iter       = newAddressIterator(tc.ignoreDuplicateHashes)
+				storerMock = mock.NewStorer()
 			)
 
-			ctx := context.Background()
-
-			bytesData := generateSampleData(tc.filesSize)
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
 
-			pipe := builder.NewPipelineBuilder(ctx, mockStorer, storage.ModePutUpload, false)
-			fr, err := builder.FeedPipeline(ctx, pipe, bytes.NewReader(bytesData), int64(len(bytesData)))
+			pipe := builder.NewPipelineBuilder(ctx, storerMock, storage.ModePutUpload, false)
+			fr, err := builder.FeedPipeline(ctx, pipe, bytes.NewReader(data), int64(len(data)))
 			if err != nil {
 				t.Fatal(err)
 			}
 
-			ls := loadsave.New(mockStorer, storage.ModePutRequest, false)
+			ls := loadsave.New(storerMock, storage.ModePutRequest, false)
 			fManifest, err := manifest.NewDefaultManifest(ls, false)
 			if err != nil {
 				t.Fatal(err)
@@ -247,15 +278,31 @@ func TestTraversalFiles(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			reference, err := fManifest.Store(ctx)
+			address, err := fManifest.Store(ctx)
 			if err != nil {
 				t.Fatal(err)
 			}
 
-			traversalCheck(t, mockStorer, traverseFn, reference, tc.expectedHashesCount, tc.expectedHashes, tc.ignoreDuplicateHash)
+			err = NewService(storerMock).Traverse(ctx, address, iter.Next)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			haveCnt, wantCnt := tc.wantHashCount, iter.cnt
+			if !tc.ignoreDuplicateHashes {
+				haveCnt, wantCnt = len(iter.seen), len(tc.wantHashes)
+			}
+			if haveCnt != wantCnt {
+				t.Fatalf("hash count mismatch: have %d; want %d", haveCnt, wantCnt)
+			}
+
+			for _, hash := range tc.wantHashes {
+				if !iter.seen[hash] {
+					t.Fatalf("hash check: want %q; have none", hash)
+				}
+			}
 		})
 	}
-
 }
 
 type file struct {
@@ -270,20 +317,16 @@ type fileChunks struct {
 }
 
 func TestTraversalManifest(t *testing.T) {
-	traverseFn := func(traversalService traversal.Service) func(context.Context, swarm.Address, swarm.AddressIterFunc) error {
-		return traversalService.TraverseManifestAddresses
-	}
-
 	testCases := []struct {
-		files               []file
-		manifestHashes      []string
-		expectedHashesCount int
-		ignoreDuplicateHash bool
+		files                 []file
+		manifestHashes        []string
+		wantHashCount         int
+		ignoreDuplicateHashes bool
 	}{
 		{
 			files: []file{
 				{
-					size: len(simpleData),
+					size: len(dataCorpus),
 					dir:  "",
 					name: "hello.txt",
 					chunks: fileChunks{
@@ -298,12 +341,12 @@ func TestTraversalManifest(t *testing.T) {
 				"f81ac8ceb2db7e55b718eca35f05233dc523022e36e11f934dbfd5f0cafde198", // root
 				"05e34f11a0967e8c09968b69c4f486f569ef58a31a197992e01304a1e59f8e75", // metadata
 			},
-			expectedHashesCount: 3,
+			wantHashCount: 3,
 		},
 		{
 			files: []file{
 				{
-					size: len(simpleData),
+					size: len(dataCorpus),
 					dir:  "",
 					name: "hello.txt",
 					chunks: fileChunks{
@@ -341,45 +384,38 @@ func TestTraversalManifest(t *testing.T) {
 				"b2662d17d51ce734695d993b44c0e2df34c3f50d5889e5bc3b8718838658e6b0", // manifest file entry (1.txt)
 				"b2662d17d51ce734695d993b44c0e2df34c3f50d5889e5bc3b8718838658e6b0", // manifest file entry (2.txt)
 			},
-			expectedHashesCount: 8,
-			ignoreDuplicateHash: true,
+			wantHashCount:         8,
+			ignoreDuplicateHashes: true,
 		},
 	}
 
 	for _, tc := range testCases {
-
-		testName := fmt.Sprintf("%s-%d-files-%d-chunks", defaultMediaType, len(tc.files), tc.expectedHashesCount)
-
-		t.Run(testName, func(t *testing.T) {
+		t.Run(fmt.Sprintf("%s-%d-files-%d-chunks", defaultMediaType, len(tc.files), tc.wantHashCount), func(t *testing.T) {
 			var (
-				mockStorer = mock.NewStorer()
+				storerMock = mock.NewStorer()
+				iter       = newAddressIterator(tc.ignoreDuplicateHashes)
 			)
 
-			expectedHashes := []string{}
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
 
-			// add hashes for files
+			var wantHashes []string
 			for _, f := range tc.files {
-				// add hash for each content
-				expectedHashes = append(expectedHashes, f.chunks.content...)
+				wantHashes = append(wantHashes, f.chunks.content...)
 			}
+			wantHashes = append(wantHashes, tc.manifestHashes...)
 
-			// add hashes for manifest
-			expectedHashes = append(expectedHashes, tc.manifestHashes...)
-
-			ctx := context.Background()
-
-			ls := loadsave.New(mockStorer, storage.ModePutRequest, false)
+			ls := loadsave.New(storerMock, storage.ModePutRequest, false)
 			dirManifest, err := manifest.NewMantarayManifest(ls, false)
 			if err != nil {
 				t.Fatal(err)
 			}
 
-			// add files to manifest
 			for _, f := range tc.files {
-				bytesData := generateSampleData(f.size)
+				data := generateSample(f.size)
 
-				pipe := builder.NewPipelineBuilder(ctx, mockStorer, storage.ModePutUpload, false)
-				fr, err := builder.FeedPipeline(ctx, pipe, bytes.NewReader(bytesData), int64(len(bytesData)))
+				pipe := builder.NewPipelineBuilder(ctx, storerMock, storage.ModePutUpload, false)
+				fr, err := builder.FeedPipeline(ctx, pipe, bytes.NewReader(data), int64(len(data)))
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -395,80 +431,29 @@ func TestTraversalManifest(t *testing.T) {
 					t.Fatal(err)
 				}
 			}
-			// save manifest
-			manifestReference, err := dirManifest.Store(ctx)
+			address, err := dirManifest.Store(ctx)
 			if err != nil {
 				t.Fatal(err)
 			}
 
-			traversalCheck(t, mockStorer, traverseFn, manifestReference, tc.expectedHashesCount, expectedHashes, tc.ignoreDuplicateHash)
-		})
-	}
+			err = NewService(storerMock).Traverse(ctx, address, iter.Next)
+			if err != nil {
+				t.Fatal(err)
+			}
 
-}
+			haveCnt, wantCnt := tc.wantHashCount, iter.cnt
+			if !tc.ignoreDuplicateHashes {
+				haveCnt, wantCnt = len(iter.seen), len(wantHashes)
+			}
+			if haveCnt != wantCnt {
+				t.Fatalf("hash count mismatch: have %d; want %d", haveCnt, wantCnt)
+			}
 
-func traversalCheck(t *testing.T,
-	storer storage.Storer,
-	traverseFn func(traversalService traversal.Service) func(context.Context, swarm.Address, swarm.AddressIterFunc) error,
-	reference swarm.Address,
-	expectedHashesCount int,
-	expectedHashes []string,
-	ignoreDuplicateHash bool,
-) {
-	t.Helper()
-
-	// sort input
-	sort.Strings(expectedHashes)
-
-	// traverse chunks
-	traversalService := traversal.NewService(storer)
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	foundAddressesCount := 0
-	foundAddresses := make(map[string]struct{})
-	var foundAddressesMu sync.Mutex
-
-	err := traverseFn(traversalService)(
-		ctx,
-		reference,
-		func(addr swarm.Address) error {
-			foundAddressesMu.Lock()
-			defer foundAddressesMu.Unlock()
-
-			foundAddressesCount++
-			if !ignoreDuplicateHash {
-				if _, ok := foundAddresses[addr.String()]; ok {
-					t.Fatalf("address found again: %s", addr.String())
+			for _, hash := range wantHashes {
+				if !iter.seen[hash] {
+					t.Fatalf("hash check: want %q; have none", hash)
 				}
 			}
-			foundAddresses[addr.String()] = struct{}{}
-			return nil
 		})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expectedHashesCount != foundAddressesCount {
-		t.Fatalf("expected to find %d addresses, got %d", expectedHashesCount, foundAddressesCount)
-	}
-
-	if !ignoreDuplicateHash {
-		if len(expectedHashes) != len(foundAddresses) {
-			t.Fatalf("expected to find %d addresses hashes, got %d", len(expectedHashes), len(foundAddresses))
-		}
-	}
-
-	checkAddressFound := func(t *testing.T, foundAddresses map[string]struct{}, address string) {
-		t.Helper()
-
-		if _, ok := foundAddresses[address]; !ok {
-			t.Fatalf("expected address %s not found", address)
-		}
-	}
-
-	for _, createdAddress := range expectedHashes {
-		checkAddressFound(t, foundAddresses, createdAddress)
 	}
 }