Skip to content

Commit bc8757a

Browse files
shamardyshamardy
authored
chore(bin): rename mm2 binaries to kdf (#2126)
This commit renames mm2 binaries to kdf while also producing a copy that uses mm2 naming for backward compatibility. For wasm, only kdf named binaries are provided.
1 parent 1d39a91 commit bc8757a

17 files changed

+188
-59
lines changed

‎.docker/Dockerfile.dev-release

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM docker.io/debian:stable-slim
2-
WORKDIR /mm2
2+
WORKDIR /kdf
3+
COPY target/release/kdf /usr/local/bin/kdf
34
COPY target/release/mm2 /usr/local/bin/mm2
45
EXPOSE 7783
5-
CMD ["mm2"]
6+
CMD ["kdf"]

‎.docker/Dockerfile.release

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM docker.io/debian:stable-slim
2-
WORKDIR /mm2
2+
WORKDIR /kdf
3+
COPY target/release/kdf /usr/local/bin/kdf
34
COPY target/release/mm2 /usr/local/bin/mm2
45
EXPOSE 7783
5-
CMD ["mm2"]
6+
CMD ["kdf"]

‎.docker/Dockerfile.ubuntu.ci

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ RUN \
1818
chmod -R 777 /root
1919

2020
ENV PATH="/root/.cargo/bin:${PATH}"
21-
WORKDIR /mm2
21+
WORKDIR /kdf

‎.dockerignore

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ cmake-build-debug
66

77
!/target/release/mm2
88
!/target/debug/mm2
9+
!/target/release/kdf
10+
!/target/debug/kdf
911
/mm2src/*/target
1012

1113
/build
@@ -17,6 +19,8 @@ cmake-build-debug
1719
/js/*.wasm
1820
/js/mm2
1921
/js/mm2.exe
22+
/js/kdf
23+
/js/kdf.exe
2024
/wasm-build.log
2125

2226
# Opt out from history in order to speed the `COPY .` up.

‎.github/ISSUE_TEMPLATE/bug_report.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bug report
3-
about: Marketmaker 1.0 bug report
3+
about: Komodo DeFi Framework bug report
44

55
---
66

@@ -9,10 +9,10 @@ A clear and concise description of what the bug is.
99

1010
**Please answer following questions and attach requested info - it'll help to solve issue faster**
1111
- What OS do you use?
12-
- What marketmaker version do you run?
12+
- What KDF version do you run?
1313
- Attach your coins.json config.
1414
- Provide your enable script with response.
1515
- Provide other curl scripts (with responses) which were executed prior to error.
16-
- Attach full marketmaker console logs (start collecting right after marketmaker execution).
16+
- Attach full KDF console logs (start collecting right after KDF execution).
1717
- ***Make sure that you don't send your passphrase, userpass and privkeys. Your funds might be stolen if you reveal this info publicly!***
1818
- 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

+82-15
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
run: |
5454
rm -f ./MM_VERSION
5555
echo $COMMIT_HASH > ./MM_VERSION
56-
cargo build --bin mm2 --release
56+
cargo build --release
5757
58-
- name: Compress build output
58+
- name: Compress mm2 build output
5959
env:
6060
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
6161
if: ${{ env.AVAILABLE != '' }}
@@ -65,6 +65,15 @@ jobs:
6565
mkdir $BRANCH_NAME
6666
mv $NAME ./$BRANCH_NAME/
6767
68+
- name: Compress kdf build output
69+
env:
70+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
71+
if: ${{ env.AVAILABLE != '' }}
72+
run: |
73+
NAME="kdf_$COMMIT_HASH-linux-x86-64.zip"
74+
zip $NAME target/release/kdf -j
75+
mv $NAME ./$BRANCH_NAME/
76+
6877
- name: Upload output
6978
env:
7079
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -121,9 +130,9 @@ jobs:
121130
run: |
122131
rm -f ./MM_VERSION
123132
echo $COMMIT_HASH > ./MM_VERSION
124-
cargo build --bin mm2 --release --target x86_64-apple-darwin
133+
cargo build --release --target x86_64-apple-darwin
125134
126-
- name: Compress build output
135+
- name: Compress mm2 build output
127136
env:
128137
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
129138
if: ${{ env.AVAILABLE != '' }}
@@ -133,6 +142,15 @@ jobs:
133142
mkdir $BRANCH_NAME
134143
mv $NAME ./$BRANCH_NAME/
135144
145+
- name: Compress kdf build output
146+
env:
147+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
148+
if: ${{ env.AVAILABLE != '' }}
149+
run: |
150+
NAME="kdf_$COMMIT_HASH-mac-x86-64.zip"
151+
zip $NAME target/x86_64-apple-darwin/release/kdf -j
152+
mv $NAME ./$BRANCH_NAME/
153+
136154
- name: Upload output
137155
env:
138156
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -178,9 +196,9 @@ jobs:
178196
remove-item "./MM_VERSION"
179197
}
180198
echo $Env:COMMIT_HASH > ./MM_VERSION
181-
cargo build --bin mm2 --release
199+
cargo build --release
182200
183-
- name: Compress build output
201+
- name: Compress mm2 build output
184202
env:
185203
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
186204
if: ${{ env.AVAILABLE != '' }}
@@ -190,6 +208,15 @@ jobs:
190208
mkdir $Env:BRANCH_NAME
191209
mv $NAME ./$Env:BRANCH_NAME/
192210
211+
- name: Compress kdf build output
212+
env:
213+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
214+
if: ${{ env.AVAILABLE != '' }}
215+
run: |
216+
$NAME="kdf_$Env:COMMIT_HASH-win-x86-64.zip"
217+
7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
218+
mv $NAME ./$Env:BRANCH_NAME/
219+
193220
- name: Upload output
194221
env:
195222
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -236,17 +263,27 @@ jobs:
236263
echo $COMMIT_HASH > ./MM_VERSION
237264
cargo rustc --target x86_64-apple-darwin --lib --release --package mm2_bin_lib --crate-type=staticlib
238265
239-
- name: Compress build output
266+
- name: Compress mm2 build output
240267
env:
241268
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
242269
if: ${{ env.AVAILABLE != '' }}
243270
run: |
244271
NAME="mm2_$COMMIT_HASH-mac-dylib-x86-64.zip"
245-
mv target/x86_64-apple-darwin/release/libmm2lib.a target/x86_64-apple-darwin/release/libmm2.a
272+
cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
246273
zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
247274
mkdir $BRANCH_NAME
248275
mv $NAME ./$BRANCH_NAME/
249276
277+
- name: Compress kdf build output
278+
env:
279+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
280+
if: ${{ env.AVAILABLE != '' }}
281+
run: |
282+
NAME="kdf_$COMMIT_HASH-mac-dylib-x86-64.zip"
283+
mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
284+
zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
285+
mv $NAME ./$BRANCH_NAME/
286+
250287
- name: Upload output
251288
env:
252289
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -310,7 +347,7 @@ jobs:
310347
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
311348
if: ${{ env.AVAILABLE != '' }}
312349
run: |
313-
NAME="mm2_$COMMIT_HASH-wasm.zip"
350+
NAME="kdf_$COMMIT_HASH-wasm.zip"
314351
(cd ./target/target-wasm-release && zip -r - .) > $NAME
315352
mkdir $BRANCH_NAME
316353
mv $NAME ./$BRANCH_NAME/
@@ -361,17 +398,27 @@ jobs:
361398
echo $COMMIT_HASH > ./MM_VERSION
362399
cargo rustc --target aarch64-apple-ios --lib --release --package mm2_bin_lib --crate-type=staticlib
363400
364-
- name: Compress build output
401+
- name: Compress mm2 build output
365402
env:
366403
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
367404
if: ${{ env.AVAILABLE != '' }}
368405
run: |
369406
NAME="mm2_$COMMIT_HASH-ios-aarch64.zip"
370-
mv target/aarch64-apple-ios/release/libmm2lib.a target/aarch64-apple-ios/release/libmm2.a
407+
cp target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
371408
zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
372409
mkdir $BRANCH_NAME
373410
mv $NAME ./$BRANCH_NAME/
374411
412+
- name: Compress kdf build output
413+
env:
414+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
415+
if: ${{ env.AVAILABLE != '' }}
416+
run: |
417+
NAME="kdf_$COMMIT_HASH-ios-aarch64.zip"
418+
mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
419+
zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
420+
mv $NAME ./$BRANCH_NAME/
421+
375422
- name: Upload output
376423
env:
377424
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -432,17 +479,27 @@ jobs:
432479
export PATH=$PATH:/android-ndk/bin
433480
CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo rustc --target=aarch64-linux-android --lib --release --crate-type=staticlib --package mm2_bin_lib
434481
435-
- name: Compress build output
482+
- name: Compress mm2 build output
436483
env:
437484
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
438485
if: ${{ env.AVAILABLE != '' }}
439486
run: |
440487
NAME="mm2_$COMMIT_HASH-android-aarch64.zip"
441-
mv target/aarch64-linux-android/release/libmm2lib.a target/aarch64-linux-android/release/libmm2.a
488+
cp target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
442489
zip $NAME target/aarch64-linux-android/release/libmm2.a -j
443490
mkdir $BRANCH_NAME
444491
mv $NAME ./$BRANCH_NAME/
445492
493+
- name: Compress kdf build output
494+
env:
495+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
496+
if: ${{ env.AVAILABLE != '' }}
497+
run: |
498+
NAME="kdf_$COMMIT_HASH-android-aarch64.zip"
499+
mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
500+
zip $NAME target/aarch64-linux-android/release/libkdf.a -j
501+
mv $NAME ./$BRANCH_NAME/
502+
446503
- name: Upload output
447504
env:
448505
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -503,17 +560,27 @@ jobs:
503560
export PATH=$PATH:/android-ndk/bin
504561
CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo rustc --target=armv7-linux-androideabi --lib --release --crate-type=staticlib --package mm2_bin_lib
505562
506-
- name: Compress build output
563+
- name: Compress mm2 build output
507564
env:
508565
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
509566
if: ${{ env.AVAILABLE != '' }}
510567
run: |
511568
NAME="mm2_$COMMIT_HASH-android-armv7.zip"
512-
mv target/armv7-linux-androideabi/release/libmm2lib.a target/armv7-linux-androideabi/release/libmm2.a
569+
cp target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
513570
zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
514571
mkdir $BRANCH_NAME
515572
mv $NAME ./$BRANCH_NAME/
516573
574+
- name: Compress kdf build output
575+
env:
576+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
577+
if: ${{ env.AVAILABLE != '' }}
578+
run: |
579+
NAME="kdf_$COMMIT_HASH-android-armv7.zip"
580+
mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
581+
zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
582+
mv $NAME ./$BRANCH_NAME/
583+
517584
- name: Upload output
518585
env:
519586
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}

0 commit comments

Comments
 (0)