Merge pull request #6 from trm-dev/blockchain_id

Settings was edited corresponding with new requirements

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "build-system/bazel-rules/apple_support"]
  path = build-system/bazel-rules/apple_support
  url = https://github.com/bazelbuild/apple_support.git
+[submodule "submodules/ton/tonlib-src"]
+ path = submodules/ton/tonlib-src
+ url = https://github.com/trm-dev/ton.git

Wallet/Sources/AppDelegate.swift

@@ -997,8 +997,8 @@ private extension MergedLocalWalletConfiguration {
  resolved: nil),*/
  testNet: MergedLocalBlockchainConfiguration(
  configuration: LocalBlockchainConfiguration(
- source: .url("https://newton-blockchain.github.io/global.config.json"),
- customId: "testnet2"
+ source: .url("https://ton.org/global-config-wallet.json"),
+ customId: "mainnet"
  ),
  resolved: nil
  ),

submodules/WalletUI/Sources/ItemList/Items/ItemListSingleLineInputItem.swift

@@ -422,7 +422,7 @@ class ItemListSingleLineInputItemNode: ListViewItemNode, UITextFieldDelegate, It
  }
  }
 
- if string.count > 1, let item = self.item, let processPaste = item.processPaste {
+ if string.count >= 1, let item = self.item, let processPaste = item.processPaste {
  let result = processPaste(string)
  if result != string {
  var text = textField.text ?? ""

submodules/WalletUI/Sources/WalletConfgurationScreen.swift

@@ -157,7 +157,7 @@ private enum WalletConfigurationScreenEntry: ItemListNodeEntry, Equatable {
  case let .blockchainName(theme, strings, title, value):
  return ItemListSingleLineInputItem(theme: theme, strings: strings, title: NSAttributedString(string: ""), text: value, placeholder: title, type: .regular(capitalization: false, autocorrection: false), sectionId: self.section, textUpdated: { value in
  arguments.updateBlockchainName(value)
-  }, action: {})
+ }, processPaste: { $0.lowercased() }, action: {})
  case let .blockchainNameInfo(theme, text):
  return ItemListTextItem(theme: theme, text: .plain(text), sectionId: self.section)
  }
@@ -224,9 +224,9 @@ private struct WalletConfigurationScreenState: Equatable {
  }
  }
 
- if self.configuration.testNet.customId == "mainnet" {
- return nil
- }
+// if self.configuration.testNet.customId == "mainnet" {
+// return nil
+// }
 
  return LocalWalletConfiguration(
  //mainNet: LocalBlockchainConfiguration(source: mainSource, customId: nil),
@@ -244,7 +244,8 @@ private struct WalletConfigurationScreenState: Equatable {
  blockchainConfiguration = self.configuration.testNet
  }
 
- if self.configuration.testNet.customId == "mainnet" {
+ if let id = self.configuration.testNet.customId,
+ id.isEmpty {
  return true
  }
 

submodules/ton/README.md

@@ -0,0 +1,11 @@
+0. make sure you have installed openssl and cmake(optional ninja)
+1. git submodule update --init --recursive
+2. cd tonlib-src
+3. mkdir build
+4. cd build
+5. cmake --DOPENSSL_ROOT_DIR=*openssl_path* .. (optional -GNinja)
+6. cmake --build . --target prepare_cross_compiling (optional ninja prepare_cross_compiling)
+7. cd ..
+8. rm -rf build
+9. cd ..
+10. profit=)

submodules/ton/build-ton-bazel.sh

@@ -26,6 +26,7 @@ mkdir -p "$OUT_DIR"
 mkdir -p "$OUT_DIR/build"
 cd "$OUT_DIR/build"
 
+git_executable_path="/usr/bin/git"
 openssl_path="$openssl_base_path"
 echo "OpenSSL path = ${openssl_path}"
 openssl_crypto_library="${openssl_path}/lib/libcrypto.a"
@@ -35,6 +36,7 @@ options="$options -DOPENSSL_CRYPTO_LIBRARY=${openssl_crypto_library}"
 options="$options -DOPENSSL_INCLUDE_DIR=${openssl_path}/include"
 options="$options -DOPENSSL_LIBRARIES=${openssl_crypto_library}"
 options="$options -DCMAKE_BUILD_TYPE=Release"
+options="$options -DGIT_EXECUTABLE=${git_executable_path}"
 
 build="build-${arch}"
 install="install-${arch}"
@@ -54,7 +56,7 @@ rm -rf $build
 mkdir -p $build
 mkdir -p $install
 cd $build
-cmake $td_path $options -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" -DIOS_PLATFORM=${ios_platform} -DTON_ARCH= -DCMAKE_INSTALL_PREFIX=../${install}
+cmake $td_path $options -DTON_ONLY_TONLIB=ON -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" -DIOS_PLATFORM=${ios_platform} -DTON_ARCH= -DCMAKE_INSTALL_PREFIX=../${install}
 CORE_COUNT=`sysctl -n hw.logicalcpu`
 make -j$CORE_COUNT install || exit
 cd ..