Merge pull request vault713#114 from ravidio/pre_release_tweaks

pre-release tweaks

Dockerfile

@@ -1,7 +1,7 @@
 # Multistage docker build, requires docker 17.05
 # based on: https://github.com/mimblewimble/grin/blob/master/etc/Dockerfile
 
-# builder stage
+# Builder stage
 FROM rust:1.31 as builder
 
 RUN set -ex && \
@@ -15,15 +15,29 @@ RUN set -ex && \
     cmake \
     git
 
+WORKDIR /usr/src
+
+# Generate project placeholder
+RUN USER=root cargo new --bin wallet713
+
 WORKDIR /usr/src/wallet713
 
-# Copying
-COPY . .
+# Copy manifest
+COPY ./Cargo.lock ./Cargo.lock
+COPY ./Cargo.toml ./Cargo.toml
+
+# Build dependencies
+RUN cargo build --release
+RUN rm ./src/*.rs
+RUN rm ./target/release/deps/wallet713*
+
+# Copy src
+COPY ./src ./src
 
-# Building
+# Build
 RUN cargo build --release
 
-# runtime stage
+# Runtime stage
 FROM debian:9.4
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales openssl ca-certificates
@@ -36,8 +50,8 @@ ENV LANG en_US.UTF-8
 
 COPY --from=builder /usr/src/wallet713/target/release/wallet713 /usr/local/bin/wallet713
 
-WORKDIR /root/.wallet713
+VOLUME /root/.wallet713
 
-VOLUME ["/root/.wallet713"]
+EXPOSE 3415 3420 13415 13420
 
 ENTRYPOINT ["wallet713"]

docs/usage.md

@@ -214,7 +214,7 @@ In the below example,
    ```
 1. Alice can now send `proof.txt` to Carol, who then can use it to verify the proof. As per the output note above, the proof **is only valid if the kernel in question is found on-chain**. One way to verify this is to locate the specific kernel in a block using a blockchain explorer.
 
-**IMPORTANT NOTE:** When sending to older versions of the wallet, the address of the sender might be missing. In this case the proof only proves that the address of the receiving party. Anyone in posession of this proof can claim they were the sender. If the sender field is missing, a warning will be displayed.
+**IMPORTANT NOTE:** When sending to older versions of the wallet, the address of the sender might be missing. In this case the proof only proves that the address of the receiving party was the one receiving the noted grins. Anyone in possession of this proof can claim they were the sender. If the sender field is missing, a warning will be displayed.
 
 #### Verifying a transaction proof
 

src/broker/grinbox.rs

@@ -342,4 +342,15 @@ impl Handler for GrinboxClient {
         }
         Ok(())
     }
+
+    fn on_error(&mut self, err: WsError) {
+        // Ignore connection reset errors by default
+        if let WsErrorKind::Io(ref err) = err.kind {
+            if let Some(104) = err.raw_os_error() {
+                return;
+            }
+        }
+
+        error!("{:?}", err);
+    }
 }