new db

new database
fift/func bugfixes

crypto/smc-envelope/HighloadWallet.cpp

@@ -0,0 +1,126 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2019 Telegram Systems LLP
+*/
+#include "HighloadWallet.h"
+#include "GenericAccount.h"
+#include "SmartContractCode.h"
+
+#include "vm/boc.h"
+#include "vm/cells/CellString.h"
+#include "td/utils/base64.h"
+
+#include <limits>
+
+namespace ton {
+td::Ref<vm::Cell> HighloadWallet::get_init_state(const td::Ed25519::PublicKey& public_key,
+                                                 td::uint32 wallet_id) noexcept {
+  auto code = get_init_code();
+  auto data = get_init_data(public_key, wallet_id);
+  return GenericAccount::get_init_state(std::move(code), std::move(data));
+}
+
+td::Ref<vm::Cell> HighloadWallet::get_init_message(const td::Ed25519::PrivateKey& private_key,
+                                                   td::uint32 wallet_id) noexcept {
+  td::uint32 seqno = 0;
+  td::uint32 valid_until = std::numeric_limits<td::uint32>::max();
+  auto append_message = [&](auto&& cb) -> vm::CellBuilder& {
+    cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(seqno, 32);
+    CHECK(cb.store_maybe_ref({}));
+    return cb;
+  };
+  auto signature = private_key.sign(append_message(vm::CellBuilder()).finalize()->get_hash().as_slice()).move_as_ok();
+
+  return append_message(vm::CellBuilder().store_bytes(signature)).finalize();
+}
+
+td::Ref<vm::Cell> HighloadWallet::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                                      td::uint32 seqno, td::uint32 valid_until,
+                                                      td::Span<Gift> gifts) noexcept {
+  CHECK(gifts.size() <= 254);
+  vm::Dictionary messages(16);
+  for (size_t i = 0; i < gifts.size(); i++) {
+    auto& gift = gifts[i];
+    td::int32 send_mode = 3;
+    auto gramms = gift.gramms;
+    if (gramms == -1) {
+      gramms = 0;
+      send_mode += 128;
+    }
+    vm::CellBuilder cb;
+    GenericAccount::store_int_message(cb, gift.destination, gramms);
+    cb.store_bytes("\0\0\0\0", 4);
+    //vm::CellString::store(cb, gift.message, 35 * 8).ensure();
+    auto message_inner = cb.finalize();
+    cb = {};
+    cb.store_long(send_mode, 8).store_ref(message_inner);
+    auto key = messages.integer_key(td::make_refint(i), 16, false);
+    messages.set_builder(key.bits(), 16, cb);
+  }
+
+  vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(seqno, 32);
+  CHECK(cb.store_maybe_ref(messages.get_root_cell()));
+  auto message_outer = cb.finalize();
+  auto signature = private_key.sign(message_outer->get_hash().as_slice()).move_as_ok();
+  return vm::CellBuilder().store_bytes(signature).append_cellslice(vm::load_cell_slice(message_outer)).finalize();
+}
+
+td::Ref<vm::Cell> HighloadWallet::get_init_code() noexcept {
+  return SmartContractCode::highload_wallet();
+}
+
+vm::CellHash HighloadWallet::get_init_code_hash() noexcept {
+  return get_init_code()->get_hash();
+}
+
+td::Ref<vm::Cell> HighloadWallet::get_init_data(const td::Ed25519::PublicKey& public_key,
+                                                td::uint32 wallet_id) noexcept {
+  return vm::CellBuilder()
+      .store_long(0, 32)
+      .store_long(wallet_id, 32)
+      .store_bytes(public_key.as_octet_string())
+      .finalize();
+}
+
+td::Result<td::uint32> HighloadWallet::get_seqno() const {
+  return TRY_VM(get_seqno_or_throw());
+}
+
+td::Result<td::uint32> HighloadWallet::get_seqno_or_throw() const {
+  if (state_.data.is_null()) {
+    return 0;
+  }
+  //FIXME use get method
+  return static_cast<td::uint32>(vm::load_cell_slice(state_.data).fetch_ulong(32));
+}
+
+td::Result<td::uint32> HighloadWallet::get_wallet_id() const {
+  return TRY_VM(get_wallet_id_or_throw());
+}
+
+td::Result<td::uint32> HighloadWallet::get_wallet_id_or_throw() const {
+  if (state_.data.is_null()) {
+    return 0;
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  cs.skip_first(32);
+  return static_cast<td::uint32>(cs.fetch_ulong(32));
+}
+
+}  // namespace ton

