chore(bin): rename mm2 binaries to kdf

.docker/Dockerfile.release

@@ -1,5 +1,5 @@
 FROM docker.io/debian:stable-slim
-WORKDIR /mm2
-COPY target/release/mm2 /usr/local/bin/mm2
+WORKDIR /kdf
+COPY target/release/kdf /usr/local/bin/kdf
 EXPOSE 7783
-CMD ["mm2"]
+CMD ["kdf"]

.docker/Dockerfile.ubuntu.ci

@@ -18,4 +18,4 @@ RUN \
     chmod -R 777 /root
 
 ENV PATH="/root/.cargo/bin:${PATH}"
-WORKDIR /mm2
+WORKDIR /kdf

.dockerignore

@@ -6,6 +6,8 @@ cmake-build-debug
 
 !/target/release/mm2
 !/target/debug/mm2
+!/target/release/kdf
+!/target/debug/kdf
 /mm2src/*/target
 
 /build
@@ -17,6 +19,8 @@ cmake-build-debug
 /js/*.wasm
 /js/mm2
 /js/mm2.exe
+/js/kdf
+/js/kdf.exe
 /wasm-build.log
 
 # Opt out from history in order to speed the `COPY .` up.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Marketmaker 1.0 bug report
+about: Komodo DeFi Framework bug report
 
 ---
 
@@ -9,10 +9,10 @@ A clear and concise description of what the bug is.
 
 **Please answer following questions and attach requested info - it'll help to solve issue faster**
 - What OS do you use?
-- What marketmaker version do you run?
+- What KDF version do you run?
 - Attach your coins.json config.
 - Provide your enable script with response.
 - Provide other curl scripts (with responses) which were executed prior to error.
-- Attach full marketmaker console logs (start collecting right after marketmaker execution).
+- Attach full KDF console logs (start collecting right after KDF execution).
 - ***Make sure that you don't send your passphrase, userpass and privkeys. Your funds might be stolen if you reveal this info publicly!***
 - Provide info for all nodes involved (e.g. if error occurs during atomic swap you should provide info for both Bob and Alice).

.github/workflows/dev-build.yml

@@ -53,15 +53,15 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --bin kdf --release
 
       - name: Compress build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-linux-x86-64.zip"
-          zip $NAME target/release/mm2 -j
+          NAME="kdf_$COMMIT_HASH-linux-x86-64.zip"
+          zip $NAME target/release/kdf -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -121,15 +121,15 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release --target x86_64-apple-darwin
+          cargo build --bin kdf --release --target x86_64-apple-darwin
 
       - name: Compress build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-mac-x86-64.zip"
-          zip $NAME target/x86_64-apple-darwin/release/mm2 -j
+          NAME="kdf_$COMMIT_HASH-mac-x86-64.zip"
+          zip $NAME target/x86_64-apple-darwin/release/kdf -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -178,15 +178,15 @@ jobs:
             remove-item "./MM_VERSION"
           }
           echo $Env:COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --bin kdf --release
 
       - name: Compress build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          $NAME="mm2_$Env:COMMIT_HASH-win-x86-64.zip"
-          7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
+          $NAME="kdf_$Env:COMMIT_HASH-win-x86-64.zip"
+          7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
           mkdir $Env:BRANCH_NAME
           mv $NAME ./$Env:BRANCH_NAME/
 
@@ -241,9 +241,9 @@ jobs:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-mac-dylib-x86-64.zip"
-          mv target/x86_64-apple-darwin/release/libmm2lib.a target/x86_64-apple-darwin/release/libmm2.a
-          zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
+          NAME="kdf_$COMMIT_HASH-mac-dylib-x86-64.zip"
+          mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
+          zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -310,7 +310,7 @@ jobs:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-wasm.zip"
+          NAME="kdf_$COMMIT_HASH-wasm.zip"
           (cd ./target/target-wasm-release && zip -r - .) > $NAME
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
@@ -366,9 +366,9 @@ jobs:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-ios-aarch64.zip"
-          mv target/aarch64-apple-ios/release/libmm2lib.a target/aarch64-apple-ios/release/libmm2.a
-          zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
+          NAME="kdf_$COMMIT_HASH-ios-aarch64.zip"
+          mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
+          zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -437,9 +437,9 @@ jobs:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-android-aarch64.zip"
-          mv target/aarch64-linux-android/release/libmm2lib.a target/aarch64-linux-android/release/libmm2.a
-          zip $NAME target/aarch64-linux-android/release/libmm2.a -j
+          NAME="kdf_$COMMIT_HASH-android-aarch64.zip"
+          mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
+          zip $NAME target/aarch64-linux-android/release/libkdf.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -508,9 +508,9 @@ jobs:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.AVAILABLE != '' }}
         run: |
-          NAME="mm2_$COMMIT_HASH-android-armv7.zip"
-          mv target/armv7-linux-androideabi/release/libmm2lib.a target/armv7-linux-androideabi/release/libmm2.a
-          zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
+          NAME="kdf_$COMMIT_HASH-android-armv7.zip"
+          mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
+          zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 

.github/workflows/release-build.yml

@@ -53,12 +53,12 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --bin kdf --release
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-linux-x86-64.zip"
-          zip $NAME target/release/mm2 -j
+          NAME="kdf_$COMMIT_HASH-linux-x86-64.zip"
+          zip $NAME target/release/kdf -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -77,7 +77,7 @@ jobs:
 
       - name: Build and push container image
         run: |
-          export CONTAINER_TAG=$(./target/release/mm2 --version | awk '{print $3}')
+          export CONTAINER_TAG=$(./target/release/kdf --version | awk '{print $3}')
           docker build -t komodoofficial/komodo-defi-framework:"$CONTAINER_TAG" -t komodoofficial/komodo-defi-framework:main-latest -f .docker/Dockerfile.release .
           docker push komodoofficial/komodo-defi-framework:"$CONTAINER_TAG"
           docker push komodoofficial/komodo-defi-framework:main-latest
@@ -112,12 +112,12 @@ jobs:
         run: |
           rm -f ./MM_VERSION
           echo $COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release --target x86_64-apple-darwin
+          cargo build --bin kdf --release --target x86_64-apple-darwin
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-mac-x86-64.zip"
-          zip $NAME target/x86_64-apple-darwin/release/mm2 -j
+          NAME="kdf_$COMMIT_HASH-mac-x86-64.zip"
+          zip $NAME target/x86_64-apple-darwin/release/kdf -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -163,12 +163,12 @@ jobs:
             remove-item "./MM_VERSION"
           }
           echo $Env:COMMIT_HASH > ./MM_VERSION
-          cargo build --bin mm2 --release
+          cargo build --bin kdf --release
 
       - name: Compress build output
         run: |
-          $NAME="mm2_$Env:COMMIT_HASH-win-x86-64.zip"
-          7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
+          $NAME="kdf_$Env:COMMIT_HASH-win-x86-64.zip"
+          7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
           mkdir $Env:BRANCH_NAME
           mv $NAME ./$Env:BRANCH_NAME/
 
@@ -216,9 +216,9 @@ jobs:
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-mac-dylib-x86-64.zip"
-          mv target/x86_64-apple-darwin/release/libmm2lib.a target/x86_64-apple-darwin/release/libmm2.a
-          zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
+          NAME="kdf_$COMMIT_HASH-mac-dylib-x86-64.zip"
+          mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
+          zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -279,7 +279,7 @@ jobs:
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-wasm.zip"
+          NAME="kdf_$COMMIT_HASH-wasm.zip"
           (cd ./target/target-wasm-release && zip -r - .) > $NAME
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
@@ -329,9 +329,9 @@ jobs:
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-ios-aarch64.zip"
-          mv target/aarch64-apple-ios/release/libmm2lib.a target/aarch64-apple-ios/release/libmm2.a
-          zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
+          NAME="kdf_$COMMIT_HASH-ios-aarch64.zip"
+          mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
+          zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -394,9 +394,9 @@ jobs:
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-android-aarch64.zip"
-          mv target/aarch64-linux-android/release/libmm2lib.a target/aarch64-linux-android/release/libmm2.a
-          zip $NAME target/aarch64-linux-android/release/libmm2.a  -j
+          NAME="kdf_$COMMIT_HASH-android-aarch64.zip"
+          mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
+          zip $NAME target/aarch64-linux-android/release/libkdf.a  -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 
@@ -459,9 +459,9 @@ jobs:
 
       - name: Compress build output
         run: |
-          NAME="mm2_$COMMIT_HASH-android-armv7.zip"
-          mv target/armv7-linux-androideabi/release/libmm2lib.a target/armv7-linux-androideabi/release/libmm2.a
-          zip $NAME target/armv7-linux-androideabi/release/libmm2.a   -j
+          NAME="kdf_$COMMIT_HASH-android-armv7.zip"
+          mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
+          zip $NAME target/armv7-linux-androideabi/release/libkdf.a   -j
           mkdir $BRANCH_NAME
           mv $NAME ./$BRANCH_NAME/
 

.github/workflows/test.yml

@@ -96,7 +96,7 @@ jobs:
         run: |
           cargo test --bins --lib --no-fail-fast
 
-  linux-x86-64-mm2-integration:
+  linux-x86-64-kdf-integration:
     timeout-minutes: 90
     runs-on: ubuntu-latest
     env:
@@ -125,7 +125,7 @@ jobs:
           wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.sh | bash
           cargo test --test 'mm2_tests_main' --no-fail-fast
 
-  mac-x86-64-mm2-integration:
+  mac-x86-64-kdf-integration:
     timeout-minutes: 90
     runs-on: macos-latest
     env:
@@ -157,7 +157,7 @@ jobs:
           wget -O - https://raw.githubusercontent.com/KomodoPlatform/komodo/master/zcutil/fetch-params-alt.sh | bash
           cargo test --test 'mm2_tests_main' --no-fail-fast
 
-  win-x86-64-mm2-integration:
+  win-x86-64-kdf-integration:
     timeout-minutes: 90
     runs-on: windows-latest
     env:

.github/workflows/validate-mm2-version.yml

@@ -1,4 +1,4 @@
-name: Validate mm2 version
+name: Validate kdf version
 
 on:
   pull_request:

.gitignore

@@ -32,6 +32,9 @@ scripts/mm2/seed/unparsed.txt
 /js/mm2
 /js/mm2.exe
 /js/.mm2.*
+/js/kdf
+/js/kdf.exe
+/js/.kdf.*
 
 # Rust artefacts
 /MM_DATETIME

README.md

@@ -89,13 +89,13 @@ If you want to build from source without installing prerequisites to your host s
 Build the image:
 
 ```sh
-docker build -t mm2-build-container -f .docker/Dockerfile .
+docker build -t kdf-build-container -f .docker/Dockerfile .
 ```
 
 Bind source code into container and compile it:
 
 ```sh
-docker run -v "$(pwd)":/app -w /app mm2-build-container cargo build
+docker run -v "$(pwd)":/app -w /app kdf-build-container cargo build
 ```
 
 Just like building it on your host system, you will now have the target directory containing the build files.
@@ -122,11 +122,11 @@ For example:
 
 The coins file contains information about the coins and tokens you want to trade. A regularly updated version is maintained in the [Komodo Platform coins repository](https://github.com/KomodoPlatform/coins/blob/master/coins). Pull Requests to add any coins not yet included are welcome.
 
-To facilitate interoperability with the `mm2` service, there is the `adex-cli` command line utility. It provides a questionnaire initialization mode to set up the configuration and obtain the proper coin set through the internet. It can also be used to start or stop the service.
+To facilitate interoperability with the `kdf` service, there is the `adex-cli` command line utility. It provides a questionnaire initialization mode to set up the configuration and obtain the proper coin set through the internet. It can also be used to start or stop the service.
 
 ## Usage
 
-To launch the Komodo DeFi Framework, run `./mm2` (or `mm2.exe` in Windows)
+To launch the Komodo DeFi Framework, run `./kdf` (or `kdf.exe` in Windows)
 
 To activate a coin:
 ```bash
@@ -185,7 +185,7 @@ Refer to the [Komodo Developer Docs](https://developers.komodoplatform.com/basic
 
 ## Disclaimer
 
-This repository contains the `work in progress` code of the brand new Komodo DeFi Framework (mm2) built mainly on Rust.  
+This repository contains the `work in progress` code of the brand new Komodo DeFi Framework (kdf) built mainly on Rust.  
 The current state can be considered as a alpha version.
 
 **<b>WARNING: Use with test coins only or with assets which value does not exceed an amount you are willing to lose. This is alpha stage software! </b>**