Merge branch 'master' into bot-unstable

production/docker/.env-example

@@ -1,37 +1,39 @@
 # START INFRASTRUCTURE SETUP
 
 # Full Node Connection
-RPC_BASEURL=http://172.17.0.1:8332
-RPC_USERNAME=bitcoin
-RPC_PASSWORD=password
+export RPC_BASEURL=http://172.17.0.1:8332
+export RPC_USERNAME=bitcoin
+export RPC_PASSWORD=password
 
 # Fulcrum Indexer
-FULCRUM_API=http://172.17.0.1:3001/v1
+export FULCRUM_API=http://172.17.0.1:3001/v1
 
 # SLP Indexer
-SLP_INDEXER_API=http://172.17.0.1:5020
+export SLP_INDEXER_API=http://localhost:5010
 
 # REST API URL for wallet operations
-LOCAL_RESTURL=http://172.17.0.1:5942/v6
+export LOCAL_RESTURL=http://localhost:5942/v6
 
 # END INFRASTRUCTURE SETUP
 
 
 # START ACCESS CONTROL
 
-PORT=5942
+export PORT=6100
 
 # x402 payments required to access this API?
-X402_ENABLED=false
-#X402_ENABLED=true
-#SERVER_BCH_ADDRESS=bitcoincash:qqlrzp23w08434twmvr4fxw672whkjy0py26r63g3d
-#FACILITATOR_URL=http://localhost:4345/facilitator
-#X402_PRICE_SAT=200
+export X402_ENABLED=true
+export SERVER_BASE_ADDRESS=0xd32585CE60815654C50CAf350e18de8096061e63
+export X402_PRICE_USDC=0.1
+export x402_NETWORK=base
+
+# Coinbase CDP Facilitator (for Bazaar registration)
+export x402_FACILITATOR_URL=https://api.cdp.coinbase.com/platform/v2/x402
+export FACILITATOR_KEY_ID=your_key_id_here
+export FACILITATOR_SECRET_KEY=your_secret_key_here
 
 # Basic Authentication required to access this API?
-USE_BASIC_AUTH=false
-#USE_BASIC_AUTH=true
-#BASIC_AUTH_TOKEN=some-random-token
+export USE_BASIC_AUTH=true
+export BASIC_AUTH_TOKEN=some-random-token
 
 # END ACCESS CONTROL
-

production/docker/Dockerfile

@@ -45,17 +45,17 @@ RUN runuser -l safeuser -c "npm config set prefix '~/.npm-global'"
 
 # Clone the rest.bitcoin.com repository
 WORKDIR /home/safeuser
-RUN git clone https://github.com/Permissionless-Software-Foundation/psf-bch-api
+RUN git clone https://github.com/Permissionless-Software-Foundation/psf-bch-api-base
 
 # Switch to the desired branch. `master` is usually stable,
 # and `stage` has the most up-to-date changes.
-WORKDIR /home/safeuser/psf-bch-api
+WORKDIR /home/safeuser/psf-bch-api-base
 
 RUN git checkout ct-unstable
 
 # Install dependencies
 RUN npm install
-RUN npm install minimal-slp-wallet
+#RUN npm install minimal-slp-wallet
 
 # Generate the API docs
 RUN npm run docs

production/docker/docker-compose.yml

@@ -1,9 +1,9 @@
 # Start the service with the command 'docker-compose up -d'
 
 services:
-    psf-bch-api:
+    psf-bch-api-x402-base:
       build: .
-      container_name: psf-bch-api
+      container_name: psf-bch-api-x402-base
       logging:
         driver: 'json-file'
         options:
@@ -13,7 +13,7 @@ services:
       #links:
       #  - mongo-slp-indexer
       ports:
-        - '5942:5942' # <host port>:<container port>
+        - '6100:6100' # <host port>:<container port>
       volumes:
         #- ./start-rest2nostr.sh:/home/safeuser/REST2NOSTR/start-rest2nostr.sh
         - ./.env:/home/safeuser/.env