Merge pull request #5 from bob-collective/nakul/fix_update_docker_and…

…_gitignore fix: add directory in git ignore , update btc core version
bob-collective · Jan 24, 2024 · 49b4052 · 49b4052
2 parents 5c7e421 + 41cfcef
commit 49b4052
Show file tree

Hide file tree

Showing 55 changed files with 5 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,7 @@ yarn-error.log*
 
 # Compiler files
 cache/
-out/*
+out/
 
 # Ignores development broadcast logs
 !/broadcast
@@ -34,3 +34,5 @@ out/*
 
 # Dotenv file
 .env
+
+.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/DevStarterKit.iml b/.idea/DevStarterKit.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
     bitcoind:
-        image: "ruimarinho/bitcoin-core:24"
+        image: "lightninglabs/bitcoin-core:25"
         command:
             - -regtest
             - -server
@@ -15,7 +15,7 @@ services:
             - "18443:18443"
 
     bitcoin-cli:
-        image: "ruimarinho/bitcoin-core:24"
+        image: "lightninglabs/bitcoin-core:25"
         command:
             - /bin/sh
             - -c

diff --git a/out/Address.sol/Address.json b/out/Address.sol/Address.json
diff --git a/out/BTCUtils.sol/BTCUtils.json b/out/BTCUtils.sol/BTCUtils.json
diff --git a/out/Base.sol/CommonBase.json b/out/Base.sol/CommonBase.json
diff --git a/out/Base.sol/ScriptBase.json b/out/Base.sol/ScriptBase.json
diff --git a/out/Base.sol/TestBase.json b/out/Base.sol/TestBase.json
diff --git a/out/BitcoinTx.sol/BitcoinTx.json b/out/BitcoinTx.sol/BitcoinTx.json
diff --git a/out/BridgeState.sol/BridgeState.json b/out/BridgeState.sol/BridgeState.json
diff --git a/out/BytesLib.sol/BytesLib.json b/out/BytesLib.sol/BytesLib.json
diff --git a/out/Context.sol/Context.json b/out/Context.sol/Context.json
diff --git a/out/Counter.s.sol/CounterScript.json b/out/Counter.s.sol/CounterScript.json