From c25506ada3aadaa028faf128800f0404a215e0bb Mon Sep 17 00:00:00 2001
From: Byron Hambly <bizzle@tari.com>
Date: Fri, 25 Jun 2021 12:16:15 +0200
Subject: [PATCH] [common] Bundle sqlite dependency

---
 .github/workflows/ci.yml     |  7 +------
 Cargo.lock                   | 11 +++++++----
 base_layer/wallet/Cargo.toml |  3 ++-
 comms/dht/Cargo.toml         |  3 ++-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 236d612451..003a327558 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,11 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [
-          #ubuntu-18.04,
-          macos-10.15,
-          windows-2019
-          ]
+        os: [ubuntu-20.04, macos-10.15, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
@@ -29,7 +25,6 @@ jobs:
             openssl \
             libssl-dev \
             pkg-config \
-            libsqlite3-dev \
             git \
             cmake \
             zip \
diff --git a/Cargo.lock b/Cargo.lock
index c113f36cbd..33c588512a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -984,9 +984,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "1.4.5"
+version = "1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2de9deab977a153492a1468d1b1c0662c1cf39e5ea87d0c060ecd59ef18d8c"
+checksum = "bba51ca66f57261fd17cadf8b73e4775cc307d0521d855de3f5de91a8f074e0e"
 dependencies = [
  "bigdecimal",
  "byteorder",
@@ -2000,10 +2000,11 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.18.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd"
+checksum = "0e9eb7b8e152b6a01be6a4a2917248381875758250dc3df5d46caf9250341dda"
 dependencies = [
+ "cc",
  "pkg-config",
  "vcpkg",
 ]
@@ -4070,6 +4071,7 @@ dependencies = [
  "futures-test-preview",
  "futures-util",
  "lazy_static 1.4.0",
+ "libsqlite3-sys",
  "lmdb-zero",
  "log 0.4.14",
  "petgraph",
@@ -4474,6 +4476,7 @@ dependencies = [
  "fs2",
  "futures 0.3.12",
  "lazy_static 1.4.0",
+ "libsqlite3-sys",
  "lmdb-zero",
  "log 0.4.14",
  "log4rs",
diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
index d329346845..57977a7a02 100644
--- a/base_layer/wallet/Cargo.toml
+++ b/base_layer/wallet/Cargo.toml
@@ -24,10 +24,11 @@ chrono = { version = "0.4.6", features = ["serde"]}
 crossbeam-channel = "0.3.8"
 digest = "0.8.0"
 diesel_migrations =  "1.4"
-diesel = {version="1.4", features = ["sqlite", "serde_json", "chrono"]}
+diesel = {version="1.4.7", features = ["sqlite", "serde_json", "chrono"]}
 fs2 = "0.3.0"
 futures =  { version = "^0.3.1", features =["compat", "std"]}
 lazy_static = "1.4.0"
+libsqlite3-sys = { version = ">=0.8.0, <0.13.0", features = ["bundled"] }
 log = "0.4.6"
 log4rs = {version = "0.8.3", features = ["console_appender", "file_appender", "file", "yaml_format"]}
 lmdb-zero = "0.4.4"
diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml
index 40c9e38fb9..380db696e6 100644
--- a/comms/dht/Cargo.toml
+++ b/comms/dht/Cargo.toml
@@ -22,10 +22,11 @@ anyhow = "1.0.32"
 bitflags = "1.2.0"
 bytes = "0.4.12"
 chrono = "0.4.9"
-diesel = {version="1.4", features = ["sqlite", "serde_json", "chrono", "numeric"]}
+diesel = {version="1.4.7", features = ["sqlite", "serde_json", "chrono", "numeric"]}
 diesel_migrations =  "1.4"
 digest = "0.8.1"
 futures= {version= "^0.3.1"}
+libsqlite3-sys = { version = ">=0.8.0, <0.13.0", features = ["bundled"] }
 log = "0.4.8"
 prost = "=0.6.1"
 prost-types = "=0.6.1"