Skip to content

Commit

Permalink
chore: rename tari > minotari (#5597)
Browse files Browse the repository at this point in the history
Description
---
This renames all user interface names from tari to minotari

Motivation and Context
---
This is inline with the name changes of Dan -> Tari, and BaseLayer ->
MinoTari

How Has This Been Tested?
---
All tests
Manual inspection of log files and binaries.
  • Loading branch information
SWvheerden authored Jul 31, 2023
1 parent 6ae34ea commit b1708fc
Show file tree
Hide file tree
Showing 446 changed files with 2,741 additions and 2,695 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/base_node_binaries.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"target": "x86_64-unknown-linux-gnu",
"cross": false,
"target_cpu": "x86-64",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
"features": "safe"
},
{
Expand All @@ -17,8 +17,8 @@
"cross": true,
"target_cpu": "generic",
"features": "safe",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"flags": "--workspace --exclude tari_mining_helper_ffi --exclude tari_integration_tests"
"target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
"flags": "--workspace --exclude minotari_mining_helper_ffi --exclude tari_integration_tests"
},
{
"name": "macos-x86_64",
Expand All @@ -27,7 +27,7 @@
"target": "x86_64-apple-darwin",
"cross": false,
"target_cpu": "x86-64",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
"features": "safe"
},
{
Expand All @@ -37,7 +37,7 @@
"target": "aarch64-apple-darwin",
"cross": false,
"target_cpu": "generic",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
"features": "safe"
},
{
Expand All @@ -48,7 +48,7 @@
"cross": false,
"target_cpu": "x86-64",
"features": "safe",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
"flags": "--workspace --exclude tari_libtor"
},
{
Expand All @@ -59,7 +59,7 @@
"cross": false,
"target_cpu": "generic",
"features": "safe",
"target_bins": "--bin tari_base_node --bin tari_console_wallet --bin tari_merge_mining_proxy --bin tari_miner",
"target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
"build_enabled": false
}
]
38 changes: 19 additions & 19 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ jobs:
run: |
mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}"
cd "$GITHUB_WORKSPACE${TBN_DIST}"
VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' "$GITHUB_WORKSPACE/applications/tari_base_node/Cargo.toml")
VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' "$GITHUB_WORKSPACE/applications/minotari_node/Cargo.toml")
echo "Branch: ${VBRANCH}"
echo "Sha: ${VSHA_SHORT}"
echo "VERSION=${VERSION}" >> $GITHUB_ENV
Expand All @@ -237,18 +237,18 @@ jobs:
echo "Copying files for ${BINFILE} to $(pwd)"
ls -la "$GITHUB_WORKSPACE/target/${{ matrix.builds.target }}/release/"
FILES=(
"tari_base_node"
"tari_console_wallet"
"tari_miner"
"tari_merge_mining_proxy"
"minotari_node"
"minotari_console_wallet"
"minotari_miner"
"minotari_merge_mining_proxy"
)
for FILE in "${FILES[@]}"; do
if [ -f "$GITHUB_WORKSPACE/target/${{ matrix.builds.target }}/release/${FILE}${TBN_EXT}" ]; then
cp -v "$GITHUB_WORKSPACE/target/${{ matrix.builds.target }}/release/${FILE}${TBN_EXT}" .
fi
done
if [ -f "$GITHUB_WORKSPACE/applications/tari_base_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" ]; then
cp -v "$GITHUB_WORKSPACE/applications/tari_base_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" .
if [ -f "$GITHUB_WORKSPACE/applications/minotari_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" ]; then
cp -v "$GITHUB_WORKSPACE/applications/minotari_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" .
fi
- name: Build the macOS pkg
Expand Down Expand Up @@ -278,10 +278,10 @@ jobs:
export target_release="target/${{ matrix.builds.target }}/release"
./create_osx_install_zip.sh unused nozip
FILES=(
"tari_base_node"
"tari_console_wallet"
"tari_miner"
"tari_merge_mining_proxy"
"minotari_node"
"minotari_console_wallet"
"minotari_miner"
"minotari_merge_mining_proxy"
)
for FILE in "${FILES[@]}"; do
codesign --options runtime --force --verify --verbose --timestamp --sign "Developer ID Application: $MACOS_APPLICATION_ID" "/tmp/tari_testnet/runtime/$FILE"
Expand Down Expand Up @@ -394,20 +394,20 @@ jobs:
shell: bash
run: |
cd "${{ github.workspace }}${{ env.TBN_DIST }}"
cp -v "tari_miner${{ env.TBN_EXT}}" \
"tari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}"
cp -v "minotari_miner${{ env.TBN_EXT}}" \
"minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}"
echo "Compute miner shasum"
${SHARUN} "tari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}" \
>> "tari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
cat "tari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
${SHARUN} "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}" \
>> "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
cat "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
echo "Checksum verification for miner is "
${SHARUN} --check "tari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
${SHARUN} --check "minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}.sha256"
- name: Artifact upload for Miner
uses: actions/upload-artifact@v3
with:
name: tari_miner-${{ matrix.builds.name }}
path: "${{ github.workspace }}${{ env.TBN_DIST }}/tari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}*"
name: minotari_miner-${{ matrix.builds.name }}
path: "${{ github.workspace }}${{ env.TBN_DIST }}/minotari_miner-${{ matrix.builds.name }}${{ env.TBN_EXT}}*"

