From ed05756eea91c06cfc81aee1d22b6d31cb40d9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Duchesneau?= Date: Mon, 18 Mar 2024 09:39:46 -0400 Subject: [PATCH 1/5] bump substreams --- .github/workflows/docker.yml | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 908ab0d..271595b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,6 +6,7 @@ on: - "v*" branches: - "develop" + - "feature/*" workflow_dispatch: env: diff --git a/go.mod b/go.mod index edbef99..e34fad3 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 github.com/streamingfast/pbgo v0.0.6-0.20240131193313-6b88bc7139db github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 - github.com/streamingfast/substreams v1.3.8-0.20240312140732-28fb8a59422a + github.com/streamingfast/substreams v1.3.8-0.20240315195136-9049f111f1e7 github.com/stretchr/testify v1.8.4 github.com/test-go/testify v1.1.4 go.uber.org/multierr v1.10.0 diff --git a/go.sum b/go.sum index cbeb9cc..cb8f49c 100644 --- a/go.sum +++ b/go.sum @@ -625,8 +625,8 @@ github.com/streamingfast/shutter v1.5.0 h1:NpzDYzj0HVpSiDJVO/FFSL6QIK/YKOxY0gJAt github.com/streamingfast/shutter v1.5.0/go.mod h1:B/T6efqdeMGbGwjzPS1ToXzYZI4kDzI5/u4I+7qbjY8= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 h1:Y15G1Z4fpEdm2b+/70owI7TLuXadlqBtGM7rk4Hxrzk= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0/go.mod h1:/Rnz2TJvaShjUct0scZ9kKV2Jr9/+KBAoWy4UMYxgv4= -github.com/streamingfast/substreams v1.3.8-0.20240312140732-28fb8a59422a h1:RKbmtCDtkk1tRMOtwEHWptQ7GZ7xRnpC6l0j4XBMmSw= -github.com/streamingfast/substreams v1.3.8-0.20240312140732-28fb8a59422a/go.mod h1:CuJIOPBZEUN4jaG7Uxgcg5QXCcZwJV4nGD41i19Yb1k= +github.com/streamingfast/substreams v1.3.8-0.20240315195136-9049f111f1e7 h1:XtwwPLLXmms3OUhYQlee3THcqTP5LWG/NqIQ93MDsaQ= +github.com/streamingfast/substreams v1.3.8-0.20240315195136-9049f111f1e7/go.mod h1:CuJIOPBZEUN4jaG7Uxgcg5QXCcZwJV4nGD41i19Yb1k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= From 59955e0d6a9b0107636546c62dc7ad58d62dc1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Duchesneau?= Date: Tue, 19 Mar 2024 15:52:49 -0400 Subject: [PATCH 2/5] bump substreams --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e34fad3..709869a 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 github.com/streamingfast/pbgo v0.0.6-0.20240131193313-6b88bc7139db github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 - github.com/streamingfast/substreams v1.3.8-0.20240315195136-9049f111f1e7 + github.com/streamingfast/substreams v1.3.8-0.20240319191803-0987bc583681 github.com/stretchr/testify v1.8.4 github.com/test-go/testify v1.1.4 go.uber.org/multierr v1.10.0 diff --git a/go.sum b/go.sum index cb8f49c..ea4c830 100644 --- a/go.sum +++ b/go.sum @@ -625,8 +625,8 @@ github.com/streamingfast/shutter v1.5.0 h1:NpzDYzj0HVpSiDJVO/FFSL6QIK/YKOxY0gJAt github.com/streamingfast/shutter v1.5.0/go.mod h1:B/T6efqdeMGbGwjzPS1ToXzYZI4kDzI5/u4I+7qbjY8= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 h1:Y15G1Z4fpEdm2b+/70owI7TLuXadlqBtGM7rk4Hxrzk= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0/go.mod h1:/Rnz2TJvaShjUct0scZ9kKV2Jr9/+KBAoWy4UMYxgv4= -github.com/streamingfast/substreams v1.3.8-0.20240315195136-9049f111f1e7 h1:XtwwPLLXmms3OUhYQlee3THcqTP5LWG/NqIQ93MDsaQ= -github.com/streamingfast/substreams v1.3.8-0.20240315195136-9049f111f1e7/go.mod h1:CuJIOPBZEUN4jaG7Uxgcg5QXCcZwJV4nGD41i19Yb1k= +github.com/streamingfast/substreams v1.3.8-0.20240319191803-0987bc583681 h1:GBBkBWcDSwRU4wi44wEWfe16txbYYHKjhagauRVYa9k= +github.com/streamingfast/substreams v1.3.8-0.20240319191803-0987bc583681/go.mod h1:CuJIOPBZEUN4jaG7Uxgcg5QXCcZwJV4nGD41i19Yb1k= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= From b48f46df0c380ba99bf792e66f12fb6df767a29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Duchesneau?= Date: Wed, 20 Mar 2024 13:03:52 -0400 Subject: [PATCH 3/5] bump substreams, revisited scheduler --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 709869a..3b1ee08 100644 --- a/go.mod +++ b/go.mod @@ -25,12 +25,12 @@ require ( github.com/streamingfast/dhammer v0.0.0-20230125192823-c34bbd561bd4 github.com/streamingfast/dmetering v0.0.0-20240227170539-29b479694f8f github.com/streamingfast/dmetrics v0.0.0-20230919161904-206fa8ebd545 - github.com/streamingfast/dstore v0.1.1-0.20240311181234-470a7a84936f + github.com/streamingfast/dstore v0.1.1-0.20240320135256-1aeefdeeecd5 github.com/streamingfast/jsonpb v0.0.0-20210811021341-3670f0aa02d0 github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 github.com/streamingfast/pbgo v0.0.6-0.20240131193313-6b88bc7139db github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 - github.com/streamingfast/substreams v1.3.8-0.20240319191803-0987bc583681 + github.com/streamingfast/substreams v1.3.8-0.20240320165847-e377e61a3229 github.com/stretchr/testify v1.8.4 github.com/test-go/testify v1.1.4 go.uber.org/multierr v1.10.0 diff --git a/go.sum b/go.sum index ea4c830..3f6c41a 100644 --- a/go.sum +++ b/go.sum @@ -600,8 +600,8 @@ github.com/streamingfast/dmetering v0.0.0-20240227170539-29b479694f8f h1:GEi9o8x github.com/streamingfast/dmetering v0.0.0-20240227170539-29b479694f8f/go.mod h1:UqWuX3REU/IInBUaymFN2eLjuvz+/0SsoUFjeQlLNyI= github.com/streamingfast/dmetrics v0.0.0-20230919161904-206fa8ebd545 h1:SUl04bZKGAv207lp7/6CHOJIRpjUKunwItrno3K463Y= github.com/streamingfast/dmetrics v0.0.0-20230919161904-206fa8ebd545/go.mod h1:JbxEDbzWRG1dHdNIPrYfuPllEkktZMgm40AwVIBENcw= -github.com/streamingfast/dstore v0.1.1-0.20240311181234-470a7a84936f h1:a7ANk6z1IiEMMUEV02Y5QoczDy/bOxeu9py5d3Kmw6E= -github.com/streamingfast/dstore v0.1.1-0.20240311181234-470a7a84936f/go.mod h1:kNzxgv2MzYFn2T4kelBVpGp/yP/1njtr3+csWuqxK3w= +github.com/streamingfast/dstore v0.1.1-0.20240320135256-1aeefdeeecd5 h1:PnlBR7S1PDdCjPXhYsCYh8P/JCoZmpX6TL/zUI8jPC4= +github.com/streamingfast/dstore v0.1.1-0.20240320135256-1aeefdeeecd5/go.mod h1:kNzxgv2MzYFn2T4kelBVpGp/yP/1njtr3+csWuqxK3w= github.com/streamingfast/dtracing v0.0.0-20220305214756-b5c0e8699839 h1:K6mJPvh1jAL+/gBS7Bh9jyzWaTib6N47m06gZOTUPwQ= github.com/streamingfast/dtracing v0.0.0-20220305214756-b5c0e8699839/go.mod h1:huOJyjMYS6K8upTuxDxaNd+emD65RrXoVBvh8f1/7Ns= github.com/streamingfast/jsonpb v0.0.0-20210811021341-3670f0aa02d0 h1:g8eEYbFSykyzIyuxNMmHEUGGUvJE0ivmqZagLDK42gw= @@ -625,8 +625,8 @@ github.com/streamingfast/shutter v1.5.0 h1:NpzDYzj0HVpSiDJVO/FFSL6QIK/YKOxY0gJAt github.com/streamingfast/shutter v1.5.0/go.mod h1:B/T6efqdeMGbGwjzPS1ToXzYZI4kDzI5/u4I+7qbjY8= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 h1:Y15G1Z4fpEdm2b+/70owI7TLuXadlqBtGM7rk4Hxrzk= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0/go.mod h1:/Rnz2TJvaShjUct0scZ9kKV2Jr9/+KBAoWy4UMYxgv4= -github.com/streamingfast/substreams v1.3.8-0.20240319191803-0987bc583681 h1:GBBkBWcDSwRU4wi44wEWfe16txbYYHKjhagauRVYa9k= -github.com/streamingfast/substreams v1.3.8-0.20240319191803-0987bc583681/go.mod h1:CuJIOPBZEUN4jaG7Uxgcg5QXCcZwJV4nGD41i19Yb1k= +github.com/streamingfast/substreams v1.3.8-0.20240320165847-e377e61a3229 h1:vETu+QXsI11kecc/EihXW+R8r4AH3vQTSnUnKSflpAo= +github.com/streamingfast/substreams v1.3.8-0.20240320165847-e377e61a3229/go.mod h1:obTvOWMnq7q05lGlAZ8ygbEaqc5+HWGFVYsA7cSD9Xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= From 1d83b79d3fdae4b6e8fc8951a45c2ce69df13cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Duchesneau?= Date: Wed, 20 Mar 2024 14:26:36 -0400 Subject: [PATCH 4/5] bump substreams, adding tier1 cache read bytes to total --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3b1ee08..26415e0 100644 --- a/go.mod +++ b/go.mod @@ -23,14 +23,14 @@ require ( github.com/streamingfast/derr v0.0.0-20230515163924-8570aaa43fe1 github.com/streamingfast/dgrpc v0.0.0-20240222213940-b9f324ff4d5c github.com/streamingfast/dhammer v0.0.0-20230125192823-c34bbd561bd4 - github.com/streamingfast/dmetering v0.0.0-20240227170539-29b479694f8f + github.com/streamingfast/dmetering v0.0.0-20240319201447-018aabe46634 github.com/streamingfast/dmetrics v0.0.0-20230919161904-206fa8ebd545 github.com/streamingfast/dstore v0.1.1-0.20240320135256-1aeefdeeecd5 github.com/streamingfast/jsonpb v0.0.0-20210811021341-3670f0aa02d0 github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 github.com/streamingfast/pbgo v0.0.6-0.20240131193313-6b88bc7139db github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 - github.com/streamingfast/substreams v1.3.8-0.20240320165847-e377e61a3229 + github.com/streamingfast/substreams v1.3.8-0.20240320182600-00d10a56a7f6 github.com/stretchr/testify v1.8.4 github.com/test-go/testify v1.1.4 go.uber.org/multierr v1.10.0 diff --git a/go.sum b/go.sum index 3f6c41a..6971028 100644 --- a/go.sum +++ b/go.sum @@ -596,8 +596,8 @@ github.com/streamingfast/dgrpc v0.0.0-20240222213940-b9f324ff4d5c h1:hn5ZPKGtgsc github.com/streamingfast/dgrpc v0.0.0-20240222213940-b9f324ff4d5c/go.mod h1:EPtUX/vhRphE37Zo6sDcgD/S3sm5YqXHhxAgzS6Ebwo= github.com/streamingfast/dhammer v0.0.0-20230125192823-c34bbd561bd4 h1:HKi8AIkLBzxZWmbCRUo1RxoOLK33iXO6gZprfsE9rf4= github.com/streamingfast/dhammer v0.0.0-20230125192823-c34bbd561bd4/go.mod h1:ehPytv7E4rI65iLcrwTes4rNGGqPPiugnH+20nDQyp4= -github.com/streamingfast/dmetering v0.0.0-20240227170539-29b479694f8f h1:GEi9o8xu++upU2AWAR2WG/0Digk3KlTT/ZKzDko0vpk= -github.com/streamingfast/dmetering v0.0.0-20240227170539-29b479694f8f/go.mod h1:UqWuX3REU/IInBUaymFN2eLjuvz+/0SsoUFjeQlLNyI= +github.com/streamingfast/dmetering v0.0.0-20240319201447-018aabe46634 h1:4V/Ae2KHAjTAxdPFb0ww3V/rAeUtFCe3uzBOCAFf8ls= +github.com/streamingfast/dmetering v0.0.0-20240319201447-018aabe46634/go.mod h1:UqWuX3REU/IInBUaymFN2eLjuvz+/0SsoUFjeQlLNyI= github.com/streamingfast/dmetrics v0.0.0-20230919161904-206fa8ebd545 h1:SUl04bZKGAv207lp7/6CHOJIRpjUKunwItrno3K463Y= github.com/streamingfast/dmetrics v0.0.0-20230919161904-206fa8ebd545/go.mod h1:JbxEDbzWRG1dHdNIPrYfuPllEkktZMgm40AwVIBENcw= github.com/streamingfast/dstore v0.1.1-0.20240320135256-1aeefdeeecd5 h1:PnlBR7S1PDdCjPXhYsCYh8P/JCoZmpX6TL/zUI8jPC4= @@ -625,8 +625,8 @@ github.com/streamingfast/shutter v1.5.0 h1:NpzDYzj0HVpSiDJVO/FFSL6QIK/YKOxY0gJAt github.com/streamingfast/shutter v1.5.0/go.mod h1:B/T6efqdeMGbGwjzPS1ToXzYZI4kDzI5/u4I+7qbjY8= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 h1:Y15G1Z4fpEdm2b+/70owI7TLuXadlqBtGM7rk4Hxrzk= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0/go.mod h1:/Rnz2TJvaShjUct0scZ9kKV2Jr9/+KBAoWy4UMYxgv4= -github.com/streamingfast/substreams v1.3.8-0.20240320165847-e377e61a3229 h1:vETu+QXsI11kecc/EihXW+R8r4AH3vQTSnUnKSflpAo= -github.com/streamingfast/substreams v1.3.8-0.20240320165847-e377e61a3229/go.mod h1:obTvOWMnq7q05lGlAZ8ygbEaqc5+HWGFVYsA7cSD9Xo= +github.com/streamingfast/substreams v1.3.8-0.20240320182600-00d10a56a7f6 h1:Rf3ofQenElvu2ZNP9V0Wp8MA70u5YEQwXUmBsTGYvDU= +github.com/streamingfast/substreams v1.3.8-0.20240320182600-00d10a56a7f6/go.mod h1:4A7BICg1aiPjpWVa4CIHQF1V58ZCbiodc7hVI4USgzU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= From 2ab3e4c25058fd878069fc9264a5d1389dd0009d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Duchesneau?= Date: Fri, 22 Mar 2024 14:17:15 -0400 Subject: [PATCH 5/5] bump substreams @v1.4.0 to get latest optimisations --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8179b97..5b7c6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ If you were at `firehose-core` version `1.0.0` and are bumping to `1.1.0`, you s ## Unreleased +* Substreams server @v1.4.0: performance improvements: less redundant module execution (at the cost of more cache storage). See https://github.com/streamingfast/substreams/releases/tag/v1.4.0. * Added `--substreams-tier2-max-concurrent-requests` to limit the number of concurrent requests to the tier2 substreams service. ## v1.2.4 diff --git a/go.mod b/go.mod index 26415e0..3adb7f3 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 github.com/streamingfast/pbgo v0.0.6-0.20240131193313-6b88bc7139db github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 - github.com/streamingfast/substreams v1.3.8-0.20240320182600-00d10a56a7f6 + github.com/streamingfast/substreams v1.4.0 github.com/stretchr/testify v1.8.4 github.com/test-go/testify v1.1.4 go.uber.org/multierr v1.10.0 diff --git a/go.sum b/go.sum index 6971028..fc70439 100644 --- a/go.sum +++ b/go.sum @@ -625,8 +625,8 @@ github.com/streamingfast/shutter v1.5.0 h1:NpzDYzj0HVpSiDJVO/FFSL6QIK/YKOxY0gJAt github.com/streamingfast/shutter v1.5.0/go.mod h1:B/T6efqdeMGbGwjzPS1ToXzYZI4kDzI5/u4I+7qbjY8= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0 h1:Y15G1Z4fpEdm2b+/70owI7TLuXadlqBtGM7rk4Hxrzk= github.com/streamingfast/snapshotter v0.0.0-20230316190750-5bcadfde44d0/go.mod h1:/Rnz2TJvaShjUct0scZ9kKV2Jr9/+KBAoWy4UMYxgv4= -github.com/streamingfast/substreams v1.3.8-0.20240320182600-00d10a56a7f6 h1:Rf3ofQenElvu2ZNP9V0Wp8MA70u5YEQwXUmBsTGYvDU= -github.com/streamingfast/substreams v1.3.8-0.20240320182600-00d10a56a7f6/go.mod h1:4A7BICg1aiPjpWVa4CIHQF1V58ZCbiodc7hVI4USgzU= +github.com/streamingfast/substreams v1.4.0 h1:BC4dPpABWiVC2cDypeKg3T4wEjAdD9anshK/377x7/U= +github.com/streamingfast/substreams v1.4.0/go.mod h1:4A7BICg1aiPjpWVa4CIHQF1V58ZCbiodc7hVI4USgzU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=