remove mege

added shell script

changed config.example.json

fixed code

fixed bugs for chosen gas

changed fee rate

clean code

change fee range step

changed base gas

changed create commands

update wallet path

bump docker shared memory to 1g

updated create.command.ts

1. Enhance the create wallet command with optional settings for mnemonic and path_index

updated docker-compose

add the -reindex command to trigger a reindexing process when the full node encounters conflicts.

Delete packages/cli/config.example.json

Delete packages/cli/script.sh

changed config.example.json

Update config.example.json to default params

Update config.example.json to default params

feat: add `getOpenApiHost` method

Fix: cli mint fail; tracker owner pkh

Fix: cli mint too small remainingSupply

add log

update tips

updated code

1. added scripts for the automated deployment environment.
2. added environment variables to .env to minimize changes to docker-compose.yaml.
3. modify the naming of some parameters.

cp bitcoin.conf to bitcoin dir

fix bugs for init_script.sh

updated tracker configs

updated: remove the reindex command in bitcoind

removed init_cat20.sh

Author: ThreeAndTwo

packages/cli/config.example.json

@@ -8,4 +8,4 @@
       "username": "bitcoin",
       "password": "opcatAwesome"
   }
-}
+}

packages/cli/src/commands/mint/mint.command.ts

@@ -125,6 +125,14 @@ export class MintCommand extends BoardcastCommand {
 
             const limit = scaledInfo.limit;
 
+            if (minter.state.data.remainingSupply < limit) {
+              console.warn(
+                `small limit of ${unScaleByDecimals(limit, token.info.decimals)} in the minter UTXO!`,
+              );
+              log(`retry to mint token [${token.info.symbol}] ...`);
+              continue;
+            }
+
             if (!minter.state.data.isPremined && scaledInfo.premine > 0n) {
               if (typeof amount === 'bigint') {
                 if (amount !== scaledInfo.premine) {

packages/cli/src/commands/wallet/create.command.ts

@@ -8,6 +8,8 @@ import * as bip39 from 'bip39';
 
 interface CreateCommandOptions extends BaseCommandOptions {
   name: string;
+  path_index: number;
+  mnemonic: string;
 }
 
 @SubCommand({
@@ -39,10 +41,18 @@ export class CreateCommand extends BaseCommand {
         ? options.name
         : `cat-${randomBytes(4).toString('hex')}`;
 
+      const path_index = options.path_index
+        ? options.path_index
+        : 0;
+
+      const mnemonic = options.mnemonic
+        ? options.mnemonic
+        : bip39.generateMnemonic();
+
       const wallet: Wallet = {
-        accountPath: "m/44'/0'/0'/0/0",
+        accountPath: `m/86'/0'/0'/0/${path_index}`,
         name: name,
-        mnemonic: bip39.generateMnemonic(),
+        mnemonic: mnemonic,
       };
 
       this.walletService.createWallet(wallet);
@@ -72,4 +82,27 @@ export class CreateCommand extends BaseCommand {
 
     return val;
   }
-}
+  @Option({
+    flags: '-p,--path_index [path_index]',
+    description: 'path index',
+  })
+  parsePathIndex(val: number): number {
+    if (!val || val < 0) {
+      logerror("path index can't be empty!", new Error('invalid path_index option'));
+      process.exit(0);
+    }
+    return val;
+  }
+
+  @Option({
+    flags: '-m,--mnemonic [mnemonic]',
+    description: 'mnemonic',
+  })
+  parseMnemonic(val: string): string {
+    if (!val) {
+      logerror("mnemonic can't be empty!", new Error('invalid mnemonic option'));
+      process.exit(0);
+    }
+    return val;
+  }
+}

packages/cli/src/common/apis-tracker.ts

@@ -14,7 +14,6 @@ import {
   toP2tr,
 } from './utils';
 import { byteString2Int } from 'scrypt-ts';
-import { createOpenMinterState } from 'src/commands/mint/ft.open-minter';
 import { findTokenMetadataById, scaleConfig } from 'src/token';
 import { logerror } from './log';
 import { ConfigService, SpendService, WalletService } from 'src/providers';
@@ -130,48 +129,25 @@ const fetchOpenMinterState = async function (
   const tx = new btc.Transaction(txhex);
 
   const REMAININGSUPPLY_WITNESS_INDEX = 16;
-  const MINTAMOUNT_WITNESS_INDEX = 6;
 
-  let newMinter = 0;
-
-  for (let i = 0; i < tx.outputs.length; i++) {
-    const output = tx.outputs[i];
-    if (output.script.toHex() === minterP2TR) {
-      newMinter++;
-    }
-  }
   for (let i = 0; i < tx.inputs.length; i++) {
     const witnesses = tx.inputs[i].getWitnesses();
 
     if (witnesses.length > 2) {
       const lockingScriptBuffer = witnesses[witnesses.length - 2];
       const { p2tr } = script2P2TR(lockingScriptBuffer);
       if (p2tr === minterP2TR) {
-        const mintAmount = byteString2Int(
-          witnesses[MINTAMOUNT_WITNESS_INDEX].toString('hex'),
-        );
-
         const preState: OpenMinterState = {
           tokenScript:
             witnesses[REMAININGSUPPLY_WITNESS_INDEX - 2].toString('hex'),
           isPremined:
             witnesses[REMAININGSUPPLY_WITNESS_INDEX - 1].toString('hex') == '01'
               ? true
               : false,
-          remainingSupply: byteString2Int(
-            witnesses[REMAININGSUPPLY_WITNESS_INDEX].toString('hex'),
-          ),
+          remainingSupply: byteString2Int(witnesses[6 + vout].toString('hex')),
         };
 
-        const { minterStates } = createOpenMinterState(
-          mintAmount,
-          preState.isPremined,
-          preState.remainingSupply,
-          metadata,
-          newMinter,
-        );
-
-        return minterStates[vout - 1] || null;
+        return preState;
       }
     }
   }

packages/cli/src/common/apis.ts

@@ -24,7 +24,7 @@ export const getFeeRate = async function (
     return feeRate;
   }
 
-  const url = `${config.getApiHost()}/api/v1/fees/recommended`;
+  const url = `${config.getMempoolApiHost()}/api/v1/fees/recommended`;
   const feeRate: any = await fetch(url, config.withProxy())
     .then((res) => {
       if (res.status === 200) {
@@ -50,7 +50,7 @@ export const getFractalUtxos = async function (
 ): Promise<UTXO[]> {
   const script = new btc.Script(address).toHex();
 
-  const url = `https://open-api-fractal-testnet.unisat.io/v1/indexer/address/${address}/utxo-data?cursor=0&size=16`;
+  const url = `${config.getOpenApiHost()}/v1/indexer/address/${address}/utxo-data?cursor=0&size=16`;
   const utxos: Array<any> = await fetch(
     url,
     config.withProxy({
@@ -118,7 +118,7 @@ export const getUtxos = async function (
 
   const script = new btc.Script(address).toHex();
 
-  const url = `${config.getApiHost()}/api/address/${address}/utxo`;
+  const url = `${config.getMempoolApiHost()}/api/address/${address}/utxo`;
   const utxos: Array<any> = await fetch(url, config.withProxy())
     .then(async (res) => {
       const contentType = res.headers.get('content-type');
@@ -156,7 +156,7 @@ export const getRawTransaction = async function (
   if (config.useRpc()) {
     return rpc_getrawtransaction(config, wallet.getWalletName(), txid);
   }
-  const url = `${config.getApiHost()}/api/tx/${txid}/hex`;
+  const url = `${config.getMempoolApiHost()}/api/tx/${txid}/hex`;
   return (
     fetch(url, config.withProxy())
       .then((res) => {
@@ -206,7 +206,7 @@ export async function broadcast(
     return rpc_broadcast(config, wallet.getWalletName(), txHex);
   }
 
-  const url = `${config.getApiHost()}/api/tx`;
+  const url = `${config.getMempoolApiHost()}/api/tx`;
   return fetch(
     url,
     config.withProxy({

packages/cli/src/providers/configService.ts

@@ -55,7 +55,18 @@ export class ConfigService {
     return this.cliConfig;
   }
 
-  getApiHost = () => {
+  getOpenApiHost = () => {
+    const config = this.getCliConfig();
+    if (config.network === 'fractal-testnet') {
+      return 'https://open-api-fractal-testnet.unisat.io';
+    } else if (config.network === 'fractal-mainnet') {
+      return 'https://open-api-fractal.unisat.io';
+    } else {
+      throw new Error(`Unsupport network: ${config.network}`);
+    }
+  };
+
+  getMempoolApiHost = () => {
     const config = this.getCliConfig();
     if (config.network === 'btc-signet') {
       return 'https://mempool.space/signet';

packages/tracker/.env.example

@@ -1,15 +1,47 @@
+# FB Full Node image
+FB_FULL_NODE_IMAGE=fractalbitcoin/fractal:v0.2.1
+POSTGRES_IMAGE=postgres:16
+
+# TODO: DEVS need to update this to their own paths
+USER_HOME=/home/ubuntu
+DATABASE_VOLUME_PATH=$USER_HOME/data/pgdata
+BITCOIND_DATA_DIR=$USER_HOME/data/bitcoin
+DATABASE_DATA_DIR=/var/lib/postgresql/data/pgdata
+
+# POSTGRES
 DATABASE_TYPE=postgres
 DATABASE_HOST=127.0.0.1
 DATABASE_PORT=5432
 DATABASE_DB=postgres
 DATABASE_USERNAME=postgres
 DATABASE_PASSWORD=postgres
 
-RPC_HOST=127.0.0.1
-RPC_PORT=8332
-RPC_USER=bitcoin
-RPC_PASSWORD=opcatAwesome
 
-NETWORK=mainnet
-API_PORT=3000
-GENESIS_BLOCK_HEIGHT=0 # the height of block that CAT protocol launches
+# TODO: DEVS needs to update this accord their machine resources
+DATABASE_SHM_SIZE=1g
+
+
+# TODO: DEVS 
+# BITCOIND default config in CAT protocol
+BITCOIND_RPC_HOST=127.0.0.1
+BITCOIND_RPC_PORT=8332
+BITCOIND_RPC_USER=bitcoin
+BITCOIND_RPC_PASSWORD=opcatAwesome
+
+BITCOIND_ZMQ_PUB_HASH_BLOCK_PORT=8330
+BITCOIND_ZMQ_PUB_RAW_TX_PORT=8331
+BITCOIND_P2P_PORT=8333
+
+# TODO: DEVS needs to update this accord their machine resources
+BITCOIND_RESOURCES_LIMITS_MEMORY=60G
+BITCOIND_RESOURCES_LIMITS_CPU=4.0
+BITCOIND_RESOURCES_RESERVATIONS_MEMORY=40G
+BITCOIND_RESOURCES_RESERVATIONS_CPU=2.0
+
+BITCOIND_MEMSWAP_LIMIT=80G
+BITCOIND_MEM_SWAPPINESS=100
+
+# TODO: DEVS needs to update this accord their machine resources
+CAT_PROTOCOL_NETWORK=mainnet
+CAT_PROTOCOL_API_PORT=3000
+CAT_PROTOCOL_GENESIS_BLOCK_HEIGHT=0 

packages/tracker/docker-compose.yml

@@ -1,39 +1,52 @@
+networks:
+  cat20_network:
+    external: true
+
 services:
   postgres:
-    image: postgres:16
+    image: $POSTGRES_IMAGE
+    shm_size: $DATABASE_SHM_SIZE
     restart: always
     environment:
       POSTGRES_USER: $DATABASE_USERNAME
       POSTGRES_PASSWORD: $DATABASE_PASSWORD
       POSTGRES_DB: $DATABASE_DB
-      PGDATA: /var/lib/postgresql/data/pgdata
+      PGDATA: $DATABASE_DATA_DIR
     ports:
-      - "5432:5432"
+      - "${DATABASE_PORT}:${DATABASE_PORT}"
     volumes:
-      - ./docker/pgdata:/var/lib/postgresql/data
+      - $DATABASE_VOLUME_PATH:$DATABASE_DATA_DIR
+    networks:
+      - cat20_network
   bitcoind:
-    image: fractalbitcoin/fractal:v0.2.1
+    image: $FB_FULL_NODE_IMAGE
     restart: always
     entrypoint: ["bitcoind", "-datadir=/data/", "-maxtipage=504576000"]
     command: ""
     healthcheck:
       test: ["CMD", "bitcoin-cli", "-datadir=/data/", "getblockchaininfo"]
     ports:
-      - "8330:8330"
-      - "8331:8331"
-      - "8332:8332"
-      - "8333:8333"
+      - "${BITCOIND_ZMQ_PUB_HASH_BLOCK_PORT}:${BITCOIND_ZMQ_PUB_HASH_BLOCK_PORT}"
+      - "${BITCOIND_ZMQ_PUB_RAW_TX_PORT}:${BITCOIND_ZMQ_PUB_RAW_TX_PORT}"
+      - "${BITCOIND_RPC_PORT}:${BITCOIND_RPC_PORT}"
+      - "${BITCOIND_P2P_PORT}:${BITCOIND_P2P_PORT}"
     deploy:
       resources:
         limits:
-          memory: 40G
-    memswap_limit: 60G
-    mem_swappiness: 100
+          memory: $BITCOIND_RESOURCES_LIMITS_MEMORY
+          cpus: '${BITCOIND_RESOURCES_LIMITS_CPU}'
+        reservations:
+          memory: $BITCOIND_RESOURCES_RESERVATIONS_MEMORY
+          cpus: '${BITCOIND_RESOURCES_RESERVATIONS_CPU}'
+    memswap_limit: $BITCOIND_MEMSWAP_LIMIT
+    mem_swappiness: $BITCOIND_MEM_SWAPPINESS
     volumes:
-      - ./docker/data:/data
+      - $BITCOIND_DATA_DIR:/data
     logging:
       driver: "json-file"
       options:
         labels: "env,filebeat,name"
         max-size: "1g"
         max-file: "3"
+    networks:
+      - cat20_network

packages/tracker/init_script.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+path=$(pwd)
+ENV_FILE="$path/.env"
+
+if [ ! -f "$ENV_FILE" ]; then
+  echo ".env file not found: $ENV_FILE"
+  exit 1
+fi
+
+USER_HOME=$(grep -E '^USER_HOME=' "$ENV_FILE" | cut -d '=' -f 2)
+DATABASE_VOLUME_PATH=$(grep -E '^DATABASE_VOLUME_PATH=' "$ENV_FILE" | cut -d '=' -f 2)
+BITCOIND_DATA_DIR=$(grep -E '^BITCOIND_DATA_DIR=' "$ENV_FILE" | cut -d '=' -f 2)
+
+NESTED_DIRS=("$USER_HOME/data/pgdata" "$USER_HOME/data/bitcoin")
+for DIR in "${NESTED_DIRS[@]}"; do
+  if [ -d "$DIR" ]; then
+    echo "Checking directory: $DIR"
+    if [ ! -w "$DIR" ]; then
+      echo "Changing permissions: $DIR"
+      sudo chmod -R 777 "$DIR"
+    else
+      echo "Permissions are correct: $DIR"
+    fi
+  else
+    echo "Directory does not exist: $DIR"
+    echo "Creating directory: $DIR"
+    sudo mkdir -p "$DIR"
+    sudo chmod -R 777 "$DIR"
+  fi
+done
+
+echo "Check completed"
+
+sudo cp docker/data/bitcoin.conf "${NESTED_DIRS[1]}"
+echo "Starting services"
+
+docker compose down
+
+# Check if the network exists
+if ! docker network ls | grep -q cat20_network; then
+  echo "Creating network cat20_network"
+  docker network create cat20_network
+else
+  echo "Network cat20_network already exists"
+fi
+
+docker compose up -d
+
+cd ../../
+echo "Building tracker service"
+docker build -t tracker:latest .
+echo "Starting tracker service"
+
+if docker ps -a | grep -q tracker; then
+  echo "Tracker service already exists, removing..."
+  docker rm -f tracker
+fi
+
+docker run -d \
+    --name tracker \
+    --network cat20_network \
+    --add-host="host.docker.internal:host-gateway" \
+    -e DATABASE_HOST="host.docker.internal" \
+    -e BITCOIND_RPC_HOST="bitcoind" \
+    -p 3000:3000 \
+    tracker:latest
+
+echo "Tracker service started"