- name: Prep diag-utils archive for upload
continue-on-error: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_libwallets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
working-directory: libwallets
run: |
ls -alht
find . -name "libtari_wallet_ffi.*.sha256" -type f \
find . -name "libminotari_wallet_ffi.*.sha256" -type f \
-exec sed -i -e "s/libwallet-.*\///g" '{}' \;
ls -alht
Expand All @@ -113,11 +113,11 @@ jobs:
run: |
ls -alht
if [ -d libwallet-ios-xcframework ]; then
7z a libtari_wallet_ffi.ios-xcframework.zip libwallet-ios-xcframework/*
7z a libminotari_wallet_ffi.ios-xcframework.zip libwallet-ios-xcframework/*
rm -fr libwallet-ios-xcframework/*
shasum -a 256 \
"libtari_wallet_ffi.ios-xcframework.zip" \
> "libtari_wallet_ffi.ios-xcframework.zip.sha256"
"libminotari_wallet_ffi.ios-xcframework.zip" \
> "libminotari_wallet_ffi.ios-xcframework.zip.sha256"
fi
ls -alht
Expand Down
66 changes: 33 additions & 33 deletions .github/workflows/build_libwallets_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
cargo install cross
cross build --lib --release \
--package tari_wallet_ffi \
--package minotari_wallet_ffi \
--target=${{ matrix.build }}
- name: Prepare libwallet libraries
Expand All @@ -75,18 +75,18 @@ jobs:
echo "target_platform=${target_platform}" >> $GITHUB_ENV
mkdir -p "${{ runner.temp }}/libwallet-android-${target_platform}"
cd "${{ runner.temp }}/libwallet-android-${target_platform}"
cp -v "$GITHUB_WORKSPACE/target/${{ matrix.build }}/release/libtari_wallet_ffi.a" "libtari_wallet_ffi.android_${target_platform}.a"
cp -v "$GITHUB_WORKSPACE/base_layer/wallet_ffi/wallet.h" libtari_wallet_ffi.h
cp -v "$GITHUB_WORKSPACE/target/${{ matrix.build }}/release/libminotari_wallet_ffi.a" "libminotari_wallet_ffi.android_${target_platform}.a"
cp -v "$GITHUB_WORKSPACE/base_layer/wallet_ffi/wallet.h" libminotari_wallet_ffi.h
if [ -f "$GITHUB_WORKSPACE/changelog-${{ env.TARI_NETWORK_CHANGELOG }}.md" ]; then
cp -v "$GITHUB_WORKSPACE/changelog-${{ env.TARI_NETWORK_CHANGELOG }}.md" .
TARI_NETWORK_CHANGELOG_FILE=libwallet-android-${target_platform}/changelog-${{ env.TARI_NETWORK_CHANGELOG }}.md
echo ${TARI_NETWORK_CHANGELOG_FILE}
fi
cd ..
shasum -a 256 \
"libwallet-android-${target_platform}/libtari_wallet_ffi.android_${target_platform}.a" \
"libwallet-android-${target_platform}/libtari_wallet_ffi.h" "${TARI_NETWORK_CHANGELOG_FILE}" \
> "libwallet-android-${target_platform}/libtari_wallet_ffi.android_${target_platform}.sha256"
"libwallet-android-${target_platform}/libminotari_wallet_ffi.android_${target_platform}.a" \
"libwallet-android-${target_platform}/libminotari_wallet_ffi.h" "${TARI_NETWORK_CHANGELOG_FILE}" \
> "libwallet-android-${target_platform}/libminotari_wallet_ffi.android_${target_platform}.sha256"
ls -alht "${{ runner.temp }}/libwallet-android-${target_platform}"
- name: Upload artifacts
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
run: |
rustup target add ${{ matrix.build }}
cargo build --lib --release \
--package tari_wallet_ffi \
--package minotari_wallet_ffi \
--target=${{ matrix.build }}
- name: Prepare libwallet libraries
Expand All @@ -152,8 +152,8 @@ jobs:
echo "target_platform=${target_platform}" >> $GITHUB_ENV
mkdir -p "${{ runner.temp }}/libwallet-ios-${target_platform}"
cd "${{ runner.temp }}/libwallet-ios-${target_platform}"
cp -v "$GITHUB_WORKSPACE/target/${{ matrix.build }}/release/libtari_wallet_ffi.a" "libtari_wallet_ffi.ios_${target_platform}.a"
cp -v "$GITHUB_WORKSPACE/base_layer/wallet_ffi/wallet.h" libtari_wallet_ffi.h
cp -v "$GITHUB_WORKSPACE/target/${{ matrix.build }}/release/libminotari_wallet_ffi.a" "libminotari_wallet_ffi.ios_${target_platform}.a"
cp -v "$GITHUB_WORKSPACE/base_layer/wallet_ffi/wallet.h" libminotari_wallet_ffi.h
if [ -f "$GITHUB_WORKSPACE/changelog-${{ env.TARI_NETWORK_CHANGELOG }}.md" ]; then
cp -v "$GITHUB_WORKSPACE/changelog-${{ env.TARI_NETWORK_CHANGELOG }}.md" .
TARI_NETWORK_CHANGELOG_FILE=libwallet-ios-${target_platform}/changelog-${{ env.TARI_NETWORK_CHANGELOG }}.md
Expand All @@ -162,9 +162,9 @@ jobs:
cd ..
shasum -a 256 \
"libwallet-ios-${target_platform}/libtari_wallet_ffi.ios_${target_platform}.a" \
"libwallet-ios-${target_platform}/libtari_wallet_ffi.h" "${TARI_NETWORK_CHANGELOG_FILE}" \
> "libwallet-ios-${target_platform}/libtari_wallet_ffi.ios_${target_platform}.sha256"
"libwallet-ios-${target_platform}/libminotari_wallet_ffi.ios_${target_platform}.a" \
"libwallet-ios-${target_platform}/libminotari_wallet_ffi.h" "${TARI_NETWORK_CHANGELOG_FILE}" \
> "libwallet-ios-${target_platform}/libminotari_wallet_ffi.ios_${target_platform}.sha256"
ls -alht "${{ runner.temp }}/libwallet-ios-${target_platform}"
- name: Upload artifacts
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
run: |
ls -alhtR
mkdir libwallet-ios-universal
cp -v "libwallet-ios-x86_64/libtari_wallet_ffi.h" \
cp -v "libwallet-ios-x86_64/libminotari_wallet_ffi.h" \
libwallet-ios-universal/
echo "Check for changelog"
if [ -f libwallet-ios-x86_64/changelog-*.md ]; then
Expand All @@ -228,13 +228,13 @@ jobs:
echo "No changelog found"
fi
lipo -create \
"libwallet-ios-x86_64/libtari_wallet_ffi.ios_x86_64.a" \
"libwallet-ios-aarch64/libtari_wallet_ffi.ios_aarch64.a" \
-output "libwallet-ios-universal/libtari_wallet_ffi.ios_universal.a"
"libwallet-ios-x86_64/libminotari_wallet_ffi.ios_x86_64.a" \
"libwallet-ios-aarch64/libminotari_wallet_ffi.ios_aarch64.a" \
-output "libwallet-ios-universal/libminotari_wallet_ffi.ios_universal.a"
shasum -a 256 \
"libwallet-ios-universal/libtari_wallet_ffi.ios_universal.a" \
"libwallet-ios-universal/libtari_wallet_ffi.h" "${TARI_NETWORK_CHANGELOG_FILE}" \
> "libwallet-ios-universal/libtari_wallet_ffi.ios_universal.sha256"
"libwallet-ios-universal/libminotari_wallet_ffi.ios_universal.a" \
"libwallet-ios-universal/libminotari_wallet_ffi.h" "${TARI_NETWORK_CHANGELOG_FILE}" \
> "libwallet-ios-universal/libminotari_wallet_ffi.ios_universal.sha256"
ls -alhtR
- name: Upload iOS universal libwallet artifacts
Expand All @@ -250,9 +250,9 @@ jobs:
ls -alhtR
mkdir libwallet-ios-universal-sim
lipo -create \
"libwallet-ios-x86_64/libtari_wallet_ffi.ios_x86_64.a" \
"libwallet-ios-aarch64-sim/libtari_wallet_ffi.ios_aarch64-sim.a" \
-output "libwallet-ios-universal-sim/libtari_wallet_ffi.ios_universal-sim.a"
"libwallet-ios-x86_64/libminotari_wallet_ffi.ios_x86_64.a" \
"libwallet-ios-aarch64-sim/libminotari_wallet_ffi.ios_aarch64-sim.a" \
-output "libwallet-ios-universal-sim/libminotari_wallet_ffi.ios_universal-sim.a"
mkdir libwallet-ios-xcframework
echo "Check for changelog"
if [ -f libwallet-ios-x86_64/changelog-*.md ]; then
Expand All @@ -273,19 +273,19 @@ jobs:
echo "No changelog found"
fi
xcodebuild -create-xcframework \
-library "libwallet-ios-universal-sim/libtari_wallet_ffi.ios_universal-sim.a" \
-headers "libwallet-ios-x86_64/libtari_wallet_ffi.h" \
-library "libwallet-ios-aarch64/libtari_wallet_ffi.ios_aarch64.a" \
-headers "libwallet-ios-aarch64/libtari_wallet_ffi.h" \
-output libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework
-library "libwallet-ios-universal-sim/libminotari_wallet_ffi.ios_universal-sim.a" \
-headers "libwallet-ios-x86_64/libminotari_wallet_ffi.h" \
-library "libwallet-ios-aarch64/libminotari_wallet_ffi.ios_aarch64.a" \
-headers "libwallet-ios-aarch64/libminotari_wallet_ffi.h" \
-output libwallet-ios-xcframework/libtminoari_wallet_ffi_ios.xcframework
shasum -a 256 \
"libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/Info.plist" \
"libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64/Headers" \
"libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64/libtari_wallet_ffi.ios_aarch64.a" \
"libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64_x86_64-simulator/Headers" \
"libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64_x86_64-simulator/libtari_wallet_ffi.ios_universal-sim.a" \
"libwallet-ios-xcframework/libminotari_wallet_ffi_ios.xcframework/Info.plist" \
"libwallet-ios-xcframework/libminotari_wallet_ffi_ios.xcframework/ios-arm64/Headers" \
"libwallet-ios-xcframework/libminotari_wallet_ffi_ios.xcframework/ios-arm64/libminotari_wallet_ffi.ios_aarch64.a" \
"libwallet-ios-xcframework/libminotari_wallet_ffi_ios.xcframework/ios-arm64_x86_64-simulator/Headers" \
"libwallet-ios-xcframework/libminotari_wallet_ffi_ios.xcframework/ios-arm64_x86_64-simulator/libminotari_wallet_ffi.ios_universal-sim.a" \
"${TARI_NETWORK_CHANGELOG_FILE}" \
> "libwallet-ios-xcframework/libtari_wallet_ffi.ios_xcframework.sha256"
> "libwallet-ios-xcframework/libminotari_wallet_ffi.ios_xcframework.sha256"
ls -alhtR
- name: Upload iOS xcframework libwallet artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
- name: cargo check
run: cargo check --release --all-targets --workspace --exclude tari_integration_tests --locked
- name: cargo check ffi separately
run: cargo check --release --package tari_wallet_ffi --locked
run: cargo check --release --package minotari_wallet_ffi --locked
licenses:
name: file licenses
runs-on: [ubuntu-20.04]
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@ pie/
/integration_tests/.husky/_/husky.sh
/integration_tests/tests/temp
integration_tests/cucumber-output-junit.xml

integration_tests/log/
20 changes: 10 additions & 10 deletions .license.ignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
./CODEOWNERS
./LICENSE
./Makefile
./applications/tari_base_node/assets/tari_banner.rs
./applications/tari_base_node/assets/tari_logo.rs
./applications/tari_base_node/linux/setup_tor_service
./applications/tari_base_node/linux/start_all
./applications/tari_base_node/linux/start_tari_base_node
./applications/tari_base_node/linux/start_tor
./applications/tari_base_node/osx-pkg/env-sample
./applications/tari_base_node/osx-pkg/scripts/postinstall
./applications/tari_base_node/osx-pkg/scripts/preinstall
./applications/tari_console_wallet/linux/start_tari_console_wallet
./applications/minotari_node/assets/tari_banner.rs
./applications/minotari_node/assets/tari_logo.rs
./applications/minotari_node/linux/setup_tor_service
./applications/minotari_node/linux/start_all
./applications/minotari_node/linux/start_tari_base_node
./applications/minotari_node/linux/start_tor
./applications/minotari_node/osx-pkg/env-sample
./applications/minotari_node/osx-pkg/scripts/postinstall
./applications/minotari_node/osx-pkg/scripts/preinstall
./applications/minotari_console_wallet/linux/start_tari_console_wallet
./base_layer/contacts/src/schema.rs
./base_layer/key_manager/Makefile
./base_layer/key_manager/src/schema.rs
Expand Down
Loading

0 comments on commit b1708fc

Please sign in to comment.