Merge pull request #67 from newton-blockchain/tonlib-libs

Add library support to tonlib

.github/workflows/macos-10.15-compile.yml

@@ -20,21 +20,41 @@ jobs:
         ./Configure --prefix=/usr/local/macos darwin64-x86_64-cc -static -mmacosx-version-min=10.15
         make build_libs -j4
 
-    - name: Build TON
+    - name: Build all
       run: |
         rootPath=`pwd`
         mkdir build
         cd build
         cmake -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$rootPath/openssl_1_1_1/include -DOPENSSL_CRYPTO_LIBRARY=$rootPath/openssl_1_1_1/libcrypto.a -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.15 -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=Release ..
         make -j4
-        
+
+    - name: Build native-lib
+      run: |
+        rootPath=`pwd`
+        export JAVA_AWT_LIBRARY=NotNeeded
+        export JAVA_JVM_LIBRARY=NotNeeded
+        export JAVA_INCLUDE_PATH=${JAVA_HOME}/include
+        export JAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
+        export JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/darwin
+        git fetch --all
+        git pull --all
+        git checkout wallets
+        cd example/android/
+        mkdir build
+        cd build
+        cmake -DOPENSSL_FOUND=1 -DOPENSSL_INCLUDE_DIR=$rootPath/openssl_1_1_1/include -DOPENSSL_CRYPTO_LIBRARY=$rootPath/openssl_1_1_1/libcrypto.a -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.15 -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=Release -DTON_ONLY_TONLIB=ON ..
+        cmake --build . --target prepare_cross_compiling
+        cmake --build . --target native-lib
+
     - name: Find & copy binaries
       run: |