crypto/smc-envelope/HighloadWallet.h

@@ -0,0 +1,54 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2019 Telegram Systems LLP
+*/
+#pragma once
+
+#include "smc-envelope/SmartContract.h"
+#include "vm/cells.h"
+#include "Ed25519.h"
+#include "block/block.h"
+#include "vm/cells/CellString.h"
+
+namespace ton {
+class HighloadWallet : ton::SmartContract {
+ public:
+  explicit HighloadWallet(State state) : ton::SmartContract(std::move(state)) {
+  }
+  static constexpr unsigned max_message_size = vm::CellString::max_bytes;
+  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept;
+  static td::Ref<vm::Cell> get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id) noexcept;
+  struct Gift {
+    block::StdAddress destination;
+    td::int64 gramms;
+    std::string message;
+  };
+  static td::Ref<vm::Cell> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                               td::uint32 seqno, td::uint32 valid_until, td::Span<Gift> gifts) noexcept;
+
+  static td::Ref<vm::Cell> get_init_code() noexcept;
+  static vm::CellHash get_init_code_hash() noexcept;
+  static td::Ref<vm::Cell> get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept;
+
+  td::Result<td::uint32> get_seqno() const;
+  td::Result<td::uint32> get_wallet_id() const;
+
+ private:
+  td::Result<td::uint32> get_seqno_or_throw() const;
+  td::Result<td::uint32> get_wallet_id_or_throw() const;
+};
+}  // namespace ton

crypto/smc-envelope/SmartContract.cpp

@@ -111,7 +111,7 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref<vm::Stac
   if (GET_VERBOSITY_LEVEL() >= VERBOSITY_NAME(DEBUG)) {
     LOG(DEBUG) << "VM log\n" << logger.res;
     std::ostringstream os;
-    res.stack->dump(os);
+    res.stack->dump(os, 2);
     LOG(DEBUG) << "VM stack:\n" << os.str();
     LOG(DEBUG) << "VM exit code: " << res.code;
     LOG(DEBUG) << "VM accepted: " << res.accepted;

crypto/smc-envelope/SmartContractCode.cpp

@@ -39,6 +39,7 @@ const auto& get_map() {
 #include "smartcont/auto/simple-wallet-ext-code.cpp"
 #include "smartcont/auto/simple-wallet-code.cpp"
 #include "smartcont/auto/wallet-code.cpp"
+#include "smartcont/auto/highload-wallet-code.cpp"
     return map;
   }();
   return map;
@@ -69,4 +70,8 @@ td::Ref<vm::Cell> SmartContractCode::simple_wallet_ext() {
   static auto res = load("simple-wallet-ext").move_as_ok();
   return res;
 }
+td::Ref<vm::Cell> SmartContractCode::highload_wallet() {
+  static auto res = load("highload-wallet").move_as_ok();
+  return res;
+}
 }  // namespace ton

crypto/smc-envelope/SmartContractCode.h

@@ -26,5 +26,6 @@ class SmartContractCode {
   static td::Ref<vm::Cell> wallet();
   static td::Ref<vm::Cell> simple_wallet();
   static td::Ref<vm::Cell> simple_wallet_ext();
+  static td::Ref<vm::Cell> highload_wallet();
 };
 }  // namespace ton