Merge pull request #6 from vulcanize/fix-http-flag

Remove depricated rpc flag from geth.
vulcanize · Oct 7, 2021 · 04b4659 · 04b4659
2 parents 0f5c243 + 725e049
commit 04b4659
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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.30.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
@@ -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
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-echo dapp 0.29.0-v1.10.8-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

diff --git 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"];