Merge branch 'master' into saihaj/579

graphprotocol · Sep 20, 2022 · ee988ac · ee988ac
2 parents f6b5b8b + 7356e0b
commit ee988ac
Show file tree

Hide file tree

Showing 54 changed files with 2,352 additions and 741 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chain/arweave/Cargo.toml b/chain/arweave/Cargo.toml
@@ -12,7 +12,7 @@ graph = { path = "../../graph" }
 prost = "0.10.1"
 prost-types = "0.10.1"
 serde = "1.0"
-sha2 = "0.10.2"
+sha2 = "0.10.5"
 
 graph-runtime-wasm = { path = "../../runtime/wasm" }
 graph-runtime-derive = { path = "../../runtime/derive" }

diff --git a/chain/ethereum/examples/firehose.rs b/chain/ethereum/examples/firehose.rs
@@ -24,6 +24,7 @@ async fn main() -> Result<(), Error> {
         "https://api.streamingfast.io:443",
         token,
         false,
+        false,
         1,
     ));
 

diff --git a/chain/substreams/examples/substreams.rs b/chain/substreams/examples/substreams.rs
@@ -50,6 +50,7 @@ async fn main() -> Result<(), Error> {
         &endpoint,
         token,
         false,
+        false,
         1,
     ));
 

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -36,5 +36,5 @@ graph-mock = { path = "../mock" }
 test-store = { path = "../store/test-store" }
 hex = "0.4.3"
 graphql-parser = "0.4.0"
-pretty_assertions = "1.2.1"
+pretty_assertions = "1.3.0"
 anyhow = "1.0"
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -30,6 +30,14 @@ RUN cd /graph-node \
     && echo "CARGO_VERSION='$(cargo --version)'" >> /etc/image-info \
     && echo "RUST_VERSION='$(rustc --version)'" >> /etc/image-info
 
+# Debug image to access core dumps
+FROM graph-node-build as graph-node-debug
+RUN apt-get update \
+    && apt-get install -y curl gdb postgresql-client
+
+COPY docker/Dockerfile /Dockerfile
+COPY docker/bin/* /usr/local/bin/
+
 # The graph-node runtime image with only the executable
 FROM debian:buster-slim as graph-node
 ENV RUST_LOG ""
@@ -82,11 +90,3 @@ COPY --from=graph-node-build /usr/local/cargo/bin/graph-node /usr/local/cargo/bi
 COPY --from=graph-node-build /etc/image-info /etc/image-info
 COPY docker/Dockerfile /Dockerfile
 CMD start
-
-# Debug image to access core dumps
-FROM graph-node-build as graph-node-debug
-RUN apt-get update \
-    && apt-get install -y curl gdb postgresql-client
-
-COPY docker/Dockerfile /Dockerfile
-COPY docker/bin/* /usr/local/bin/
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ async fn main() -> Result<(), Error> { @@
             "https://api.streamingfast.io:443",
             token,
             false,
+            false,
 ,
         ));
@@ Expand Down @@