-        mkdir artifacts
+        mkdir -p artifacts/tonlib-java
         rsync -r --exclude 'CMakeFiles' --exclude 'Makefile' --exclude '*.a' --exclude '*.cmake' --exclude 'third-party' --exclude 'test-*' --exclude '*.cc' --exclude '*.json' --exclude '*.txt' build/* artifacts/        
-        
+        cp example/android/src/drinkless/org/ton/TonApi.java artifacts/tonlib-java/
+        cp example/android/build/libnative-lib.dylib artifacts/tonlib-java/
+
     - name: Upload artifacts
       uses: actions/upload-artifact@master
       with:
         name: ton-macos-binaries
-        path: artifacts
+        path: artifacts

.github/workflows/ubuntu-18.04-compile.yml

@@ -26,20 +26,41 @@ jobs:
     - name: mkdir
       run: |
         mkdir build
-    - name: cmake
+    - name: cmake all
       run: | 
         cd build
-        cmake ..
-    - name: make -j4
+        cmake -DCMAKE_BUILD_TYPE=Release ..
+    - name: make all
       run: |
         cd build
-        make -j4
+        make -j4 fift func tonlib tonlibjson tonlib-cli validator-engine lite-client pow-miner validator-engine-console generate-random-id json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork
+
+    - name: build native-lib
+      run: |
+        export JAVA_AWT_LIBRARY=NotNeeded
+        export JAVA_JVM_LIBRARY=NotNeeded
+        export JAVA_INCLUDE_PATH=${JAVA_HOME}/include
+        export JAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
+        export JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
+        git fetch --all
+        git pull --all
+        git checkout wallets
+        cd example/android/
+        mkdir build
+        cd build
+        cmake -DCMAKE_BUILD_TYPE=Release -DTON_ONLY_TONLIB=ON ..
+        cmake --build . --target prepare_cross_compiling
+        cmake --build . --target native-lib
+
     - name: find & copy binaries
       run: |
-        mkdir artifacts
-        cp --parents build/crypto/fift build/crypto/adjust-block build/crypto/dump-block build/crypto/tlbc build/crypto/func build/crypto/create-state build/validator-engine-console/validator-engine-console build/tonlib/tonlib-cli build/tonlib/libtonlibjson.so.0.5 build/tddb/io-bench build/http/http-proxy build/tdnet/udp_ping_pong build/tdnet/tcp_ping_pong build/rldp-http-proxy/rldp-http-proxy build/dht-server/dht-server build/lite-client/lite-client build/validator-engine/validator-engine build/utils/generate-random-id build/utils/pack-viewer build/utils/json2tlo build/adnl/adnl-proxy build/adnl/adnl-pong artifacts
+        mkdir -p artifacts/tonlib-java
+        cp --parents build/crypto/fift build/crypto/tlbc build/crypto/func build/crypto/create-state build/validator-engine-console/validator-engine-console build/tonlib/tonlib-cli build/tonlib/libtonlibjson.so.0.5 build/http/http-proxy build/rldp-http-proxy/rldp-http-proxy build/dht-server/dht-server build/lite-client/lite-client build/validator-engine/validator-engine build/utils/generate-random-id build/utils/json2tlo build/adnl/adnl-proxy artifacts
+        cp example/android/src/drinkless/org/ton/TonApi.java artifacts/tonlib-java/
+        cp example/android/build/libnative-lib.so artifacts/tonlib-java/
+
     - name: Upload artifacts
       uses: actions/upload-artifact@master
       with:
         name: ton-binaries
-        path: artifacts
+        path: artifacts

.github/workflows/windows2019x64-compile.yml

@@ -5,7 +5,7 @@ on: [push,workflow_dispatch]
 defaults:
   run:
     shell: cmd
-    
+
 jobs:
   build:
 
@@ -20,58 +20,79 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-        
+
       - name: Check out zlib repository
         uses: actions/checkout@v2
         with:
           repository: desktop-app/zlib
           path: zlib
-          
+
       - name: Setup msbuild.exe
         uses: microsoft/[email protected]
-                
+
       - name: Compile zlib Win64
         run: |
           cd zlib\contrib\vstudio\vc14
-          msbuild zlibstat.vcxproj /p:Configuration=Debug /p:platform=x64        
-          msbuild zlibstat.vcxproj /p:Configuration=ReleaseWithoutAsm /p:platform=x64
-          
+          msbuild zlibstat.vcxproj /p:Configuration=Debug /p:platform=x64 -p:PlatformToolset=v142
+          msbuild zlibstat.vcxproj /p:Configuration=ReleaseWithoutAsm /p:platform=x64 -p:PlatformToolset=v142
+
       - name: Install OpenSSL Win64
         run: |
-          curl -o openssl.msi https://slproweb.com/download/Win64OpenSSL-1_1_1L.msi
+          curl -o openssl.msi https://slproweb.com/download/Win64OpenSSL-1_1_1m.msi
           msiexec /i openssl.msi /quiet /qn /norestart
-          
+
       - name: Build ton
         run: |
           set root=%cd%
           echo %root%
           mkdir build
           cd build
-          cmake -DZLIB_FOUND=1 -DZLIB_INCLUDE_DIR=%root%\zlib -DZLIB_LIBRARY=%root%\zlib\contrib\vstudio\vc14\x64\ZlibStatReleaseWithoutAsm\zlibstat.lib -DCMAKE_CXX_FLAGS="/DTD_WINDOWS=1 /EHsc /bigobj /W0" -DCMAKE_BUILD_TYPE=Release ..
-          
+          cmake -DZLIB_FOUND=1 -DZLIB_INCLUDE_DIR=%root%\zlib -DZLIB_LIBRARY=%root%\zlib\contrib\vstudio\vc14\x64\ZlibStatReleaseWithoutAsm\zlibstat.lib -DCMAKE_CXX_FLAGS="/DTD_WINDOWS=1 /EHsc /bigobj /W0" ..
+
       - name: Compile ton
         run: |       
           cd build   
-          cmake --build .
-        continue-on-error: true          
-
+          cmake --build . --config Release
+        continue-on-error: true
+
+      - name: Compile native-lib
+        run: |
+          set root=%cd%
+          set JAVA_AWT_LIBRARY=NotNeeded
+          set JAVA_JVM_LIBRARY=NotNeeded
+          set JAVA_INCLUDE_PATH=${JAVA_HOME}/include
+          set JAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
+          set JAVA_INCLUDE_PATH2=${JAVA_HOME}/include/win32
+          git fetch --all
+          git pull --all
+          git checkout wallets
+          cd example/android/
+          mkdir build
+          cd build
+          cmake -DZLIB_FOUND=1 -DZLIB_INCLUDE_DIR=%root%\zlib -DZLIB_LIBRARY=%root%\zlib\contrib\vstudio\vc14\x64\ZlibStatReleaseWithoutAsm\zlibstat.lib -DTON_ONLY_TONLIB=ON ..
+          cmake --build . --target native-lib --config Release
+
       - name: Show executables
         run: |
-          cd build          
+          cd build
+          del Release\test-*
           dir *.exe /a-D /S /B
-          
+          dir *.dll /a-D /S /B
+
       - name: Check if validator-engine.exe exists
         run: |
           set root=%cd%
-          copy %root%\build\validator-engine\Debug\validator-engine.exe test
-          
+          copy %root%\build\validator-engine\Release\validator-engine.exe test
+
       - name: Find & copy binaries
         run: |
           mkdir artifacts
           for /f %%a in ('dir *.exe /b /a /s') do copy /Y %%a artifacts
-          
+          copy build\tonlib\Release\tonlibjson.dll artifacts
+          copy example\android\build\Release\native-lib.dll artifacts
+
       - name: Upload artifacts
         uses: actions/upload-artifact@master
         with:
           name: ton-win64-binaries
-          path: artifacts
+          path: artifacts

crypto/block/mc-config.cpp

@@ -2100,7 +2100,7 @@ Ref<vm::Cell> ConfigInfo::lookup_library(td::ConstBitPtr root_hash) const {
     return {};
   }
   auto csr = libraries_dict_->lookup(root_hash, 256);
-  if (csr.is_null() || csr->prefetch_ulong(8) != 0 || !csr->have_refs()) {  // shared_lib_descr$00 lib:^Cell
+  if (csr.is_null() || csr->prefetch_ulong(2) != 0 || !csr->have_refs()) {  // shared_lib_descr$00 lib:^Cell
     return {};
   }
   auto lib = csr->prefetch_ref();

crypto/smc-envelope/SmartContract.cpp

@@ -52,30 +52,51 @@ td::Ref<vm::Stack> prepare_vm_stack(td::RefInt256 amount, td::Ref<vm::CellSlice>
   return stack_ref;
 }
 
-td::Ref<vm::Tuple> prepare_vm_c7(td::uint32 now, td::uint64 balance) {
-  // TODO: fix initialization of c7
+td::Ref<vm::Tuple> prepare_vm_c7(SmartContract::Args args) {
   td::BitArray<256> rand_seed;
   rand_seed.as_slice().fill(0);
   td::RefInt256 rand_seed_int{true};
   rand_seed_int.unique_write().import_bits(rand_seed.cbits(), 256, false);
+
+  td::uint32 now = 0;
+  if (args.now) {
+    now = args.now.unwrap();
+  }
+
+  vm::CellBuilder cb;
+  if (args.address) {
+    td::BigInt256 dest_addr;
+    dest_addr.import_bits((*args.address).addr.as_bitslice());
+    cb.store_ones(1)
+        .store_zeroes(2)
+        .store_long((*args.address).workchain, 8)
+        .store_int256(dest_addr, 256);
+  }
+  auto address = cb.finalize();
+  auto config = td::Ref<vm::Cell>();
+
+  if (args.config) {
+    config = (*args.config)->get_root_cell();
+  }
+
   auto tuple = vm::make_tuple_ref(
       td::make_refint(0x076ef1ea),                           // [ magic:0x076ef1ea
       td::make_refint(0),                                    //   actions:Integer
       td::make_refint(0),                                    //   msgs_sent:Integer
       td::make_refint(now),                                  //   unixtime:Integer
-      td::make_refint(0),                                    //   block_lt:Integer
-      td::make_refint(0),                                    //   trans_lt:Integer
+      td::make_refint(0),             //TODO:                //   block_lt:Integer
+      td::make_refint(0),             //TODO:                //   trans_lt:Integer
       std::move(rand_seed_int),                              //   rand_seed:Integer
-      block::CurrencyCollection(balance).as_vm_tuple(),      //   balance_remaining:[Integer (Maybe Cell)]
-      vm::load_cell_slice_ref(vm::CellBuilder().finalize())  //  myself:MsgAddressInt
-                                                             //vm::StackEntry::maybe(td::Ref<vm::Cell>())
+      block::CurrencyCollection(args.balance).as_vm_tuple(),      //   balance_remaining:[Integer (Maybe Cell)]
+      vm::load_cell_slice_ref(address),  //  myself:MsgAddressInt
+      vm::StackEntry::maybe(config)       //vm::StackEntry::maybe(td::Ref<vm::Cell>())
   );                                                         //  global_config:(Maybe Cell) ] = SmartContractInfo;
   //LOG(DEBUG) << "SmartContractInfo initialized with " << vm::StackEntry(tuple).to_string();
   return vm::make_tuple_ref(std::move(tuple));
 }
 
 SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref<vm::Stack> stack, td::Ref<vm::Tuple> c7,
-                                    vm::GasLimits gas, bool ignore_chksig) {
+                                    vm::GasLimits gas, bool ignore_chksig, td::Ref<vm::Cell> libraries) {
   auto gas_credit = gas.gas_credit;
   vm::init_op_cp0();
   vm::DictionaryBase::get_empty_dictionary();
@@ -108,11 +129,15 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref<vm::Stac
   vm::VmState vm{state.code, std::move(stack), gas, 1, state.data, log};
   vm.set_c7(std::move(c7));
   vm.set_chksig_always_succeed(ignore_chksig);
+  if (!libraries.is_null()) {
+    vm.register_library_collection(libraries);
+  }
   try {
     res.code = ~vm.run();
   } catch (...) {
     LOG(FATAL) << "catch unhandled exception";
   }
+  td::ConstBitPtr mlib = vm.get_missing_library();
   res.new_state = std::move(state);
   res.stack = vm.get_stack_ref();
   gas = vm.get_gas_limits();
@@ -128,13 +153,17 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref<vm::Stac
     LOG(DEBUG) << "VM accepted: " << res.accepted;
     LOG(DEBUG) << "VM success: " << res.success;
   }
+  if (!mlib.is_null()) {
+    LOG(DEBUG) << "Missing library: " << mlib.to_hex(256);
+    res.missing_library = mlib;
+  }
   if (res.success) {
     res.new_state.data = vm.get_c4();
     res.actions = vm.get_d(5);
     LOG(DEBUG) << "output actions:\n"
                << block::gen::OutList{res.output_actions_count(res.actions)}.as_string_ref(res.actions);
   }
-  LOG_IF(ERROR, gas_credit != 0 && (res.accepted && !res.success))
+  LOG_IF(ERROR, gas_credit != 0 && (res.accepted && !res.success) && mlib.is_null())
       << "Accepted but failed with code " << res.code << "\n"
       << res.gas_used << "\n";
   return res;
@@ -176,12 +205,8 @@ td::Ref<vm::Cell> SmartContract::get_init_state() const {
 }
 
 SmartContract::Answer SmartContract::run_method(Args args) {
-  td::uint32 now = 0;
-  if (args.now) {
-    now = args.now.unwrap();
-  }
   if (!args.c7) {
-    args.c7 = prepare_vm_c7(now, args.balance);
+    args.c7 = prepare_vm_c7(args);
   }
   if (!args.limits) {
     bool is_internal = args.get_method_id().ok() == 0;
@@ -193,18 +218,15 @@ SmartContract::Answer SmartContract::run_method(Args args) {
   CHECK(args.method_id);
   args.stack.value().write().push_smallint(args.method_id.unwrap());
   auto res =
-      run_smartcont(get_state(), args.stack.unwrap(), args.c7.unwrap(), args.limits.unwrap(), args.ignore_chksig);
+      run_smartcont(get_state(), args.stack.unwrap(), args.c7.unwrap(), args.limits.unwrap(), args.ignore_chksig,
+                    args.libraries ? args.libraries.unwrap().get_root_cell() : td::Ref<vm::Cell>{});
   state_ = res.new_state;
   return res;
 }
 
 SmartContract::Answer SmartContract::run_get_method(Args args) const {
-  td::uint32 now = 0;
-  if (args.now) {
-    now = args.now.unwrap();
-  }
   if (!args.c7) {
-    args.c7 = prepare_vm_c7(now, args.balance);
+    args.c7 = prepare_vm_c7(args);
   }
   if (!args.limits) {
     args.limits = vm::GasLimits{1000000, 1000000};
@@ -214,7 +236,8 @@ SmartContract::Answer SmartContract::run_get_method(Args args) const {
   }
   CHECK(args.method_id);
   args.stack.value().write().push_smallint(args.method_id.unwrap());
-  return run_smartcont(get_state(), args.stack.unwrap(), args.c7.unwrap(), args.limits.unwrap(), args.ignore_chksig);
+  return run_smartcont(get_state(), args.stack.unwrap(), args.c7.unwrap(), args.limits.unwrap(), args.ignore_chksig,
+                       args.libraries ? args.libraries.unwrap().get_root_cell() : td::Ref<vm::Cell>{});
 }
 
 SmartContract::Answer SmartContract::run_get_method(td::Slice method, Args args) const {