diff --git a/README.md b/README.md index 6d6c03e..97cad3c 100644 --- a/README.md +++ b/README.md @@ -79,15 +79,6 @@ cd blast ./build.sh ``` -### Install electrs -```bash -git clone https://github.com/blockstream/electrs && cd electrs -git checkout new-index -cargo install --path . --root /usr/local/bin -rm /usr/local/bin/.crates.toml -rm /usr/local/bin/crates2.json -``` - # Run ### Run CLI ```bash diff --git a/blast_core/.gitignore b/blast_core/.gitignore index a6622d1..f2f9e58 100644 --- a/blast_core/.gitignore +++ b/blast_core/.gitignore @@ -1,3 +1,2 @@ target -electrs_id.txt Cargo.lock \ No newline at end of file diff --git a/blast_core/start_bitcoind.sh b/blast_core/start_bitcoind.sh index 7db8bdb..af9d60f 100755 --- a/blast_core/start_bitcoind.sh +++ b/blast_core/start_bitcoind.sh @@ -46,7 +46,3 @@ do fi done bitcoin-cli generatetoaddress 6 "mp76nrashrCCYLy3a8cAc5HufEas11yHbh" - -electrs -vvvv --daemon-dir ~/.bitcoin --network=regtest --cookie user:pass --db-dir ~/.electrs/db > /dev/null 2>&1 & -echo $! > electrs_id.txt -echo "Started electrs with PID: $(cat electrs_id.txt)" diff --git a/blast_core/stop_bitcoind.sh b/blast_core/stop_bitcoind.sh index 5a48121..81b403e 100755 --- a/blast_core/stop_bitcoind.sh +++ b/blast_core/stop_bitcoind.sh @@ -3,10 +3,3 @@ bitcoin-cli stop rm -rf ~/.bitcoin/regtest rm ~/.bitcoin/bitcoin.conf - -if [ -f electrs_id.txt ]; then - PID=$(cat electrs_id.txt) - kill -9 $PID - rm electrs_id.txt -fi -rm -rf ~/.electrs diff --git a/blast_models/blast_ldk/blast_ldk/src/main.rs b/blast_models/blast_ldk/blast_ldk/src/main.rs index 0d6cc4c..254ca76 100644 --- a/blast_models/blast_ldk/blast_ldk/src/main.rs +++ b/blast_models/blast_ldk/blast_ldk/src/main.rs @@ -81,8 +81,7 @@ impl BlastRpc for BlastLdkServer { }; let mut builder = Builder::from_config(config); - builder.set_chain_source_esplora("http://localhost:3002".to_string(), None); - //builder.set_gossip_source_rgs("https://rapidsync.lightningdevkit.org/testnet/snapshot".to_string()); + builder.set_chain_source_bitcoind_rpc(String::from("127.0.0.1"), 18443, String::from("user"), String::from("pass")); builder.set_gossip_source_p2p(); let node = Arc::new(builder.build().unwrap());