From ae495ee5cf4f915b9e9441b9e680c94128c9d8e5 Mon Sep 17 00:00:00 2001
From: Arijit Das <arijitad.in@gmail.com>
Date: Tue, 5 Oct 2021 18:23:12 +0530
Subject: [PATCH 1/2] Remove depricated rpc flag from geth.

---
 src/dapp/default.nix                        | 2 +-
 src/dapp/libexec/dapp/dapp---testnet-launch | 4 ++--
 src/dapp/libexec/dapp/dapp---version        | 2 +-
 src/go-ethereum-statediff/default.nix       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dapp/default.nix b/src/dapp/default.nix
index 5d93c6514..064a85ef4 100644
--- a/src/dapp/default.nix
+++ b/src/dapp/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "dapp-${version}";
-  version = "0.29.0-v1.10.8-statediff-0.0.27";
+  version = "0.29.0-v1.10.9-statediff-0.0.27";
   src = ./.;
 
   nativeBuildInputs = [makeWrapper shellcheck coreutils nodejs];
diff --git a/src/dapp/libexec/dapp/dapp---testnet-launch b/src/dapp/libexec/dapp/dapp---testnet-launch
index 963df2fb4..d746aef45 100755
--- a/src/dapp/libexec/dapp/dapp---testnet-launch
+++ b/src/dapp/libexec/dapp/dapp---testnet-launch
@@ -129,8 +129,8 @@ geth \
   2> >(tee "$chaindir/geth.log" | grep --line-buffered Success | sed 's/^/geth: /' >&2) \
   --datadir "$chaindir" --networkid "$CHAINID" --port="$port" \
   --mine --miner.threads=1 --allow-insecure-unlock \
-  --rpc --rpcapi "web3,eth,net,debug,personal,statediff" --rpccorsdomain '*' --rpcvhosts '*' --nodiscover \
-  --rpcaddr="$RPC_ADDRESS" --rpcport="$RPC_PORT" --syncmode=full --gcmode=archive \
+  --http --http.api "web3,eth,net,debug,personal,statediff" --http.corsdomain '*' --http.vhosts '*' --nodiscover \
+  --http.addr="$RPC_ADDRESS" --http.port="$RPC_PORT" --syncmode=full --gcmode=archive \
   --statediff --statediff.db="host=$DB_HOST port=$DB_PORT user=$DB_USER password=$DB_PASSWORD dbname=$DB_NAME sslmode=disable" \
   --statediff.dbnodeid 1 --statediff.dbclientname test1 --statediff.writing=true \
   --ws --ws.addr="0.0.0.0" --unlock="$(IFS=,; echo "${address[*]}")" --password=<(exit) &
diff --git a/src/dapp/libexec/dapp/dapp---version b/src/dapp/libexec/dapp/dapp---version
index c631c2ff6..e9f144dcc 100755
--- a/src/dapp/libexec/dapp/dapp---version
+++ b/src/dapp/libexec/dapp/dapp---version
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-echo dapp 0.29.0-v1.10.8-statediff-0.0.27
+echo dapp 0.29.0-v1.10.9-statediff-0.0.27
 # use a custom path is DAPP_SOLC is set
 SOLC=${DAPP_SOLC:-solc}
 $SOLC --version
diff --git a/src/go-ethereum-statediff/default.nix b/src/go-ethereum-statediff/default.nix
index dcfa2cb38..58873568d 100644
--- a/src/go-ethereum-statediff/default.nix
+++ b/src/go-ethereum-statediff/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "go-ethereum-statediff";
-  version = "v1.10.8-statediff-0.0.27";
+  version = "v1.10.9-statediff-0.0.27";
   src = fetchurl {
     url = "https://github.com/vulcanize/go-ethereum/releases/download/${version}/geth-linux-amd64";
-    sha256 = "12i3wrriza99ka42f6wr0kf1mpdapw92cz2kvb56ng6ci7s0dizs";
+    sha256 = "0sah9cmc7k1s7bf8m5slhp3dhiwf436pmjg8553n0kpkgig9n6cg";
   };
 
   phases = ["installPhase" "patchPhase"];

From 725e049c42a7496165f4acaeae8f4cd3da5b7816 Mon Sep 17 00:00:00 2001
From: Arijit Das <arijitad.in@gmail.com>
Date: Thu, 7 Oct 2021 15:20:08 +0530
Subject: [PATCH 2/2] Bump dapptools version.

---
 src/dapp/default.nix                 | 2 +-
 src/dapp/libexec/dapp/dapp---version | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dapp/default.nix b/src/dapp/default.nix
index 064a85ef4..ad40638e8 100644
--- a/src/dapp/default.nix
+++ b/src/dapp/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "dapp-${version}";
-  version = "0.29.0-v1.10.9-statediff-0.0.27";
+  version = "0.30.0-v1.10.9-statediff-0.0.27";
   src = ./.;
 
   nativeBuildInputs = [makeWrapper shellcheck coreutils nodejs];
diff --git a/src/dapp/libexec/dapp/dapp---version b/src/dapp/libexec/dapp/dapp---version
index e9f144dcc..d40ad1271 100755
--- a/src/dapp/libexec/dapp/dapp---version
+++ b/src/dapp/libexec/dapp/dapp---version
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-echo dapp 0.29.0-v1.10.9-statediff-0.0.27
+echo dapp 0.30.0-v1.10.9-statediff-0.0.27
 # use a custom path is DAPP_SOLC is set
 SOLC=${DAPP_SOLC:-solc}
 $SOLC --version